LibreOffice Gerrit News for core on 2014-05-22
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT in https://gerrit.libreoffice.org/9423 from Mukhiddin Yusupov about module include, sal + fdo#78957: Corruption - wp:extent cy height exceed the limit in heade in https://gerrit.libreoffice.org/9424 from Yogesh Bharate about module sw + fdo#78333 : SdtContent and a Shape overlapping causes corruption in https://gerrit.libreoffice.org/9374 from Umesh Kadam about module sw + fdo#78887:w:br tag is not being preserved after export. in https://gerrit.libreoffice.org/9420 from Ravindra Vidhate about module sw + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak about module filter + fdo#39631: Add SAL_LIKELY, SAL_UNLIKELY, SAL_HOT and SAT COLD macros. in https://gerrit.libreoffice.org/9418 from Michal Strnad about module include End of freshness + add default value for Context param in uno::Exception constructors in https://gerrit.libreoffice.org/9428 from Noel Grandin about module basic, codemaker, cppuhelper, cpputools, cui + fdo#77993 actually impact 10.6 too apparently in https://gerrit.libreoffice.org/9426 from Norbert Thiebaud about module vcl + fdo#78833 Improve AutoTexts for all languages (mainly FN Autotext) in https://gerrit.libreoffice.org/9408 from Laurent BP about module extras + fdo#78910 Hyperlink and Field start-end mismatch in https://gerrit.libreoffice.org/9421 from Vinaya Mandke about module sw + fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2 in https://gerrit.libreoffice.org/9327 from Winfried Donkers about module formula, include, sc, scaddins + WIP: Remove Crystal icon duplicates using symlinks in https://gerrit.libreoffice.org/7454 from Rodolfo Ribeiro Gomes about module icon-themes * Merged changes on master for project core changed in the last 25 hours: + libgltf: Updated version. in https://gerrit.libreoffice.org/9425 from Jan Holesovsky + libgltf: Update to the new version. in https://gerrit.libreoffice.org/9333 from Jan Holesovsky + care for Java 1.5 support in external packages in https://gerrit.libreoffice.org/9312 from Douglas Mencken + RID_DLG_UPDATE conversion to .ui in https://gerrit.libreoffice.org/9417 from Szymon Kłos + fdo#78663 : Corrupt: 2007 WordArt whithin a Drawing tool in https://gerrit.libreoffice.org/9392 from Rajashri Udhoji + fdo#78469 FileCorrupt:During export LO was adding wrong tags inside w:sd in https://gerrit.libreoffice.org/9371 from Tushar Bende + upgrade to python-3.3.5 in https://gerrit.libreoffice.org/9311 from Thomas Arnhold * Abandoned changes on master for project core changed in the last 25 hours: + fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT in https://gerrit.libreoffice.org/9419 from Mukhiddin Yusupov * Open changes needing tweaks, but being untouched for more than a week: + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for submodules on 2014-05-22
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + fdo#77282 Replace Edit Group with Enter Group in Writer as in Draw in https://gerrit.libreoffice.org/8944 from Laurent BP * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/UnpackedTarball_coinmp.mk |1 +
external/coinmp/werror-format-security.patch.0 | 12
2 files changed, 13 insertions(+)
New commits:
commit 197f2016e3164702db168e11f98f42042092e68e
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 08:09:14 2014 +0200
fdo#77313: coinmp: error: format not a string literal and no format
arguments
Change-Id: I044f12c4b7b28963d6d491d5e5850ddb59a564c4
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk
b/external/coinmp/UnpackedTarball_coinmp.mk
index d27d46c..831f65f 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
$(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/android.build.patch.1 \
external/coinmp/no-binaries.patch.1 \
+ external/coinmp/werror-format-security.patch.0 \
external/coinmp/windows.build.patch.1 \
))
diff --git a/external/coinmp/werror-format-security.patch.0
b/external/coinmp/werror-format-security.patch.0
new file mode 100644
index 000..90c116b
--- /dev/null
+++ b/external/coinmp/werror-format-security.patch.0
@@ -0,0 +1,12 @@
+diff -ur coinmp.org/CoinUtils/src/CoinMessageHandler.cpp
coinmp/CoinUtils/src/CoinMessageHandler.cpp
+--- CoinUtils/src/CoinMessageHandler.cpp 2014-05-21 23:14:01.384874167
+0200
CoinUtils/src/CoinMessageHandler.cpp 2014-05-21 23:14:47.708874712
+0200
+@@ -820,7 +820,7 @@
+ sprintf(messageOut_,g_format_,doublevalue);
+ if (next != format_+2) {
+ messageOut_+=strlen(messageOut_);
+- sprintf(messageOut_,format_+2);
++ sprintf(messageOut_,%s,format_+2);
+ }
+ }
+ messageOut_+=strlen(messageOut_);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/profile.cxx | 377 ---
sal/osl/unx/security.cxx | 19 +-
2 files changed, 46 insertions(+), 350 deletions(-)
New commits:
commit 4c05911b7ef25505acacbb81053a56cf428e9edc
Author: Mukhiddin Yusupov ymukhid...@gmail.com
Date: Wed May 21 01:46:57 2014 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Replaced OSL_ASSERT with SAL_WARN_IF, OSL_TRACE with SAL_INFO
Change-Id: Ia2283c09ac702558fe6ad39e963b0f401ef31de0
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 15df5b5..6684662 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -47,9 +47,6 @@
#define DEFAULT_PMODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH |
S_IWOTH)
-/*#define DEBUG_OSL_PROFILE*/
-/*#define TRACE_OSL_PROFILE*/
-
typedef time_t osl_TStamp;
typedef enum _osl_TLockMode
@@ -153,41 +150,8 @@ static oslProfile SAL_CALL osl_psz_openProfile(const
sal_Char *pszProfileName, o
osl_TProfileImpl* pProfile;
bool bRet = false;
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(In osl_openProfile);
-#endif
-
-#ifdef DEBUG_OSL_PROFILE
-Flags=osl_Profile_FLUSHWRITE;
-
-OSL_TRACE(opening '%s',pszProfileName);
-if ( Flags == osl_Profile_DEFAULT )
-{
-OSL_TRACE(with osl_Profile_DEFAULT);
-}
-if ( Flags osl_Profile_SYSTEM )
-{
-OSL_TRACE(with osl_Profile_SYSTEM);
-}
-if ( Flags osl_Profile_READLOCK )
-{
-OSL_TRACE(with osl_Profile_READLOCK);
-}
-if ( Flags osl_Profile_WRITELOCK )
-{
-OSL_TRACE(with osl_Profile_WRITELOCK);
-}
-if ( Flags osl_Profile_FLUSHWRITE )
-{
-OSL_TRACE(with osl_Profile_FLUSHWRITE);
-}
-#endif
-
if ( ( pFile = openFileImpl(pszProfileName, Flags ) ) == NULL )
{
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_openProfile [not opened]);
-#endif
return (NULL);
}
@@ -212,14 +176,11 @@ static oslProfile SAL_CALL osl_psz_openProfile(const
sal_Char *pszProfileName, o
pProfile-m_Stamp = OslProfile_getFileStamp(pFile);
bRet=loadProfile(pFile, pProfile);
bRet = realpath(pszProfileName, pProfile-m_FileName) != NULL;
-OSL_ASSERT(bRet);
+SAL_WARN_IF(!bRet, sal.osl, realpath(pszProfileName,
pProfile-m_FileName) != NULL == false);
if (pProfile-m_pFile == NULL)
closeFileImpl(pFile,pProfile-m_Flags);
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_openProfile [ok]);
-#endif
return (pProfile);
}
@@ -228,15 +189,8 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
osl_TProfileImpl* pTmpProfile;
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(In osl_closeProfile);
-#endif
-
if ( Profile == 0 )
{
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_closeProfile [profile==0]);
-#endif
return sal_False;
}
@@ -244,11 +198,9 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
if ( pProfile-m_bIsValid == false )
{
-OSL_ASSERT(pProfile-m_bIsValid);
+SAL_WARN(sal.osl, !pProfile-m_bIsValid);
pthread_mutex_unlock((pProfile-m_AccessLock));
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_closeProfile [not valid]);
-#endif
+
return sal_False;
}
@@ -261,7 +213,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
if ( pTmpProfile != 0 )
{
bool bRet = storeProfile(pTmpProfile, true);
-OSL_ASSERT(bRet);
+SAL_WARN_IF(!bRet, sal.osl, storeProfile(pTmpProfile, true) ==
false);
(void)bRet;
}
}
@@ -273,9 +225,8 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
if ( pTmpProfile == 0 )
{
pthread_mutex_unlock((pProfile-m_AccessLock));
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_closeProfile [pProfile==0]);
-#endif
+
+SAL_INFO(sal.osl, Out osl_closeProfile [pProfile==0]);
return sal_False;
}
@@ -326,9 +277,6 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
free(pProfile);
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_closeProfile [ok]);
-#endif
return (sal_True);
}
@@ -338,15 +286,8 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
osl_TFile* pFile;
bool bRet = false;
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(In osl_flushProfile());
-#endif
-
if ( pProfile == 0 )
{
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out osl_flushProfile() [pProfile == 0]);
-#endif
return sal_False;
}
@@ -354,11 +295,8 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
if ( pProfile-m_bIsValid == false )
{
-OSL_ASSERT(pProfile-m_bIsValid);
+SAL_WARN_IF(!pProfile-m_bIsValid, sal.osl, !pProfile-m_bIsValid);
pthread_mutex_unlock((pProfile-m_AccessLock));
-#ifdef TRACE_OSL_PROFILE
-OSL_TRACE(Out
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #28 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Mukhiddin Yusupov committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=4c05911b7ef25505acacbb81053a56cf428e9edc fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/ShapeOverlappingWithSdt.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/attributeoutputbase.hxx |9 +
sw/source/filter/ww8/docxattributeoutput.cxx | 69 +++
sw/source/filter/ww8/docxattributeoutput.hxx |6 +
sw/source/filter/ww8/wrtw8nds.cxx | 78 +++--
sw/source/filter/ww8/wrtww8.hxx| 13 ++
7 files changed, 174 insertions(+), 10 deletions(-)
New commits:
commit 80fd9fb7209cfd5c0622ee99d59e42e6db32f021
Author: Umesh Kadam umesh.ka...@synerzip.com
Date: Thu May 15 23:02:34 2014 +0530
fdo#78333 : SdtContent and a Shape overlapping causes corruption
- Normally if there is a case where text/shape is overlapped with (another)
shape then LO used to write the text and the AlternateContent in the
same run.
- This is supported in MSO and there is no visual difference.
- But in case if the SdtContent(with text) is overlapped with the Shape
then LO
processes sdtContent as a text and ends up putting the alternateContent
and the
text in a single run. Ultimately it includes the entire run in a
SdtContent,
which is incorrect.
- The fix checks for the aforementioned scenario and puts them in a
different run
and also restricts the sdtContent being written in an invalid
AlternateContent.
Change-Id: I36f4cdb1b583523dd8f717ae094bdf09c7a61f62
Reviewed-on: https://gerrit.libreoffice.org/9374
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/ShapeOverlappingWithSdt.docx
b/sw/qa/extras/ooxmlexport/data/ShapeOverlappingWithSdt.docx
new file mode 100644
index 000..e1ec074
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/ShapeOverlappingWithSdt.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7a69e67..16d13a2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2052,6 +2052,15 @@
DECLARE_OOXMLEXPORT_TEST(testFileOpenInputOutputError,floatingtbl_with_formula.
assertXPath(pXmlDoc, /w:document/w:body/w:p[1]/w:pPr/w:pStyle, val,
Normal);
}
+DECLARE_OOXMLEXPORT_TEST(testSdtAndShapeOverlapping,ShapeOverlappingWithSdt.docx)
+{
+ xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+ if (!pXmlDoc)
+ return;
+ assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:r[1]/mc:AlternateContent);
+ assertXPath(pXmlDoc,
/w:document/w:body/w:p/w:sdt[1]/w:sdtContent[1]/w:r[1]/w:t[1]);
+}
+
DECLARE_OOXMLEXPORT_TEST(testRelorientation, relorientation.docx)
{
uno::Referencedrawing::XShape xShape = getShape(1);
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 5a25c86..d2df9c0 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -309,6 +309,15 @@ public:
/// Has different headers/footers for the title page.
virtual void SectionTitlePage() = 0;
+/// If the node has an anchor linked.
+virtual void SetAnchorIsLinkedToNode( bool /*bAnchorLinkedToNode*/){};
+
+/// Is processing of fly postponed ?
+virtual bool IsFlyProcessingPostponed(){ return false; };
+
+/// Reset the flag for FlyProcessing
+virtual void ResetFlyProcessingFlag(){};
+
/// Description of the page borders.
virtual void SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt*
pFirstPageFmt ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 96602c3..fb5933d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -287,6 +287,20 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
m_bIsFirstParagraph = false;
}
+static void lcl_deleteAndResetTheLists( ::sax_fastparser::FastAttributeList*
pSdtPrTokenChildren, ::sax_fastparser::FastAttributeList*
pSdtPrDataBindingAttrs)
+{
+if( pSdtPrTokenChildren )
+{
+delete pSdtPrTokenChildren ;
+pSdtPrTokenChildren = NULL;
+}
+if( pSdtPrDataBindingAttrs )
+{
+delete pSdtPrDataBindingAttrs;
+pSdtPrDataBindingAttrs = NULL;
+}
+}
+
void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t
pTextNodeInfoInner )
{
// write the paragraph properties + the run, already in the correct order
@@ -382,8 +396,16 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
}
m_pSerializer-endElementNS( XML_w, XML_p );
+if( !m_bAnchorLinkedToNode )
+WriteSdtBlock( m_nParagraphSdtPrToken, m_pParagraphSdtPrTokenChildren,
m_pParagraphSdtPrDataBindingAttrs );
+
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78886.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/docxattributeoutput.cxx |1 +
3 files changed, 10 insertions(+)
New commits:
commit c5547beb47e6eb94cf917a319fcc426a36fed7af
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date: Tue May 20 15:29:27 2014 +0530
fdo#78886 File getting corrupted after Roundtrip due to fieldChar
In a hyperlink, extra field with fldCharType=end is getting added
even though there is no begin and separate fldCharType. When hyperlink is
closing pageref was not set to false. Due to which LO was adding extra
end fldCharType.
Change-Id: I0f54ab03c38cec2888cf9a1638ec5435da90099c
Reviewed-on: https://gerrit.libreoffice.org/9414
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78886.docx
b/sw/qa/extras/ooxmlexport/data/fdo78886.docx
new file mode 100644
index 000..e364948
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78886.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 16d13a2..a039e0b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3437,6 +3437,15 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78300,fdo78300.docx)
0);
}
+DECLARE_OOXMLEXPORT_TEST(testfdo78886, fdo78886.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[2]/w:tr[1]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[2]/w:fldChar[1],
0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFdo78651, fdo78651.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index fb5933d..aafb31c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -802,6 +802,7 @@ void DocxAttributeOutput::EndRun()
}
m_pSerializer-endElementNS( XML_w, XML_hyperlink );
m_startedHyperlink = false;
+m_endPageRef = false;
m_nHyperLinkCount--;
}
m_closeHyperlinkInPreviousRun = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78887.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 11 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 8555c24e069dc00071eaad23c711f1d1375e5afc
Author: Ravindra Vidhate ravindra.vidh...@synerzip.com
Date: Wed May 21 14:54:35 2014 +0530
fdo#78887 w:br tag is not being preserved after export.
When we have w:br tag continuous like in the following cases...
Title: Superstition\v\vComposer: Stevie Wonder\v\v
or \vLyrics: \v
where \n is internally replaced by \v LO.
Before text \v or after text multiple \v is not preserved.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9420
Change-Id: I2a6d0a7d2382dfbc2f0ab04f150653c9b17bbfd1
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78887.docx
b/sw/qa/extras/ooxmlexport/data/fdo78887.docx
new file mode 100644
index 000..db92fe4
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a039e0b..a82f810 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3446,6 +3446,17 @@ DECLARE_OOXMLEXPORT_TEST(testfdo78886, fdo78886.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:tbl[2]/w:tr[1]/w:tc[1]/w:p[1]/w:hyperlink[1]/w:r[2]/w:fldChar[1],
0);
}
+DECLARE_OOXMLEXPORT_TEST(testFDO78887, fdo78887.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[1], 1);
+assertXPathContent(pXmlDoc,
/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:t[1], Lyrics: );
+assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:br[2], 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFdo78651, fdo78651.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index aafb31c..91562d7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1726,6 +1726,8 @@ void DocxAttributeOutput::RunText( const OUString rText,
rtl_TextEncoding /*eCh
if ( m_pRedlineData m_pRedlineData-GetType() ==
nsRedlineType_t::REDLINE_DELETE )
nTextToken = XML_delText;
+sal_Unicode prevUnicode = *pBegin;
+
for ( const sal_Unicode *pIt = pBegin; pIt pEnd; ++pIt )
{
switch ( *pIt )
@@ -1733,20 +1735,26 @@ void DocxAttributeOutput::RunText( const OUString
rText, rtl_TextEncoding /*eCh
case 0x09: // tab
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer-singleElementNS( XML_w, XML_tab, FSEND );
+prevUnicode = *pIt;
break;
case 0x0b: // line break
{
-if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ))
+if (impl_WriteRunText( m_pSerializer, nTextToken, pBegin,
pIt ) || (prevUnicode == *pIt))
+{
m_pSerializer-singleElementNS( XML_w, XML_br, FSEND );
+prevUnicode = *pIt;
+}
}
break;
case 0x1E: //non-breaking hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer-singleElementNS( XML_w, XML_noBreakHyphen,
FSEND );
+prevUnicode = *pIt;
break;
case 0x1F: //soft (on demand) hyphen
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
m_pSerializer-singleElementNS( XML_w, XML_softHyphen, FSEND );
+prevUnicode = *pIt;
break;
default:
if ( *pIt 0x0020 ) // filter out the control codes
@@ -1754,6 +1762,7 @@ void DocxAttributeOutput::RunText( const OUString rText,
rtl_TextEncoding /*eCh
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt
);
OSL_TRACE( Ignored control code %x in a text run., *pIt
);
}
+prevUnicode = *pIt;
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/clucene
external/clucene/UnpackedTarball_clucene.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit c1db9194a53f3da7688db3463309f65659e8 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 10:28:05 2014 +0200 Record patch upstream notification Change-Id: I102160cb6fac41f5ba3caa5cb947aebbcd62681f diff --git a/external/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk index d059241..93defa2 100644 --- a/external/clucene/UnpackedTarball_clucene.mk +++ b/external/clucene/UnpackedTarball_clucene.mk @@ -24,6 +24,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0)) # http://sourceforge.net/mailarchive/message.php?msg_id=29143260 # clucene-mutex.patch was proposed upstream, see # http://sourceforge.net/mailarchive/message.php?msg_id=32314782 +# clucene-asan.patch was proposed upstream, see +# http://sourceforge.net/mailarchive/message.php?msg_id=32367781 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ external/clucene/patches/clucene-debug.patch \ external/clucene/patches/clucene-multimap-put.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/core/xmlfilterbase.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 3bebb3c2d25601767e950de02f2d549acbdaa2d2 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu May 22 10:22:43 2014 +0200 oox: fix export of OOXML generator info This time we did preserve this info, and we should not. Change-Id: If2ddd7a266cd7da5642dc234411ce34e94bd3384 diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 14d50fc..746ba2e 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -28,6 +28,7 @@ #include com/sun/star/xml/sax/XFastSAXSerializable.hpp #include com/sun/star/document/XDocumentProperties.hpp #include unotools/mediadescriptor.hxx +#include unotools/docinfohelper.hxx #include sax/fshelper.hxx #include rtl/strbuf.hxx #include rtl/ustrbuf.hxx @@ -658,7 +659,7 @@ writeAppProperties( XmlFilterBase rSelf, Reference XDocumentProperties xProp writeElement( pAppProps, XML_HyperlinksChanged, hyperlinks changed ); writeElement( pAppProps, XML_DigSig,digital signature ); #endif /* def OOXTODO */ -writeElement( pAppProps, XML_Application, xProperties-getGenerator() ); +writeElement( pAppProps, XML_Application, utl::DocInfoHelper::GetGeneratorString() ); #ifdef OOXTODO writeElement( pAppProps, XML_AppVersion,app version ); writeElement( pAppProps, XML_DocSecurity, doc security ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c39bf522eed16b5e53e3f955579692906579fc47 Author: Andras Timar andras.ti...@collabora.com Date: Thu May 22 10:31:26 2014 +0200 Updated core Project: translations b31a57455b1bf9dcffd2cee0a4c79c4f6425dd6c diff --git a/translations b/translations index b1ee9c9..b31a574 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b1ee9c9e1542b856cfe2412c6dffeeb5a353810a +Subproject commit b31a57455b1bf9dcffd2cee0a4c79c4f6425dd6c ___ 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' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ec248e390f3384cbd1ff86f0f69af27ec1e8823 Author: Andras Timar andras.ti...@collabora.com Date: Thu May 22 10:31:26 2014 +0200 Updated core Project: translations 6a87b861c97099bc61e3d0156c7efdecd8707fed diff --git a/translations b/translations index 6c2c46d..6a87b86 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6c2c46db3641281b7f7a89a6e079fe2d4f5b0808 +Subproject commit 6a87b861c97099bc61e3d0156c7efdecd8707fed ___ 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' - oox/source
oox/source/core/xmlfilterbase.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b5e0ea4ae944482f43de447668758348ce0251c4 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu May 22 10:22:43 2014 +0200 oox: fix export of OOXML generator info This time we did preserve this info, and we should not. Change-Id: If2ddd7a266cd7da5642dc234411ce34e94bd3384 (cherry picked from commit 3bebb3c2d25601767e950de02f2d549acbdaa2d2) diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 14d50fc..746ba2e 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -28,6 +28,7 @@ #include com/sun/star/xml/sax/XFastSAXSerializable.hpp #include com/sun/star/document/XDocumentProperties.hpp #include unotools/mediadescriptor.hxx +#include unotools/docinfohelper.hxx #include sax/fshelper.hxx #include rtl/strbuf.hxx #include rtl/ustrbuf.hxx @@ -658,7 +659,7 @@ writeAppProperties( XmlFilterBase rSelf, Reference XDocumentProperties xProp writeElement( pAppProps, XML_HyperlinksChanged, hyperlinks changed ); writeElement( pAppProps, XML_DigSig,digital signature ); #endif /* def OOXTODO */ -writeElement( pAppProps, XML_Application, xProperties-getGenerator() ); +writeElement( pAppProps, XML_Application, utl::DocInfoHelper::GetGeneratorString() ); #ifdef OOXTODO writeElement( pAppProps, XML_AppVersion,app version ); writeElement( pAppProps, XML_DocSecurity, doc security ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/Library_vcl.mk vcl/source
include/vcl/debugevent.hxx | 36
include/vcl/window.hxx |3
vcl/Library_vcl.mk |1
vcl/source/app/svmain.cxx|5
vcl/source/window/debugevent.cxx | 281 +++
vcl/source/window/window.cxx | 12 +
6 files changed, 338 insertions(+)
New commits:
commit 344dc7fd0684acc31f4c18e99e65bfa6700c9c64
Author: Michael Meeks michael.me...@collabora.com
Date: Thu May 8 21:59:45 2014 +0100
Make the inserted text more European and sensible for now.
Change-Id: I8b2ecef11362c0fc1dc2b76780140881e769bb89
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index ce31570..2700324 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -20,7 +20,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer {
DebugEventInjector( sal_uInt32 nMaxEvents );
Window *ChooseWindow();
- void InjectKeyEvent();
+ void InjectTextEvent();
void InjectMenuEvent();
void InjectMouseEvent();
void InjectEvent();
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index 37ca716..e83909e 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include stdio.h
+// #include stdio.h
#include rtl/math.hxx
#include rtl/string.hxx
#include tools/time.hxx
@@ -110,11 +110,11 @@ void DebugEventInjector::InjectMenuEvent()
SalMenuEvent aEvent = aIds[ getRandom() * aIds.size() ];
bool bHandled = ImplWindowFrameProc( pSysWin, NULL, nEvent, aEvent);
-fprintf( stderr, Injected menu event %p (%d) '%s' - %d\n,
+/*fprintf( stderr, Injected menu event %p (%d) '%s' - %d\n,
aEvent.mpMenu, aEvent.mnId,
OUStringToOString( ((Menu *)aEvent.mpMenu)-GetItemText(
aEvent.mnId ),
RTL_TEXTENCODING_UTF8 ).getStr(),
- (int)bHandled);
+ (int)bHandled); */
}
static void InitKeyEvent( SalKeyEvent rKeyEvent )
@@ -131,22 +131,43 @@ static void InitKeyEvent( SalKeyEvent rKeyEvent )
rKeyEvent.mnRepeat = 0;
}
-void DebugEventInjector::InjectKeyEvent()
+void DebugEventInjector::InjectTextEvent()
{
SalKeyEvent aKeyEvent;
Window *pWindow = ChooseWindow();
InitKeyEvent( aKeyEvent );
-sal_uInt16 nCode = getRandom() * KEY_CODE;
-if( getRandom() 0.05 ) // modifier
-nCode |= (sal_uInt16)( getRandom() * KEY_MODTYPE ) KEY_MODTYPE;
-aKeyEvent.mnCode = nCode;
-aKeyEvent.mnCharCode = getRandom() * 0x;
+if (getRandom() 0.10) // Occasionally a truly random event
+{
+aKeyEvent.mnCode = getRandom() * KEY_CODE;
+aKeyEvent.mnCharCode = getRandom() * 0x;
+}
+else
+{
+struct {
+sal_uInt16 nCodeStart, nCodeEnd;
+char aCharStart;
+} nTextCodes[] = {
+{ KEY_0, KEY_9, '0' },
+{ KEY_A, KEY_Z, 'a' }
+};
+
+size_t i = getRandom() * SAL_N_ELEMENTS( nTextCodes );
+int offset = trunc( getRandom() * ( nTextCodes[i].nCodeEnd -
nTextCodes[i].nCodeStart ) );
+aKeyEvent.mnCode = nTextCodes[i].nCodeStart + offset;
+aKeyEvent.mnCharCode = nTextCodes[i].aCharStart + offset;
+//fprintf( stderr, Char '%c' offset %d into record %d base '%c'\n,
+// aKeyEvent.mnCharCode, offset, (int)i,
nTextCodes[i].aCharStart );
+}
+
+if( getRandom() 0.05 ) // modifier
+aKeyEvent.mnCode |= (sal_uInt16)( getRandom() * KEY_MODTYPE )
KEY_MODTYPE;
bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT,
aKeyEvent);
-fprintf (stderr, Injected key 0x%x - %d win %p\n,
- (int) aKeyEvent.mnCode, (int)bHandled, pWindow);
+//fprintf( stderr, Injected key 0x%x - %d win %p\n,
+// (int) aKeyEvent.mnCode, (int)bHandled, pWindow );
+ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYUP, aKeyEvent );
}
/*
@@ -155,12 +176,14 @@ void DebugEventInjector::InjectKeyEvent()
*/
void DebugEventInjector::InjectEvent()
{
+//fprintf( stderr, %6d - , (int)mnEventsLeft );
+
double nRand = getRandom();
-if (nRand 0.50)
+if (nRand 0.30)
{
int nEvents = getRandom() * 10;
for (int i = 0; i nEvents; i++)
-InjectKeyEvent();
+InjectTextEvent();
}
else if (nRand 0.60)
InjectKeyNavEdit();
@@ -222,8 +245,8 @@ void DebugEventInjector::InjectKeyNavEdit()
aKeyEvent.mnCharCode = 0x0; // hopefully unused.
bool bHandled = ImplWindowFrameProc( pWindow, NULL, SALEVENT_KEYINPUT,
aKeyEvent );
-fprintf( stderr, Injected edit / move key 0x%x - %d win %p\n,
- (int) aKeyEvent.mnCode, (int)bHandled, pWindow );
+//fprintf( stderr, Injected edit / move key 0x%x - %d win %p\n,
+// (int) aKeyEvent.mnCode, (int)bHandled, pWindow );
[Libreoffice-commits] core.git: leak-suppress.txt
leak-suppress.txt |9 + 1 file changed, 9 insertions(+) New commits: commit e72d794b3911eef7ed480fa895fa0b4ea0951f92 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 10:52:06 2014 +0200 Moved leak-suppress.txt from dev-tools to core repo from 196396ffc72bbb1e4f9bbc8ff83432e22bf638af:leak-sanitizer/leak-suppress.txt Change-Id: Icc7bab46de7a8e63ce149fd0277283f267fb2931 diff --git a/leak-suppress.txt b/leak-suppress.txt new file mode 100644 index 000..5e99d64 --- /dev/null +++ b/leak-suppress.txt @@ -0,0 +1,9 @@ + +#uno typelib +leak:cppu/source/typelib/typelib.cxx + +# uno component context +leak:cppu::defaultBootstrap_InitialComponentContext + +# global objects +leak:SfxFilterContainer::ReadSingleFilter_Impl ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl test/source vcl/source
include/vcl/svapp.hxx| 10 ++ test/source/bootstrapfixture.cxx |3 +++ vcl/source/app/svapp.cxx |1 + 3 files changed, 10 insertions(+), 4 deletions(-) New commits: commit b56c9aaa80639f93531ae7aa2a929eca158c4401 Author: Tor Lillqvist t...@collabora.com Date: Thu May 22 11:12:44 2014 +0300 Avoid including config_features.h in vcl/svapp.hxx Change-Id: I711621c89e8f75d4450867e303ccdc8017bcd9d7 diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 3509c62..810aa2b 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_VCL_SVAPP_HXX #define INCLUDED_VCL_SVAPP_HXX -#include config_features.h - #include sal/config.h #include sal/types.h @@ -851,9 +849,11 @@ public: */ static ImplSVEvent *PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); -#if !HAVE_FEATURE_DESKTOP /** Send zoom event + Experimental work in progress. Available only for iOS and Android, and unclear whether actually + is needed now with tiled rendering. + @param nEvent Event ID for zoom event @param pWinPointer to window to which the event is sent @param pZoomEvent Zoom event to send @@ -862,12 +862,14 @@ public: /* Send scroll event + Experimental work in progress. Available only for iOS and Android, and unclear whether actually + is needed now with tiled rendering. + @param nEvent Event ID for scroll event @param pWinPointer to window to which the event is sent @param pScrollEventScroll event to send */ static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent ); -#endif /** Remove mouse and keypress events from a window... any also zoom and scroll events if the platform supports it. diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index b7c49ba..e8dcfa8 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -6,6 +6,9 @@ * 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 config_features.h + #include test/bootstrapfixture.hxx #include tools/errinf.hxx #include rtl/strbuf.hxx diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7855260..b27b9c3 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include config_features.h #include config_libraries.h #include comphelper/processfactory.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78910.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx | 15 +--
3 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 3c87d89bca61732cb2ee679e278863bd56bb
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date: Wed May 21 11:42:07 2014 +0530
fdo#78910 Hyperlink and Field start-end mismatch
Originally a Field began inside a hyperlink but ended after the hyperlink.
This causes the corruption in MS Word.
Incremented the field count if the field is added for the current new
hyperlink.
Added another variable to store the Field-Count from previous hyperlink.
Added UT for the same.
Change-Id: Id3c3bee1c8ed9c0755f8fff7efd5d1c5662f2c82
Reviewed-on: https://gerrit.libreoffice.org/9421
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78910.docx
b/sw/qa/extras/ooxmlexport/data/fdo78910.docx
new file mode 100644
index 000..e8a090b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78910.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a82f810..8d5323c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3486,6 +3486,18 @@ DECLARE_OOXMLEXPORT_TEST(testWordArtWithinDraingtool,
testWordArtWithinDraingto
assertXPath(pXmlDoc,/w:document[1]/w:body[1]/w:p[1]/w:r[4]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:inline[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:txbx[1]/w:txbxContent[1],1);
}
+DECLARE_OOXMLEXPORT_TEST(testFdo78910, fdo78910.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+
+if (!pXmlDoc)
+return;
+
+// This is to ensure that the fld starts and ends inside a hyperlink...
+assertXPath ( pXmlDoc, //w:hyperlink[2]/w:r[1]/w:fldChar, fldCharType,
begin );
+assertXPath ( pXmlDoc, //w:hyperlink[2]/w:r[5]/w:fldChar, fldCharType,
end );
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 91562d7..25019ba 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -759,6 +759,13 @@ void DocxAttributeOutput::StartRun( const SwRedlineData*
pRedlineData, bool /*bS
void DocxAttributeOutput::EndRun()
{
+int nFieldsInPrevHyperlink = m_nFieldsInHyperlink;
+// Reset m_nFieldsInHyperlink if a new hyperlink is about to start
+if ( m_pHyperlinkAttrList )
+{
+m_nFieldsInHyperlink = 0;
+}
+
// Write field starts
for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt !=
m_Fields.end(); )
{
@@ -767,6 +774,11 @@ void DocxAttributeOutput::EndRun()
{
StartField_Impl( *pIt );
+if ( m_pHyperlinkAttrList )
+{
+m_nFieldsInHyperlink++;
+}
+
// Remove the field from the stack if only the start has to be
written
// Unknown fields sould be removed too
if ( !pIt-bClose || ( pIt-eType == ww::eUNKNOWN ) )
@@ -791,7 +803,7 @@ void DocxAttributeOutput::EndRun()
{
if ( m_startedHyperlink )
{
-for ( int i = 0; i m_nFieldsInHyperlink; i++ )
+for ( int i = 0; i nFieldsInPrevHyperlink; i++ )
{
// If fields begin before hyperlink then
// it should end before hyperlink close
@@ -836,7 +848,6 @@ void DocxAttributeOutput::EndRun()
m_pHyperlinkAttrList = NULL;
m_startedHyperlink = true;
m_nHyperLinkCount++;
-m_nFieldsInHyperlink = 0;
}
// if there is some redlining in the document, output it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo78957.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 15 +
sw/source/filter/ww8/docxsdrexport.cxx | 71 ++--
3 files changed, 73 insertions(+), 13 deletions(-)
New commits:
commit f7bcaa98827b086f9e9a541b75654a14cf69e343
Author: Yogesh Bharate yogesh.bhar...@synerzip.com
Date: Wed May 21 19:12:48 2014 +0530
fdo#78957 Corruption - wp:extent cy height exceed the limit in
header.xml
Problem Description:
1. On 19th May windows daily build
[Build ID: dd0f844728a53a337233a3c687b792e725803da5, TinderBox: Win-x86@42,
Branch:master],
if we RT document, RT get corrupted due to the exceeding the limit of
extend height width.
2. As per ECMA standard, extend height width is of type long, but MSO only
support int32.Hence added code changes to check the same.
3. On 20th May windows daily build
[Build ID: f3a46244a07b76d633ccc7f83da3fa502612e978, TinderBox: Win-x86@42,
Branch:master],
if we RT document, it get corrupted due to exceeding value of posOffset.
4. Added code changes to make sure posOffset value is within the allowed
range.
Reviewed on:
https://gerrit.libreoffice.org/9424
Change-Id: Ib0b55314f54c51f39a492485992356f71eb062e3
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78957.docx
b/sw/qa/extras/ooxmlexport/data/fdo78957.docx
new file mode 100644
index 000..38a18a3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo78957.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8d5323c..b4a002c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3498,6 +3498,21 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78910, fdo78910.docx)
assertXPath ( pXmlDoc, //w:hyperlink[2]/w:r[5]/w:fldChar, fldCharType,
end );
}
+DECLARE_OOXMLEXPORT_TEST(testFdo78957, fdo78957.docx)
+{
+xmlDocPtr pXmlHeader = parseExport(word/header2.xml);
+
+if(!pXmlHeader)
+return;
+
+const sal_Int64 IntMax = 2147483647;
+sal_Int64 cx = 0, cy = 0;
+cx =
getXPath(pXmlHeader,/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1],cx).toInt64();
+cy =
getXPath(pXmlHeader,/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1],cy).toInt64();
+// Here we check the values of extent width height
+CPPUNIT_ASSERT(cx = IntMax );
+CPPUNIT_ASSERT(cy = 0 );
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 29c1195..c2481c5 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -44,7 +44,6 @@
#include writerhelper.hxx
#include comphelper/seqstream.hxx
-#include climits
using namespace com::sun::star;
using namespace oox;
@@ -426,6 +425,13 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
break;
}
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_positionH,
XML_relativeFrom, relativeFromH, FSEND);
+/**
+* Sizes of integral types
+* climits header defines constants with the limits of integral types
for the specific system and compiler implemetation used.
+* Use of this might cause platform dependent problem like posOffset
exceed the limit.
+**/
+const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
+const sal_Int64 MIN_INTEGER_VALUE = -2147483648;
if (alignH != NULL)
{
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_align, FSEND);
@@ -447,13 +453,14 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
*
* Please refer :
http://www.schemacentral.com/sc/xsd/t-xsd_int.html
*/
-if (nTwipstoEMU INT_MAX)
+
+if (nTwipstoEMU MAX_INTEGER_VALUE)
{
-nTwipstoEMU = INT_MAX;
+nTwipstoEMU = MAX_INTEGER_VALUE;
}
-else if (nTwipstoEMU INT_MIN)
+else if (nTwipstoEMU MIN_INTEGER_VALUE)
{
-nTwipstoEMU = INT_MIN;
+nTwipstoEMU = MIN_INTEGER_VALUE;
}
m_pImpl-m_pSerializer-write(nTwipstoEMU);
m_pImpl-m_pSerializer-endElementNS(XML_wp, XML_posOffset);
@@ -470,13 +477,13 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
{
m_pImpl-m_pSerializer-startElementNS(XML_wp, XML_posOffset,
FSEND);
sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.Y);
-if (nTwipstoEMU INT_MAX)
+if (nTwipstoEMU MAX_INTEGER_VALUE)
{
-nTwipstoEMU = INT_MAX;
+nTwipstoEMU = MAX_INTEGER_VALUE;
}
-
[Libreoffice-commits] core.git: include/vcl
include/vcl/debugevent.hxx |4
1 file changed, 4 insertions(+)
New commits:
commit 51f92027b49da2375c01594e3e193f7fb1e3d2c1
Author: Michael Meeks michael.me...@collabora.com
Date: Thu May 22 10:28:11 2014 +0100
Fix Windows link issue around missing vtable fn.
Change-Id: I8a9a8c56b91783288e2319ad3a5e9803ab5562d0
diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx
index 56c47ff..c61f93f 100644
--- a/include/vcl/debugevent.hxx
+++ b/include/vcl/debugevent.hxx
@@ -10,6 +10,8 @@
#ifndef INCLUDED_VCL_DEBUGEVENT_HXX
#define INCLUDED_VCL_DEBUGEVENT_HXX
+#if OSL_DEBUG_LEVEL 0
+
#include vcl/dllapi.h
#include vcl/timer.hxx
#include sal/types.h
@@ -31,6 +33,8 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer {
static DebugEventInjector *getCreate();
};
+#endif // OSL_DEBUG_LEVEL 0
+
#endif // INCLUDED_VCL_DEBUGEVENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - basic/source sw/CppunitTest_sw_macros_test.mk sw/qa
basic/source/inc/namecont.hxx|4 +
basic/source/inc/scriptcont.hxx |1
basic/source/uno/namecont.cxx| 97 ++-
basic/source/uno/scriptcont.cxx |6 ++
sw/CppunitTest_sw_macros_test.mk | 62 +---
sw/qa/core/data/odt/fdo68983.odt |binary
sw/qa/core/macros-test.cxx | 48 +++
7 files changed, 158 insertions(+), 60 deletions(-)
New commits:
commit 5246fa262450f686674850c53df666422f441c86
Author: Michael Stahl mst...@redhat.com
Date: Wed May 21 22:26:05 2014 +0200
fdo#68983: basic: if the library is not loaded fully, copy source storage
Also fixes fdo#42899 and fdo#67685 in a different way; the previous fix
for fdo#42899 caused the problem with password-protected libraries for
which the password is not known: only the binary representation of the
BAISC module was stored, not the source code; by simply copying from the
source storage the problem can be avoided.
It would be possible to ask for the password when storing, but that
would not work when non-interactive (called via API).
An alternative fix would be to pass in the
SfxObjectShell::IsSetModifyEnabled() flag and actually reset the BASIC
library's modify flag correctly, but that requires adding a
parameter to XStorageBasedLibraryContainer::storeLibrariesToStorage().
(regression from af34774d260a68fc02cd78ba90dd8d4afaf1a2a4 )
Change-Id: I4701401f35171139fc2fe8d225d13d4e533091a0
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 109835a..6355549 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -582,7 +582,9 @@ private:
bool mbReadOnlyLink;
bool mbPreload;
+protected:
bool mbPasswordProtected;
+private:
bool mbPasswordVerified;
bool mbDoc50Password;
OUString maPassword;
@@ -702,6 +704,8 @@ public:
}
protected:
+virtual bool isLoadedStorable();
+
virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any
aElement ) const = 0;
};
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index ea09a91..0a331b9 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -154,6 +154,7 @@ class SfxScriptLibrary : public SfxLibrary, public
SfxScriptLibrary_BASE
const ::com::sun::star::uno::Reference
::com::sun::star::task::XInteractionHandler xHandler ) SAL_OVERRIDE;
virtual void storeResourcesToStorage( const
::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage xStorage ) SAL_OVERRIDE;
+virtual bool isLoadedStorable() SAL_OVERRIDE;
public:
SfxScriptLibrary
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index c3329d1..52d3494f 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1909,8 +1909,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
if( pImplLib-implIsModified() || bComplete )
{
-// For the moment don't copy storage (as an optimisation )
-// but instead always write to storage from memory.
// Testing pImplLib-implIsModified() is not reliable,
// IMHO the value of pImplLib-implIsModified() should
// reflect whether the library ( in-memory ) model
@@ -1921,9 +1919,14 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
// temp storage when saving ( and later sets the root storage of the
// library container ) and similar madness in dbaccess means some surgery
// is required to make it possible to successfully use this optimisation
-#if 0
+// It would be possible to do the implSetModified() call below only
+// conditionally, but that would require an additional boolean to be
+// passed in via the XStorageBasedDocument::storeLibrariesToStorage()...
+// fdo#68983: If there's a password and the password is not known, only
+// copying the storage works!
// Can we simply copy the storage?
-if( !mbOldInfoFormat !pImplLib-implIsModified()
!mbOasis2OOoFormat xSourceLibrariesStor.is() )
+if (!mbOldInfoFormat !pImplLib-isLoadedStorable()
+!mbOasis2OOoFormat xSourceLibrariesStor.is())
{
try
{
@@ -1936,7 +1939,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
}
}
else
-#endif
{
uno::Reference embed::XStorage xLibraryStor;
if( bStorage )
@@ -3037,6 +3039,11 @@ SfxLibrary::SfxLibrary( ModifiableHelper _rModifiable,
const Type aType,
{
}
+bool SfxLibrary::isLoadedStorable()
+{
+return mbLoaded (!mbPasswordProtected || mbPasswordVerified);
+}
+
void SfxLibrary::implSetModified( bool _bIsModified )
{
if ( mbIsModified == _bIsModified )
diff --git
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 1159ab61494bf82fbb2a92ea52015b85501418d1 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 22 13:18:00 2014 +0200 change the bar size a bit Change-Id: I09df4a7104a4df1603a7d64bfa49c103be4f4ade diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 542711a..a3a8858 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -64,10 +64,10 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vectorVDataSeries rDataSer // guarantee they are positioned correctly. In fact, they are guaranteed // to be positioned incorrectly. -const float nBarSizeX = 10; -const float nBarSizeY = 10; -const float nBarDistanceX = nBarSizeX / 2; -const float nBarDistanceY = nBarSizeY / 2; +const float nBarSizeX = 10.0f; +const float nBarSizeY = 30.0f; +const float nBarDistanceX = 5.0f; +const float nBarDistanceY = 5.0; sal_uInt32 nId = 1; float nXEnd = 0.0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 7f55233410a241434d4e68e5f84020ab38662a30 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Thu May 22 13:18:00 2014 +0200 change the bar size a bit Change-Id: I09df4a7104a4df1603a7d64bfa49c103be4f4ade diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 542711a..a3a8858 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -64,10 +64,10 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vectorVDataSeries rDataSer // guarantee they are positioned correctly. In fact, they are guaranteed // to be positioned incorrectly. -const float nBarSizeX = 10; -const float nBarSizeY = 10; -const float nBarDistanceX = nBarSizeX / 2; -const float nBarDistanceY = nBarSizeY / 2; +const float nBarSizeX = 10.0f; +const float nBarSizeY = 30.0f; +const float nBarDistanceX = 5.0f; +const float nBarDistanceY = 5.0; sal_uInt32 nId = 1; float nXEnd = 0.0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - chart2/source
chart2/source/view/main/GL3DRenderer.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 156f793e6c592c08e62d641080a6c2f386121548 Author: Stephan Bergmann sberg...@redhat.com Date: Wed May 21 16:21:26 2014 +0200 -Werror,-Wunused-variable Change-Id: Ie7919740e7e95eb53f7a719e3dc2b114c6fd3862 diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index d686009..d6c1dff 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -1601,7 +1601,6 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long nX, long nY) boost::scoped_arraysal_uInt8 buf(new sal_uInt8[4]); glReadPixels(nX, nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get()); Color aColor(buf[3], buf[2], buf[1], buf[0]); -static sal_Int32 i = 0; return aColor.GetColor(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_macros_test.mk
sw/CppunitTest_sw_macros_test.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3e69b7bcd3e4a9cb1a29360c905e7fba96365999 Author: Michael Stahl mst...@redhat.com Date: Thu May 22 13:23:25 2014 +0200 sw: use xsec_xmlsec.windows on WNT Change-Id: I9cb9bce9d30230d48daf2f1deccaf52014b79296 diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 7b68eff..a33fe67 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -98,7 +98,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ xmloff/util/xo \ - xmlsecurity/util/xsec_xmlsec \ + xmlsecurity/util/$(if $(filter WNT,$(OS)),xsec_xmlsec.windows,xsec_xmlsec) \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test)) ___ 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/WW8TableInfo.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b630d26a2a53767d4d39e14d421448ed87811773
Author: Caolán McNamara caol...@redhat.com
Date: Thu May 22 12:28:24 2014 +0100
fix DBG_UTIL build
Change-Id: I0bafcda49f3e9de6da30fd0446212bd7a18159d8
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx
b/sw/source/filter/ww8/WW8TableInfo.cxx
index af3d71c..c1b6592 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -1345,7 +1345,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells()
#ifdef DBG_UTIL
::std::string WW8TableCellGrid::toString()
{
-string sResult = WW8TableCellGrid;
+::std::string sResult = WW8TableCellGrid;
RowTops_t::const_iterator aTopsIt = getRowTopsBegin();
static char sBuffer[1024];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source sd/source sfx2/source sw/source
sc/source/filter/excel/expop2.cxx |3 ---
sc/source/filter/xml/xmlwrap.cxx|2 --
sd/source/ui/docshell/docshel4.cxx | 11 ---
sfx2/source/doc/objcont.cxx |4 +---
sfx2/source/doc/objstor.cxx |2 ++
sfx2/source/doc/objxtor.cxx |2 +-
sw/source/core/uibase/app/docsh.cxx |1 -
sw/source/filter/xml/xmlexp.cxx |4
8 files changed, 4 insertions(+), 25 deletions(-)
New commits:
commit 6e87f0bb75734e464bb0160dc00ab2fbe1a8fac3
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:50:39 2014 +0200
Update also revision and editing time when setting 'modified' properties.
Change-Id: Id756ef6dd62ca8df2e62265b9cc930f07d13f2e3
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index bea59cd..7bba8d6 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -208,9 +208,7 @@ void SfxObjectShell::UpdateDocInfoForSave()
now.GetHour(), now.GetDay(), now.GetMonth(),
now.GetYear(), false) );
xDocProps-setModifiedBy( aUserName );
-if ( !HasName() || pImp-bIsSaving )
-// QUESTION: not in case of real SaveAs as this is meant to
create a new document
-UpdateTime_Impl( xDocProps );
+UpdateTime_Impl( xDocProps );
}
}
}
commit fee87c6fda46923a564cd2574827a7beeffb1a1f
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:42:55 2014 +0200
Use proper constructor to fill with system time.
Probably 86adb5cacb4fe3e7fb869299447da5876f0da30d did not mean to change
the behaviour here.
Change-Id: If39c150973c502323b3c785a9738cf65cdd74e5d
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 29fe983..b0b2347 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -209,7 +209,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell
_rDocShell )
,rDocShell( _rDocShell )
,aMacroMode( *this )
,pProgress( 0)
-,nTime( DateTime::EMPTY )
+,nTime( DateTime::SYSTEM )
,nVisualDocumentNumber( USHRT_MAX)
,nDocumentSignatureState( SIGNATURESTATE_UNKNOWN )
,nScriptingSignatureState( SIGNATURESTATE_UNKNOWN )
commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 10:11:38 2014 +0200
cp#177: Set 'modified' document property more consistently.
Update document info at one place, so that it works for other formats
like .doc, .docx, ... too.
Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260
diff --git a/sc/source/filter/excel/expop2.cxx
b/sc/source/filter/excel/expop2.cxx
index 8f9ebf9..f1453e9 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -88,9 +88,6 @@ FltError ExportBiff5::Write()
if( pDocShell xRootStrg.Is() )
{
-// #i88642# update doc info (revision etc)
-pDocShell-UpdateDocInfoForSave();
-
using namespace ::com::sun::star;
uno::Referencedocument::XDocumentPropertiesSupplier xDPS(
pDocShell-GetModel(), uno::UNO_QUERY_THROW);
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 640890b..a9e8dd9 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -788,8 +788,6 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly)
if ( pObjSh xStorage.is() )
{
-pObjSh-UpdateDocInfoForSave(); // update information
-
uno::Referenceframe::XModel xModel(pObjSh-GetModel());
uno::Referencetask::XStatusIndicator
xStatusIndicator(GetStatusIndicator());
sal_Int32 nProgressRange(100);
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index b61aa45..654d6a8 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -506,12 +506,7 @@ bool DrawDocShell::Save()
bool bRet = SfxObjectShell::Save();
if( bRet )
-{
-// Call UpdateDocInfoForSave() before export
-UpdateDocInfoForSave();
-
bRet = SdXMLFilter( *GetMedium(), *this, true, SDXMLMODE_Normal,
SotStorage::GetVersion( GetMedium()-GetStorage() ) ).Export();
-}
return bRet;
}
@@ -545,11 +540,7 @@ bool DrawDocShell::SaveAs( SfxMedium rMedium )
boolbRet = SfxObjectShell::SaveAs( rMedium );
if( bRet )
-{
-// Call UpdateDocInfoForSave() before export
-UpdateDocInfoForSave();
bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal,
SotStorage::GetVersion( rMedium.GetStorage() ) ).Export();
-}
if( GetError() == ERRCODE_NONE )
SetError( nVBWarning, OSL_LOG_PREFIX );
@@ -587,13 +578,11 @@ bool DrawDocShell::ConvertTo( SfxMedium rMedium )
aTypeName.indexOf( impress8 ) = 0 )
{
pFilter = new SdXMLFilter(
[Libreoffice-commits] core.git: l10ntools/inc
l10ntools/inc/cfgmerge.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ace815b451242b13f492887b004d14337362ae58
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:17:32 2014 +0200
Fix memory leak in cfgex tool
Change-Id: Ic8c410a805fa06777c1a85de646df2dcd5b6506a
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index b938a11..1eb5f55 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -74,13 +74,13 @@ public:
~CfgStack();
CfgStackData *Push(const OString rTag, const OString rId);
-CfgStackData *Pop()
+void Pop()
{
-if (maList.empty())
-return NULL;
-CfgStackData* temp = maList.back();
-maList.pop_back();
-return temp;
+if (!maList.empty())
+{
+delete maList.back();
+maList.pop_back();
+}
}
CfgStackData *GetStackData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/Makefile-clang.mk
compilerplugins/Makefile-clang.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5db9861383f054c6e2018c0e90d31ee1c89b25b4
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:18:51 2014 +0200
Filter out all -fsanitize= args when building compilerplugins
Change-Id: Ic809ddad81608f107749498c1432606403ee2314
diff --git a/compilerplugins/Makefile-clang.mk
b/compilerplugins/Makefile-clang.mk
index 8f8311b..bed75ce 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -11,7 +11,7 @@
CLANG_COMMA :=,
# You may occasionally want to override some of these
-CLANGCXX=$(filter-out -m32 -m64 -fsanitize=address,$(CXX))
+CLANGCXX=$(filter-out -m32 -m64 -fsanitize=%,$(CXX))
# Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin)
CLANGCXXFLAGS=-O2 -Wall -Wextra -g
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/concat-deps.c | 30 +-
1 file changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 92cb4099c46f62f537db93a59c3141bce1355924
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:21:09 2014 +0200
concat-deps: Clean up memory at exit when run with lsan
Change-Id: I66ccb5332e6c5eceb2f199911ebd4296c93cac4b
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 439deb9..4a22309 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -74,6 +74,8 @@
#include unistd.h
#endif
+#include config_options.h
+
/* modes */
#ifdef __windows
#define FILE_O_RDONLY _O_RDONLY
@@ -590,6 +592,11 @@ off_t size = -1;
return size;
}
+#if !ENABLE_RUNTIME_OPTIMIZATIONS
+static void * file_load_buffers[100];
+static size_t file_load_buffer_count = 0;
+#endif
+
static char* file_load(const char* name, off_t* size, int* return_rc)
{
off_t local_size = 0;
@@ -610,6 +617,20 @@ int fd;
if (!(fd == -1))
{
buffer = malloc((size_t)(*size + 1));
+#if !ENABLE_RUNTIME_OPTIMIZATIONS
+if (buffer != NULL)
+{
+if (file_load_buffer_count == 100)
+{
+free(buffer);
+buffer = NULL;
+}
+else
+{
+file_load_buffers[file_load_buffer_count++] = buffer;
+}
+}
+#endif
if (buffer == NULL)
{
rc = ENOMEM;
@@ -1089,7 +1110,7 @@ off_t in_list_size = 0;
char* in_list;
char* in_list_cursor;
char* in_list_base;
-struct hash* dep_hash;
+struct hash* dep_hash = 0;
const char *env_str;
if(argc 2)
@@ -1149,6 +1170,13 @@ const char *env_str;
dep_hash-collisions, dep_hash-memcmp, dep_hash-cost);
#endif
}
+#if !ENABLE_RUNTIME_OPTIMIZATIONS
+hash_destroy(dep_hash);
+for (size_t i = 0; i != file_load_buffer_count; ++i)
+{
+free(file_load_buffers[i]);
+}
+#endif
return rc;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/macros-test.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit b01b171fbfdda4e40ef1fec696589f8981518b93
Author: Michael Stahl mst...@redhat.com
Date: Thu May 22 14:21:03 2014 +0200
sw: why the heck is that #ifdef'd out?
Change-Id: I213ad0f0ab853aec5cb523474218dfad2c44d11b
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index f5565bc..faa97c5 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -56,9 +56,7 @@ class SwMacrosTest : public test::BootstrapFixture, public
unotest::MacrosTest
public:
SwMacrosTest();
-#if !defined MACOSX !defined WNT
void createFileURL(const OUString aFileBase, const OUString
aFileExtension, OUString rFilePath);
-#endif
virtual void setUp() SAL_OVERRIDE;
virtual void tearDown() SAL_OVERRIDE;
@@ -86,7 +84,6 @@ private:
OUString m_aBaseString;
};
-#if !defined MACOSX !defined WNT
void SwMacrosTest::createFileURL(const OUString aFileBase, const OUString
aFileExtension, OUString rFilePath)
{
OUString aSep(/);
@@ -95,7 +92,6 @@ void SwMacrosTest::createFileURL(const OUString aFileBase,
const OUString aFil
aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
rFilePath = aBuffer.makeStringAndClear();
}
-#endif
#if 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice 43 bibisect (was: LibreOffice 4.3~beta1 bibisect)
On Thu, May 22, 2014 at 01:18:11AM +0200, Bjoern Michaelsen wrote: I will now merge those and upload a 43all and 43only repo replacing the current 42all and 42only ones ... 43only merged and uploaded -- so with 42all and 43only you have the range from mid-3.5 to 4.3 branchoff in two repos. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - external/cppunit external/icu leak-suppress.txt soltools/cpp
external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 | 11 +++
external/cppunit/UnpackedTarball_cppunit.mk|1 +
external/icu/UnpackedTarball_icu.mk|1 +
external/icu/icu-ubsan.patch.0 | 20
leak-suppress.txt | 14 +-
soltools/cpp/_macro.c |1 +
soltools/cpp/_unix.c |1 +
7 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 60c43d81ad4fa2ee587527d18522ac34148af2f2
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:33:00 2014 +0200
Some trivial fix for hash function signed overflow undefined behavior
Change-Id: I41ec24a02867ba3c5bf4f39b5d79bf6a3254ad0d
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index 77cd38a..3b06d22 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-mkdir.patch \
external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
+ external/icu/icu-ubsan.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
new file mode 100644
index 000..ef3121f
--- /dev/null
+++ b/external/icu/icu-ubsan.patch.0
@@ -0,0 +1,20 @@
+--- source/common/ustring.cpp
source/common/ustring.cpp
+@@ -1486,7 +1486,7 @@
+ */
+
+ #define STRING_HASH(TYPE, STR, STRLEN, DEREF) \
+-int32_t hash = 0; \
++uint32_t hash = 0; \
+ const TYPE *p = (const TYPE*) STR;\
+ if (p != NULL) { \
+ int32_t len = (int32_t)(STRLEN); \
+@@ -1497,7 +1497,7 @@
+ p += inc; \
+ } \
+ } \
+-return hash
++return static_castint32_t(hash)
+
+ /* Used by UnicodeString to compute its hashcode - Not public API. */
+ U_CAPI int32_t U_EXPORT2
commit 77ad60af119ab23a0bfadb3e5a0c4433fe97835b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:28:20 2014 +0200
Adapt CppUnit to our CPPUNIT_PLUGIN_EXPORT
...which mentions extern C, so CppUnit's TestPlugInSignature must reflect
that. It is a bit odd how CPPUNIT_PLUGIN_EXPORT needs to be passed into
CppUnit, so probably best to keep this as a local patch for now. (Clang's
-fsanitize=undefined complained about the mismatch.)
Change-Id: Ied179a1afe82ceb04de4739c14cf8fadff31b80f
diff --git a/external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0
b/external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0
new file mode 100644
index 000..a764be9
--- /dev/null
+++ b/external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0
@@ -0,0 +1,11 @@
+--- include/cppunit/plugin/TestPlugIn.h
include/cppunit/plugin/TestPlugIn.h
+@@ -111,7 +111,7 @@
+ /*! \brief Type of the function exported by a plug-in.
+ * \ingroup WritingTestPlugIn
+ */
+-typedef CppUnitTestPlugIn *(*TestPlugInSignature)();
++extern C { typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); }
+
+
+ /*! \brief Implements the function exported by the test plug-in
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk
b/external/cppunit/UnpackedTarball_cppunit.mk
index 86dc77d..a46e9bf 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/windows.patch \
external/cppunit/unix.patch \
external/cppunit/wundef.patch \
+ external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \
))
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
commit ec46bb9ff8d165ab7f4537e305f8d0dae707fcf8
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:26:57 2014 +0200
Silence remaining memory leaks in soltools/cpp when run with lsan
Change-Id: Ia71c9abedfd325b9f5bb2a5e28b2386db5c2fd6b
diff --git a/leak-suppress.txt b/leak-suppress.txt
index 3370a55..b9a1fd2 100644
--- a/leak-suppress.txt
+++ b/leak-suppress.txt
@@ -16,3 +16,6 @@ leak:cppu::defaultBootstrap_InitialComponentContext
# global objects
leak:SfxFilterContainer::ReadSingleFilter_Impl
+
+# build-time tool soltools/cpp:
+leak:soltools/cpp/_cpp.c
commit 0a181c9aa28f1e1315e31623c1f04e774d300ec3
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 14:24:26 2014 +0200
Fix some memory leak in soltools/cpp tool
...though many more remain, as the design appears to be let heap grow
until exit.
Change-Id: I3e5cc95a0896c8add33a767209ab0ff60d6a4b52
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index bd91141..6d48ef6 100644
---
[Libreoffice-commits] core.git: Changes to 'feature/fastsax'
New branch 'feature/fastsax' available with the following commits: commit 16454dc15fa98a2064047f87c1981d3d13fb7329 Author: Michael Meeks michael.me...@collabora.com Date: Wed May 21 21:54:17 2014 +0100 First cut at FastParser wrapper test ... Change-Id: I4e9f315d6ee56aea2ea36b75680705ead6b67d69 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/textbox' - 5 commits - sw/inc sw/source
sw/inc/doc.hxx |4 ++--
sw/inc/textboxhelper.hxx |2 +-
sw/source/core/doc/docfly.cxx| 23 +--
sw/source/core/doc/textboxhelper.cxx | 10 ++
sw/source/core/unocore/unocoll.cxx | 12 +---
5 files changed, 39 insertions(+), 12 deletions(-)
New commits:
commit f7f16dd245ea73cfd198684fb33abe968380768b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu May 22 15:12:03 2014 +0200
SwXFrameEnumeration: ignore textboxes
Change-Id: Ifd8ff27bfb11b1162197e7a159c5bbe25b7d9bc3
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index 95fe53e..99a6146 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -49,6 +49,7 @@
#include unofield.hxx
#include unoidx.hxx
#include unoframe.hxx
+#include textboxhelper.hxx
#include unofootnote.hxx
#include vcl/svapp.hxx
#include fmtcntnt.hxx
@@ -1087,12 +1088,15 @@ SwXFrameEnumerationT::SwXFrameEnumeration(const
SwDoc* const pDoc)
::std::insert_iteratorfrmcontainer_t pInserter =
::std::insert_iteratorfrmcontainer_t(m_aFrames, m_aFrames.begin());
// #i104937#
SwFrmFmt* pFmt( 0 );
+
+std::listSwFrmFmt* aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+
for( sal_uInt16 i = 0; i nSize; ++i )
//for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt pFmtsEnd; ++pFmt)
{
// #i104937#
pFmt = (*pFmts)[i];
-if(pFmt-Which() != RES_FLYFRMFMT)
+if(pFmt-Which() != RES_FLYFRMFMT || std::find(aTextBoxes.begin(),
aTextBoxes.end(), pFmt) != aTextBoxes.end())
continue;
const SwNodeIndex* pIdx = pFmt-GetCntnt().GetCntntIdx();
if(!pIdx || !pIdx-GetNodes().IsDocNodes())
commit 18824d52c4a326c2b31c30c2153e05adbaf27faa
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu May 22 14:51:41 2014 +0200
SwXFrames::getByIndex: ignore textboxes
Change-Id: I0d0f16e147092402b85d84e90fe8ee9812a2937f
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index bccd5dd..8bab97a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1233,7 +1233,7 @@ public:
/** Access to frames.
Iterate over Flys - forr Basic-Collections. */
sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool
bIgnoreTextBoxes = false ) const;
-SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL);
+SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL,
bool bIgnoreTextBoxes = false );
// Copy formats in own arrays and return them.
SwFrmFmt *CopyFrmFmt ( const SwFrmFmt );
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index c657db0..4755251 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -120,16 +120,25 @@ sal_uInt16 SwDoc::GetFlyCount( FlyCntType eType, bool
bIgnoreTextBoxes ) const
}
/// @attention If you change this, also update SwXFrameEnumeration in unocoll.
-SwFrmFmt* SwDoc::GetFlyNum( sal_uInt16 nIdx, FlyCntType eType )
+SwFrmFmt* SwDoc::GetFlyNum( sal_uInt16 nIdx, FlyCntType eType, bool
bIgnoreTextBoxes )
{
SwFrmFmts rFmts = *GetSpzFrmFmts();
SwFrmFmt* pRetFmt = 0;
sal_uInt16 nSize = rFmts.size();
const SwNodeIndex* pIdx;
sal_uInt16 nCount = 0;
+
+std::listSwFrmFmt* aTextBoxes;
+if (bIgnoreTextBoxes)
+aTextBoxes = SwTextBoxHelper::findTextBoxes(this);
+
for( sal_uInt16 i = 0; !pRetFmt i nSize; ++i )
{
SwFrmFmt* pFlyFmt = rFmts[ i ];
+
+if (bIgnoreTextBoxes std::find(aTextBoxes.begin(),
aTextBoxes.end(), pFlyFmt) != aTextBoxes.end())
+continue;
+
if( RES_FLYFRMFMT == pFlyFmt-Which()
0 != ( pIdx = pFlyFmt-GetCntnt().GetCntntIdx() )
pIdx-GetNodes().IsDocNodes()
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index d0d1a32..95fe53e 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1200,7 +1200,8 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
throw uno::RuntimeException();
if(nIndex 0 || nIndex = USHRT_MAX)
throw IndexOutOfBoundsException();
-SwFrmFmt* pFmt = GetDoc()-GetFlyNum(static_castsal_uInt16(nIndex),
eType);
+// Ignore TextBoxes for TextFrames.
+SwFrmFmt* pFmt = GetDoc()-GetFlyNum(static_castsal_uInt16(nIndex),
eType, /*bIgnoreTextBoxes=*/eType == FLYCNTTYPE_FRM);
if(!pFmt)
throw IndexOutOfBoundsException();
return lcl_UnoWrapFrame(pFmt, eType);
commit d41fdbdb56dc1a27b83753f2facd50e12add9b77
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu May 22 14:21:38 2014 +0200
SwXFrames::getCount: ignore TextFrames, which are TextBoxes
Change-Id: I39fb4fcff2a55cef658d93c80c1cf448bd2e7c86
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4e833d8..bccd5dd 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1232,7 +1232,7 @@ public:
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/macros-test.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 73f65ac3ef713cc53c53da301785e35b36528504
Author: Tor Lillqvist t...@collabora.com
Date: Thu May 22 16:12:09 2014 +0300
WaE: unused variable 'aFileNameBase'
Change-Id: I26cf27c7edc51d0a28e228c56465c3ec2ad7d35e
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index faa97c5..7a7d804 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -195,7 +195,6 @@ void SwMacrosTest::testFdo55289()
void SwMacrosTest::testFdo68983()
{
-const OUString aFileNameBase(StarBasic.);
OUString aFileName;
createFileURL(fdo68983., odt, aFileName);
Reference com::sun::star::lang::XComponent xComponent =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/doc/sfxbasemodel.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit d0cefa6fc9b6beb61c021637f5967af85429b5d4
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 16:36:13 2014 +0100
valgrind: SfxBaseModel's pImpl of fallback TargetDocument for paste leaks
e.g. repeatedly pasting a metafile into writer and deleting it.
==13369== 342 (232 direct, 110 indirect) bytes in 1 blocks are definitely
lost in loss record 19,396 of 22,170
==13369==at 0x4A06965: operator new(unsigned long) (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==13369==by 0x686D72E: SfxBaseModel::SfxBaseModel(SfxObjectShell*)
(sfxbasemodel.cxx:518)
==13369==by 0x288CA9C1:
SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel*) (unomod.cxx:255)
==13369==by 0x28961055: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
com::sun::star::uno::Referencecom::sun::star::lang::XComponent const, char
const*) (xmlexport.cxx:164)
==13369==by 0x28960FA2: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
com::sun::star::uno::Referencecom::sun::star::lang::XComponent const)
(xmlexport.cxx:148)
==13369==by 0x2896175E: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const)
(xmlexport.cxx:254)
==13369==by 0x240B1002: SwFEShell::Paste(SvStream, unsigned short,
Point const*) (fecopy.cxx:1333)
==13369==by 0x247B981A:
SwTransferable::_PasteSdrFormat(TransferableDataHelper, SwWrtShell, unsigned
short, Point const*, unsigned char, bool) (swdtflvr.cxx:2207)
==13369==by 0x247B678E:
SwTransferable::PasteData(TransferableDataHelper, SwWrtShell, unsigned short,
unsigned long, unsigned short, bool, bool, Point const*, signed char, bool)
(swdtflvr.cxx:1481)
==13369==by 0x247B5AE4: SwTransferable::Paste(SwWrtShell,
TransferableDataHelper) (swdtflvr.cxx:1150)
==13369==by 0x2488FCCE: SwBaseShell::ExecClpbrd(SfxRequest)
(basesh.cxx:277)
Reference lang::XComponent xTargetDocument( xComponent );
if( !xTargetDocument.is() )
{
xTargetDocument = new SvxUnoDrawingModel( pModel );
pModel-setUnoModel( Reference XInterface ::query(
xTargetDocument ) );
}
(cherry picked from commit fdca15fb864aca975533257d5ee83440992d8a7e)
Conflicts:
sfx2/source/doc/sfxbasemodel.cxx
Change-Id: I3bd0fc983d9b6bdcdc91071a4ec3d2c584397ebf
Reviewed-on: https://gerrit.libreoffice.org/9384
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1de92d6..67096db 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -537,6 +537,11 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
SfxBaseModel::~SfxBaseModel()
{
DBG_DTOR(sfx2_SfxBaseModel,NULL);
+//In SvxDrawingLayerImport when !xTargetDocument the fallback
SvxUnoDrawingModel created there
+//never gets disposed called on it, so m_pData leaks.
+IMPL_SfxBaseModel_DataContainer* pData = m_pData;
+m_pData = 0;
+delete pData;
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo79008.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 10 ++
sw/source/filter/ww8/wrtw8esh.cxx |2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit ed3fd76b65b2a281effea55b8a55101a8b740aec
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date: Wed May 21 19:32:54 2014 +0530
fdo#79008 Crash: File getting crash while saving in LO
File is getting crashed while saving in LO, as it tries
to access the value of vector after erasing that value.
Code changed to access the vector value first and
then erase that value from vector.
Change-Id: I29369b7582fdbd7363d0e6fdae091a30c79a747d
Reviewed-on: https://gerrit.libreoffice.org/9433
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79008.docx
b/sw/qa/extras/ooxmlexport/data/fdo79008.docx
new file mode 100644
index 000..2b17587
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo79008.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b4a002c..562541d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3124,6 +3124,16 @@ DECLARE_OOXMLEXPORT_TEST(testfdo76589 , fdo76589.docx)
assertXPath ( pXmlDoc,
/w:numbering/w:abstractNum[1]/w:lvl[1]/w:lvlText,val,%1 );
}
+DECLARE_OOXMLEXPORT_TEST(testfdo79008, fdo79008.docx)
+{
+/* File getting crash while saving in LO.
+ * Checking if document.xml file is getting created after fix
+ */
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+}
+
DECLARE_OOXMLEXPORT_TEST(testAuthorPropertySdt, author-property.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 0e0b141..858a721 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1134,8 +1134,8 @@ void MSWord_SdrAttrIter::SetCharSet(const EECharAttrib
rAttr, bool bStart)
std::find( aChrTxtAtrArr.begin(), aChrTxtAtrArr.end(), rAttr );
if ( it != aChrTxtAtrArr.end() )
{
-aChrTxtAtrArr.erase( it );
aChrSetArr.erase( aChrSetArr.begin() + (it -
aChrTxtAtrArr.begin()) );
+aChrTxtAtrArr.erase( it );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
New commits:
commit faa9a681e730e5028c5fefa90938726ff9abe31d
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu May 22 15:51:54 2014 +0200
using xargs for string manipulation is somewhat of an abuse
(and breaks the build on windows/cygwin for some reason, although
running the find/xargs command by itself works just fine)
So just use awk instead and have a nicer solution without breaking the
build
Change-Id: I24b9f52c0b84c2e8019f3f6719a307fe508fb755
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 1eb591b..0bc71a9 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -595,27 +595,28 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- $(call gb_Helper_abbreviate_dirs, \
- echo 'list' $@ \
-( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)
-name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo
'filename{}/filename') $@ \
-echo '/list' $@ \
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
+-name *.xcu -size +0c \
+ | awk 'BEGIN{print list} \
+ {print filename$$0/filename} \
+ END {print /list}' $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo 'list' $@ \
-$(call gb_Helper_abbreviate_dirs, \
- (find $(call gb_XcuResTarget_get_target,registry/$*/) -name
*.xcu -print0 | xargs -n1 -0 -I '{}' echo 'filename{}/filename') $@ \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
- $(foreach driver,$(postprocess_DRIVERS), \
-(find $(call
gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I
'{}' echo 'filename{}/filename') $@ \
- ) \
- ) \
- $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
-(find $(call gb_XcuResTarget_get_target,updchk/$*/)
-name *.xcu -print0 | xargs -n1 -0 -I '{}' echo 'filename{}/filename')
$@ \
- ) \
- ) \
-echo '/list' $@
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,registry/$*/)\
+$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+$(foreach driver,$(postprocess_DRIVERS),\
+$(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
+$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+$(call gb_XcuResTarget_get_target,updchk/$*/))\
+-name *.xcu \
+ | awk 'BEGIN{print list} \
+ {print filename$$0/filename} \
+ END {print /list}' $@ \
+ )
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
___
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' - postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
New commits:
commit 754160755adb071f432898978c487aec9c87177d
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu May 22 15:51:54 2014 +0200
using xargs for string manipulation is somewhat of an abuse
(and breaks the build on windows/cygwin for some reason, although
running the find/xargs command by itself works just fine)
So just use awk instead and have a nicer solution without breaking the
build
Change-Id: I24b9f52c0b84c2e8019f3f6719a307fe508fb755
(cherry picked from commit faa9a681e730e5028c5fefa90938726ff9abe31d)
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 1eb591b..0bc71a9 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -595,27 +595,28 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- $(call gb_Helper_abbreviate_dirs, \
- echo 'list' $@ \
-( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)
-name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo
'filename{}/filename') $@ \
-echo '/list' $@ \
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
+-name *.xcu -size +0c \
+ | awk 'BEGIN{print list} \
+ {print filename$$0/filename} \
+ END {print /list}' $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo 'list' $@ \
-$(call gb_Helper_abbreviate_dirs, \
- (find $(call gb_XcuResTarget_get_target,registry/$*/) -name
*.xcu -print0 | xargs -n1 -0 -I '{}' echo 'filename{}/filename') $@ \
- $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
- $(foreach driver,$(postprocess_DRIVERS), \
-(find $(call
gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I
'{}' echo 'filename{}/filename') $@ \
- ) \
- ) \
- $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
-(find $(call gb_XcuResTarget_get_target,updchk/$*/)
-name *.xcu -print0 | xargs -n1 -0 -I '{}' echo 'filename{}/filename')
$@ \
- ) \
- ) \
-echo '/list' $@
+ $(call gb_Helper_abbreviate_dirs,\
+ find $(call gb_XcuResTarget_get_target,registry/$*/)\
+$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
+$(foreach driver,$(postprocess_DRIVERS),\
+$(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
+$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+$(call gb_XcuResTarget_get_target,updchk/$*/))\
+-name *.xcu \
+ | awk 'BEGIN{print list} \
+ {print filename$$0/filename} \
+ END {print /list}' $@ \
+ )
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
___
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' - 14 commits - cui/source dbaccess/source include/svx include/vcl officecfg/registry oox/source package/source postprocess/CustomTarget
cui/source/tabpages/paragrph.cxx |6
dbaccess/source/core/api/FilteredContainer.cxx| 18 -
include/svx/relfld.hxx|3
include/vcl/builder.hxx |2
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |2
oox/source/drawingml/textcharacterpropertiescontext.cxx |2
package/source/xstor/xstorage.cxx | 14 -
postprocess/CustomTarget_registry.mk |3
sc/source/ui/app/inputhdl.cxx |5
sd/source/ui/func/fuparagr.cxx|4
sfx2/source/dialog/templdlg.cxx | 13 -
sfx2/source/doc/sfxbasemodel.cxx |5
sfx2/source/inc/templdgi.hxx |2
svx/source/dialog/relfld.cxx | 13 -
sw/source/filter/ww8/writerwordglue.cxx | 104
--
vcl/source/window/builder.cxx |6
16 files changed, 150 insertions(+), 52 deletions(-)
New commits:
commit 01bffda54c7206cb8502b4acde0de377fc53cc75
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 16 16:36:13 2014 +0100
valgrind: SfxBaseModel's pImpl of fallback TargetDocument for paste leaks
e.g. repeatedly pasting a metafile into writer and deleting it.
==13369== 342 (232 direct, 110 indirect) bytes in 1 blocks are definitely
lost in loss record 19,396 of 22,170
==13369==at 0x4A06965: operator new(unsigned long) (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==13369==by 0x686D72E: SfxBaseModel::SfxBaseModel(SfxObjectShell*)
(sfxbasemodel.cxx:518)
==13369==by 0x288CA9C1:
SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel*) (unomod.cxx:255)
==13369==by 0x28961055: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
com::sun::star::uno::Referencecom::sun::star::lang::XComponent const, char
const*) (xmlexport.cxx:164)
==13369==by 0x28960FA2: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
com::sun::star::uno::Referencecom::sun::star::lang::XComponent const)
(xmlexport.cxx:148)
==13369==by 0x2896175E: SvxDrawingLayerImport(SdrModel*,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const)
(xmlexport.cxx:254)
==13369==by 0x240B1002: SwFEShell::Paste(SvStream, unsigned short,
Point const*) (fecopy.cxx:1333)
==13369==by 0x247B981A:
SwTransferable::_PasteSdrFormat(TransferableDataHelper, SwWrtShell, unsigned
short, Point const*, unsigned char, bool) (swdtflvr.cxx:2207)
==13369==by 0x247B678E:
SwTransferable::PasteData(TransferableDataHelper, SwWrtShell, unsigned short,
unsigned long, unsigned short, bool, bool, Point const*, signed char, bool)
(swdtflvr.cxx:1481)
==13369==by 0x247B5AE4: SwTransferable::Paste(SwWrtShell,
TransferableDataHelper) (swdtflvr.cxx:1150)
==13369==by 0x2488FCCE: SwBaseShell::ExecClpbrd(SfxRequest)
(basesh.cxx:277)
Reference lang::XComponent xTargetDocument( xComponent );
if( !xTargetDocument.is() )
{
xTargetDocument = new SvxUnoDrawingModel( pModel );
pModel-setUnoModel( Reference XInterface ::query(
xTargetDocument ) );
}
(cherry picked from commit fdca15fb864aca975533257d5ee83440992d8a7e)
Conflicts:
sfx2/source/doc/sfxbasemodel.cxx
Change-Id: I3bd0fc983d9b6bdcdc91071a4ec3d2c584397ebf
Reviewed-on: https://gerrit.libreoffice.org/9384
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1de92d6..67096db 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -537,6 +537,11 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
SfxBaseModel::~SfxBaseModel()
{
DBG_DTOR(sfx2_SfxBaseModel,NULL);
+//In SvxDrawingLayerImport when !xTargetDocument the fallback
SvxUnoDrawingModel created there
+//never gets disposed called on it, so m_pData leaks.
+IMPL_SfxBaseModel_DataContainer* pData = m_pData;
+m_pData = 0;
+delete pData;
}
//
commit a987c3ad1844d2f6babde18b73baf9cc6f2f75db
Author: Michael Stahl mst...@redhat.com
Date: Tue May 20 16:20:42 2014 +0200
SvxRelativeField: set the unit from the passed stringmap
In the Paragraph Indents Spacing tab there are fields with unit:
object class=svxlo-SvxRelativeField id=spinED_LEFTINDENT:0cm
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9023bfdd3ec8a7711fe0dfba1fd00645ffd0c685 Author: Andras Timar andras.ti...@collabora.com Date: Thu May 22 16:16:14 2014 +0200 Bump version to 4.2-4 Change-Id: Ia0ad7166369086d24f199a87de43119f59d6b683 diff --git a/configure.ac b/configure.ac index bdcb5d3..4f6d9ba 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.3],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.4],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - avmedia/source external/collada2gltf external/opencollada
avmedia/source/framework/modeltools.cxx
| 32
external/collada2gltf/UnpackedTarball_collada2gltf.mk
|5
external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3
| 8522 --
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
| 8522 ++
external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0
| 128
external/collada2gltf/patches/wrong_uri_usage.patch.1
| 77
external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
| 128
external/opencollada/UnpackedTarball_opencollada.mk
|5
external/opencollada/opencollada.clang.patch.0
| 22
external/opencollada/opencollada.libxml.patch.0
| 12
external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1
| 35
external/opencollada/patches/opencollada.clang.patch.0
| 22
external/opencollada/patches/opencollada.libxml.patch.0
| 12
13 files changed, 8822 insertions(+), 8700 deletions(-)
New commits:
commit 60ce9e98cb3d1469d3e94164f5670daa2f3a26f0
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 22 15:59:34 2014 +0200
collada2gltf: move patches to an own folder
Change-Id: Ife28845af92883d8090bb80283c59a0a9a350b32
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 0ced364..a3ba218 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -14,9 +14,9 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,collada2gltf,$(COLLADA2GLTF_TARBALL
$(eval $(call
gb_UnpackedTarball_add_file,collada2gltf,.,external/collada2gltf/GitSHA1.cpp))
$(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
-
external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3 \
- external/collada2gltf/write-only-.dae-file-which-we-need.patch.0 \
- external/collada2gltf/wrong_uri_usage.patch.1 \
+
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
\
+
external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0 \
+ external/collada2gltf/patches/wrong_uri_usage.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3
b/external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
similarity index 100%
rename from
external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3
rename to
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
diff --git a/external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
b/external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0
similarity index 100%
rename from external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
rename to
external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0
diff --git a/external/collada2gltf/wrong_uri_usage.patch.1
b/external/collada2gltf/patches/wrong_uri_usage.patch.1
similarity index 100%
rename from external/collada2gltf/wrong_uri_usage.patch.1
rename to external/collada2gltf/patches/wrong_uri_usage.patch.1
commit 1dd84fc4674141449c78f6c5838e2254c5a28f35
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 22 15:56:19 2014 +0200
collada2gltf: fix URL problems
collada2gltf does not handle Windows pathes, the used COLLADABU::URI
class can't parse native Windows pathes so call COLLADA2GLTFWriter
with URL only.
Other problems:
collada2gltf uses the URL path for creating/opening files,
instead of native ones.
collada2gltf initializes _outputFilePath member in different way,
sometimes as an URL path, sometimes as a native one, but handle it
on the same way(as an URL).
Change-Id: I104182653c07e7dcf6fc5b6e32c7031d59246b84
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index c3fa11e..a7237d5 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -152,28 +152,36 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(.kmz);
if (bIsDAE || bIsKMZ)
{
-OUString sName;
-
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sName);
-// remove .tmp extension
-sName = sName.copy(0, sName.getLength() - 4);
-const INetURLObject aSourceURLObj(rSourceURL);
-std::string sSourcePath = OUStringToOString(
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 4 commits - avmedia/source external/collada2gltf external/opencollada
avmedia/source/framework/modeltools.cxx
| 32
external/collada2gltf/UnpackedTarball_collada2gltf.mk
|5
external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3
| 8522 --
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
| 8522 ++
external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0
| 128
external/collada2gltf/patches/wrong_uri_usage.patch.1
| 77
external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
| 128
external/opencollada/UnpackedTarball_opencollada.mk
|5
external/opencollada/opencollada.clang.patch.0
| 22
external/opencollada/opencollada.libxml.patch.0
| 12
external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1
| 35
external/opencollada/patches/opencollada.clang.patch.0
| 22
external/opencollada/patches/opencollada.libxml.patch.0
| 12
13 files changed, 8822 insertions(+), 8700 deletions(-)
New commits:
commit 6d80ca0e521dfb5cf3c3eda0658e2ca4b172067b
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 22 15:59:34 2014 +0200
collada2gltf: move patches to an own folder
Change-Id: Ife28845af92883d8090bb80283c59a0a9a350b32
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 0ced364..a3ba218 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -14,9 +14,9 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,collada2gltf,$(COLLADA2GLTF_TARBALL
$(eval $(call
gb_UnpackedTarball_add_file,collada2gltf,.,external/collada2gltf/GitSHA1.cpp))
$(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
-
external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3 \
- external/collada2gltf/write-only-.dae-file-which-we-need.patch.0 \
- external/collada2gltf/wrong_uri_usage.patch.1 \
+
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
\
+
external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0 \
+ external/collada2gltf/patches/wrong_uri_usage.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3
b/external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
similarity index 100%
rename from
external/collada2gltf/add-unzip-kmz-files-to-collada-files-module.patch.3
rename to
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3
diff --git a/external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
b/external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0
similarity index 100%
rename from external/collada2gltf/write-only-.dae-file-which-we-need.patch.0
rename to
external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0
diff --git a/external/collada2gltf/wrong_uri_usage.patch.1
b/external/collada2gltf/patches/wrong_uri_usage.patch.1
similarity index 100%
rename from external/collada2gltf/wrong_uri_usage.patch.1
rename to external/collada2gltf/patches/wrong_uri_usage.patch.1
commit 4a75abfa09b493d39dbff8ad1d6970a79f31b5d6
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 22 15:56:19 2014 +0200
collada2gltf: fix URL problems
collada2gltf does not handle Windows pathes, the used COLLADABU::URI
class can't parse native Windows pathes so call COLLADA2GLTFWriter
with URL only.
Other problems:
collada2gltf uses the URL path for creating/opening files,
instead of native ones.
collada2gltf initializes _outputFilePath member in different way,
sometimes as an URL path, sometimes as a native one, but handle it
on the same way(as an URL).
Change-Id: I104182653c07e7dcf6fc5b6e32c7031d59246b84
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index c3fa11e..a7237d5 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -152,28 +152,36 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(.kmz);
if (bIsDAE || bIsKMZ)
{
-OUString sName;
-
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sName);
-// remove .tmp extension
-sName = sName.copy(0, sName.getLength() - 4);
-const INetURLObject aSourceURLObj(rSourceURL);
-std::string sSourcePath = OUStringToOString(
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/dtrans/X11_transferable.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 278baa557d18136a2641c015f7077a5838188766 Author: Matúš Kukan matus.ku...@collabora.com Date: Thu May 22 16:17:12 2014 +0200 cp#178: Replace \r\n with \n when pasting from X11 clipboard. E.g. when pasting from terminal you will get \r\n. Writer inserts '\r' character into the document as an invisible character. If you save that to .odt and reload, you will get ' ' instead. Or when saving to .doc and reload, you will get '\n'. Change-Id: Id6780bf6d71a8f0a17c1e6ee7a7dcb4d297446dc diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 55c5092..dd64fb7 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -71,7 +71,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor rFlavor ) OUStringToOString( rFlavor.MimeType, RTL_TEXTENCODING_ISO_8859_1 ).getStr(), OUStringToOString( aString, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif -aRet = aString; +aRet = aString.replaceAll(\r\n, \n); } else aRet = aData; ___ 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' - 4 commits - sc/source sd/source sfx2/source sw/source vcl/unx
sc/source/filter/excel/expop2.cxx |3 ---
sc/source/filter/xml/xmlwrap.cxx|2 --
sd/source/ui/docshell/docshel4.cxx | 11 ---
sfx2/source/doc/objcont.cxx |4 +---
sfx2/source/doc/objstor.cxx |2 ++
sfx2/source/doc/objxtor.cxx |2 +-
sw/source/filter/xml/xmlexp.cxx |4
vcl/unx/generic/dtrans/X11_transferable.cxx |2 +-
8 files changed, 5 insertions(+), 25 deletions(-)
New commits:
commit 921ebc39a1cafe5351922edc4e3ca4a465fe2741
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 16:17:12 2014 +0200
cp#178: Replace \r\n with \n when pasting from X11 clipboard.
E.g. when pasting from terminal you will get \r\n.
Writer inserts '\r' character into the document as an
invisible character. If you save that to .odt and reload, you will
get ' ' instead. Or when saving to .doc and reload, you will get '\n'.
Change-Id: Id6780bf6d71a8f0a17c1e6ee7a7dcb4d297446dc
(cherry picked from commit 278baa557d18136a2641c015f7077a5838188766)
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx
b/vcl/unx/generic/dtrans/X11_transferable.cxx
index bcf54b6..8029405 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -78,7 +78,7 @@ Any SAL_CALL X11Transferable::getTransferData( const
DataFlavor rFlavor )
OUStringToOString( rFlavor.MimeType, RTL_TEXTENCODING_ISO_8859_1
).getStr(),
OUStringToOString( aString, RTL_TEXTENCODING_ISO_8859_1
).getStr() );
#endif
-aRet = aString;
+aRet = aString.replaceAll(\r\n, \n);
}
else
aRet = aData;
commit b837e9b137bd3cab36a48d7673b5170c83e7fe06
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:50:39 2014 +0200
Update also revision and editing time when setting 'modified' properties.
Change-Id: Id756ef6dd62ca8df2e62265b9cc930f07d13f2e3
(cherry picked from commit 6e87f0bb75734e464bb0160dc00ab2fbe1a8fac3)
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index b3b8347..218efab 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -206,9 +206,7 @@ void SfxObjectShell::UpdateDocInfoForSave()
now.GetHour(), now.GetDay(), now.GetMonth(),
now.GetYear(), false) );
xDocProps-setModifiedBy( aUserName );
-if ( !HasName() || pImp-bIsSaving )
-// QUESTION: not in case of real SaveAs as this is meant to
create a new document
-UpdateTime_Impl( xDocProps );
+UpdateTime_Impl( xDocProps );
}
}
}
commit 9527a9f688e00263909705f6046d33de0fed1e18
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:42:55 2014 +0200
Use proper constructor to fill with system time.
Probably 86adb5cacb4fe3e7fb869299447da5876f0da30d did not mean to change
the behaviour here.
Change-Id: If39c150973c502323b3c785a9738cf65cdd74e5d
(cherry picked from commit fee87c6fda46923a564cd2574827a7beeffb1a1f)
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 54b67be..b2cf2f2 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -215,7 +215,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell
_rDocShell )
,rDocShell( _rDocShell )
,aMacroMode( *this )
,pProgress( 0)
-,nTime( DateTime::EMPTY )
+,nTime( DateTime::SYSTEM )
,nVisualDocumentNumber( USHRT_MAX)
,nDocumentSignatureState( SIGNATURESTATE_UNKNOWN )
,nScriptingSignatureState( SIGNATURESTATE_UNKNOWN )
commit b1a04f9326a7c52944f391364e72049eea6ee629
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 10:11:38 2014 +0200
cp#177: Set 'modified' document property more consistently.
Update document info at one place, so that it works for other formats
like .doc, .docx, ... too.
(cherry picked from commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4)
Conflicts:
sd/source/ui/docshell/docshel4.cxx
sw/source/core/uibase/app/docsh.cxx
Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260
diff --git a/sc/source/filter/excel/expop2.cxx
b/sc/source/filter/excel/expop2.cxx
index 1cec3de..a72c6ba 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -88,9 +88,6 @@ FltError ExportBiff5::Write()
if( pDocShell xRootStrg.Is() )
{
-// #i88642# update doc info (revision etc)
-pDocShell-UpdateDocInfoForSave();
-
using namespace ::com::sun::star;
uno::Referencedocument::XDocumentPropertiesSupplier xDPS(
pDocShell-GetModel(), uno::UNO_QUERY_THROW);
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 2e3210f..d1daf43 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basic/source
basic/source/uno/namecont.cxx | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit adfd7805bc61ff4ec56f6570fc516ff3aad74a28
Author: Michael Stahl mst...@redhat.com
Date: Wed May 21 19:43:46 2014 +0200
Revert fdo#67685 open xSourceLibrariesStor only when needed
This reverts commit fc9080a0c60f263d00eb7fcda72b3c0a2ebb.
This bug was apparently introduced by
af34774d260a68fc02cd78ba90dd8d4afaf1a2a4, which will be reverted
in the next commit.
Change-Id: I81ccb5bf9cc7e29fbf1e66d02f38268ee1fd1d0c
(cherry picked from commit 5ca4b9d51046b9b6a36b91c9abd0cc1e7c04b480)
Reviewed-on: https://gerrit.libreoffice.org/9436
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 357f2e0..20e2bb3 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1871,6 +1871,21 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
DBG_UNHANDLED_EXCEPTION();
return;
}
+
+// open the source storage which might be used to copy yet-unmodified
libraries
+try
+{
+if ( mxStorage-hasByName( maLibrariesDir ) || bInplaceStorage )
+{
+xSourceLibrariesStor = mxStorage-openStorageElement(
maLibrariesDir,
+ bInplaceStorage ?
embed::ElementModes::READWRITE : embed::ElementModes::READ );
+}
+}
+catch( const uno::Exception )
+{
+DBG_UNHANDLED_EXCEPTION();
+return;
+}
}
int iArray = 0;
@@ -1999,21 +2014,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
// then we need to clean up the temporary storage we used for this
if ( bInplaceStorage !sTempTargetStorName.isEmpty() )
{
-// open the source storage which might be used to copy yet-unmodified
libraries
-try
-{
-if ( mxStorage-hasByName( maLibrariesDir ) || bInplaceStorage )
-{
-xSourceLibrariesStor = mxStorage-openStorageElement(
maLibrariesDir,
- bInplaceStorage ?
embed::ElementModes::READWRITE : embed::ElementModes::READ );
-}
-}
-catch( const uno::Exception )
-{
-DBG_UNHANDLED_EXCEPTION();
-return;
-}
-
SAL_WARN_IF(
!xSourceLibrariesStor.is(), basic,
(SfxLibrariesContainer::storeLibraries_impl: unexpected: we
should
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: o3tl/qa
o3tl/qa/test-sorted_vector.cxx | 11 +++ 1 file changed, 11 insertions(+) New commits: commit d967e03ace342bcc6bc0cbf39905331b1a883f30 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 17:15:20 2014 +0200 Fix memory leaks in test code Change-Id: I0dbb2546f1e776ebf95b61c16ebedbce0ead4c7f diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx index 059c1ba..5090dee 100644 --- a/o3tl/qa/test-sorted_vector.cxx +++ b/o3tl/qa/test-sorted_vector.cxx @@ -68,6 +68,7 @@ public: CPPUNIT_ASSERT( aVec.erase(p2) == 0 ); aVec.DeleteAndDestroyAll(); +delete p1; delete p2; delete p4; } @@ -118,6 +119,9 @@ public: aVec2.insert( aVec1 ); CPPUNIT_ASSERT( aVec2.size() == 3 ); +delete p1; +delete p2; +delete p3; } void testLowerBound() @@ -134,6 +138,9 @@ public: CPPUNIT_ASSERT( aVec.lower_bound(p1) == aVec.begin() ); CPPUNIT_ASSERT( aVec.lower_bound(p4) == aVec.end() ); +delete p1; +delete p2; +delete p3; delete p4; } @@ -193,7 +200,9 @@ public: CPPUNIT_ASSERT( aVec.size() == 3 ); aVec.DeleteAndDestroyAll(); +delete p1; delete p2; +delete p2_3; delete p4; } @@ -245,6 +254,8 @@ public: aVec.DeleteAndDestroyAll(); CPPUNIT_ASSERT( aVec.size() == 0 ); +delete p1; +delete p1_3; delete p4; } ___ 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' - basic/source sw/CppunitTest_sw_macros_test.mk sw/qa
basic/source/inc/namecont.hxx|4 ++
basic/source/inc/scriptcont.hxx |1
basic/source/uno/namecont.cxx| 17 +++---
basic/source/uno/scriptcont.cxx |6 +++
sw/CppunitTest_sw_macros_test.mk | 62 ---
sw/qa/core/data/odt/fdo68983.odt |binary
sw/qa/core/macros-test.cxx | 48 ++
7 files changed, 103 insertions(+), 35 deletions(-)
New commits:
commit 9d2b0fd3424eaf8a685728aa7788e1148159714d
Author: Michael Stahl mst...@redhat.com
Date: Wed May 21 22:26:05 2014 +0200
fdo#68983: basic: if the library is not loaded fully, copy source storage
Also fixes fdo#42899 and fdo#67685 in a different way; the previous fix
for fdo#42899 caused the problem with password-protected libraries for
which the password is not known: only the binary representation of the
BAISC module was stored, not the source code; by simply copying from the
source storage the problem can be avoided.
It would be possible to ask for the password when storing, but that
would not work when non-interactive (called via API).
An alternative fix would be to pass in the
SfxObjectShell::IsSetModifyEnabled() flag and actually reset the BASIC
library's modify flag correctly, but that requires adding a
parameter to XStorageBasedLibraryContainer::storeLibrariesToStorage().
(regression from af34774d260a68fc02cd78ba90dd8d4afaf1a2a4 )
(cherry picked from commit 5246fa262450f686674850c53df666422f441c86)
Conflicts:
basic/source/inc/namecont.hxx
basic/source/inc/scriptcont.hxx
basic/source/uno/namecont.cxx
sw/CppunitTest_sw_macros_test.mk
sw: use xsec_xmlsec.windows on WNT
(cherry picked from commit 3e69b7bcd3e4a9cb1a29360c905e7fba96365999)
Change-Id: I4701401f35171139fc2fe8d225d13d4e533091a0
Reviewed-on: https://gerrit.libreoffice.org/9437
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 0568a981..6a04d9d 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -582,7 +582,9 @@ private:
sal_Bool mbReadOnlyLink;
sal_Bool mbPreload;
+protected:
sal_Bool mbPasswordProtected;
+private:
sal_Bool mbPasswordVerified;
bool mbDoc50Password;
OUString maPassword;
@@ -702,6 +704,8 @@ public:
}
protected:
+virtual bool isLoadedStorable();
+
virtual bool SAL_CALL isLibraryElementValid( ::com::sun::star::uno::Any
aElement ) const = 0;
};
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 357c663..d9abeb5 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -154,6 +154,7 @@ class SfxScriptLibrary : public SfxLibrary, public
SfxScriptLibrary_BASE
const ::com::sun::star::uno::Reference
::com::sun::star::task::XInteractionHandler xHandler );
virtual void storeResourcesToStorage( const
::com::sun::star::uno::Reference
::com::sun::star::embed::XStorage xStorage );
+virtual bool isLoadedStorable() SAL_OVERRIDE;
public:
SfxScriptLibrary
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 20e2bb3..28efa64 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1920,8 +1920,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
if( pImplLib-implIsModified() || bComplete )
{
-// For the moment don't copy storage (as an optimisation )
-// but instead always write to storage from memory.
// Testing pImplLib-implIsModified() is not reliable,
// IMHO the value of pImplLib-implIsModified() should
// reflect whether the library ( in-memory ) model
@@ -1932,9 +1930,14 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
// temp storage when saving ( and later sets the root storage of the
// library container ) and similar madness in dbaccess means some surgery
// is required to make it possible to successfully use this optimisation
-#if 0
+// It would be possible to do the implSetModified() call below only
+// conditionally, but that would require an additional boolean to be
+// passed in via the XStorageBasedDocument::storeLibrariesToStorage()...
+// fdo#68983: If there's a password and the password is not known, only
+// copying the storage works!
// Can we simply copy the storage?
-if( !mbOldInfoFormat !pImplLib-implIsModified()
!mbOasis2OOoFormat xSourceLibrariesStor.is() )
+if (!mbOldInfoFormat !pImplLib-isLoadedStorable()
+!mbOasis2OOoFormat xSourceLibrariesStor.is())
{
try
{
@@ -1947,7 +1950,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference embed::XSto
[Libreoffice-commits] core.git: basctl/inc basctl/source include/sfx2
basctl/inc/basidesh.hrc |1 +
basctl/source/basicide/basidesh.cxx | 10 +-
basctl/source/basicide/basidesh.src |4
include/sfx2/viewfrm.hxx|2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 7aa79223d73a97c6530894a8feea51e9820b14cb
Author: Jan Holesovsky ke...@collabora.com
Date: Thu May 22 17:29:56 2014 +0200
bnc#467278: Introduce a warning that changes to VBA macros cannot be saved.
As an InfoBar, so hopefully not annoying...
Change-Id: I5d4e79273edc03829fdab2d6d5a291576c954e4b
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 4fee05a..d6cf84d 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -61,6 +61,7 @@
#define RID_STR_OPEN( RID_BASICIDE_START + 20 )
#define RID_STR_SAVE( RID_BASICIDE_START + 21 )
#define RID_STR_RUNTIMEERROR( RID_BASICIDE_START + 22 )
+#define RID_STR_CANNOTSAVEVBA ( RID_BASICIDE_START + 23 )
#define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 )
#define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 )
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index cad57f7..f66f8ca 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -37,6 +37,7 @@
#include sfx2/app.hxx
#include sfx2/dinfdlg.hxx
#include sfx2/dispatch.hxx
+#include sfx2/infobar.hxx
#include sfx2/minfitem.hxx
#include sfx2/objface.hxx
#include svl/aeitem.hxx
@@ -140,8 +141,8 @@ SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell,
IDEResId(RID_STR_IDENAME))
void basctl_Shell::InitInterface_Impl()
{
GetStaticInterface()-RegisterChildWindow(SID_SEARCH_DLG);
-
GetStaticInterface()-RegisterChildWindow(SID_SHOW_PROPERTYBROWSER, false,
BASICIDE_UI_FEATURE_SHOW_BROWSER);
+
GetStaticInterface()-RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()-RegisterPopupMenu(IDEResId(RID_POPUP_DLGED));
}
@@ -253,7 +254,14 @@ Shell::~Shell()
void Shell::onDocumentCreated( const ScriptDocument /*_rDocument*/ )
{
if (pCurWin)
+{
pCurWin-OnNewDocument();
+
+// for VBA documents, show a warning that we can save them only in ODF
+if (pCurWin-GetDocument().isInVBAMode())
+GetViewFrame()-AppendInfoBar(vba_save,
IDE_RESSTR(RID_STR_CANNOTSAVEVBA));
+}
+
UpdateWindows();
}
diff --git a/basctl/source/basicide/basidesh.src
b/basctl/source/basicide/basidesh.src
index 70d6423..3875f5b 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -216,6 +216,10 @@ String RID_STR_CANNOTCLOSE
{
Text [ en-US ] = The window cannot be closed while BASIC is running. ;
};
+String RID_STR_CANNOTSAVEVBA
+{
+Text [ en-US ] = You are editing a VBA macro. Changes can be saved only
in OpenDocument Format. ;
+};
String RID_STR_REPLACESTDLIB
{
Text [ en-US ] = The default library cannot be replaced. ;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 09ec9b5..af55515 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -194,7 +194,7 @@ public:
The buttons will be added from Right to Left at the right of the info
bar. The parent, size
and position of each button will be changed: only the width will
remain unchanged.
*/
-voidAppendInfoBar( const OUString sId, const
OUString sMessage, std::vector PushButton* aButtons );
+voidAppendInfoBar( const OUString sId, const
OUString sMessage, std::vector PushButton* aButtons = std::vector
PushButton* () );
voidRemoveInfoBar( const OUString sId );
SAL_DLLPRIVATE void SetDowning_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - chart2/source
chart2/source/view/main/GL3DRenderer.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 56d5364b711745e563eb20957e91a18c9fee5556
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu May 22 17:30:39 2014 +0200
Revert add reverse bars code
This reverts commit 07ef1602dfc48301031dc92d1795a42c2b6d8769.
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index d6c1dff..1f8fe41 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -348,7 +348,7 @@ void OpenGL3DRenderer::CreateActualRoundedCube(float
fRadius, int iSubDivY, int
glm::vec3 actualNormals[3];
std::vectorunsigned short indeices[5];
glm::vec3 externSurNormal;
-glm::mat4 corrctCoord = glm::translate(glm::vec3(0.0f, 0.0f, depth / 2.0f
- fRadius));
+glm::mat4 corrctCoord = glm::translate(glm::vec3(width / 2.0f, height /
2.0f, depth / 2.0f - fRadius));
m_RoundBarMesh.topThreshold = topThreshold;
m_RoundBarMesh.bottomThreshold = bottomThreshold;
m_RoundBarMesh.iMeshStartIndices = m_Vertices.size();
@@ -978,14 +978,13 @@ void OpenGL3DRenderer::AddShape3DExtrudeObject(bool
roundedCorner, sal_uInt32 nC
glm::vec4 DirX = modelMatrix * glm::vec4(1.0, 0.0, 0.0, 0.0);
glm::vec4 DirY = modelMatrix * glm::vec4(0.0, 1.0, 0.0, 0.0);
glm::vec4 DirZ = modelMatrix * glm::vec4(0.0, 0.0, 1.0, 0.0);
-float crossZ = glm::normalize(glm::dot(glm::vec3(DirZ), glm::vec3(0.0,
0.0, 1.0)));
-m_Extrude3DInfo.reverse = (crossZ 0 ? 0 : 1);
m_Extrude3DInfo.xScale = glm::length(DirX);
m_Extrude3DInfo.yScale = glm::length(DirY);
m_Extrude3DInfo.zScale = glm::length(DirZ);
glm::mat4 transformMatrixInverse =
glm::inverse(glm::translate(glm::vec3(tranform)));
-glm::mat4 scaleMatrixInverse =
glm::inverse(glm::scale(m_Extrude3DInfo.xScale, m_Extrude3DInfo.yScale,
m_Extrude3DInfo.zScale * crossZ));
+glm::mat4 scaleMatrixInverse =
glm::inverse(glm::scale(m_Extrude3DInfo.xScale, m_Extrude3DInfo.yScale,
m_Extrude3DInfo.zScale));
m_Extrude3DInfo.rotation = transformMatrixInverse * modelMatrix *
scaleMatrixInverse;
+
//color
m_Extrude3DInfo.extrudeColor = getColorAsVector(nColor);
m_Extrude3DInfo.material.materialColor =
m_Extrude3DInfo.extrudeColor;//material color seems to be the same for all
parts, so we use the polygon color
@@ -1021,8 +1020,8 @@ void OpenGL3DRenderer::AddShape3DExtrudeObject(bool
roundedCorner, sal_uInt32 nC
m_SenceBox.minXCoord = std::min(m_SenceBox.minXCoord,
m_Extrude3DInfo.xTransform);
m_SenceBox.maxYCoord = std::max(m_SenceBox.maxYCoord,
m_Extrude3DInfo.yTransform + m_Extrude3DInfo.yScale);
m_SenceBox.minYCoord = std::min(m_SenceBox.minYCoord,
m_Extrude3DInfo.yTransform );
-m_SenceBox.maxZCoord = std::max(m_SenceBox.maxZCoord,
m_Extrude3DInfo.zTransform - (m_Extrude3DInfo.reverse - 1) *
m_Extrude3DInfo.zScale);
-m_SenceBox.minZCoord = std::min(m_SenceBox.minZCoord,
m_Extrude3DInfo.zTransform - m_Extrude3DInfo.reverse * m_Extrude3DInfo.zScale);
+m_SenceBox.maxZCoord = std::max(m_SenceBox.maxZCoord,
m_Extrude3DInfo.zTransform + m_Extrude3DInfo.zScale);
+m_SenceBox.minZCoord = std::min(m_SenceBox.minZCoord,
m_Extrude3DInfo.zTransform);
}
void OpenGL3DRenderer::EndAddShape3DExtrudeObject()
@@ -1130,7 +1129,7 @@ void OpenGL3DRenderer::RenderExtrudeBottomSurface(const
Extrude3DInfo extrude3D
}
else
{
-glm::mat4 topTrans = glm::translate(glm::vec3(0.0, 0.0,
-actualZTrans));
+glm::mat4 topTrans = glm::translate(glm::vec3(0.0, 0.0, actualZTrans));
glm::mat4 topScale = glm::scale(xyScale, xyScale, xyScale);
glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(trans.x,
trans.y, trans.z));
m_Model = aTranslationMatrix * extrude3D.rotation * topTrans *
topScale;
@@ -1351,6 +1350,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
CHECK_GL_ERROR();
glBindBuffer(GL_UNIFORM_BUFFER, 0);
}
+extrude3DInfo.reverse = 0;
if (extrude3DInfo.rounded)
{
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_CubeElementBuf);
___
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' - basctl/inc basctl/source include/sfx2
basctl/inc/basidesh.hrc |1 +
basctl/source/basicide/basidesh.cxx | 10 +-
basctl/source/basicide/basidesh.src |4
include/sfx2/viewfrm.hxx|2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 694fff63b50ec5c7f5e052e8969f9e94651b3a9a
Author: Jan Holesovsky ke...@collabora.com
Date: Thu May 22 17:29:56 2014 +0200
bnc#467278: Introduce a warning that changes to VBA macros cannot be saved.
As an InfoBar, so hopefully not annoying...
Change-Id: I5d4e79273edc03829fdab2d6d5a291576c954e4b
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 4fee05a..d6cf84d 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -61,6 +61,7 @@
#define RID_STR_OPEN( RID_BASICIDE_START + 20 )
#define RID_STR_SAVE( RID_BASICIDE_START + 21 )
#define RID_STR_RUNTIMEERROR( RID_BASICIDE_START + 22 )
+#define RID_STR_CANNOTSAVEVBA ( RID_BASICIDE_START + 23 )
#define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 )
#define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 )
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index cad57f7..f66f8ca 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -37,6 +37,7 @@
#include sfx2/app.hxx
#include sfx2/dinfdlg.hxx
#include sfx2/dispatch.hxx
+#include sfx2/infobar.hxx
#include sfx2/minfitem.hxx
#include sfx2/objface.hxx
#include svl/aeitem.hxx
@@ -140,8 +141,8 @@ SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell,
IDEResId(RID_STR_IDENAME))
void basctl_Shell::InitInterface_Impl()
{
GetStaticInterface()-RegisterChildWindow(SID_SEARCH_DLG);
-
GetStaticInterface()-RegisterChildWindow(SID_SHOW_PROPERTYBROWSER, false,
BASICIDE_UI_FEATURE_SHOW_BROWSER);
+
GetStaticInterface()-RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()-RegisterPopupMenu(IDEResId(RID_POPUP_DLGED));
}
@@ -253,7 +254,14 @@ Shell::~Shell()
void Shell::onDocumentCreated( const ScriptDocument /*_rDocument*/ )
{
if (pCurWin)
+{
pCurWin-OnNewDocument();
+
+// for VBA documents, show a warning that we can save them only in ODF
+if (pCurWin-GetDocument().isInVBAMode())
+GetViewFrame()-AppendInfoBar(vba_save,
IDE_RESSTR(RID_STR_CANNOTSAVEVBA));
+}
+
UpdateWindows();
}
diff --git a/basctl/source/basicide/basidesh.src
b/basctl/source/basicide/basidesh.src
index 70d6423..3875f5b 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -216,6 +216,10 @@ String RID_STR_CANNOTCLOSE
{
Text [ en-US ] = The window cannot be closed while BASIC is running. ;
};
+String RID_STR_CANNOTSAVEVBA
+{
+Text [ en-US ] = You are editing a VBA macro. Changes can be saved only
in OpenDocument Format. ;
+};
String RID_STR_REPLACESTDLIB
{
Text [ en-US ] = The default library cannot be replaced. ;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 09ec9b5..af55515 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -194,7 +194,7 @@ public:
The buttons will be added from Right to Left at the right of the info
bar. The parent, size
and position of each button will be changed: only the width will
remain unchanged.
*/
-voidAppendInfoBar( const OUString sId, const
OUString sMessage, std::vector PushButton* aButtons );
+voidAppendInfoBar( const OUString sId, const
OUString sMessage, std::vector PushButton* aButtons = std::vector
PushButton* () );
voidRemoveInfoBar( const OUString sId );
SAL_DLLPRIVATE void SetDowning_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source cui/uiconfig
cui/source/options/personalization.cxx| 129 -
cui/source/options/personalization.hxx| 10 +
cui/source/options/personasdochandler.hxx |1
cui/uiconfig/ui/select_persona_dialog.ui | 151 +++---
4 files changed, 269 insertions(+), 22 deletions(-)
New commits:
commit 62df0a31f5298843586c3c4936434761fdf4268c
Author: Rachit Gupta rachitgupta1...@gmail.com
Date: Thu May 22 20:48:34 2014 +0530
The search result images are shown in the dialog.
1. Changed the UI to include a 3x3 grid of images
2. The preview images are downloaded in the thread
3. The images are downloaded in their respective folders
4. A progress label is shown
Change-Id: Id87e72343d28e03b37e0c422e5ebfe1a9a37c1b5
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index b454d17..357d5ab 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -35,11 +35,23 @@ using namespace ::com::sun::star::ucb;
SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
: ModalDialog( pParent, SelectPersonaDialog,
cui/ui/select_persona_dialog.ui )
{
-get( pButton, search_personas );
-pButton-SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
+get( m_pButton, search_personas );
+m_pButton-SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
get( m_pEdit, search_term );
m_pEdit-SetPlaceholderText( Search term... );
+
+get( m_pProgressLabel, progress_label );
+
+get(m_vImageList[0], image1);
+get(m_vImageList[1], image2);
+get(m_vImageList[2], image3);
+get(m_vImageList[3], image4);
+get(m_vImageList[4], image5);
+get(m_vImageList[5], image6);
+get(m_vImageList[6], image7);
+get(m_vImageList[7], image8);
+get(m_vImageList[8], image9);
}
OUString SelectPersonaDialog::GetPersonaURL() const
@@ -55,12 +67,29 @@ OUString SelectPersonaDialog::GetPersonaURL() const
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
OUString searchTerm = m_pEdit-GetText();
-OUString rURL = https://addons.allizom.org/en-US/firefox/api/1.5/search/;
+ searchTerm + /9/;
+OUString rURL = https://addons.allizom.org/en-US/firefox/api/1.5/search/;
+ searchTerm + /9/9;
m_aSearchThread = new SearchAndParseThread( this, rURL );
m_aSearchThread-launch();
return 0;
}
+void SelectPersonaDialog::SetProgress( OUString rProgress )
+{
+if(rProgress.isEmpty())
+m_pProgressLabel-Hide();
+else
+m_pProgressLabel-SetText( rProgress );
+}
+
+void SelectPersonaDialog::SetImages( std::vectorImage rImageList )
+{
+sal_Int32 nCount = 0;
+for( std::vectorImage::iterator it=rImageList.begin();
it!=rImageList.end(); ++it )
+{
+m_vImageList[nCount++]-SetImage( *it );
+}
+}
+
SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const
SfxItemSet rSet )
: SfxTabPage( pParent, PersonalizationTabPage,
cui/ui/personalization_tab.ui, rSet )
{
@@ -187,7 +216,9 @@ static OUString searchValue( const OString rBuffer,
sal_Int32 from, const OStri
}
/// Parse the Persona web page, and find where to get the bitmaps + the color
values.
-static bool parsePersonaInfo( const OString rBuffer, OUString *pHeaderURL,
OUString *pFooterURL, OUString *pTextColor, OUString *pAccentColor )
+static bool parsePersonaInfo( const OString rBuffer, OUString *pHeaderURL,
OUString *pFooterURL,
+ OUString *pTextColor, OUString *pAccentColor,
OUString *pPreviewURL,
+ OUString *pName )
{
// it is the first attribute that contains persona=
sal_Int32 persona = rBuffer.indexOf( data-browsertheme=\{ );
@@ -211,6 +242,14 @@ static bool parsePersonaInfo( const OString rBuffer,
OUString *pHeaderURL, OUSt
if ( pAccentColor-isEmpty() )
return false;
+*pPreviewURL = searchValue( rBuffer, persona, #34;previewURL#34;:#34;
);
+if ( pAccentColor-isEmpty() )
+return false;
+
+*pName = searchValue( rBuffer, persona, #34;name#34;:#34; );
+if ( pAccentColor-isEmpty() )
+return false;
+
return true;
}
@@ -249,9 +288,9 @@ bool SvxPersonalizationTabPage::CopyPersonaToGallery( const
OUString rURL )
xStream-closeInput();
// get the important bits of info
-OUString aHeaderURL, aFooterURL, aTextColor, aAccentColor;
+OUString aHeaderURL, aFooterURL, aTextColor, aAccentColor, aPreviewURL,
aName;
-if ( !parsePersonaInfo( aBuffer.makeStringAndClear(), aHeaderURL,
aFooterURL, aTextColor, aAccentColor ) )
+if ( !parsePersonaInfo( aBuffer.makeStringAndClear(), aHeaderURL,
aFooterURL, aTextColor, aAccentColor, aPreviewURL, aName ) ) // Temp
return false;
// copy the images to the user's gallery
@@ -292,6 +331,8 @@ SearchAndParseThread::~SearchAndParseThread()
void
minutes of ESC call ...
* Present + Christian, Stephan, Bjoern, Norbert, Eike, Andras, Fridrich, Miklos, Michael M, Jacobo, Robinson, Eilidh, Markus, Caolan, Tor, Adam, Michael S, Norbert, Kendy * Completed Action Items + send address sanitiser example (Markus) + http://lists.freedesktop.org/archives/libreoffice/2014-May/061142.html + chasing build / test intermittency: [ seem to have vanished ] + Add StarOffice OOoXML export removal to 4.2 release notes (Cloph) + Add students to the commiter group (Norbert) + Avoiding big binary checkins (update git hook) (Miklos) [ assuming good faith - chatty message to help people ] + walk through old gerrit changes, nag people, abandon changes (Bjoern) [ done before branch-off, some will be abandoned in a week cf. note, could expire these automatically - auto-abandon ? ] + fix git importing service (Kendy) * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ ongoing ] + encourage icon authors to put them into git (Astron) + fix the Java bridge for MSVC2012 for 4.3 (Michael S.) [ current plan to do before the branch-off ... (bit late) ] + create easy hack to find an auto-abandon config/setting for a gerrit (Bjoern) + schedule a new coverity build (moggi) [ tried during the weekend, coverity analysis takes longer than 24hours etc. (Caolan) + may change the timeout to 36 hours ? + have enabled debugging so coverity can see asserts + not the problem still timing out ... ] * GSOC Update (Fridrich) + started on Monday. + poke Fridrich / Cedric if no sign of students. + should have sent telephone contacts already. + please give them a welcome help to get spun up. + all going well. * FISL Brazil Update (Fridrich) + huge event, FOSDEM but in Latin America, and no dev-rooms. + several big halls for keynotes + LibreOffice well represented: several talks + Document Liberation Flat ODF promoted by Fridrich + FISL release of LibreOffice etc. + great work there, huge community. * Release Engineering update (Christian) + 4.3.0 Beta 1 status + tagged yesterday. + branch libreoffice-4-3 created + Windows build delayed, will be tonight / tomorrow + MacOS 10.6 needed a patch, not exactly the tag + only Beta1 - no need for a separate tag. + investigating Windows test failures (spellchecking) + a python issue related to UI mode - not seen when running from the terminal; different return value internally; around stdout/in etc. + now patched. http://cgit.freedesktop.org/libreoffice/core/tree/external/python3/python-3.3.3-py17797.patch.1 + will run on XP and later without crashing. + currently a problem with Java runtime on Windows XP + problems with Tools-Macros-Python ... tries to init Java VM. AI: + create / promote a 4.3 MAB for WinXP/Java (Cloph) + 4.2.5 RC1 status ... + deadline next Monday: get fixes into gerrit so on the radar ... + ... Now Feature Frozen ... + tripple approval needed for new features. + bug bug fixes welcome on the branch with no review. + Late features ? + libreofficekit bits / rename etc. + OpenGL pieces / status + experimentalising 3D chart bits. + impress work as well. + some changes in language listbox (Eike) + switching to a combo-box, so can enter an arbitrary lang_tag + due today. + preserving rendering OOXML Artistic Effects (Jacobo) + Android / iOS remote + will build a new version with buttons to start/exit remote ptr. feature. + Credits update: http://www.libreoffice.org/about-us/credits/ + crediting translators (Cloph) + pointing to the pootle page, that lists translators. https://translations.documentfoundation.org/about/contributors/ AI:+ should link to it there (Cloph) + page is usually updated for a final release when we update the source code. + some bugs: + 'Contributors to Bundled Templates' - oddly coloured heading. + can we separate rows better for readability ? + embolden bold name perhaps ? * 4.3 Features Page (Michael) + https://wiki.documentfoundation.org/ReleaseNotes/4.3 * UX Update (Bjoern) + getting into the start menu a 'get involved' button - a help / extensions - in start center + add a get involved button linking to the web / feedback page + or replace the help button in the start center (not the prime context for help). * Distro branches commits (Michael) + it would be great to see what others are doing in distro
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/convertisciidevangari.tab |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c8945b3fb850985794efcb8afbbdc2f5985d7088 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 17:57:34 2014 +0200 Fix order of function pointers Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3 diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index 6c4a24b..19fbca1 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -22,8 +22,8 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData ImplDestroyIsciiDevanagariToUnicodeContext, ImplResetIsciiDevanagariToUnicodeContext, ImplCreateUnicodeToIsciiDevanagariContext, - ImplResetUnicodeToIsciiDevanagariContext, - ImplDestroyUnicodeToIsciiDevanagariContext }, + ImplDestroyUnicodeToIsciiDevanagariContext, + ImplResetUnicodeToIsciiDevanagariContext }, 1, 2, 2, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/sal sal/qa sal/rtl
include/sal/types.h |6 --
sal/qa/inc/valueequal.hxx |8
sal/qa/rtl/oustring/rtl_OUString2.cxx | 20 ++--
sal/rtl/ustring.cxx | 19 +--
4 files changed, 47 insertions(+), 6 deletions(-)
New commits:
commit 9adad0d1eae6e3d54042ab1e65f0b80a77562dc6
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 18:36:31 2014 +0200
Avoid undef use of null ptr, use offsetof instead
Change-Id: I095f45b537690fe98bf385d99194db6319d7ac93
diff --git a/include/sal/types.h b/include/sal/types.h
index 5a534b8..c19673a 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -21,8 +21,10 @@
#define INCLUDED_SAL_TYPES_H
#include sal/config.h
-#include sal/macros.h
+#include stddef.h
+
+#include sal/macros.h
#include sal/typesizes.h
#ifdef __cplusplus
@@ -337,7 +339,7 @@ typedef struct _sal_Sequence
charelements[1];
} sal_Sequence;
-#define SAL_SEQUENCE_HEADER_SIZE ((sal_Size)((sal_Sequence *)0)-elements)
+#define SAL_SEQUENCE_HEADER_SIZE ((sal_Size) offsetof(sal_Sequence,elements))
#if defined( SAL_W32)
#pragma pack(pop)
commit b5cb4935c268f12e63b61e035b455b0a59e67aa2
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 18:31:07 2014 +0200
Work around undef conversion of large double to float
...as flagged by -fsanitize=undefined. But is it really undefined?
[conv.double] If the source value is between two adjacent destination
values,
the result of the conversion is an implementation-defined choice of either
of
those values. So if the double is between
std::numeric_limitsfloat::max()
and std::numeric_limitsfloat::infinity()...
Change-Id: I6389c8ac4a922991e240638d231dd2a39e173882
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx
b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 849c521..27a06ab 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -23,6 +23,7 @@
#include stdio.h
#include algorithm
+#include limits
#include cppunit/TestFixture.h
#include cppunit/extensions/HelperMacros.h
@@ -34,6 +35,21 @@
namespace rtl_OUString
{
+namespace {
+
+// Avoid -fsanitize=undefined warning e.g. runtime error: value 1e+99 is
+// outside the range of representable values of type 'float':
+float doubleToFloat(double x) {
+return
+x -std::numeric_limitsfloat::max()
+? -std::numeric_limitsfloat::infinity()
+: x std::numeric_limitsfloat::max()
+? std::numeric_limitsfloat::infinity()
+: static_castfloat(x);
+}
+
+}
+
class number : public CppUnit::TestFixture
{
void number_float_test_impl(float _nValue)
@@ -43,7 +59,7 @@ class number : public CppUnit::TestFixture
sValue = suValue;
printf(nFloat := %.9f sValue := %s\n, _nValue, sValue.getStr());
-float nValueATOF = static_castfloat(atof( sValue.getStr() ));
+double nValueATOF = doubleToFloat(atof( sValue.getStr() ));
bool bEqualResult = is_float_equal(_nValue, nValueATOF);
CPPUNIT_ASSERT_MESSAGE(Values are not equal., bEqualResult ==
true);
@@ -439,7 +455,7 @@ sal_Int16 SAL_CALL checkPrecisionSize()
void toFloat_test_impl(rtl::OString const _sValue)
{
//printf(the original str is %s\n, _sValue.getStr());
-float nValueATOF = static_castfloat(atof( _sValue.getStr()
));
+float nValueATOF = doubleToFloat(atof( _sValue.getStr() ));
//printf(the original str is %.10f\n, nValueATOF);
rtl::OUString suValue = rtl::OUString::createFromAscii(
_sValue.getStr() );
float nValueToFloat = suValue.toFloat();
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index f10e755..a79c917 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -148,11 +148,26 @@ sal_Int32 SAL_CALL rtl_ustr_valueOfDouble(sal_Unicode *
pStr, double d)
return nLen;
}
+namespace {
+
+// Avoid -fsanitize=undefined warning e.g. runtime error: value 1e+99 is
+// outside the range of representable values of type 'float':
+float doubleToFloat(double x) {
+return
+x -std::numeric_limitsfloat::max()
+? -std::numeric_limitsfloat::infinity()
+: x std::numeric_limitsfloat::max()
+? std::numeric_limitsfloat::infinity()
+: static_castfloat(x);
+}
+
+}
+
float SAL_CALL rtl_ustr_toFloat(sal_Unicode const * pStr) SAL_THROW_EXTERN_C()
{
-return (float) rtl_math_uStringToDouble(pStr,
+return doubleToFloat(rtl_math_uStringToDouble(pStr,
pStr + rtl_ustr_getLength(pStr),
-'.', 0, 0, 0);
+'.', 0, 0, 0));
}
double SAL_CALL rtl_ustr_toDouble(sal_Unicode const * pStr)
SAL_THROW_EXTERN_C()
commit
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sal/textenc
sal/textenc/convertisciidevangari.tab |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bcf6b0bc94eae1d9b19dc8d71eea72d2c54d228e Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 17:57:34 2014 +0200 Fix order of function pointers Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3 (cherry picked from commit c8945b3fb850985794efcb8afbbdc2f5985d7088) diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index 6c4a24b..19fbca1 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -22,8 +22,8 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData ImplDestroyIsciiDevanagariToUnicodeContext, ImplResetIsciiDevanagariToUnicodeContext, ImplCreateUnicodeToIsciiDevanagariContext, - ImplResetUnicodeToIsciiDevanagariContext, - ImplDestroyUnicodeToIsciiDevanagariContext }, + ImplDestroyUnicodeToIsciiDevanagariContext, + ImplResetUnicodeToIsciiDevanagariContext }, 1, 2, 2, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source
l10ntools/inc/xrmlex.hxx |2 +-
l10ntools/source/xrmlex.l |5 +
l10ntools/source/xrmmerge.cxx |8 +++-
3 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 407db844120ead0d57118c40ab5e6acc1bad736d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu May 22 18:51:57 2014 +0200
Fix memory leak in xrmex tool
Change-Id: I102566a95b5b34daf60730ffef290913caf28eb2
diff --git a/l10ntools/inc/xrmlex.hxx b/l10ntools/inc/xrmlex.hxx
index 2b15928..e109243 100644
--- a/l10ntools/inc/xrmlex.hxx
+++ b/l10ntools/inc/xrmlex.hxx
@@ -30,7 +30,7 @@ extern C int InitXrmExport( const char * );
extern C int EndXrmExport();
extern C int GetError();
extern C int SetError();
-extern C char *GetOutputFile( int argc, char* argv[]);
+extern C bool GetOutputFile( int argc, char* argv[]);
extern C FILE *GetXrmFile();
extern C int isQuiet();
extern C const char* getFilename();
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index f91405f..c29406e 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -205,12 +205,9 @@ void yyerror ( const char *s )
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
/* error level */
int nRetValue = 0;
- char *pOutput;
FILE *pFile;
- pOutput = GetOutputFile( argc, argv );
-
- if ( !pOutput )
+ if ( !GetOutputFile( argc, argv ) )
{
return 1;
}
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 37190fb..510fc1a 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -54,7 +54,7 @@ XRMResParser *pParser = NULL;
extern C {
// the whole interface to lexer is in this extern C section
-extern char *GetOutputFile( int argc, char* argv[])
+extern bool GetOutputFile( int argc, char* argv[])
{
bDisplayName = false;
bExtensionDescription = false;
@@ -67,15 +67,13 @@ extern char *GetOutputFile( int argc, char* argv[])
sInputFileName = aArgs.m_sInputFile;
sOutputFile = aArgs.m_sOutputFile;
sMergeSrc = aArgs.m_sMergeSrc;
-char *pReturn = new char[ sOutputFile.getLength() + 1 ];
-std::strcpy( pReturn, sOutputFile.getStr());
-return pReturn;
+return true;
}
else
{
// command line is not valid
common::writeUsage(xrmex,*.xrm/*.xml);
-return NULL;
+return false;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/doc/docmacromode.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c4fc6ae7e4b1e10c805c057564ccd4753249fce0
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 20 14:55:40 2014 +0200
Use varying aElement name
Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 7082bc4..00efbfb 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -342,7 +342,7 @@ namespace sfx2
if( aElement == aStdLibName || aElement ==
aVBAProject )
{
Reference XNameAccess xLib;
-Any aAny = xContainer-getByName( aStdLibName
);
+Any aAny = xContainer-getByName( aElement );
aAny = xLib;
if ( xLib.is() xLib-hasElements() )
return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - cui/source cui/uiconfig include/svtools include/svx svtools/source svx/source
cui/source/inc/chardlg.hxx |2
cui/source/tabpages/chardlg.cxx | 24 ++
cui/uiconfig/ui/charnamepage.ui |4 -
include/svtools/langtab.hxx |1
include/svx/langbox.hxx | 16 ++-
svtools/source/misc/langtab.cxx | 14 ++
svx/source/dialog/langbox.cxx | 90
7 files changed, 147 insertions(+), 4 deletions(-)
New commits:
commit fe2b8ef18b11b226fddd1cf3fc7f9133426a1b1a
Author: Eike Rathke er...@redhat.com
Date: Thu May 22 19:23:14 2014 +0200
advance start of edit selection on a matching entry
... to allow continuous typing.
Change-Id: I4717e72e422037a441e582004bc87689ea7bc455
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 77ec154..028e33d 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -711,7 +711,24 @@ IMPL_LINK( SvxLanguageComboBox, EditModifyHdl,
SvxLanguageComboBox*, /*pEd*/ )
{
const sal_Int32 nPos = GetEntryPos( aStr);
if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+{
+// Advance start of full selection by one so the next character
+// will already continue the string instead of having to type the
+// same character again to start a new string. The selection
+// includes formatting characters and is reverse when obtained from
+// the Edit control.
+Selection aSel( GetSelection());
+if (aSel.Max() == 1)
+{
+OUString aText( GetText());
+if (aSel.Min() == aText.getLength())
+{
+++aSel.Max();
+SetSelection( aSel);
+}
+}
meEditedAndValid = EDITED_NO;
+}
else
{
OUString aCanonicalized;
commit dbe8b3b6d4f2d2cc2e8c702b78034e9013f71e8f
Author: Eike Rathke er...@redhat.com
Date: Thu May 22 16:31:09 2014 +0200
finally switch the Western language list box to SvxLanguageComboBox
Change-Id: Ibf0cb4c0fa951adcd0a7f185d7dd45b06913a40d
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index d90c2cb..69b46c8 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -86,7 +86,7 @@ private:
FixedText* m_pWestFontSizeFT;
FontSizeBox*m_pWestFontSizeLB;
FixedText* m_pWestFontLanguageFT;
-SvxLanguageBox* m_pWestFontLanguageLB;
+SvxLanguageComboBox* m_pWestFontLanguageLB;
FixedText* m_pWestFontTypeFT;
VclContainer* m_pEastFrame;
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 25c67f1..6205dfd 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -54,7 +54,7 @@
/packing
/child
child
- object class=svxcorelo-SvxLanguageBox id=westlanglb-nocjk
+ object class=svxcorelo-SvxLanguageComboBox
id=westlanglb-nocjk
property name=visibleTrue/property
property name=can_focusFalse/property
property name=halignstart/property
@@ -342,7 +342,7 @@
/packing
/child
child
- object class=svxcorelo-SvxLanguageBox id=westlanglb-cjk
+ object class=svxcorelo-SvxLanguageComboBox
id=westlanglb-cjk
property name=visibleTrue/property
property name=can_focusFalse/property
property name=hexpandTrue/property
commit 1aad7628dcd7fd14d48814d00c3d04e4ec0c59d5
Author: Eike Rathke er...@redhat.com
Date: Thu May 22 16:30:11 2014 +0200
handle SvxLanguageComboBox edit
Change-Id: Icc2a4829b8a859756ed194f35df214f8bb55c7ae
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1f0e58560..f36ae8e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1086,6 +1086,30 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet
rSet, LanguageGroup eLangGrp
}
nWhich = GetWhich( nSlot );
pOld = GetOldItem( rSet, nSlot );
+
+// For language list boxes acting as ComboBox, check for, add and select an
+// edited entry.
+SvxLanguageComboBox* pLangComboBox =
dynamic_castSvxLanguageComboBox*(pLangBox);
+if (pLangComboBox)
+{
+switch (pLangComboBox-GetEditedAndValid())
+{
+case SvxLanguageComboBox::EDITED_NO:
+; // nothing to do
+break;
+case SvxLanguageComboBox::EDITED_VALID:
+{
+const sal_Int32 nPos = pLangComboBox-SaveEditedAsEntry();
+if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+pLangComboBox-SelectEntryPos( nPos);
+}
+break;
+case
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/framework/modeltools.cxx | 41 +---
1 file changed, 33 insertions(+), 8 deletions(-)
New commits:
commit b40ca0935d72a3aff8a2beeabec156850c3417ba
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 22 19:19:02 2014 +0200
glTF: download *.dae and *.kmz files to the temp folder before conversion
Copy them to the same folder where the conversion output is written.
Change-Id: I38b93bf3fc427974cff7d6975151451a253b1cce
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index a7237d5..7de35f7 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -153,12 +153,43 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
if (bIsDAE || bIsKMZ)
{
std::shared_ptr GLTF::GLTFAsset asset(new GLTF::GLTFAsset());
-asset-setInputFilePath(OUStringToOString( rSourceURL,
RTL_TEXTENCODING_UTF8 ).getStr());
+
+OUString sOutput;
+
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sOutput);
+// remove .tmp extension
+sOutput = sOutput.copy(0, sOutput.getLength()-4);
+asset-setBundleOutputPath(OUStringToOString( sOutput,
RTL_TEXTENCODING_UTF8 ).getStr());
+
+const INetURLObject aSourceURLObj(sSource);
+// If *.dae or *.kmz file is not in the local file system, then copy
them to a temp folder for the conversion
+if(aSourceURLObj.GetProtocol() != INET_PROT_FILE )
+{
+try
+{
+ ::ucbhelper::Content aSourceContent(sSource,
+uno::Referenceucb::XCommandEnvironment(),
+comphelper::getProcessComponentContext());
+
+const OUString sTarget = sOutput + GetFilename(sSource);
+::ucbhelper::Content aTempContent(sTarget,
+uno::Referenceucb::XCommandEnvironment(),
+comphelper::getProcessComponentContext());
+
+aTempContent.writeStream(aSourceContent.openStream(), true);
+sSource = sTarget;
+}
+catch (const uno::Exception)
+{
+SAL_WARN(avmedia.opengl, Exception while trying to copy
source file to the temp folder for conversion:\n sSource);
+return false;
+}
+}
+
+asset-setInputFilePath(OUStringToOString( sSource,
RTL_TEXTENCODING_UTF8 ).getStr());
if (bIsKMZ)
{
// KMZ converter needs a system path
-const INetURLObject aSourceURLObj(rSourceURL);
const std::string sSourcePath =
OUStringToOString(
aSourceURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8
).getStr();
const std::string strDaeFilePath =
GLTF::Kmz2Collada()(sSourcePath);
@@ -172,12 +203,6 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
asset-setInputFilePath(OUStringToOString( sDaeFilePath,
RTL_TEXTENCODING_UTF8 ).getStr());
}
-OUString sOutput;
-
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sOutput);
-// remove .tmp extension
-sOutput = sOutput.copy(0, sOutput.getLength()-4);
-asset-setBundleOutputPath(OUStringToOString( sOutput,
RTL_TEXTENCODING_UTF8 ).getStr());
-
GLTF::COLLADA2GLTFWriter writer(asset);
writer.write();
// Path to the .json file created by COLLADA2GLTFWriter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - avmedia/source
avmedia/source/framework/modeltools.cxx | 41 +---
1 file changed, 33 insertions(+), 8 deletions(-)
New commits:
commit 22c98417735273a4c987edb0651dad645cf593bd
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu May 22 19:19:02 2014 +0200
glTF: download *.dae and *.kmz files to the temp folder before conversion
Copy them to the same folder where the conversion output is written.
Change-Id: I38b93bf3fc427974cff7d6975151451a253b1cce
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index a7237d5..7de35f7 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -153,12 +153,43 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
if (bIsDAE || bIsKMZ)
{
std::shared_ptr GLTF::GLTFAsset asset(new GLTF::GLTFAsset());
-asset-setInputFilePath(OUStringToOString( rSourceURL,
RTL_TEXTENCODING_UTF8 ).getStr());
+
+OUString sOutput;
+
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sOutput);
+// remove .tmp extension
+sOutput = sOutput.copy(0, sOutput.getLength()-4);
+asset-setBundleOutputPath(OUStringToOString( sOutput,
RTL_TEXTENCODING_UTF8 ).getStr());
+
+const INetURLObject aSourceURLObj(sSource);
+// If *.dae or *.kmz file is not in the local file system, then copy
them to a temp folder for the conversion
+if(aSourceURLObj.GetProtocol() != INET_PROT_FILE )
+{
+try
+{
+ ::ucbhelper::Content aSourceContent(sSource,
+uno::Referenceucb::XCommandEnvironment(),
+comphelper::getProcessComponentContext());
+
+const OUString sTarget = sOutput + GetFilename(sSource);
+::ucbhelper::Content aTempContent(sTarget,
+uno::Referenceucb::XCommandEnvironment(),
+comphelper::getProcessComponentContext());
+
+aTempContent.writeStream(aSourceContent.openStream(), true);
+sSource = sTarget;
+}
+catch (const uno::Exception)
+{
+SAL_WARN(avmedia.opengl, Exception while trying to copy
source file to the temp folder for conversion:\n sSource);
+return false;
+}
+}
+
+asset-setInputFilePath(OUStringToOString( sSource,
RTL_TEXTENCODING_UTF8 ).getStr());
if (bIsKMZ)
{
// KMZ converter needs a system path
-const INetURLObject aSourceURLObj(rSourceURL);
const std::string sSourcePath =
OUStringToOString(
aSourceURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8
).getStr();
const std::string strDaeFilePath =
GLTF::Kmz2Collada()(sSourcePath);
@@ -172,12 +203,6 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
asset-setInputFilePath(OUStringToOString( sDaeFilePath,
RTL_TEXTENCODING_UTF8 ).getStr());
}
-OUString sOutput;
-
::utl::LocalFileHelper::ConvertPhysicalNameToURL(::utl::TempFile::CreateTempName(),
sOutput);
-// remove .tmp extension
-sOutput = sOutput.copy(0, sOutput.getLength()-4);
-asset-setBundleOutputPath(OUStringToOString( sOutput,
RTL_TEXTENCODING_UTF8 ).getStr());
-
GLTF::COLLADA2GLTFWriter writer(asset);
writer.write();
// Path to the .json file created by COLLADA2GLTFWriter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source include/vcl vcl/source
editeng/source/editeng/impedit3.cxx |9 +
editeng/source/items/svxfont.cxx|1 +
include/vcl/font.hxx|5 +
include/vcl/outdev.hxx |5 +++--
vcl/source/outdev/font.cxx |1 +
vcl/source/outdev/outdevstate.cxx |7 +++
vcl/source/outdev/text.cxx | 14 +++---
7 files changed, 33 insertions(+), 9 deletions(-)
New commits:
commit 181266201b5e6aaad1dcd9cbc2dd4db44ecf3dc5
Author: matteocam matteo.campane...@gmail.com
Date: Thu May 22 13:53:19 2014 -0400
HasBkg method to Font.HasBkg iff HasSingleUnderline.SetBkgColor in OutputDev
Change-Id: I10e6e1b916df0c78d26596a37944e8b57b2897e7
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index fee0219..3bf1b26 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3673,7 +3673,12 @@ void ImpEditEngine::Paint( ImpEditView* pView, const
Rectangle rRect, OutputDev
VirtualDevice* pVDev = GetVirtualDevice( pTarget-GetMapMode(),
pTarget-GetDrawMode() );
pVDev-SetDigitLanguage( GetRefDevice()-GetDigitLanguage() );
+/*
+ * Set the appropriate background color according
+ * to text criteria
+*/
{
+
Color aBackgroundColor( pView-GetBackgroundColor() );
// #i47161# Check if text is visible on background
SvxFont aTmpFont;
@@ -3699,11 +3704,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const
Rectangle rRect, OutputDev
if( nColorDiff 8 )
aBackgroundColor = aFontColor.IsDark() ? COL_WHITE : COL_BLACK;
-// XXX: BEGIN my changes
-aBackgroundColor = COL_GRAY;
pVDev-SetBackground( aBackgroundColor );
-// END my changes
-//pVDev-SetBackground( aBackgroundColor ); // original code
}
bool bVDevValid = true;
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 7feb70e..895eef6 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -456,6 +456,7 @@ void SvxFont::QuickDrawText( OutputDevice *pOut,
const Point rPos, const OUString rTxt,
const sal_Int32 nIdx, const sal_Int32 nLen, const sal_Int32* pDXArray )
const
{
+
// Font has to be selected in OutputDevice...
if ( !IsCaseMap() !IsCapital() !IsKern() !IsEsc() )
{
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index d9649ba..7079c8d 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -60,6 +60,11 @@ public:
voidSetAlign( FontAlign );
FontAlign GetAlign() const;
+// XXX: now font has background iff it is (single-y) underlined
+boolHasBackgroundColor() const {
+return GetUnderline() == UNDERLINE_SINGLE;
+}
+
voidSetName( const OUString rFamilyName );
const OUString GetName() const;
voidSetStyleName( const OUString rStyleName );
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 676cf08..5336df1 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -338,6 +338,7 @@ private:
mutable boolmbKerning : 1;
mutable boolmbNewFont : 1;
mutable boolmbTextLines : 1;
+mutable boolmbTextBackground : 1;
mutable boolmbTextSpecial : 1;
mutable boolmbRefPoint : 1;
mutable boolmbEnableRTL : 1;
@@ -648,7 +649,7 @@ public:
///@}
-/** @name Rectangle functions
+/** @name Rectangle functionsf
*/
///@{
@@ -1043,7 +1044,7 @@ private:
SAL_DLLPRIVATE void ImplInitAboveTextLineSize();
-SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout, bool
bTextLines, sal_uInt32 flags = 0 );
+SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout, bool
bTextLines, bool bTextBkg = false, sal_uInt32 flags = 0 );
SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout );
SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY,
long nX, long nY, long nWidth, long nHeight );
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 541df8ef..72e2d0c 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1624,6 +1624,7 @@ bool OutputDevice::ImplNewFont() const
mbTextSpecial = maFont.IsShadow() || maFont.IsOutline() ||
(maFont.GetRelief() != RELIEF_NONE);
+
// #95414# fix for OLE objects which use scale factors very creatively
if( mbMap !aSize.Width() )
{
diff --git a/vcl/source/outdev/outdevstate.cxx
b/vcl/source/outdev/outdevstate.cxx
index 2dcaf11..8787a6e 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -520,6
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 9 commits - instsetoo_native/util svtools/source sw/inc sw/source vcl/aqua vcl/source xmloff/source
instsetoo_native/util/openoffice.lst | 48 +++
svtools/source/filter/filter.cxx | 11 ++-
sw/inc/ndgrf.hxx | 58 ++
sw/source/core/graphic/ndgrf.cxx | 53 -
sw/source/core/unocore/unoframe.cxx| 19 ++
sw/source/filter/xml/xmltexte.cxx |2
sw/source/ui/misc/glossary.cxx |5 +
vcl/aqua/source/gdi/ctfonts.cxx| 18 -
vcl/aqua/source/gdi/ctfonts.hxx|2
vcl/aqua/source/gdi/ctlayout.cxx | 43 +++--
vcl/aqua/source/window/salframeview.mm | 102 +++--
vcl/source/gdi/font.cxx|6 -
vcl/source/gdi/outdev3.cxx |8 --
xmloff/source/draw/shapeexport2.cxx| 73 ---
14 files changed, 215 insertions(+), 233 deletions(-)
New commits:
commit 8470308050cb5c71262fdf67ec689d628c9558e8
Author: Herbert Dürr h...@apache.org
Date: Wed May 21 12:56:56 2014 +
#i124915# use target device dependent font height again
Setting a fixed default font height parameter doesn't make much sense when
neither the target device nor its mapping mode nor its target resolution are
known. This change reverts revision 1589449 of bug 124686 that has already
been
solved differently and restores the previous behaviour so that the default
height
of default constructed fonts is set to 12pt when the target device becomes
known.
Reviewed-by: Armin Le Grand a...@apache.org
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 6972467..1826c92 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -74,12 +74,6 @@ Impl_Font::Impl_Font() :
mbVertical = false;
mbTransparent = true;
mbConfigLookup = false;
-
-// #124686# the Size is defaulted to (0,0) when default constructed,
-// this is not useful for a default font. Init it to a useful default
-// so that the Font::Font() constructor which uses a 'naked' static
-// Impl_Font instance (aStaticImplFont) creates a useful default font
-maSize = Size(0, 16);
}
// ---
commit 4bdef485997f44c1acf786232327ed6901c60f63
Author: Herbert Dürr h...@apache.org
Date: Wed May 21 11:50:36 2014 +
#i124940# update build target product name after the AOO 4.1 release
on trunk the 4.1.0 build target product name is obsolete after AOO 4.1 was
branched off and released. This change tentatively updates it to 4.2 which
is
the anticipated name of the next release to be branched of from trunk.
Reported-by: Rainer Bielefeld rainerbielefeld_ooo...@bielefeldundbuss.de
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 4ed8f31..b8125cb 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,9 +5,9 @@ Globals
variables
{
APACHEPROJECTNAME Apache OpenOffice
-OOOBASEVERSION 4.1
-OOOPACKAGEVERSION 4.1.0
-UREPACKAGEVERSION 4.1.0
+OOOBASEVERSION 4.2
+OOOPACKAGEVERSION 4.2.0
+UREPACKAGEVERSION 4.2.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice
UNIXBASISROOTNAME openoffice
@@ -39,9 +39,9 @@ Globals
OOOXMLFILEFORMATNAME OpenOffice.org XML
OOOXMLFILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-SERVICETAG_PRODUCTNAME Apache OpenOffice 4.1
-SERVICETAG_PRODUCTVERSION 4.1
-SERVICETAG_PARENTNAME Apache OpenOffice 4.1
+SERVICETAG_PRODUCTNAME Apache OpenOffice 4.2
+SERVICETAG_PRODUCTVERSION 4.2
+SERVICETAG_PARENTNAME Apache OpenOffice 4.2
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
SERVICETAG_URN urn:uuid:500061aa-5666-11e0-8e00-080020a9ed93
REGISTRATION_HOST https://registration.openoffice.org
@@ -59,7 +59,7 @@ Apache_OpenOffice
{
FULLPRODUCTNAME Apache OpenOffice
PRODUCTNAME OpenOffice
-PRODUCTVERSION 4.1.0
+PRODUCTVERSION 4.2.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -67,15 +67,15 @@ Apache_OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.1.0
-BASEPRODUCTVERSION 4.1
+ABOUTBOXPRODUCTVERSION 4.2.0
+BASEPRODUCTVERSION 4.2
PCPFILENAME openoffice.pcp
UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
[Bug 39439] Web search for UI strings
https://bugs.freedesktop.org/show_bug.cgi?id=39439 Mat M m...@gmx.fr changed: What|Removed |Added Status|REOPENED|NEEDINFO --- Comment #10 from Mat M m...@gmx.fr --- I managed to deliver the small site to openshift. It was painful but learning as well. So you can test it here: http://lionss-codeornot.rhcloud.com/ Because of all the changes and the inital request, I am not sure this is what you expect. Don't mind to provide use cases so I can improve my work. -- 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' - sal/textenc
sal/textenc/convertisciidevangari.tab |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 31ae901aa73b5766c9894a316dc33d56f8bcd568 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 17:57:34 2014 +0200 Fix order of function pointers Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3 (cherry picked from commit c8945b3fb850985794efcb8afbbdc2f5985d7088) Reviewed-on: https://gerrit.libreoffice.org/9440 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index 6c4a24b..19fbca1 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -22,8 +22,8 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData ImplDestroyIsciiDevanagariToUnicodeContext, ImplResetIsciiDevanagariToUnicodeContext, ImplCreateUnicodeToIsciiDevanagariContext, - ImplResetUnicodeToIsciiDevanagariContext, - ImplDestroyUnicodeToIsciiDevanagariContext }, + ImplDestroyUnicodeToIsciiDevanagariContext, + ImplResetUnicodeToIsciiDevanagariContext }, 1, 2, 2, ___ 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' - 5 commits - external/coinmp sc/source sd/source sfx2/source sw/source vcl/unx
external/coinmp/UnpackedTarball_coinmp.mk |1 +
external/coinmp/werror-format-security.patch.0 | 12
sc/source/filter/excel/expop2.cxx |3 ---
sc/source/filter/xml/xmlwrap.cxx |2 --
sd/source/ui/docshell/docshel4.cxx | 11 ---
sfx2/source/doc/objcont.cxx|4 +---
sfx2/source/doc/objstor.cxx|2 ++
sfx2/source/doc/objxtor.cxx|2 +-
sw/source/core/uibase/app/docsh.cxx|1 -
sw/source/filter/xml/xmlexp.cxx|4
vcl/unx/generic/dtrans/X11_transferable.cxx|2 +-
11 files changed, 18 insertions(+), 26 deletions(-)
New commits:
commit bedf2134f78ef0c6d0117d3c29272047d90bcce3
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 16:17:12 2014 +0200
cp#178: Replace \r\n with \n when pasting from X11 clipboard.
E.g. when pasting from terminal you will get \r\n.
Writer inserts '\r' character into the document as an
invisible character. If you save that to .odt and reload, you will
get ' ' instead. Or when saving to .doc and reload, you will get '\n'.
Change-Id: Id6780bf6d71a8f0a17c1e6ee7a7dcb4d297446dc
(cherry picked from commit 278baa557d18136a2641c015f7077a5838188766)
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx
b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 55c5092..dd64fb7 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -71,7 +71,7 @@ Any SAL_CALL X11Transferable::getTransferData( const
DataFlavor rFlavor )
OUStringToOString( rFlavor.MimeType, RTL_TEXTENCODING_ISO_8859_1
).getStr(),
OUStringToOString( aString, RTL_TEXTENCODING_ISO_8859_1
).getStr() );
#endif
-aRet = aString;
+aRet = aString.replaceAll(\r\n, \n);
}
else
aRet = aData;
commit 24f8a56d961fdbdc470213cf1684955d6cf6f1f8
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:50:39 2014 +0200
Update also revision and editing time when setting 'modified' properties.
Change-Id: Id756ef6dd62ca8df2e62265b9cc930f07d13f2e3
(cherry picked from commit 6e87f0bb75734e464bb0160dc00ab2fbe1a8fac3)
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index bea59cd..7bba8d6 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -208,9 +208,7 @@ void SfxObjectShell::UpdateDocInfoForSave()
now.GetHour(), now.GetDay(), now.GetMonth(),
now.GetYear(), false) );
xDocProps-setModifiedBy( aUserName );
-if ( !HasName() || pImp-bIsSaving )
-// QUESTION: not in case of real SaveAs as this is meant to
create a new document
-UpdateTime_Impl( xDocProps );
+UpdateTime_Impl( xDocProps );
}
}
}
commit 47797db65faa754675c3da350862fe2c7bb980f3
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:42:55 2014 +0200
Use proper constructor to fill with system time.
Probably 86adb5cacb4fe3e7fb869299447da5876f0da30d did not mean to change
the behaviour here.
Change-Id: If39c150973c502323b3c785a9738cf65cdd74e5d
(cherry picked from commit fee87c6fda46923a564cd2574827a7beeffb1a1f)
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 29fe983..b0b2347 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -209,7 +209,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell
_rDocShell )
,rDocShell( _rDocShell )
,aMacroMode( *this )
,pProgress( 0)
-,nTime( DateTime::EMPTY )
+,nTime( DateTime::SYSTEM )
,nVisualDocumentNumber( USHRT_MAX)
,nDocumentSignatureState( SIGNATURESTATE_UNKNOWN )
,nScriptingSignatureState( SIGNATURESTATE_UNKNOWN )
commit f18a00184733867ca9b43e0b0cf7bb6f3ceec764
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 10:11:38 2014 +0200
cp#177: Set 'modified' document property more consistently.
Update document info at one place, so that it works for other formats
like .doc, .docx, ... too.
Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260
(cherry picked from commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4)
diff --git a/sc/source/filter/excel/expop2.cxx
b/sc/source/filter/excel/expop2.cxx
index 8f9ebf9..f1453e9 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -88,9 +88,6 @@ FltError ExportBiff5::Write()
if( pDocShell xRootStrg.Is() )
{
-// #i88642# update doc info (revision etc)
-pDocShell-UpdateDocInfoForSave();
-
using namespace ::com::sun::star;
uno::Referencedocument::XDocumentPropertiesSupplier xDPS(
pDocShell-GetModel(), uno::UNO_QUERY_THROW);
diff --git a/sc/source/filter/xml/xmlwrap.cxx
Re: master build fails in Chart2
Le 20/05/2014 10:08, Stephan Bergmann a écrit : [...] Do you have a leftover chart2/source/controller/dialogs/res_LegendPosition.hxx that should have been removed long ago by http://cgit.freedesktop.org/libreoffice/core/commit/?id=27eb33d753eedfa4215eaf8325bc0ee9baeb7417 remove unnecessary empty dtor, etc.? Removing this file fixed the problem. Thank you very much. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39439] Web search for UI strings
https://bugs.freedesktop.org/show_bug.cgi?id=39439 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Status|NEEDINFO|NEW CC||cl...@cup.uni-muenchen.de --- Comment #11 from Michael Meeks michael.me...@collabora.com --- Wow: this is awesome ! :-) I entered Format code (eg. a string from the Calc format dialog) and it took me straight to the code: That's awesome =) Thanks 1 Cloph may have some idea of how we can host this - perhaps put it on the same machine as OoenGrok ? Is the code hosted somewhere ? Also - I think we should have a small piece of text that says: F_o_o (with the o underlined) is mangled as 'F_oo' to help people search for strings with accelerators. Because of all the changes and the inital request, I am not sure this is what you expect. Don't mind to provide use cases so I can improve my work. Looks brilliant to me ! =) There are other cases like menu items that we should prolly handle differently: there we need to search more deeply: in the officecfg to find a string, map that to a .uno:Foo thing, then map that to an SID_FOO_BAA_URL thing and onwards to SID_FOO_BAA into the code ... But this is a great start! Cloph - whom should we poke wrt. hosting it ? [ and thanks Mat ] -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: master build fails in Chart2
Hi, Le 20/05/2014 12:22, Christian Lohmaier a écrit : [...] git clean -dxn will show you all the stuff you have in your tree that's not managed by git (and thus probably shouldn't be there when you do the build in a separate directory). with -f instead of -n, git will remove those obsolete files for you. Oh, thank you. That did a big clean up ! Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/svtools sw/qa sw/source
include/svtools/rtfkeywd.hxx|1 +
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 10 --
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 10 ++
sw/source/core/doc/docbm.cxx|3 +++
sw/source/filter/ww8/rtfexport.cxx | 15 +++
5 files changed, 17 insertions(+), 22 deletions(-)
New commits:
commit c0765d1b5e317ec542be8285649c2c2a70892eff
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu May 22 19:51:41 2014 +0200
coverity#735895 Unchecked dynamic_cast
Change-Id: I6c2cc90668a2158a0b5bf638ce520c8af7731f4e
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 72764a6..6519285 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -417,6 +417,9 @@ namespace sw { namespace mark
- Mark was not created.);
MarkBase* pMarkBase = dynamic_castMarkBase*(pMark.get());
+if (!pMark)
+return 0;
+
if(pMark-GetMarkPos() != pMark-GetMarkStart())
pMarkBase-Swap();
commit 8e2b894c30f90c577857a16bab13e45f867bf36e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu May 22 19:32:19 2014 +0200
fdo#76101 move testcase to CppunitTest_sw_ooxmlsdrexport
The motivation is that this test takes time to execute (and we're
testing a limit here, so it's not easy to speed it up), though moving it
out of CppunitTest_sw_ooxmlexport is still possible (which is the
current critical path during a toplevel 'make').
Change-Id: Ibe6580f8aea1439f4feb281996f2f4bbd46ff4ce
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 562541d..e348ccd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3091,16 +3091,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76248, FDO76248.docx)
assertXPath(pXmlDoc, //a:graphicData[not(*)], 0);
}
-DECLARE_OOXMLEXPORT_TEST(testFdo76101, fdo76101.docx)
-{
-xmlDocPtr pXmlDoc = parseExport(word/styles.xml);
-
-if (!pXmlDoc)
- return;
-xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, /w:styles/w:style);
-CPPUNIT_ASSERT(4091 = xmlXPathNodeSetGetLength(pXmlNodes));
-}
-
DECLARE_OOXMLEXPORT_TEST(testFDO76163 , fdo76163.docx)
{
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 2dde9d1..9c49216 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -1414,6 +1414,16 @@ DECLARE_OOXMLEXPORT_TEST(testPresetShape,
preset-shape.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(21600), aSubViewSize[0].Height);
}
+DECLARE_OOXMLEXPORT_TEST(testFdo76101, fdo76101.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/styles.xml);
+
+if (!pXmlDoc)
+ return;
+xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, /w:styles/w:style);
+CPPUNIT_ASSERT(4091 = xmlXPathNodeSetGetLength(pXmlNodes));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit 8acb6155c310ac19827f97227c8e45753fcef7e6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu May 22 19:30:25 2014 +0200
clean up RtfExport::WriteInfo()
The \vern output was never parsed, and Word uses the generator field, so
let us do the same. And with the standard generator string, if we ever
need to parse it, we already have a parser for it in the ODF filter.
Change-Id: I57f25a6414b2b753a23cf82b691e364d84e4bb44
diff --git a/include/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx
index a6a1157..8518f69 100644
--- a/include/svtools/rtfkeywd.hxx
+++ b/include/svtools/rtfkeywd.hxx
@@ -1204,6 +1204,7 @@
#define LO_STRING_SVTOOLS_RTF_LISTPICTURE \\listpicture
#define LO_STRING_SVTOOLS_RTF_LEVELPICTURE \\levelpicture
#define LO_STRING_SVTOOLS_RTF_BRDRSH \\brdrsh
+#define LO_STRING_SVTOOLS_RTF_GENERATOR \\generator
#endif // INCLUDED_SVTOOLS_RTFKEYWD_HXX
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 8b8b21b..83c753e 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -57,6 +57,7 @@
#include svtools/rtfkeywd.hxx
#include filter/msfilter/rtfutil.hxx
#include unotools/configmgr.hxx
+#include unotools/docinfohelper.hxx
#include vcl/svapp.hxx
#if OSL_DEBUG_LEVEL 1
@@ -425,6 +426,8 @@ void RtfExport::WriteMainText()
void RtfExport::WriteInfo()
{
+OString aGenerator =
OUStringToOString(utl::DocInfoHelper::GetGeneratorString(),
RTL_TEXTENCODING_UTF8);
+Strm().WriteCharPtr({ OOO_STRING_SVTOOLS_RTF_IGNORE
LO_STRING_SVTOOLS_RTF_GENERATOR
).WriteCharPtr(aGenerator.getStr()).WriteChar('}');
Strm().WriteChar('{').WriteCharPtr(OOO_STRING_SVTOOLS_RTF_INFO);
SwDocShell* pDocShell(pDoc-GetDocShell());
@@ -453,18 +456,6 @@ void RtfExport::WriteInfo()
OutDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM,
[Libreoffice-commits] core.git: sal/osl unotools/source
sal/osl/unx/profile.cxx|2 +-
unotools/source/config/fontcfg.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4fbbfc2269d9671415efea2d946176abb83c5930
Author: Douglas Mencken dougmenc...@gmail.com
Date: Thu May 22 13:08:14 2014 -0400
WoE: while (..) {} instead of while(..);
warning: suggest a space before ';' or explicit braces around empty body
Change-Id: I71a55cc888d3480217621491ecace7d0af3dca6e
Reviewed-on: https://gerrit.libreoffice.org/9441
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 6684662..70505da 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -1133,7 +1133,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile)
pFile-m_pReadPtr = pChr;
}
-while (Max 0);
+while (Max 0) ;
return pLine;
}
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index fccab2d..e442870 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -700,7 +700,7 @@ static bool ImplKillTrailingWithExceptions( OUString
rName, const char* const*
else
{
// skip exception strings
-while( *++ppStr );
+while( *++ppStr ) {}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source vcl/source
editeng/source/items/svxfont.cxx |7 +++
vcl/source/outdev/text.cxx |5 +
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit ea56441757a34082b9ffc5f28936413fcb55e31a
Author: matteocam matteo.campane...@gmail.com
Date: Thu May 22 16:18:29 2014 -0400
Put text filling in SvxFont
Change-Id: I290fff0cb66fc07122b976d977dff24ac491e108
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 895eef6..e9f2a71 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -457,9 +457,16 @@ void SvxFont::QuickDrawText( OutputDevice *pOut,
const sal_Int32 nIdx, const sal_Int32 nLen, const sal_Int32* pDXArray )
const
{
+fprintf(stderr, About to print %s\n, rTxt.getStr());
+
// Font has to be selected in OutputDevice...
if ( !IsCaseMap() !IsCapital() !IsKern() !IsEsc() )
{
+// set right background
+if ( HasBackgroundColor() ) {
+Color aColor = COL_RED;
+pOut-SetTextFillColor(aColor);
+}
pOut-DrawTextArray( rPos, rTxt, pDXArray, nIdx, nLen );
return;
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 90da4db..eea1569 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -288,6 +288,7 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout
rSalLayout,
if( ImplDrawRotateText( rSalLayout ) )
return true;
+
long nOldX = rSalLayout.DrawBase().X();
if( HasMirroredGraphics() )
{
@@ -330,10 +331,6 @@ bool OutputDevice::ImplDrawTextDirect( SalLayout
rSalLayout,
maFont.GetStrikeout(), maFont.GetUnderline(), maFont.GetOverline(),
maFont.IsWordLineMode(), ImplIsUnderlineAbove( maFont ) );
-// draw background
-if ( bTextBkg ) {
-
-}
// emphasis marks
if( maFont.GetEmphasisMark() EMPHASISMARK_STYLE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/python3 postprocess/CustomTarget_registry.mk solenv/gbuild sysui/CustomTarget_deb.mk
external/python3/ExternalProject_python3.mk |2 +-
postprocess/CustomTarget_registry.mk|8
solenv/gbuild/Output.mk |4 ++--
sysui/CustomTarget_deb.mk |2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 87c1aa16a95dcff9247ae12a4bb5ea2d866b1772
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu May 22 16:58:22 2014 +0200
use $(gb_AWK) instead of awk
Change-Id: Ia00d7e52de5edfce09c3a0a8aa4390e3e1582a01
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 1f7be7f..0bbd9b5 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -109,7 +109,7 @@ $(call
gb_ExternalProject_get_state_target,python3,fixscripts) : $(call gb_Exter
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-config
\
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m-config
\
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pyvenv-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
; do \
- { rm $$file awk '\
+ { rm $$file $(gb_AWK) '\
BEGIN {print #!/bin/bash\n\
origpath=$$(pwd)\n\
bindir=$$(cd $$(dirname \$$0\) ; pwd)\n\
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 0bc71a9..2ae4ab6 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -594,17 +594,17 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the
# find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2)
$(call gb_Helper_abbreviate_dirs,\
find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
-name *.xcu -size +0c \
- | awk 'BEGIN{print list} \
+ | $(gb_AWK) 'BEGIN{print list} \
{print filename$$0/filename} \
END {print /list}' $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2)
$(call gb_Helper_abbreviate_dirs,\
find $(call gb_XcuResTarget_get_target,registry/$*/)\
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
@@ -613,7 +613,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
$(call gb_XcuResTarget_get_target,updchk/$*/))\
-name *.xcu \
- | awk 'BEGIN{print list} \
+ | $(gb_AWK) 'BEGIN{print list} \
{print filename$$0/filename} \
END {print /list}' $@ \
)
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index ca3da3b..01e9ad2 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -45,8 +45,8 @@ define gb_Output_warn
$(warning $(NEWLINE)[WARN $(2)] !!!$(NEWLINE)[WARN $(2)] !!!
$(1)$(NEWLINE)[WARN $(2)] !!!)
endef
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf %c, 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf %c, 7 }' -)
+gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf %c, 27 }' -)
+gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf %c, 7 }' -)
# only enable colorized output if
# - gb_COLOR is set
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 82acd32..ea68e2f 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -57,7 +57,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call
gb_CustomTarget_ge
sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
$@
echo Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH) $@
- du -k -s $(deb_WORKDIR)/$* | awk -F ' ' '{ printf Installed-Size:
%s\n, $$1 ; }' $@
+ du -k -s $(deb_WORKDIR)/$* | $(gb_AWK) -F ' ' '{ printf
Installed-Size: %s\n, $$1 ; }' $@
$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb:
$(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst
$(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call
gb_Library_get_target,getuid)
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/sdbcx/VCollection.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e4ec60ac717bfc0ef30cc2755a99987d731c1dd1
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu May 22 23:43:49 2014 +0200
Fix previous commit
Change-Id: I629b5f6e57c5d8368bafc544c1c23785ee209a1e
diff --git a/connectivity/source/sdbcx/VCollection.cxx
b/connectivity/source/sdbcx/VCollection.cxx
index 8081d15..9473d95 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -480,7 +480,7 @@ void SAL_CALL OCollection::release() throw()
Type SAL_CALL OCollection::getElementType( ) throw(RuntimeException,
std::exception)
{
-returncppu::UnoTypeXPropertySet::get();
+return cppu::UnoTypeXPropertySet::get();
}
sal_Bool SAL_CALL OCollection::hasElements( ) throw(RuntimeException,
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/databasecontext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6deec9c9106eed60e32450a28323e139bd3ced1f
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu May 22 23:48:37 2014 +0200
Fix
Change-Id: Ib4d7c2da71a6fa083fc1ed56f058c8dfbc6e58fb
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 94b3d37..99a647d 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -580,7 +580,7 @@ void SAL_CALL
ODatabaseContext::removeDatabaseRegistrationsListener( const Refer
// ::com::sun::star::container::XElementAccess
Type ODatabaseContext::getElementType( ) throw(RuntimeException,
std::exception)
{
-returncppu::UnoTypeXDataSource::get();
+return cppu::UnoTypeXDataSource::get();
}
sal_Bool ODatabaseContext::hasElements(void) throw( RuntimeException,
std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Additional predefined label formats #fdo79068
Hi, in https://bugs.freedesktop.org/show_bug.cgi?id=79068 a manufacture ask to get his labels integrated in LibreOffice. Would that be OK? Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 67 ++--
1 file changed, 50 insertions(+), 17 deletions(-)
New commits:
commit 831c8e02ca4640ddc7fb4966c0026f99b6e6296a
Author: Michael Stahl mst...@redhat.com
Date: Fri May 23 00:01:45 2014 +0200
jvmfwk: generalize (and fix) the do_msvcr71_magic to Oracle JRE 7
With just the Oracle JRE installed, it is not possible to load the
jvm.dll directly, because the required MSVC runtime DLL is not
found (unless some other software happens to install it system-wide),
as described in http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7184978
There was a hack do_msvcr71_magic to manually load the runtime that
is bundled with Oracle JRE 6 and this generalizes that to work with the
MSVCR100.DLL that is bundled with Oracle JRE 7 as well.
An additional adaption of the virtual addresses in the file is done,
and it's a mystery whether it even worked before without that.
This issue was not user-visible before because LO releases 3.5 - 4.2
bundle the MSVCR100.DLL themselves.
Change-Id: If61565df80ff8a68472a76000ab5b10d6c78e11c
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 266cdc6..ef91401 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -449,20 +449,20 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
// think it should be, do nothing, and just let the implicit loading
// that happens when loading the JVM take care of it.
-static void load_msvcr71(LPCWSTR jvm_dll)
+static void load_msvcr(LPCWSTR jvm_dll, wchar_t const* msvcr)
{
-wchar_t msvcr71_dll[MAX_PATH];
+wchar_t msvcr_dll[MAX_PATH];
wchar_t *slash;
if (wcslen(jvm_dll) MAX_PATH - 15)
return;
-wcscpy(msvcr71_dll, jvm_dll);
+wcscpy(msvcr_dll, jvm_dll);
// First check if msvcr71.dll is in the same folder as jvm.dll. It
// normally isn't, at least up to 1.6.0_22, but who knows if it
// might be in the future.
-slash = wcsrchr(msvcr71_dll, L'\\');
+slash = wcsrchr(msvcr_dll, L'\\');
if (!slash)
{
@@ -470,27 +470,27 @@ static void load_msvcr71(LPCWSTR jvm_dll)
return;
}
-wcscpy(slash+1, Lmsvcr71.dll);
-if (LoadLibraryW(msvcr71_dll))
+wcscpy(slash+1, msvcr);
+if (LoadLibraryW(msvcr_dll))
return;
// Then check if msvcr71.dll is in the parent folder of where
// jvm.dll is. That is currently (1.6.0_22) as far as I know the
// normal case.
*slash = 0;
-slash = wcsrchr(msvcr71_dll, L'\\');
+slash = wcsrchr(msvcr_dll, L'\\');
if (!slash)
return;
-wcscpy(slash+1, Lmsvcr71.dll);
-LoadLibraryW(msvcr71_dll);
+wcscpy(slash+1, msvcr);
+LoadLibraryW(msvcr_dll);
}
// Check if the jvm DLL imports msvcr71.dll, and in that case try
// loading it explicitly. In case something goes wrong, do nothing,
// and just let the implicit loading try to take care of it.
-static void do_msvcr71_magic(rtl_uString *jvm_dll)
+static void do_msvcr_magic(rtl_uString *jvm_dll)
{
rtl_uString* Module(0);
struct stat st;
@@ -524,18 +524,51 @@ static void do_msvcr71_magic(rtl_uString *jvm_dll)
IMAGE_NT_HEADERS *nt_hdr = (IMAGE_NT_HEADERS *) ((char *)dos_hdr +
dos_hdr-e_lfanew);
+DWORD importsVA = nt_hdr-OptionalHeader
+.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
+// first determine Virtual-to-File-address mapping for the section
+// that contains the import directory
+IMAGE_SECTION_HEADER *sections = IMAGE_FIRST_SECTION(nt_hdr);
+ptrdiff_t VAtoPhys = -1;
+for (int i = 0; i nt_hdr-FileHeader.NumberOfSections; ++i)
+{
+if (sections-VirtualAddress = importsVA
+importsVA sections-VirtualAddress + sections-SizeOfRawData)
+{
+VAtoPhys = sections-PointerToRawData - sections-VirtualAddress;
+break;
+}
+++sections;
+}
+if (-1 == VAtoPhys) // not found?
+{
+free(dos_hdr);
+return;
+}
IMAGE_IMPORT_DESCRIPTOR *imports =
-(IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr +
nt_hdr-OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
+(IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr + importsVA + VAtoPhys);
while (imports = (IMAGE_IMPORT_DESCRIPTOR *) ((char *) dos_hdr +
st.st_size - sizeof (IMAGE_IMPORT_DESCRIPTOR))
imports-Name != 0
- imports-Name (DWORD) st.st_size)
+ imports-Name + VAtoPhys (DWORD) st.st_size)
{
-// Intentional use of sizeof(msvcr71.dll) here to include the
terminating zero byte
-if (strnicmp((char *) dos_hdr + imports-Name, msvcr71.dll,
sizeof(msvcr71.dll)) == 0)
+static struct { char const * name; wchar_t const * wname; }
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Output.mk |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f56101cb2135136af91926be7b8f758509a3f938
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Fri May 23 00:24:55 2014 +0200
gb_AWK variable not available here...
Change-Id: Ib763efb268bc9165704185c2b588ed282121cfa0
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 01e9ad2..ca3da3b 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -45,8 +45,8 @@ define gb_Output_warn
$(warning $(NEWLINE)[WARN $(2)] !!!$(NEWLINE)[WARN $(2)] !!!
$(1)$(NEWLINE)[WARN $(2)] !!!)
endef
-gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf %c, 27 }' -)
-gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf %c, 7 }' -)
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf %c, 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf %c, 7 }' -)
# only enable colorized output if
# - gb_COLOR is set
___
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' - external/python3 postprocess/CustomTarget_registry.mk sysui/CustomTarget_deb.mk
external/python3/ExternalProject_python3.mk |2 +-
postprocess/CustomTarget_registry.mk|8
sysui/CustomTarget_deb.mk |2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit cf3a3bfa560d293a7c15fed56221f7c3b3d4b8f5
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu May 22 16:58:22 2014 +0200
use $(gb_AWK) instead of awk
but only where available, revert the change in Output.mk
(cherry picked from commit 87c1aa16a95dcff9247ae12a4bb5ea2d866b1772)
Change-Id: Ia00d7e52de5edfce09c3a0a8aa4390e3e1582a01
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 1f7be7f..0bbd9b5 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -109,7 +109,7 @@ $(call
gb_ExternalProject_get_state_target,python3,fixscripts) : $(call gb_Exter
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-config
\
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m-config
\
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pyvenv-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
; do \
- { rm $$file awk '\
+ { rm $$file $(gb_AWK) '\
BEGIN {print #!/bin/bash\n\
origpath=$$(pwd)\n\
bindir=$$(cd $$(dirname \$$0\) ; pwd)\n\
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 0bc71a9..2ae4ab6 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -594,17 +594,17 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the
# find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2)
$(call gb_Helper_abbreviate_dirs,\
find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
-name *.xcu -size +0c \
- | awk 'BEGIN{print list} \
+ | $(gb_AWK) 'BEGIN{print list} \
{print filename$$0/filename} \
END {print /list}' $@ \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2)
$(call gb_Helper_abbreviate_dirs,\
find $(call gb_XcuResTarget_get_target,registry/$*/)\
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
@@ -613,7 +613,7 @@ $(call
gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
$(call gb_XcuResTarget_get_target,updchk/$*/))\
-name *.xcu \
- | awk 'BEGIN{print list} \
+ | $(gb_AWK) 'BEGIN{print list} \
{print filename$$0/filename} \
END {print /list}' $@ \
)
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 82acd32..ea68e2f 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -57,7 +57,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call
gb_CustomTarget_ge
sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \
$@
echo Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH) $@
- du -k -s $(deb_WORKDIR)/$* | awk -F ' ' '{ printf Installed-Size:
%s\n, $$1 ; }' $@
+ du -k -s $(deb_WORKDIR)/$* | $(gb_AWK) -F ' ' '{ printf
Installed-Size: %s\n, $$1 ; }' $@
$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb:
$(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst
$(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call
gb_Library_get_target,getuid)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
Hi *, On Thu, May 22, 2014 at 5:57 PM, Michael Meeks michael.me...@collabora.com wrote: [...] * Release Engineering update (Christian) + 4.3.0 Beta 1 status [...] + investigating Windows test failures (spellchecking) + a python issue related to UI mode - not seen when running from the terminal; different return value internally; around stdout/in etc. + now patched. http://cgit.freedesktop.org/libreoffice/core/tree/external/python3/python-3.3.3-py17797.patch.1 + will run on XP and later without crashing. Turns out that the patch is not as reliable as it should be :-/ Beta1 build on XP still suffers from the problem. Workarounds: * run LibreOffice from a cygwin shell (then everything works, also java and python scripts) or * disable auto-spellchecking and don't use Tools|Macros (i.e. avoid to load python in any way). ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/hyphen external/mythes lingucomponent/source
external/hyphen/UnpackedTarball_hyphen.mk |1
external/hyphen/hyphen-fdo48017-wfopen.patch | 46 +++
external/mythes/UnpackedTarball_mythes.mk |1
external/mythes/mythes-fdo48017-wfopen.patch | 72 ++
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 10 +-
lingucomponent/source/lingutil/lingutil.cxx | 27 --
lingucomponent/source/lingutil/lingutil.hxx | 10 --
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 14 +--
8 files changed, 130 insertions(+), 51 deletions(-)
New commits:
commit 6d06aa8ba83b7629603cd86cf14a63c432ce268f
Author: László Németh nem...@numbertext.org
Date: Thu May 22 12:27:44 2014 +0200
fdo#48017 WIN32 long path support in Hyphen and MyThes
Change-Id: Ifb068efb553ed24a7caf65dbab28726bdeced0e6
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk
b/external/hyphen/UnpackedTarball_hyphen.mk
index 5cd0af8..c112b35 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-android.patch \
external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
+ external/hyphen/hyphen-fdo48017-wfopen.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch
b/external/hyphen/hyphen-fdo48017-wfopen.patch
new file mode 100644
index 000..9a73b4a
--- /dev/null
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -0,0 +1,46 @@
+diff -u hyphen/hyphen.c build/hyphen/hyphen.c
+--- hyphen/hyphen.c2014-05-22 00:28:13.164587974 +0200
build/hyphen/hyphen.c 2014-05-22 11:08:55.0 +0200
+@@ -44,6 +44,11 @@
+ #include unistd.h /* for exit */
+ #endif
+
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ #define noVERBOSE
+
+ /* calculate hyphenmin values with long ligature length (2 or 3 characters
+@@ -371,6 +376,21 @@
+ }
+ }
+
++FILE * hnj_fopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
++int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
++wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
++
+ HyphenDict *
+ hnj_hyphen_load (const char *fn)
+ {
+@@ -383,7 +403,7 @@
+ HashEntry *e;
+ int state_num = 0;
+
+- f = fopen (fn, r);
++ f = hnj_fopen (fn, r);
+ if (f == NULL)
+ return NULL;
+
diff --git a/external/mythes/UnpackedTarball_mythes.mk
b/external/mythes/UnpackedTarball_mythes.mk
index d2d4e1d..7571c34 100644
--- a/external/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
external/mythes/mythes-1.2.0-android.patch \
external/mythes/mythes-ssizet.patch \
+ external/mythes/mythes-fdo48017-wfopen.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mythes/mythes-fdo48017-wfopen.patch
b/external/mythes/mythes-fdo48017-wfopen.patch
new file mode 100644
index 000..1621b1d
--- /dev/null
+++ b/external/mythes/mythes-fdo48017-wfopen.patch
@@ -0,0 +1,72 @@
+diff -u mythes/mythes.cxx build/mythes/mythes.cxx
+--- mythes/mythes.cxx 2014-05-22 00:27:38.508588487 +0200
build/mythes/mythes.cxx2014-05-22 10:07:06.107547417 +0200
+@@ -8,6 +8,11 @@
+
+ #include mythes.hxx
+
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ MyThes::MyThes(const char* idxpath, const char * datpath)
+ {
+ nw = 0;
+@@ -35,7 +40,7 @@
+ {
+
+ // open the index file
+-FILE * pifile = fopen(idxpath,r);
++FILE * pifile = myfopen(idxpath,r);
+ if (!pifile) {
+ return 0;
+ }
+@@ -90,7 +95,7 @@
+ fclose(pifile);
+
+ /* next open the data file */
+-pdfile = fopen(datpath,r);
++pdfile = myfopen(datpath,r);
+ if (!pdfile) {
+ return 0;
+ }
+@@ -370,3 +375,17 @@
+ return -1;
+ }
+
++FILE * MyThes::myfopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
++int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
++wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
+diff -u mythes/mythes.hxx
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgexport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8778b5b37e919384f3dbcf51e0dde0d26fe5fc39 Author: László Németh nem...@numbertext.org Date: Fri May 23 01:11:07 2014 +0200 fdo#79078 restore transparency in SVG export Change-Id: I5bdf6c3b313a73126cb692e5101836f424a2fc08 diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 244d08b..00016cd 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -353,8 +353,8 @@ SVGExport::SVGExport( // Native Decoration mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, sal_False); -// Tiny Opacity -mbIsUseOpacity = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True); +// Tiny Opacity (supported from SVG Tiny 1.2) +mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True); // Positioned Characters(Seems to be experimental, as it was always initialized with false) mbIsUsePositionedCharacters = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_POSITIONED_CHARACTERS, sal_False); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/hyphen external/mythes lingucomponent/source
external/hyphen/UnpackedTarball_hyphen.mk |1
external/hyphen/hyphen-fdo48017-wfopen.patch | 46 +++
external/mythes/UnpackedTarball_mythes.mk |1
external/mythes/mythes-fdo48017-wfopen.patch | 72 ++
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 10 +-
lingucomponent/source/lingutil/lingutil.cxx | 27 --
lingucomponent/source/lingutil/lingutil.hxx | 10 --
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 14 +--
8 files changed, 130 insertions(+), 51 deletions(-)
New commits:
commit 6f98f4981cb29e84723128ab3839110526e33655
Author: László Németh nem...@numbertext.org
Date: Thu May 22 12:27:44 2014 +0200
fdo#48017 WIN32 long path support in Hyphen and MyThes
Change-Id: Ifb068efb553ed24a7caf65dbab28726bdeced0e6
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk
b/external/hyphen/UnpackedTarball_hyphen.mk
index 5cd0af8..c112b35 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-android.patch \
external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
+ external/hyphen/hyphen-fdo48017-wfopen.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch
b/external/hyphen/hyphen-fdo48017-wfopen.patch
new file mode 100644
index 000..9a73b4a
--- /dev/null
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -0,0 +1,46 @@
+diff -u hyphen/hyphen.c build/hyphen/hyphen.c
+--- hyphen/hyphen.c2014-05-22 00:28:13.164587974 +0200
build/hyphen/hyphen.c 2014-05-22 11:08:55.0 +0200
+@@ -44,6 +44,11 @@
+ #include unistd.h /* for exit */
+ #endif
+
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ #define noVERBOSE
+
+ /* calculate hyphenmin values with long ligature length (2 or 3 characters
+@@ -371,6 +376,21 @@
+ }
+ }
+
++FILE * hnj_fopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
++int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
++wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
++
+ HyphenDict *
+ hnj_hyphen_load (const char *fn)
+ {
+@@ -383,7 +403,7 @@
+ HashEntry *e;
+ int state_num = 0;
+
+- f = fopen (fn, r);
++ f = hnj_fopen (fn, r);
+ if (f == NULL)
+ return NULL;
+
diff --git a/external/mythes/UnpackedTarball_mythes.mk
b/external/mythes/UnpackedTarball_mythes.mk
index d2d4e1d..7571c34 100644
--- a/external/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
external/mythes/mythes-1.2.0-android.patch \
external/mythes/mythes-ssizet.patch \
+ external/mythes/mythes-fdo48017-wfopen.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mythes/mythes-fdo48017-wfopen.patch
b/external/mythes/mythes-fdo48017-wfopen.patch
new file mode 100644
index 000..1621b1d
--- /dev/null
+++ b/external/mythes/mythes-fdo48017-wfopen.patch
@@ -0,0 +1,72 @@
+diff -u mythes/mythes.cxx build/mythes/mythes.cxx
+--- mythes/mythes.cxx 2014-05-22 00:27:38.508588487 +0200
build/mythes/mythes.cxx2014-05-22 10:07:06.107547417 +0200
+@@ -8,6 +8,11 @@
+
+ #include mythes.hxx
+
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ MyThes::MyThes(const char* idxpath, const char * datpath)
+ {
+ nw = 0;
+@@ -35,7 +40,7 @@
+ {
+
+ // open the index file
+-FILE * pifile = fopen(idxpath,r);
++FILE * pifile = myfopen(idxpath,r);
+ if (!pifile) {
+ return 0;
+ }
+@@ -90,7 +95,7 @@
+ fclose(pifile);
+
+ /* next open the data file */
+-pdfile = fopen(datpath,r);
++pdfile = myfopen(datpath,r);
+ if (!pdfile) {
+ return 0;
+ }
+@@ -370,3 +375,17 @@
+ return -1;
+ }
+
++FILE * MyThes::myfopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
++int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
++wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
+diff -u mythes/mythes.hxx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - filter/source
filter/source/svg/svgexport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 62a1d235238ca946f4b960a91480107d6acdd2c0 Author: László Németh nem...@numbertext.org Date: Fri May 23 01:11:07 2014 +0200 fdo#79078 restore transparency in SVG export Change-Id: I5bdf6c3b313a73126cb692e5101836f424a2fc08 diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 244d08b..00016cd 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -353,8 +353,8 @@ SVGExport::SVGExport( // Native Decoration mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, sal_False); -// Tiny Opacity -mbIsUseOpacity = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True); +// Tiny Opacity (supported from SVG Tiny 1.2) +mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True); // Positioned Characters(Seems to be experimental, as it was always initialized with false) mbIsUsePositionedCharacters = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_POSITIONED_CHARACTERS, sal_False); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39439] Web search for UI strings
https://bugs.freedesktop.org/show_bug.cgi?id=39439 --- Comment #12 from Mat M m...@gmx.fr --- (In reply to comment #11) Wow: this is awesome ! :-) I entered Format code (eg. a string from the Calc format dialog) and it took me straight to the code: That's awesome =) Thanks 1 Cloph may have some idea of how we can host this - perhaps put it on the same machine as OoenGrok ? This is python, so I need an apache + wsgi + python2.7 and enough space to put a core repo at hand. Is the code hosted somewhere ? On Openshift for now. I plan to put it in dev-tools. Also - I think we should have a small piece of text that says: F_o_o (with the o underlined) is mangled as 'F_oo' to help people search for strings with accelerators. Well, I always add the accelerator character to the search string, just in case. That was in the specs: Handle accelerator transparently. We could tell the user it can be omitted, though. There are other cases like menu items that we should prolly handle differently: there we need to search more deeply: in the officecfg to find a string, map that to a .uno:Foo thing, then map that to an SID_FOO_BAA_URL thing and onwards to SID_FOO_BAA into the code ... Not that hard. It looks like the old hrc files system we had for dialogs, which is already coded on the heroku version of the site. (BTW, is there plans to move menu to ui system ?) Anything else after menus and dialogs ? But this is a great start! Thanks -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 57
sc/qa/unit/ucalc.hxx|3 ++
sc/source/core/data/column3.cxx | 22 ---
3 files changed, 60 insertions(+), 22 deletions(-)
New commits:
commit cb167ac784f9b16944da4494b65e56b2a5b66bb7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 22 20:56:04 2014 -0400
fdo#78903: Don't broadcast prematurely during cell deletion.
We need to wait until all the affected cells get marked dirty at the
end of the deletion process.
Change-Id: I49618fcc386ec2209f5f0267d50257ecb8dd21d1
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 3d447d1..2d54fd5 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -169,11 +169,6 @@ public:
maRows.push_back(i + nTopRow);
}
-void endFormulas()
-{
-mrDoc.EndListeningFormulaCells(maFormulaCells);
-}
-
const std::vectorSCROW getNonEmptyRows() const
{
return maRows;
@@ -266,12 +261,6 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
sc::AutoCalcSwitch aACSwitch(*pDocument, false);
-// Parse all non-empty cells in the range to pick up their row positions,
-// and end all formula cells.
-DeleteRowsHandler aDeleteRowsFunc(*pDocument);
-sc::ProcessFormula(itCell, maCells, nStartRow, nEndRow, aDeleteRowsFunc,
aDeleteRowsFunc);
-aDeleteRowsFunc.endFormulas();
-
// Remove the cells.
maCells.erase(nStartRow, nEndRow);
maCells.resize(MAXROWCOUNT);
@@ -285,22 +274,11 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
-// Single cell broadcasts on deleted cells.
-BroadcastCells(aDeleteRowsFunc.getNonEmptyRows(), SC_HINT_DATACHANGED);
-
// Shift the text attribute array too (before the broadcast).
maCellTextAttrs.erase(nStartRow, nEndRow);
maCellTextAttrs.resize(MAXROWCOUNT);
CellStorageModified();
-
-if (!bShiftCells)
-return;
-
-// Do area broadcast on the old non-empty cell ranges prior to the shift.
-sc::SingleColumnSpanSet::SpansType aSpans;
-aNonEmptySpans.getSpans(aSpans);
-std::for_each(aSpans.begin(), aSpans.end(), RangeBroadcaster(*pDocument,
nTab, nCol));
}
sc::CellStoreType::iterator ScColumn::GetPositionToInsert( SCROW nRow )
commit fa2751ea5ce9066002a250f06bf5d056f6e0b71b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 22 20:54:08 2014 -0400
fdo#78903: Write test for this.
Change-Id: If8ed8b74b58efd948772376a14172b52ff588f82
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8e65f68..38f7a3b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1352,6 +1352,63 @@ void Test::testFormulaDepTracking2()
m_pDoc-DeleteTab(0);
}
+void Test::testFormulaDepTrackingDeleteRow()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calculation.
+
+m_pDoc-InsertTab(0, Test);
+
+// Values in A1:A3.
+m_pDoc-SetValue(ScAddress(0,0,0), 1.0);
+m_pDoc-SetValue(ScAddress(0,1,0), 3.0);
+m_pDoc-SetValue(ScAddress(0,2,0), 5.0);
+
+// SUM(A1:A3) in A5.
+m_pDoc-SetString(ScAddress(0,4,0), =SUM(A1:A3));
+
+// A6 to reference A5.
+m_pDoc-SetString(ScAddress(0,5,0), =A5*10);
+const ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(0,5,0));
+CPPUNIT_ASSERT(pFC);
+
+// A4 should have a broadcaster with A5 listening to it.
+SvtBroadcaster* pBC = m_pDoc-GetBroadcaster(ScAddress(0,4,0));
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: broadcaster at
A5 = %p\n, pBC);
+CPPUNIT_ASSERT(pBC);
+SvtBroadcaster::ListenersType* pListeners = pBC-GetAllListeners();
+CPPUNIT_ASSERT_MESSAGE(A5 should have one listener., pListeners-size()
== 1);
+SvtListener* pListener = pListeners-at(0);
+CPPUNIT_ASSERT_MESSAGE(A6 should be listening to A5., pListener == pFC);
+
+// Check initial values.
+CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc-GetValue(ScAddress(0,4,0)));
+CPPUNIT_ASSERT_EQUAL(90.0, m_pDoc-GetValue(ScAddress(0,5,0)));
+
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: Deleting row
2\n);
+// Delete row 2.
+ScDocFunc rFunc = getDocShell().GetDocFunc();
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), aMark, DEL_CELLSUP, true,
true);
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: Done deleting
row 2.\n);
+
+pBC = m_pDoc-GetBroadcaster(ScAddress(0,3,0));
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: broadcaster at
A4 = %p\n, pBC);
+CPPUNIT_ASSERT_MESSAGE(Broadcaster at A5 should have shifted to A4.,
pBC);
+pListeners = pBC-GetAllListeners();
+CPPUNIT_ASSERT_MESSAGE(A3 should have one listener., pListeners-size()
== 1);
+pFC = m_pDoc-GetFormulaCell(ScAddress(0,4,0));
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 57
sc/qa/unit/ucalc.hxx|3 ++
sc/source/core/data/column3.cxx | 22 ---
3 files changed, 60 insertions(+), 22 deletions(-)
New commits:
commit 62b3d1dedfd7dd85b18297890d35e2c9368f0fef
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 22 20:56:04 2014 -0400
fdo#78903: Don't broadcast prematurely during cell deletion.
We need to wait until all the affected cells get marked dirty at the
end of the deletion process.
Change-Id: I49618fcc386ec2209f5f0267d50257ecb8dd21d1
(cherry picked from commit cb167ac784f9b16944da4494b65e56b2a5b66bb7)
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 3d447d1..2d54fd5 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -169,11 +169,6 @@ public:
maRows.push_back(i + nTopRow);
}
-void endFormulas()
-{
-mrDoc.EndListeningFormulaCells(maFormulaCells);
-}
-
const std::vectorSCROW getNonEmptyRows() const
{
return maRows;
@@ -266,12 +261,6 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
sc::AutoCalcSwitch aACSwitch(*pDocument, false);
-// Parse all non-empty cells in the range to pick up their row positions,
-// and end all formula cells.
-DeleteRowsHandler aDeleteRowsFunc(*pDocument);
-sc::ProcessFormula(itCell, maCells, nStartRow, nEndRow, aDeleteRowsFunc,
aDeleteRowsFunc);
-aDeleteRowsFunc.endFormulas();
-
// Remove the cells.
maCells.erase(nStartRow, nEndRow);
maCells.resize(MAXROWCOUNT);
@@ -285,22 +274,11 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
-// Single cell broadcasts on deleted cells.
-BroadcastCells(aDeleteRowsFunc.getNonEmptyRows(), SC_HINT_DATACHANGED);
-
// Shift the text attribute array too (before the broadcast).
maCellTextAttrs.erase(nStartRow, nEndRow);
maCellTextAttrs.resize(MAXROWCOUNT);
CellStorageModified();
-
-if (!bShiftCells)
-return;
-
-// Do area broadcast on the old non-empty cell ranges prior to the shift.
-sc::SingleColumnSpanSet::SpansType aSpans;
-aNonEmptySpans.getSpans(aSpans);
-std::for_each(aSpans.begin(), aSpans.end(), RangeBroadcaster(*pDocument,
nTab, nCol));
}
sc::CellStoreType::iterator ScColumn::GetPositionToInsert( SCROW nRow )
commit 1972488c6ededaf36b97c1880316df1f94e275e5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 22 20:54:08 2014 -0400
fdo#78903: Write test for this.
Change-Id: If8ed8b74b58efd948772376a14172b52ff588f82
(cherry picked from commit fa2751ea5ce9066002a250f06bf5d056f6e0b71b)
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8e65f68..38f7a3b 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1352,6 +1352,63 @@ void Test::testFormulaDepTracking2()
m_pDoc-DeleteTab(0);
}
+void Test::testFormulaDepTrackingDeleteRow()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calculation.
+
+m_pDoc-InsertTab(0, Test);
+
+// Values in A1:A3.
+m_pDoc-SetValue(ScAddress(0,0,0), 1.0);
+m_pDoc-SetValue(ScAddress(0,1,0), 3.0);
+m_pDoc-SetValue(ScAddress(0,2,0), 5.0);
+
+// SUM(A1:A3) in A5.
+m_pDoc-SetString(ScAddress(0,4,0), =SUM(A1:A3));
+
+// A6 to reference A5.
+m_pDoc-SetString(ScAddress(0,5,0), =A5*10);
+const ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(0,5,0));
+CPPUNIT_ASSERT(pFC);
+
+// A4 should have a broadcaster with A5 listening to it.
+SvtBroadcaster* pBC = m_pDoc-GetBroadcaster(ScAddress(0,4,0));
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: broadcaster at
A5 = %p\n, pBC);
+CPPUNIT_ASSERT(pBC);
+SvtBroadcaster::ListenersType* pListeners = pBC-GetAllListeners();
+CPPUNIT_ASSERT_MESSAGE(A5 should have one listener., pListeners-size()
== 1);
+SvtListener* pListener = pListeners-at(0);
+CPPUNIT_ASSERT_MESSAGE(A6 should be listening to A5., pListener == pFC);
+
+// Check initial values.
+CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc-GetValue(ScAddress(0,4,0)));
+CPPUNIT_ASSERT_EQUAL(90.0, m_pDoc-GetValue(ScAddress(0,5,0)));
+
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: Deleting row
2\n);
+// Delete row 2.
+ScDocFunc rFunc = getDocShell().GetDocFunc();
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+rFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), aMark, DEL_CELLSUP, true,
true);
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: Done deleting
row 2.\n);
+
+pBC = m_pDoc-GetBroadcaster(ScAddress(0,3,0));
+fprintf(stdout, Test::testFormulaDepTrackingDeleteRow: broadcaster at
A4 = %p\n, pBC);
+CPPUNIT_ASSERT_MESSAGE(Broadcaster at A5 should have shifted to A4.,
pBC);
+pListeners =
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - 5 commits - chart2/source include/vcl vcl/source
chart2/source/view/charttypes/GL3DBarChart.cxx | 14 --
chart2/source/view/inc/GL3DBarChart.hxx|2 ++
chart2/source/view/main/GL3DRenderer.cxx | 19 +++
include/vcl/opengl/OpenGLContext.hxx |2 ++
include/vcl/openglwin.hxx |2 ++
vcl/source/opengl/OpenGLContext.cxx|7 +++
vcl/source/opengl/OpenGLHelper.cxx |6 +++---
vcl/source/window/openglwin.cxx|2 ++
8 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit 032df92ebcb59cc614b703073fdb5f31aa8570fc
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 23 02:11:23 2014 +0200
Lsan: fix memory leak
Change-Id: I82a517a267cceaac4dd1030d45c67fc070e22def
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index a9df966..ed2a6c7 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -137,6 +137,8 @@ struct GLWindow
bMultiSampleSupported(false)
{
}
+
+~GLWindow();
};
class VCLOPENGL_DLLPUBLIC OpenGLContext
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 4128bf4..e07b341 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -19,6 +19,13 @@
using namespace com::sun::star;
+GLWindow::~GLWindow()
+{
+#if defined( UNX )
+XFree(vi);
+#endif
+}
+
OpenGLContext::OpenGLContext():
mpWindow(NULL),
m_pChildWindow(NULL),
commit 7410d9f8f0d927825ce8820ff8e3afc66c739fb5
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 23 02:01:03 2014 +0200
Lsan: fix memory leak
Change-Id: Id8adb7517960a33f9900cb773b62b84db71e795a
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 50d5799..bace47b 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -38,14 +38,14 @@ OString loadShader(const OUString rFilename)
{
sal_uInt64 nSize = 0;
aFile.getSize(nSize);
-char* content = new char[nSize+1];
+boost::scoped_arraychar content(new char[nSize+1]);
sal_uInt64 nBytesRead = 0;
-aFile.read(content, nSize, nBytesRead);
+aFile.read(content.get(), nSize, nBytesRead);
if(nSize != nBytesRead)
assert(false);
content[nSize] = 0;
-return OString(content);
+return OString(content.get());
}
else
{
commit 640bdf827d45425b07e53bcb1eb223ebd45aea9f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 23 01:58:41 2014 +0200
Lsan: fix memory leaks
Change-Id: I010c7c194bf0680a499077b6b364498a09542764
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 7cec6af..e5e08d3 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -873,6 +873,8 @@ void OpenGL3DRenderer::RenderPolygon3DObject()
polygon.verticesList.end(), DeletePointerVertices3D());
std::for_each(polygon.normalsList.begin(),
polygon.normalsList.end(), DeletePointerNormals3D());
+delete polygon.vertices;
+delete polygon.normals;
m_Polygon3DInfoList.pop_front();
}
glDepthMask(GL_TRUE);
commit eea7e208486e57ac1ff60281c077570f1179aa47
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 23 01:41:49 2014 +0200
Lsan: fix memory leaks
Change-Id: I35adb022f12c6833f4f29b2e8dad44394a2c4be5
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 1f8fe41..7cec6af 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -840,6 +840,19 @@ void OpenGL3DRenderer::RenderPolygon3D(Polygon3DInfo
polygon)
glUseProgram(0);
}
+namespace {
+
+template typename T
+struct DeletePointer
+{
+void operator()(T* p)
+{
+delete p;
+}
+};
+
+}
+
void OpenGL3DRenderer::RenderPolygon3DObject()
{
glDepthMask(GL_FALSE);
@@ -856,6 +869,10 @@ void OpenGL3DRenderer::RenderPolygon3DObject()
{
RenderPolygon3D(polygon);
}
+std::for_each(polygon.verticesList.begin(),
+polygon.verticesList.end(), DeletePointerVertices3D());
+std::for_each(polygon.normalsList.begin(),
+polygon.normalsList.end(), DeletePointerNormals3D());
m_Polygon3DInfoList.pop_front();
}
glDepthMask(GL_TRUE);
commit d8af055bacfad18aebceb1be7163ef8bf5e4ff6d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri May 23 01:19:19 2014 +0200
Lsan: fix invalid memory access
The chart object can be destroyed after the context.
Change-Id: I5ae370638f296ea314ee11680e0a8d81a8fdbe69
diff --git
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c68c5e753de14579ba8a5f8bd5360bc0e3fd7c33
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 23 03:01:35 2014 +0200
the variable is only available on linux
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index cba0b52..974f913 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -21,7 +21,7 @@ using namespace com::sun::star;
GLWindow::~GLWindow()
{
-#if defined( UNX )
+#if defined( UNX ) !defined MACOSX !defined IOS !defined ANDROID
XFree(vi);
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - vcl/source
vcl/source/opengl/OpenGLContext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1766f4b4ca28fa03cc94f373cf52a0af1cfb863c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 23 03:01:35 2014 +0200
the variable is only available on linux
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index e07b341..7221101 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -21,7 +21,7 @@ using namespace com::sun::star;
GLWindow::~GLWindow()
{
-#if defined( UNX )
+#if defined( UNX ) !defined MACOSX !defined IOS !defined ANDROID
XFree(vi);
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
SAL_NO_VTABLE in formula
Hey, so by going through Lsan reports I noted that we have a few classes in formula that are marked with SAL_NO_VTABLE and therefore have no virtual protected destructors, This prevents us from deleting some of these instances and it looks like people just leaked them in the past. Is there any reason not to remove the SAL_NO_VTABLE and make the destructor virtual and public. Im talking especially about include/formula/IFunctionDescription.hxx where the use of SAL_NO_VTABLE looks like premature optimization to me. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source
sc/source/filter/xml/xmlimprt.cxx |2 +-
sc/source/filter/xml/xmlimprt.hxx |2 +-
sc/source/filter/xml/xmlwrap.cxx | 37 -
3 files changed, 22 insertions(+), 19 deletions(-)
New commits:
commit a00784b7877017b39badca7289dd997de807e43b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu May 22 21:13:37 2014 -0400
Build fix.
Change-Id: Id1eb1b5929151954f99f92ef9b0836e5c36d5096
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 904d62c..8d095ee 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2257,7 +2257,7 @@ ScXMLImport::~ScXMLImport() throw()
}
void ScXMLImport::initialize( const css::uno::Sequencecss::uno::Any
aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
+throw (css::uno::Exception, css::uno::RuntimeException)
{
SvXMLImport::initialize(aArguments);
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 1d2e8ed..2db8250 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -989,7 +989,7 @@ public:
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequencecss::uno::Any
aArguments )
-throw (css::uno::Exception, css::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+throw (css::uno::Exception, css::uno::RuntimeException);
// namespace office
// NB: in contrast to other CreateFooContexts, this particular one handles
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index d1daf43..1376471 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -330,26 +330,29 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode,
ErrCode rError )
uno::Referenceframe::XModel xModel = mrDocShell.GetModel();
/** property map for export info set */
-comphelper::PropertyMapEntry const aImportInfoMap[] =
+comphelper::PropertyMapEntry aImportInfoMap[] =
{
-{ OUString(ProgressRange), 0, ::cppu::UnoTypesal_Int32::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString(ProgressMax), 0, ::cppu::UnoTypesal_Int32::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString(ProgressCurrent), 0, ::cppu::UnoTypesal_Int32::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString(NumberStyles), 0,
cppu::UnoTypecontainer::XNameAccess::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString(PrivateData), 0, cppu::UnoTypeuno::XInterface::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(BaseURI), 0, ::cppu::UnoTypeOUString::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(StreamRelPath), 0, ::cppu::UnoTypeOUString::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(StreamName), 0, ::cppu::UnoTypeOUString::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(BuildId), 0, ::cppu::UnoTypeOUString::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(VBACompatibilityMode), 0, ::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString(ScriptConfiguration), 0,
cppu::UnoTypecontainer::XNameAccess::get(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString(OrganizerMode), 0, ::getBooleanCppuType(),
+{ MAP_LEN( ProgressRange ), 0, ::getCppuType((sal_Int32*)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN( ProgressMax ), 0, ::getCppuType((sal_Int32*)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN( ProgressCurrent ), 0, ::getCppuType((sal_Int32*)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN( NumberStyles ), 0,
::getCppuType((uno::Referencecontainer::XNameAccess *)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN( PrivateData ), 0, ::getCppuType(
(uno::Referenceuno::XInterface *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN( BaseURI ), 0, ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN( StreamRelPath ), 0, ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN( StreamName ), 0, ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN( BuildId ), 0, ::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN( VBACompatibilityMode ), 0, ::getBooleanCppuType(),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+{
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|35217 | -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|54398 | -- 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 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||54398 -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270
Bug 60270 depends on bug 60533, which changed state.
Bug 60533 Summary: Brackets (..),{..},[..] inverted )..(,}..{,]..[ when
switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.freedesktop.org/show_bug.cgi?id=60533
What|Removed |Added
Status|NEW |RESOLVED
Resolution|--- |WORKSFORME
--
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 67274] Gallery: Do not link inserted images
https://bugs.freedesktop.org/show_bug.cgi?id=67274 Joel Madero jmadero@gmail.com changed: What|Removed |Added Severity|normal |enhancement Priority|highest |medium CC||jmadero@gmail.com Blocks|60270 | --- Comment #13 from Joel Madero jmadero@gmail.com --- Removing from MAB - this is an enhancement and does not belong on mab list. Marking as enhancement also. The product works as designed, the request is just to change the design which by definition is an enhancement. -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|67274 | -- 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 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||66209 -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|66209 | -- 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
