LibreOffice Gerrit News for core on 2014-04-18
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Begin removing ASCII art and useless comments from sw in https://gerrit.libreoffice.org/9090 from Chris Laplante about module sw + Rewrite getHash to reduce code duplication improve maintainability. in https://gerrit.libreoffice.org/8912 from Chris Laplante about module sw + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam about module chart2, oox + fdo77216-Charts-Scattered chart: Chart gets distorted on RT in https://gerrit.libreoffice.org/9011 from Sourav Mahajan about module chart2, oox + Change use of '*b' to a varable, to remove compiler warning in https://gerrit.libreoffice.org/9088 from Adam CloudOn about module external + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji about module sw End of freshness + fdo#67350 : sanity check utility for help ids wrt ui files in https://gerrit.libreoffice.org/9089 from Mathias M about module bin + fdo#73148 (partial patch) Add Excel 2010 function AGGREGATE in https://gerrit.libreoffice.org/8475 from Winfried Donkers about module formula, include, sc + cppcheck: multiCondition, second test should be DataOutputStream in https://gerrit.libreoffice.org/9007 from Julien Nabet about module extensions * Merged changes on master for project core changed in the last 25 hours: + cppcheck: Fix redundant assignments in the sw module in https://gerrit.libreoffice.org/8914 from Chris Laplante + fdo#57950 Replace chained append() with operator+ in https://gerrit.libreoffice.org/8701 from Krisztian Pinter + Enable letter-spacing for Firefox HTML export in https://gerrit.libreoffice.org/8947 from Harri Pitkänen + Fix a memory leak in https://gerrit.libreoffice.org/9016 from Takeshi Abe + fdo#77219 Image property Z-index [behindDoc] not preserved after RT in https://gerrit.libreoffice.org/9065 from Ravindra Vidhate * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#43157 : Remove OSL_THIS_FILE in https://gerrit.libreoffice.org/8886 from Michaël Lefèvre + fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn 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-commits] core.git: Branch 'aoo/trunk' - framework/source
framework/source/uielement/popuptoolbarcontroller.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 46d6cabf120e6c1cdf4b01548f435a5ae6f72ae2 Author: Ariel Constenla-Haile arie...@apache.org Date: Fri Apr 18 05:40:56 2014 + i124706 - Consider the toolbar alignment when executing the PopupMenu diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 5e160d4..f269d81 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -156,10 +156,13 @@ PopupMenuToolbarController::createPopupWindow() return xRet; pToolBox-SetItemDown( m_nToolBoxId, sal_True ); +WindowAlign eAlign( pToolBox-GetAlign() ); sal_uInt16 nId = m_xPopupMenu-execute( css::uno::Reference css::awt::XWindowPeer ( getParent(), css::uno::UNO_QUERY ), VCLUnoHelper::ConvertToAWTRect( pToolBox-GetItemRect( m_nToolBoxId ) ), -css::awt::PopupMenuDirection::EXECUTE_DEFAULT ); +( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ? +css::awt::PopupMenuDirection::EXECUTE_DOWN : +css::awt::PopupMenuDirection::EXECUTE_RIGHT ); pToolBox-SetItemDown( m_nToolBoxId, sal_False ); if ( nId ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build fail on master
Hi, On pc Debian x86-64 with master sources updated today + make clean, I've got this: In file included from /home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:41:0: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx: In function ‘void SbRtl_CallByName(StarBASIC*, SbxArray, sal_Bool)’: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx:351:10: error: ‘void SbiRuntime::StepSET_Impl(SbxVariableRef, SbxVariableRef, bool)’ is private void StepSET_Impl( SbxVariableRef refVal, SbxVariableRef refVar, bool bDefaultHandling = false ); ^ /home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:184:65: error: within this context pRT-StepSET_Impl( pValVar, rFindVar, false ); (gcc (Debian 4.8.2-16) 4.8.2) autogen.input: --with-system-odbc --enable-ext-barcode --enable-ext-diagram --enable-ext-hunart --enable-ext-nlpsolver --enable-ext-ct2n --enable-ext-numbertext --enable-postgresql-sdbc --enable-ext-typo --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher --enable-dbus --enable-graphite --enable-werror --enable-debug --enable-dbgutil --enable-crashdump --enable-dependency-tracking --enable-online-update --enable-extra-sample --enable-extra-template --enable-extra-gallery --enable-python=internal --enable-ext-mariadb-connector --with-system-mariadb --enable-bundle-mariadb --enable-avahi --enable-eot --disable-gstreamer-0.10 --enable-gstreamer --enable-odk Any idea? -- View this message in context: http://nabble.documentfoundation.org/Build-fail-on-master-tp4105630.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - lotuswordpro/source sc/inc sc/source sdext/source sw/source unusedcode.easy
lotuswordpro/source/filter/lwpfilter.cxx| 151
lotuswordpro/source/filter/lwpfilter.hxx| 45
sc/inc/scmod.hxx|1
sc/source/ui/app/scmod.cxx | 12 --
sdext/source/presenter/PresenterToolBar.cxx | 16 ++
sw/source/filter/ww8/sortedarray.hxx|4
unusedcode.easy | 11 +-
7 files changed, 23 insertions(+), 217 deletions(-)
New commits:
commit 42dd5615429e6273e9169a4bd941ad56fec1e6f6
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 09:45:38 2014 +0100
Related: rhbz#1088625 PresenterPaintManager seen as NULL
Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
diff --git a/sdext/source/presenter/PresenterToolBar.cxx
b/sdext/source/presenter/PresenterToolBar.cxx
index dd0ca91..4c825ed 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea (
const awt::Rectangle rRepaintBox,
const bool bSynchronous)
{
-mpPresenterController-GetPaintManager()-Invalidate(
+::boost::shared_ptrPresenterPaintManager
xManager(mpPresenterController-GetPaintManager());
+if (!xManager)
+return;
+xManager-Invalidate(
mxWindow,
rRepaintBox,
bSynchronous);
@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void)
{
mbIsLayoutPending = true;
-mpPresenterController-GetPaintManager()-Invalidate(mxWindow);
+::boost::shared_ptrPresenterPaintManager
xManager(mpPresenterController-GetPaintManager());
+if (!xManager)
+return;
+
+xManager-Invalidate(mxWindow);
}
geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
@@ -822,7 +829,10 @@ void PresenterToolBar::Layout (
}
// The whole window has to be repainted.
-mpPresenterController-GetPaintManager()-Invalidate(mxWindow);
+::boost::shared_ptrPresenterPaintManager
xManager(mpPresenterController-GetPaintManager());
+if (!xManager)
+return;
+xManager-Invalidate(mxWindow);
}
geometry::RealSize2D PresenterToolBar::CalculatePartSize (
commit 8773d9695845913bea8c969309d95e6cb585328e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 09:34:23 2014 +0100
callcatcher: update unused code
Change-Id: Ia88d83a209113fa4c351c0300d407da0c71baeac
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx
b/lotuswordpro/source/filter/lwpfilter.cxx
index c316cc7..edf53d5 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -130,157 +130,6 @@ void LWPFilterReader::cancel() throw
(com::sun::star::uno::RuntimeException, std
{
}
-LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference
XMultiServiceFactory xFact )
-{
-try
-{
-uno::Reference XDocumentHandler xDoc( xFact-createInstance(
OUString( STR_WRITER_IMPORTER_NAME ) ), UNO_QUERY );
-
-LWPFilterReader *p = new LWPFilterReader;
-p-setDocumentHandler( xDoc );
-
-uno::Reference XImporter xImporter = uno::Reference XImporter (
xDoc, UNO_QUERY );
-rImporter = xImporter;
-uno::Reference XFilter xFilter = uno::Reference XFilter ( p );
-rFilter = xFilter;
-}
-catch( Exception )
-{
- exit( 1 );
-}
-}
-
-LWPFilterImportFilter::~LWPFilterImportFilter()
-{
-}
-
-sal_Bool LWPFilterImportFilter::filter( const Sequence PropertyValue
aDescriptor )
-throw( RuntimeException, std::exception )
-{
-sal_Bool ret = rFilter-filter( aDescriptor );
-
-return ret;
-}
-
-void LWPFilterImportFilter::cancel() throw
(::com::sun::star::uno::RuntimeException, std::exception)
-{
-rFilter-cancel();
-}
-
-void LWPFilterImportFilter::setTargetDocument( const uno::Reference
XComponent xDoc )
-throw( IllegalArgumentException, RuntimeException, std::exception )
-{
-rImporter-setTargetDocument( xDoc );
-}
-
-OUString LWPFilterImportFilter::getImplementationName() throw(std::exception)
-{
-return OUString( STR_IMPLEMENTATION_NAME );
-}
-
-sal_Bool LWPFilterImportFilter::supportsService( const OUString ServiceName )
throw(std::exception)
-{
-return cppu::supportsService(this, ServiceName);
-}
-
-Sequence OUString LWPFilterImportFilter::getSupportedServiceNames( void )
throw(std::exception)
-{
-Sequence OUString seq(1);
-seq[0] = STR_SERVICE_NAME;
-return seq;
-}
-
-OUString SAL_CALL LWPFilterImportFilter::detect(
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
aDescriptor )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
-{
-OUString ret;
-OUString aTypeName;// a name describing the type (from
MediaDescriptor, usually from flat detection)
-// opening as template is done when a parameter tells to do so and a
template filter can be detected
-// (otherwise no valid
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/popuptoolbarcontroller.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit d8db205e7fdedddee10ac81a32a28df1e0ad6c56 Author: Ariel Constenla-Haile arie...@apache.org Date: Fri Apr 18 05:40:56 2014 + Resolves: #i124706# Consider the toolbar alignment... when executing the PopupMenu (cherry picked from commit 46d6cabf120e6c1cdf4b01548f435a5ae6f72ae2) Conflicts: framework/source/uielement/popuptoolbarcontroller.cxx Change-Id: Icfccdd35c1849ea00a1ea706aedac25de794bbf6 diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index e871cae..df569dc 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -187,10 +187,13 @@ PopupMenuToolbarController::createPopupWindow() return xRet; pToolBox-SetItemDown( m_nToolBoxId, true ); +WindowAlign eAlign( pToolBox-GetAlign() ); sal_uInt16 nId = m_xPopupMenu-execute( css::uno::Reference css::awt::XWindowPeer ( getParent(), css::uno::UNO_QUERY ), VCLUnoHelper::ConvertToAWTRect( pToolBox-GetItemRect( m_nToolBoxId ) ), -css::awt::PopupMenuDirection::EXECUTE_DEFAULT ); +( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ? +css::awt::PopupMenuDirection::EXECUTE_DOWN : +css::awt::PopupMenuDirection::EXECUTE_RIGHT ); pToolBox-SetItemDown( m_nToolBoxId, false ); if ( nId ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build fail on master
Hi Julien, On Thu, Apr 17, 2014 at 11:53:43PM -0700, julien2412 serval2...@yahoo.fr wrote: On pc Debian x86-64 with master sources updated today + make clean, I've got this: In file included from /home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:41:0: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx: In function ‘void SbRtl_CallByName(StarBASIC*, SbxArray, sal_Bool)’: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx:351:10: error: ‘void SbiRuntime::StepSET_Impl(SbxVariableRef, SbxVariableRef, bool)’ is private What is the exact commit? Seeing that http://tinderbox.libreoffice.org/MASTER/status.html is quite green, one wonders if you just need to pull and try again. :-) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp |binary 1 file changed New commits: commit e404080a60cd419f4403fbff16a178a878c54df5 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 10:09:55 2014 +0100 add a testcase for CVE-2008-1097 bmp Change-Id: I3b1b315654fbb2a35785a87540f7da03d2d7301c diff --git a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp new file mode 100644 index 000..76aaecf Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/bmp/pass/CVE-2008-1097-1.bmp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Searching help to build LibreOffice
Hi, I am building the master branch. I am using : Ubuntu Version 12.04 (precise) 32 bits Kernel Linux 3.2.0-60-generic-pae GNOME 3.4.2 The output of clinfo is in the attached file. Le 17/04/2014 13:54, Markus Mohrhard a écrit : Hey, On Thu, Apr 17, 2014 at 12:12 PM, Eike Rathke er...@redhat.com mailto:er...@redhat.com wrote: Hi Oswald, Please don't continue public discussions as private mail, stay on the mailing list instead where others can jump in as well. I'm taking this back to the list, please use Reply-All when replying or reply only to the list. Btw, which branch of LibreOffice are you building? master, libreoffice-4-2, ...? On Monday, 2014-04-14 22:38:45 +0200, Oswald Luc wrote: Here is the whole make output in the attached file. It would be nice to trim log files to the necessary parts.. which is opencl-test.cxx:3789:Assertion Test name: ScOpenclTest::testStatisticalFormulaExpondist double equality assertion failed - Expected: 3.35964639172048e-321 - Actual : 3.30035851421953e-321 - Delta : 0 [...] make[1]: *** [/home/MyLibreOffice/core/workdir/CppunitTest/sc_opencl_test.test] Erreur 1 So strangely your combination of OpenCL driver and graphics card produces quite a large difference in the result. About the graphics card I have, here is what I found : lspci | grep -E VGA|3D 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Whistler LE [Radeon HD 6610M/7610M] sudo lspci -v -s 01:00.0 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Whistler LE [Radeon HD 6610M/7610M] (prog-if 00 [VGA controller]) Subsystem: Toshiba America Info Systems Radeon HD 7610M Flags: bus master, fast devsel, latency 0, IRQ 47 Memory at b000 (64-bit, prefetchable) [size=256M] Memory at c200 (64-bit, non-prefetchable) [size=128K] I/O ports at 4000 [size=256] Expansion ROM at c204 [disabled] [size=128K] Capabilities: [50] Power Management version 3 Capabilities: [58] Express Legacy Endpoint, MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 ? Capabilities: [150] Advanced Error Reporting Kernel driver in use: fglrx_pci Kernel modules: fglrx_updates, radeon Please share the output of clinfo and your exact system (e.g. OpenSuse AMD drivers for example are known to be problematic). Number of platforms: 1 Platform Profile: FULL_PROFILE Platform Version: OpenCL 1.2 AMD-APP (1348.5) Platform Name: AMD Accelerated Parallel Processing Platform Vendor: Advanced Micro Devices, Inc. Platform Extensions: cl_khr_icd cl_amd_event_callback cl_amd_offline_devices Platform Name: AMD Accelerated Parallel Processing Number of devices: 2 Device Type: CL_DEVICE_TYPE_GPU Device ID: 4098 Board name: AMD Radeon HD 7500/7600 Series Device Topology: PCI[ B#1, D#0, F#0 ] Max compute units: 5 Max work items dimensions: 3 Max work items[0]: 256 Max work items[1]: 256 Max work items[2]: 256 Max work group size: 256 Preferred vector width char: 16 Preferred vector width short: 8 Preferred vector width int: 4 Preferred vector width long: 2 Preferred vector width float: 4 Preferred vector width double: 0 Native vector width char: 16 Native vector width short: 8 Native vector width int: 4 Native vector width long: 2 Native vector width float: 4 Native vector width double: 0 Max clock frequency: 450Mhz Address bits: 32 Max memory allocation: 134217728 Image support: Yes Max number of images read arguments: 128 Max number of images write arguments: 8 Max image 2D width: 16384 Max image 2D height: 16384 Max image 3D width: 2048 Max image 3D height: 2048 Max image 3D depth: 2048 Max samplers within kernel: 16 Max size of kernel argument: 1024 Alignment (bits) of base address: 2048 Minimum alignment (bytes) for any datatype: 128 Single precision floating point capability Denorms: No Quiet NaNs: Yes Round to nearest even: Yes Round to zero: Yes Round to +ve and infinity: Yes IEEE754-2008 fused multiply-add: Yes Cache type: None Cache line size: 0 Cache size: 0 Global memory size: 536870912 Constant buffer size: 65536 Max number of constant args: 8 Local memory type: Scratchpad Local memory size: 32768 Kernel Preferred work group size multiple: 64 Error correction support: 0 Unified memory for Host and Device: 0 Profiling timer resolution: 1 Device endianess:
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/NumberedList.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 15 +++
sw/source/filter/ww8/docxattributeoutput.cxx|2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit a7f68538f5f27093b8165e2e8fce3f7fade3aaf9
Author: Rajashri rajashri.udh...@synerzip.com
Date: Fri Jan 31 15:08:11 2014 +0530
fdo#74150:Numbered list getting display after RT -table-within-table-1.docx
Description:
For pStyle = 'NumberedList1', iLvl and numId was not preserved.
These tags needs to be preserved under numPr in document.xml
These tags are preserved now.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Ib6734c9ae55bd72d4fbc0f6d6cae85764ac1a244
Reviewed-on: https://gerrit.libreoffice.org/7767
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/data/NumberedList.docx
b/sw/qa/extras/ooxmlexport/data/NumberedList.docx
new file mode 100644
index 000..53f4490
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/NumberedList.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e7f57e6..a7ad9b7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3129,6 +3129,21 @@ DECLARE_OOXMLEXPORT_TEST(test77219, test77219.docx)
assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[6]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1],
behindDoc, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testNumberedList,NumberedList.docx)
+{
+//fdo74150:In document.xml, for pStyle = NumberedList1, iLvl and numId
was not preserved
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr[1]/w:pStyle, val,
NumberedList1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr[1]/w:numPr/w:ilvl,val,
0);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr[1]/w:numPr/w:numId,val,
0);
+
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:pStyle,val,
NumberedList1);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:numPr/w:ilvl,val,
0);
+assertXPath(pXmlDoc,
/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:numPr/w:numId,val,
0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFDO76597, fdo76597.docx)
{
// check XML
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3de5f8b..a4679f7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6106,7 +6106,7 @@ void DocxAttributeOutput::ParaHyphenZone( const
SvxHyphenZoneItem rHyphenZone )
void DocxAttributeOutput::ParaNumRule_Impl( const SwTxtNode* /*pTxtNd*/,
sal_Int32 nLvl, sal_Int32 nNumId )
{
-if ( USHRT_MAX != nNumId 0 != nNumId )
+if ( USHRT_MAX != nNumId )
{
m_pSerializer-startElementNS( XML_w, XML_numPr, FSEND );
m_pSerializer-singleElementNS( XML_w, XML_ilvl, FSNS( XML_w, XML_val
), OString::number( nLvl).getStr(), FSEND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk pyuno/PythonTest_pytests.mk pyuno/PythonTest_pyuno_pytests_ssl.mk pyuno/qa
pyuno/Module_pyuno.mk |6 ++ pyuno/PythonTest_pytests.mk |1 + pyuno/PythonTest_pyuno_pytests_ssl.mk | 16 pyuno/qa/pytests/ssl.py | 12 4 files changed, 35 insertions(+) New commits: commit ec95e6a17c591bff6c0582c304c1beeb1efe141f Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 10:17:30 2014 +0100 add an import ssl test Change-Id: Ia2dad214e6a224c979a8664bfded7d2caffb221a diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 9a07993..9b966e5 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -60,6 +60,12 @@ endif endif # SYSTEM_PYTHON +ifneq ($(DISABLE_PYTHON),TRUE) +$(eval $(call gb_Module_add_targets,pyuno, \ +PythonTest_pyuno_pytests_ssl \ +)) +endif + ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS))) $(eval $(call gb_Module_add_targets,pyuno, \ PythonTest_pytests \ diff --git a/pyuno/PythonTest_pytests.mk b/pyuno/PythonTest_pytests.mk index 63ffbb6..177195f 100644 --- a/pyuno/PythonTest_pytests.mk +++ b/pyuno/PythonTest_pytests.mk @@ -25,5 +25,6 @@ $(eval $(call gb_PythonTest_PythonTest,pytests)) $(call gb_PythonTest_get_target,pytests) : \ $(call gb_PythonTest_get_target,pyuno_pytests_insertremovecells) \ +$(call gb_PythonTest_get_target,pyuno_pytests_ssl) \ # vim: set noet sw=4 ts=4: diff --git a/pyuno/PythonTest_pyuno_pytests_ssl.mk b/pyuno/PythonTest_pyuno_pytests_ssl.mk new file mode 100644 index 000..95779dd --- /dev/null +++ b/pyuno/PythonTest_pyuno_pytests_ssl.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_PythonTest_PythonTest,pyuno_pytests_ssl)) + +$(eval $(call gb_PythonTest_add_modules,pyuno_pytests_ssl,$(SRCDIR)/pyuno/qa/pytests,\ +ssl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/pyuno/qa/pytests/ssl.py b/pyuno/qa/pytests/ssl.py new file mode 100644 index 000..a67f532 --- /dev/null +++ b/pyuno/qa/pytests/ssl.py @@ -0,0 +1,12 @@ +import unittest + +from org.libreoffice.unotest import pyuno + +#I want to ensure that import ssl works on all platforms +class SSLTest(unittest.TestCase): +def test_ssl_import(self): +import ssl + +if __name__ == '__main__': +unittest.main() + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/freetype RepositoryExternal.mk
RepositoryExternal.mk |2 +- config_host.mk.in |1 + configure.ac | 17 + external/freetype/ExternalProject_freetype.mk | 20 ++-- external/freetype/Module_freetype.mk |2 +- external/freetype/README |4 +--- 6 files changed, 31 insertions(+), 15 deletions(-) New commits: commit b6cbb15026e2df1e985f19c5bb723f64a26f2658 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Apr 18 10:10:39 2014 +0200 Freetype is needed by libgltf on all platforms Change-Id: I042cbc5f4cabfa7ec387594189e2f86be6ec7fbf diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 722e22f..a371f2f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1254,7 +1254,7 @@ endef gb_ExternalProject__use_freetype := -else ifeq ($(OS),ANDROID) +else ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) diff --git a/config_host.mk.in b/config_host.mk.in index f798ce3..0b4595d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -126,6 +126,7 @@ export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@ export ENABLE_ORCUS=@ENABLE_ORCUS@ export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@ +export ENABLE_GLTF=@ENABLE_GLTF@ export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@ export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@ export ENABLE_GTK3=@ENABLE_GTK3@ diff --git a/configure.ac b/configure.ac index 3a294ca..50c8117 100644 --- a/configure.ac +++ b/configure.ac @@ -10359,6 +10359,23 @@ fi AC_SUBST(ENABLE_OPENCL) +dnl === +dnl Check whether to enable glTF support +dnl === + +ENABLE_GLTF= +AC_MSG_CHECKING([whether to enable glTF support]) +if test $enable_opengl = yes; then +ENABLE_GLTF=TRUE +AC_MSG_RESULT([yes]) +if test $test_freetype = no; then +BUILD_TYPE=$BUILD_TYPE FREETYPE +fi +else +AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_GLTF) + # pdf import? AC_MSG_CHECKING([whether to build the PDF import feature]) ENABLE_PDFIMPORT= diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index aa9a1b7..11fcba5 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -14,16 +14,16 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\ )) $(call gb_ExternalProject_get_state_target,freetype,build) : - cd $(EXTERNAL_WORKDIR) \ -CFLAGS=$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) \ + $(call gb_ExternalProject_run,build,\ ./configure \ - --disable-shared \ - --without-zlib \ - --without-bzip2 \ - --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ -chmod +x builds/unix/freetype-config \ -$(MAKE) install \ -touch $@ + --disable-shared \ + --without-zlib \ + --without-bzip2 \ + --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ + --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + CFLAGS=$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) \ +chmod +x builds/unix/freetype-config \ +$(MAKE) install \ +touch $@ ) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index 51badc8..9ff2582 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,freetype)) -ifeq ($(OS),ANDROID) +ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ diff --git a/external/freetype/README b/external/freetype/README index c90f950..4814664 100644 --- a/external/freetype/README +++ b/external/freetype/README @@ -1,8 +1,6 @@ -This bundled freetype is built only in an Android build - FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well. -From [http://freetype.sourceforge.net/freetype2/index.html] \ No newline at end of file +From [http://freetype.sourceforge.net/freetype2/index.html] ___ Libreoffice-commits mailing list
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 53 +++--
sdext/source/pdfimport/tree/genericelements.hxx|2
sdext/source/pdfimport/tree/pdfiprocessor.cxx |1
sdext/source/pdfimport/tree/writertreevisiting.cxx | 51 ++--
4 files changed, 89 insertions(+), 18 deletions(-)
New commits:
commit efaa53bc980c92054ae39f4317b8acc607fd6a34
Author: Vort vv...@yandex.ru
Date: Fri Apr 18 08:07:17 2014 +0300
fdo#69051 fdo#72028 PDF Import: text fixes
1. Set font size not only on text span, but also on text frame.
2. Some copy-paste from Draw import code to Writer import code:
2.1. Set frame's auto-size properties.
2.2. Set correctly line joins and caps.
Change-Id: I6beecfb50aa7f45d20cc3cb3740e415172394638
Reviewed-on: https://gerrit.libreoffice.org/9091
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 723d091..237baff 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -198,6 +198,9 @@ void DrawXmlEmitter::fillFrameProps( DrawElement
rElem,
rProps[ svg:width ] = convertPixelToUnitString( rElem.w );
rProps[ svg:height ] = convertPixelToUnitString( rElem.h );
+if (rElem.IsForText)
+rProps[draw:text-style-name] =
rEmitContext.rStyles.getStyleName(rElem.TextStyleId);
+
const GraphicsContext rGC =
rEmitContext.rProcessor.getGraphicsContext( rElem.GCId );
if( rGC.Transformation.isIdentity() || bWasTransformed )
@@ -862,6 +865,17 @@ void DrawXmlFinalizer::visit( HyperlinkElement, const
std::list Element* ::co
{
}
+void SetFontsizeProperties(PropertyMap props, double fontSize)
+{
+OUStringBuffer aBuf(32);
+aBuf.append(fontSize * 72 / PDFI_OUTDEV_RESOLUTION);
+aBuf.appendAscii(pt);
+OUString aFSize = aBuf.makeStringAndClear();
+props[fo:font-size] = aFSize;
+props[style:font-size-asian] = aFSize;
+props[style:font-size-complex] = aFSize;
+}
+
void DrawXmlFinalizer::visit( TextElement elem, const std::list Element*
::const_iterator )
{
const FontAttributes rFont = m_rProcessor.getFont( elem.FontId );
@@ -900,14 +914,9 @@ void DrawXmlFinalizer::visit( TextElement elem, const
std::list Element* ::co
{
aFontProps[ style:text-outline ] = true;
}
+
// size
-OUStringBuffer aBuf( 32 );
-aBuf.append( rFont.size*72/PDFI_OUTDEV_RESOLUTION );
-aBuf.appendAscii( pt );
-OUString aFSize = aBuf.makeStringAndClear();
-aFontProps[ fo:font-size ]= aFSize;
-aFontProps[ style:font-size-asian ] = aFSize;
-aFontProps[ style:font-size-complex ] = aFSize;
+SetFontsizeProperties(aFontProps, rFont.size);
// color
const GraphicsContext rGC = m_rProcessor.getGraphicsContext( elem.GCId );
@@ -921,6 +930,7 @@ void DrawXmlFinalizer::visit( TextElement elem, const
std::list Element* ::co
if (((textScale = 1) (textScale = 99)) ||
((textScale = 101) (textScale = 999)))
{
+OUStringBuffer aBuf(32);
aBuf.append(textScale);
aBuf.appendAscii(%);
aFontProps[ style:text-scale ] = aBuf.makeStringAndClear();
@@ -959,9 +969,9 @@ void DrawXmlFinalizer::visit( ParagraphElement elem, const
std::list Element*
void DrawXmlFinalizer::visit( FrameElement elem, const std::list Element*
::const_iterator)
{
-PropertyMap aProps;
-aProps[ style:family ] = graphic;
-aProps[ style:parent-style-name ] = standard;
+PropertyMap props1;
+props1[ style:family ] = graphic;
+props1[ style:parent-style-name ] = standard;
// generate standard graphic style if necessary
m_rStyleContainer.getStandardStyleId( graphic );
@@ -987,11 +997,26 @@ void DrawXmlFinalizer::visit( FrameElement elem, const
std::list Element* ::c
if( elem.MirrorVertical )
aGCProps[ style:mirror ] = horizontal;
-StyleContainer::Style aStyle( style:style, aProps );
-StyleContainer::Style aSubStyle( style:graphic-properties, aGCProps );
-aStyle.SubStyles.push_back( aSubStyle );
+StyleContainer::Style style1( style:style, props1 );
+StyleContainer::Style subStyle1( style:graphic-properties, aGCProps );
+style1.SubStyles.push_back(subStyle1);
+
+elem.StyleId = m_rStyleContainer.getStyleId(style1);
+
+if (elem.IsForText)
+{
+PropertyMap props2;
+props2[style:family] = paragraph;
+
+PropertyMap textProps;
+SetFontsizeProperties(textProps, elem.FontSize);
+
+StyleContainer::Style style2(style:style, props2);
+StyleContainer::Style subStyle2(style:text-properties, textProps);
+style2.SubStyles.push_back(subStyle2);
+elem.TextStyleId = m_rStyleContainer.getStyleId(style2);
+}
-elem.StyleId =
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/EnhancedPDFExportHelper.cxx | 69 +++-
sw/source/core/text/atrhndl.hxx | 16 +
sw/source/core/text/atrstck.cxx | 69 +---
sw/source/core/text/blink.cxx | 10 +--
sw/source/core/text/frmcrsr.cxx | 44 ---
sw/source/core/text/frmform.cxx | 35
sw/source/core/text/frminf.cxx | 41 --
sw/source/core/text/guess.cxx | 11 +--
sw/source/core/text/guess.hxx |4 -
sw/source/core/text/inftxt.cxx | 61 ++---
sw/source/core/text/inftxt.hxx | 54 ++
sw/source/core/text/itradj.cxx | 61 ++---
12 files changed, 67 insertions(+), 408 deletions(-)
New commits:
commit d8f8c8aa4544e2a0e7e3c43764080d5fe0effacf
Author: Chris Laplante mostthings...@gmail.com
Date: Fri Apr 18 00:59:07 2014 -0400
Begin removing ASCII art and useless comments from sw
Change-Id: Ic367b2ebca1a766c830ccd44a84274d86be4f080
Reviewed-on: https://gerrit.libreoffice.org/9090
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 4a59b55..f310c5f 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -258,9 +258,6 @@ bool lcl_HasPreviousParaSameNumRule( const SwTxtNode rNode
)
} // end namespace
-/*
- * SwTaggedPDFHelper::SwTaggedPDFHelper()
- */
SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info* pNumInfo,
const Frm_Info* pFrmInfo,
const Por_Info* pPorInfo,
@@ -297,9 +294,6 @@ SwTaggedPDFHelper::SwTaggedPDFHelper( const Num_Info*
pNumInfo,
}
}
-/*
- * SwTaggedPDFHelper::~SwTaggedPDFHelper()
- */
SwTaggedPDFHelper::~SwTaggedPDFHelper()
{
if ( mpPDFExtOutDevData mpPDFExtOutDevData-GetIsExportTaggedPDF() )
@@ -319,9 +313,6 @@ SwTaggedPDFHelper::~SwTaggedPDFHelper()
}
}
-/*
- * SwTaggedPDFHelper::CheckReopenTag()
- */
bool SwTaggedPDFHelper::CheckReopenTag()
{
bool bRet = false;
@@ -391,9 +382,6 @@ bool SwTaggedPDFHelper::CheckReopenTag()
return bRet !bContinue;
}
-/*
- * SwTaggedPDFHelper::CheckRestoreTag()
- */
bool SwTaggedPDFHelper::CheckRestoreTag() const
{
bool bRet = false;
@@ -413,9 +401,6 @@ bool SwTaggedPDFHelper::CheckRestoreTag() const
return bRet;
}
-/*
- * SwTaggedPDFHelper::BeginTag()
- */
void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const
OUString rString )
{
// write new tag
@@ -474,9 +459,6 @@ void SwTaggedPDFHelper::BeginTag(
vcl::PDFWriter::StructElement eType, const OUS
SetAttributes( eType );
}
-/*
- * SwTaggedPDFHelper::EndTag()
- */
void SwTaggedPDFHelper::EndTag()
{
mpPDFExtOutDevData-EndStructureElement();
@@ -486,11 +468,7 @@ void SwTaggedPDFHelper::EndTag()
#endif
}
-/*
- * SwTaggedPDFHelper::SetAttributes()
- *
- * Sets the attributes according to the structure type.
- */
+// Sets the attributes according to the structure type.
void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
{
vcl::PDFWriter::StructAttributeValue eVal;
@@ -845,9 +823,6 @@ void SwTaggedPDFHelper::SetAttributes(
vcl::PDFWriter::StructElement eType )
}
}
-/*
- * SwTaggedPDFHelper::BeginNumberedListStructureElements()
- */
void SwTaggedPDFHelper::BeginNumberedListStructureElements()
{
OSL_ENSURE( mpNumInfo, List without mpNumInfo? );
@@ -985,9 +960,6 @@ void SwTaggedPDFHelper::BeginNumberedListStructureElements()
}
}
-/*
- * SwTaggedPDFHelper::BeginBlockStructureElements()
- */
void SwTaggedPDFHelper::BeginBlockStructureElements()
{
const SwFrm* pFrm = mpFrmInfo-mrFrm;
@@ -1323,9 +1295,6 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
}
}
-/*
- * SwTaggedPDFHelper::EndStructureElements()
- */
void SwTaggedPDFHelper::EndStructureElements()
{
while ( nEndStructureElement 0 )
@@ -1337,9 +1306,6 @@ void SwTaggedPDFHelper::EndStructureElements()
CheckRestoreTag();
}
-/*
- * SwTaggedPDFHelper::BeginInlineStructureElements()
- */
void SwTaggedPDFHelper::BeginInlineStructureElements()
{
const SwLinePortion* pPor = mpPorInfo-mrPor;
@@ -1471,18 +1437,12 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
}
}
-/*
- * static SwTaggedPDFHelper::IsExportTaggedPDF
- */
- bool SwTaggedPDFHelper::IsExportTaggedPDF( const OutputDevice rOut )
- {
+bool SwTaggedPDFHelper::IsExportTaggedPDF( const OutputDevice rOut )
+{
vcl::PDFExtOutDevData* pPDFExtOutDevData = PTR_CAST(
vcl::PDFExtOutDevData, rOut.GetExtOutDevData() );
return pPDFExtOutDevData
Loading file Finished
How I know file loading finished when I open? I am using loadComponentFromURL load find, i'm searching event return when loading finished but i don'n know. How to I get event return? Can you help me? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/cgm.cxx | 61 +++
filter/source/graphicfilter/icgm/cgm.hxx |1
2 files changed, 38 insertions(+), 24 deletions(-)
New commits:
commit f38ccdcc5bf5792a242bf20b282748007160d6e5
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 10:39:22 2014 +0100
coverity#1202962 Uninitialized pointer field
Change-Id: If400eda10e0b6367c58431c528b84a95a35b76f9
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx
b/filter/source/graphicfilter/icgm/cgm.cxx
index a89fd3b..003b725 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -32,32 +32,47 @@
using namespace ::com::sun::star;
-void CGM::ImplCGMInit()
-{
-mbIsFinished = mbPicture = mbMetaFile = mbPictureBody = sal_False;
-
-mnActCount = 0;
-mnOutdx = 28000;
-mnOutdy = 21000;
-
-mpBuf = NULL;
-mpChart = NULL;
-mpBitmapInUse = NULL;
-
-pCopyOfE = new CGMElements( *this );
-pElement = new CGMElements( *this );
-}
-
#ifdef CGM_EXPORT_IMPRESS
-CGM::CGM( sal_uInt32 nMode, uno::Reference frame::XModel rModel ) :
-mpGraphic ( NULL ),
-mbStatus( sal_True ),
-mpOutAct( new CGMImpressOutAct( *this, rModel ) ),
-mnMode ( nMode )
+CGM::CGM( sal_uInt32 nMode, uno::Reference frame::XModel rModel )
+: mnOutdx(28000)
+, mnOutdy(21000)
+, mnVDCXadd(0)
+, mnVDCXmul(0)
+, mnVDCYmul(0)
+, mnVDCdx(0)
+, mnVDCdy(0)
+, mnXFraction(0)
+, mnYFraction(0)
+, mbAngReverse(false)
+, mpGraphic(NULL)
+, mbStatus(true)
+, mbMetaFile(false)
+, mbIsFinished(false)
+, mbPicture(false)
+, mbPictureBody(false)
+, mbFigure(false)
+, mbFirstOutPut(false)
+, mnAct4PostReset(0)
+, mpBitmapInUse(NULL)
+, mpChart(NULL)
+, mpOutAct(new CGMImpressOutAct(*this, rModel))
+, mpSource(NULL)
+, mnParaSize(0)
+, mnActCount(0)
+, mpBuf(NULL)
+, mnMode(nMode | CGM_EXPORT_IMPRESS)
+, mnEscape(0)
+, mnElementClass(0)
+, mnElementID(0)
+, mnElementSize(0)
+#ifdef CGM_EXPORT_META
+, mpVirDev(NULL)
+, mpGDIMetaFile(NULL)
+#endif
{
-mnMode |= CGM_EXPORT_IMPRESS;
-ImplCGMInit();
+pElement = new CGMElements( *this );
+pCopyOfE = new CGMElements( *this );
}
#endif
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx
b/filter/source/graphicfilter/icgm/cgm.hxx
index 033e790..ab7076d1 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -94,7 +94,6 @@ class CGM
sal_uInt32 mnElementID;
sal_uInt32 mnElementSize; // full parameter size for the
latest action
-voidImplCGMInit();
sal_uInt32 ImplGetUI16( sal_uInt32 nAlign = 0 );
sal_uInt8 ImplGetByte( sal_uInt32 nSource, sal_uInt32
nPrecision );
longImplGetI( sal_uInt32 nPrecision );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/SwStyleNameMapper.cxx | 155 ---
1 file changed, 60 insertions(+), 95 deletions(-)
New commits:
commit bfefe114e11d155abf0785a3b2c887fcf4077199
Author: Chris Laplante mostthings...@gmail.com
Date: Wed Apr 9 15:15:14 2014 -0400
Rewrite getHash to reduce code duplication improve maintainability.
Instead of each case block repeating the same operations, we build
an intermediate vector of entries to process.
Change-Id: Id111d7938a7802f6f016c2a0d1be0cb062a32110
Reviewed-on: https://gerrit.libreoffice.org/8912
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index d85a6de..6bff575 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include numeric
+#include boost/tuple/tuple.hpp
+
#include SwStyleNameMapper.hxx
#include tools/resmgr.hxx
#include poolfmt.hxx
@@ -388,6 +391,13 @@ static void lcl_CheckSuffixAndDelete(OUString rString)
rString = rString.copy(0, rString.getLength() - 7);
}
}
+
+typedef boost::tuplesal_uInt16, sal_uInt16, const ::std::vectorOUString
(*)() NameArrayIndexTuple_t;
+
+static sal_uInt16 lcl_AccumulateIndexCount( sal_uInt16 nSum,
NameArrayIndexTuple_t const tuple ){
+// Return running sum + (index end) - (index start)
+return nSum + boost::get1( tuple ) - boost::get0( tuple );
+}
}
#ifdef _NEED_TO_DEBUG_MAPPING
@@ -413,124 +423,79 @@ void SwStyleNameMapper::testNameTable(
SwGetPoolIdFromName const nFamily, sal_uI
const NameToIdHash SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName
eFlags, bool bProgName )
{
-NameToIdHash *pHash = 0;
-const ::std::vectorOUString *pStrings = 0;
+// pHashPointer is a pointer to a pointer which stores the UI/prog name
array
+NameToIdHash **pHashPointer = 0;
+// Stores tuples representing (index start, index end, pointer to function
which returns ref to name array)
+::std::vectorNameArrayIndexTuple_t vIndexes;
switch ( eFlags )
{
case nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL:
{
-sal_uInt16 nIndex;
-sal_uInt16 nId;
-
-pHash = bProgName ? pParaProgMap : pParaUIMap;
-if ( !pHash )
-{
-pHash = new NameToIdHash ( RES_POOLCOLL_TEXT_END -
RES_POOLCOLL_TEXT_BEGIN +
- RES_POOLCOLL_LISTS_END -
RES_POOLCOLL_LISTS_BEGIN +
- RES_POOLCOLL_EXTRA_END -
RES_POOLCOLL_EXTRA_BEGIN +
- RES_POOLCOLL_REGISTER_END -
RES_POOLCOLL_REGISTER_BEGIN +
- RES_POOLCOLL_DOC_END -
RES_POOLCOLL_DOC_BEGIN +
- RES_POOLCOLL_HTML_END -
RES_POOLCOLL_HTML_BEGIN );
-pStrings = bProgName ? GetTextProgNameArray() :
GetTextUINameArray();
-for ( nIndex = 0, nId = RES_POOLCOLL_TEXT_BEGIN ; nId
RES_POOLCOLL_TEXT_END ; nId++,nIndex++ )
-(*pHash)[((*pStrings)[nIndex])] = nId;
-pStrings = bProgName ? GetListsProgNameArray() :
GetListsUINameArray();
-for ( nIndex = 0, nId = RES_POOLCOLL_LISTS_BEGIN ; nId
RES_POOLCOLL_LISTS_END ; nId++,nIndex++ )
-(*pHash)[((*pStrings)[nIndex])] = nId;
-pStrings = bProgName ? GetExtraProgNameArray() :
GetExtraUINameArray();
-for ( nIndex = 0, nId = RES_POOLCOLL_EXTRA_BEGIN ; nId
RES_POOLCOLL_EXTRA_END ; nId++,nIndex++ )
-(*pHash)[((*pStrings)[nIndex])] = nId;
-pStrings = bProgName ? GetRegisterProgNameArray() :
GetRegisterUINameArray();
-for ( nIndex = 0, nId = RES_POOLCOLL_REGISTER_BEGIN ; nId
RES_POOLCOLL_REGISTER_END ; nId++,nIndex++ )
-(*pHash)[((*pStrings)[nIndex])] = nId;
-pStrings = bProgName ? GetDocProgNameArray() :
GetDocUINameArray();
-for ( nIndex = 0, nId = RES_POOLCOLL_DOC_BEGIN ; nId
RES_POOLCOLL_DOC_END ; nId++,nIndex++ )
-(*pHash)[((*pStrings)[nIndex])] = nId;
-pStrings = bProgName ? GetHTMLProgNameArray() :
GetHTMLUINameArray();
-for ( nIndex = 0, nId = RES_POOLCOLL_HTML_BEGIN ; nId
RES_POOLCOLL_HTML_END ; nId++,nIndex++ )
-(*pHash)[((*pStrings)[nIndex])] = nId;
-
-if ( bProgName )
-pParaProgMap = pHash;
-else
-pParaUIMap = pHash;
-}
+pHashPointer = bProgName ? pParaProgMap : pParaUIMap;
+vIndexes.push_back( boost::make_tuple(RES_POOLCOLL_TEXT_BEGIN,
RES_POOLCOLL_TEXT_END,
[Libreoffice-commits] dev-tools.git: scripts/test-hid-vs-ui.py
scripts/test-hid-vs-ui.py | 174 --
1 file changed, 174 deletions(-)
New commits:
commit fe392d97b1bc49580a1bf48abbfd0e2c03ae35a8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 10:49:42 2014 +0100
test-hid-vs-ui moved to core
diff --git a/scripts/test-hid-vs-ui.py b/scripts/test-hid-vs-ui.py
deleted file mode 100755
index f6ba14f..000
--- a/scripts/test-hid-vs-ui.py
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/usr/bin/env python
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, you can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# Parses all help files (.xhp) to check that hids referencing .ui are
up-to-date
-# From fdo#67350
-
-
-import sys
-import argparse
-import os
-import subprocess
-import xml.etree.ElementTree as ET
-import collections
-import re
-import smtplib
-import email
-import email.mime.text
-import time
-import datetime
-
-# retrieve all hids related to .ui files
-def init_hids():
-global args
-repo_dir='/var/tmp/help.git'
-if not os.path.exists(repo_dir):os.makedirs(repo_dir)
-os.chdir(repo_dir)
-
-if not os.path.exists(os.path.join(repo_dir,'config')):
-
subprocess.call(['git','clone','--bare','git://gerrit.libreoffice.org/help',repo_dir])
-elif not args['git_static']:
-subprocess.call(['git','fetch','origin'])
-return
subprocess.check_output(['git','grep','hid=[^]*/[^]*','master','--'])
-
-# retrieve .ui files list from the core
-def init_core_files():
-global core_repo_dir
-core_repo_dir = args['core_repo_dir']
-if core_repo_dir is None: core_repo_dir = '/var/tmp/core.git'
-
-if not os.path.exists(core_repo_dir):os.makedirs(core_repo_dir)
-os.chdir(core_repo_dir)
-
-if not os.path.exists(os.path.join(core_repo_dir,'.git')):
-
subprocess.call(['git','clone','git://gerrit.libreoffice.org/core',core_repo_dir])
-elif not args['git_static']:
-subprocess.call(['git','fetch','origin'])
-allfiles =
subprocess.check_output(['git','ls-tree','--name-only','--full-name','-r','master'])
-return re.findall('.*\.ui',allfiles)
-
-
-if __name__ == __main__:
-
-parser = argparse.ArgumentParser('hid for ui consistency parser')
-parser.add_argument('-s', '--send-to', action='append', help='email
address to send the report to. Use one flag per address.', required=False)
-parser.add_argument('-g', '--git-static', action='store_true', help='to
avoid contacting remote server to refresh repositories.', required=False)
-parser.add_argument('-r', '--core-repo-dir', help='enforce path to core
repository when analyzing .ui files.', required=False)
-args=vars(parser.parse_args())
-
-rows = init_hids().splitlines()
-#tree:relative_file:text
-# handled as sets to remove duplicates (and we don't need an iterator)
-targets = collections.defaultdict(set)
-origin = collections.defaultdict(set)
-
-# fill all matching hids and their parent file
-for row in rows:
-fname, rawtext = row.split(':',2)[1:]
-hid = rawtext.split('hid=')[1].split('')[0]
-if hid.startswith('.uno'): continue
-uifileraw, compname = hid.rsplit('/',1)
-uifile = uifileraw + .ui
-# map modules/ etc, which exist only in install
-# back to their source location
-if uifile.startswith(modules/scalc):
-uifile = sc/scalc + uifile[13:]
-elif uifile.startswith(modules/swriter):
-uifile = sw/swriter + uifile[15:]
-elif uifile.startswith(modules/schart):
-uifile = chart2 + uifile[14:]
-elif uifile.startswith(modules/smath):
-uifile = starmath/smath + uifile[13:]
-elif uifile.startswith(modules/sdraw):
-uifile = sd/sdraw + uifile[13:]
-elif uifile.startswith(modules/simpress):
-uifile = sd/simpress + uifile[16:]
-elif uifile.startswith(modules/BasicIDE):
-uifile = basctl/basicide + uifile[16:]
-elif uifile.startswith(modules/spropctrlr):
-uifile = extensions/spropctrlr + uifile[18:]
-elif uifile.startswith(sfx):
-uifile = sfx2 + uifile[3:]
-elif uifile.startswith(svt):
-uifile = svtools + uifile[3:]
-components = uifile.split('/',1);
-uifile = components[0] + '/uiconfig/' + components[1]
-targets[uifile].add(compname.split(':')[0])
-origin[uifile].add(fname) # help file(s)
-
-uifileslist = init_core_files()
-# allfiles = init_core_files()
-# uifileslist = '\n'.join(re.findall('.*\.ui',allfiles))
-errors = ''
-# search in all .ui files referenced in help
-# 2 possible errors: file not found in repo, id not found in
[Libreoffice-commits] core.git: bin/test-hid-vs-ui.py
bin/test-hid-vs-ui.py | 156 ++
1 file changed, 156 insertions(+)
New commits:
commit fa8e3464c8760dcbd774a9fc8d79e9489a7c1bdf
Author: Mathias Michel m...@gmx.fr
Date: Fri Apr 18 00:58:56 2014 +0200
fdo#67350 : sanity check utility for help ids wrt ui files
Change-Id: I2407d7b0ccdc592fde3da073a6ee2d40537fbe5f
Reviewed-on: https://gerrit.libreoffice.org/9089
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/bin/test-hid-vs-ui.py b/bin/test-hid-vs-ui.py
new file mode 100755
index 000..232d978
--- /dev/null
+++ b/bin/test-hid-vs-ui.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Parses all help files (.xhp) to check that hids referencing .ui are
up-to-date
+# From fdo#67350
+
+
+import sys
+import argparse
+import os
+import subprocess
+import xml.etree.ElementTree as ET
+import collections
+import re
+import smtplib
+import email
+import email.mime.text
+import time
+import datetime
+
+# retrieve all hids related to .ui files
+def init_hids():
+global args, local_repo
+if local_repo:
+repo_dir = os.path.join(core_repo_dir,'helpcontent2')
+os.chdir(repo_dir)
+return subprocess.check_output(['git','grep','hid=[^]*/[^]*','.'])
+else:
+repo_dir = '/var/tmp/help.git'
+if not os.path.exists(repo_dir):os.makedirs(repo_dir)
+os.chdir(repo_dir)
+
+if not os.path.exists(os.path.join(repo_dir,'config')):
+
subprocess.call(['git','clone','--bare','git://gerrit.libreoffice.org/help',repo_dir])
+elif not args['git_static']:
+subprocess.call(['git','fetch','origin'])
+return
subprocess.check_output(['git','grep','hid=[^]*/[^]*','master','--'])
+
+# retrieve .ui files list from the core
+def init_core_files():
+global core_repo_dir, local_repo
+core_repo_dir = args['core_repo_dir']
+if core_repo_dir is None:
+core_repo_dir =
os.path.dirname(os.path.abspath(os.path.dirname(sys.argv[0])))
+local_repo = True
+
+if not os.path.exists(core_repo_dir):os.makedirs(core_repo_dir)
+os.chdir(core_repo_dir)
+
+if not os.path.exists(os.path.join(core_repo_dir,'.git')):
+
subprocess.call(['git','clone','git://gerrit.libreoffice.org/core',core_repo_dir])
+elif not args['git_static']:
+subprocess.call(['git','fetch','origin'])
+allfiles =
subprocess.check_output(['git','ls-tree','--name-only','--full-name','-r','master'])
+return '\n'.join(re.findall('.*\.ui',allfiles))
+
+
+if __name__ == __main__:
+
+parser = argparse.ArgumentParser('hid for ui consistency parser')
+parser.add_argument('-s', '--send-to', action='append', help='email
address to send the report to. Use one flag per address.', required=False)
+parser.add_argument('-g', '--git-static', action='store_true', help='to
avoid contacting remote server to refresh repositories.', required=False)
+parser.add_argument('-r', '--core-repo-dir', help='enforce path to core
repository when analyzing .ui files.', required=False)
+args=vars(parser.parse_args())
+
+uifileslist = init_core_files() # play it early to gain the local repo
identification
+
+rows = init_hids().splitlines()
+#tree:relative_file:text
+# handled as sets to remove duplicates (and we don't need an iterator)
+targets = collections.defaultdict(set)
+origin = collections.defaultdict(set)
+
+# fill all matching hids and their parent file
+for row in rows:
+fname, rawtext = row.split(':',1)[0:]
+hid = rawtext.split('hid=')[1].split('')[0]
+if hid.startswith('.uno'): continue
+uifileraw, compname = hid.rsplit('/',1)
+uifile = uifileraw.split('/',1)[1] + .ui # remove modules/ which
exist only in install
+targets[uifile].add(compname.split(':')[0])
+origin[uifile].add(fname) # help file(s)
+
+errors = ''
+# search in all .ui files referenced in help
+# 2 possible errors: file not found in repo, id not found in file
+for uikey in dict.keys(targets):
+if uikey not in uifileslist:
+if len(origin[uikey]) == 1:
+errors += '\nFrom ' + origin[uikey].pop()
+else:
+errors += '\nFrom one of ' +
str(origin[uikey]).replace('set(','').replace(')','')
+errors += ', we did not found file '+ uikey+'.'
+continue
+
+full_path =
os.path.join(core_repo_dir,re.search('(.*'+uikey+')',uifileslist).group(1))
+# print full_path
+root =
[Libreoffice-commits] core.git: bin/test-hid-vs-ui.py
bin/test-hid-vs-ui.py | 32
1 file changed, 28 insertions(+), 4 deletions(-)
New commits:
commit d7ae4dfdf0c254361d012aefed203a59638c3e3c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 10:54:09 2014 +0100
map the modules and special names back manually
Change-Id: Ie80e2ef74932b9dd46b2f709e181c00aac4d4f9c
diff --git a/bin/test-hid-vs-ui.py b/bin/test-hid-vs-ui.py
index 232d978..72fa503 100755
--- a/bin/test-hid-vs-ui.py
+++ b/bin/test-hid-vs-ui.py
@@ -58,7 +58,7 @@ def init_core_files():
elif not args['git_static']:
subprocess.call(['git','fetch','origin'])
allfiles =
subprocess.check_output(['git','ls-tree','--name-only','--full-name','-r','master'])
-return '\n'.join(re.findall('.*\.ui',allfiles))
+return re.findall('.*\.ui',allfiles)
if __name__ == __main__:
@@ -83,7 +83,31 @@ if __name__ == __main__:
hid = rawtext.split('hid=')[1].split('')[0]
if hid.startswith('.uno'): continue
uifileraw, compname = hid.rsplit('/',1)
-uifile = uifileraw.split('/',1)[1] + .ui # remove modules/ which
exist only in install
+uifile = uifileraw + .ui
+# map modules/ etc, which exist only in install
+# back to their source location
+if uifile.startswith(modules/scalc):
+uifile = sc/scalc + uifile[13:]
+elif uifile.startswith(modules/swriter):
+uifile = sw/swriter + uifile[15:]
+elif uifile.startswith(modules/schart):
+uifile = chart2 + uifile[14:]
+elif uifile.startswith(modules/smath):
+uifile = starmath/smath + uifile[13:]
+elif uifile.startswith(modules/sdraw):
+uifile = sd/sdraw + uifile[13:]
+elif uifile.startswith(modules/simpress):
+uifile = sd/simpress + uifile[16:]
+elif uifile.startswith(modules/BasicIDE):
+uifile = basctl/basicide + uifile[16:]
+elif uifile.startswith(modules/spropctrlr):
+uifile = extensions/spropctrlr + uifile[18:]
+elif uifile.startswith(sfx):
+uifile = sfx2 + uifile[3:]
+elif uifile.startswith(svt):
+uifile = svtools + uifile[3:]
+components = uifile.split('/',1);
+uifile = components[0] + '/uiconfig/' + components[1]
targets[uifile].add(compname.split(':')[0])
origin[uifile].add(fname) # help file(s)
@@ -96,10 +120,10 @@ if __name__ == __main__:
errors += '\nFrom ' + origin[uikey].pop()
else:
errors += '\nFrom one of ' +
str(origin[uikey]).replace('set(','').replace(')','')
-errors += ', we did not found file '+ uikey+'.'
+errors += ', we did not find file '+ uikey+'.'
continue
-full_path =
os.path.join(core_repo_dir,re.search('(.*'+uikey+')',uifileslist).group(1))
+full_path = os.path.join(core_repo_dir,uikey)
# print full_path
root = ET.parse(full_path).getroot()
ids = [element.attrib['id'].split(':')[0] for element in
root.findall('.//object[@id]')]
___
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/wrtw8nds.cxx | 27 +--
1 file changed, 5 insertions(+), 22 deletions(-)
New commits:
commit a74f0cd6a7dad15982bcdbc048cc2712ed8b976d
Author: Chris Laplante mostthings...@gmail.com
Date: Wed Apr 9 19:55:35 2014 -0400
Simplify the AttributeOutputBase::OutputFlyFrame method.
Change-Id: Iac3b1b627728d5268ce7633904af9113e3127be2
Reviewed-on: https://gerrit.libreoffice.org/9006
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 523a9ec..5024333 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2885,32 +2885,15 @@ void AttributeOutputBase::OutputFlyFrame( const
sw::Frame rFmt )
return;
const SwCntntNode rNode = *rFmt.GetCntntNode();
-Point aNdPos, aPgPos;
-Point* pLayPos;
-bool bValidNdPos = false, bValidPgPos = false;
+Point aLayPos;
+// get the Layout Node-Position
if (FLY_AT_PAGE == rFmt.GetFrmFmt().GetAnchor().GetAnchorId())
-{
-// get the Layout Node-Position.
-if ( !bValidPgPos )
-{
-aPgPos = rNode.FindPageFrmRect(false, aPgPos).Pos();
-bValidPgPos = true;
-}
-pLayPos = aPgPos;
-}
+aLayPos = rNode.FindPageFrmRect().Pos();
else
-{
-// get the Layout Node-Position.
-if ( !bValidNdPos )
-{
-aNdPos = rNode.FindLayoutRect(false, aNdPos).Pos();
-bValidNdPos = true;
-}
-pLayPos = aNdPos;
-}
+aLayPos = rNode.FindLayoutRect().Pos();
-OutputFlyFrame_Impl( rFmt, *pLayPos );
+OutputFlyFrame_Impl( rFmt, aLayPos );
}
// write data of any redline
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/tabview.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 7d0f4ec68d0f6954ffd5f55afd8adf8b2a3c7a08 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 10:48:22 2014 +0100 Related: coverity#1202953 unused pIPClient member Change-Id: I0fb8f207e8b41563dad9cc4958abecce125742da diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index ce968e5..0c6b5e8 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -96,8 +96,6 @@ private: ScHeaderSelectionEngine* pHdrSelEng; ScHeaderFunctionSet aHdrFunc; -SfxInPlaceClient* pIPClient; - ScDrawView* pDrawView; SizeaFrameSize; // passed on as for DoResize ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabview.cxx | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 2756299d43fc04f32a24c1d8cd236d3249643067 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 11:12:28 2014 +0100 coverity#1202953 Uninitialized pointer field Change-Id: I7d0950873bed5bf9fb83cb72419c9b46555b23ae diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index aff4024..578d859 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -207,7 +207,18 @@ ScTabView::ScTabView( Window* pParent, ScDocShell rDocSh, ScTabViewShell* pView pDrawBrushSet( NULL ), pTimerWindow( NULL ), nTipVisible( 0 ), +nPrevDragPos( 0 ), meBlockMode(None), +nBlockStartX( 0 ), +nBlockStartXOrig( 0 ), +nBlockEndX( 0 ), +nBlockStartY( 0 ), +nBlockStartYOrig( 0 ), +nBlockEndY( 0 ), +nBlockStartZ( 0 ), +nBlockEndZ( 0 ), +nOldCurX( 0 ), +nOldCurY( 0 ), mfPendingTabBarWidth( -1.0 ), bMinimized( false ), bInUpdateHeader( 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-1' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx | 673 +---
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2
sd/source/ui/remotecontrol/Communicator.cxx |7
3 files changed, 609 insertions(+), 73 deletions(-)
New commits:
commit d92b1152cb4e700902288d5694add7154045140e
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Apr 10 21:58:29 2014 +0100
fdo#74697 Add Bluez 5 support for impress remote.
This time we:
- Don't break SAL_WARN with an fprintf like syntax.
- Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might
be building on dbus-glib versions that do not support it (however
presumably anyone running bluez 5 will have a dbus version that is
new enough to support this, i.e. purely a build-time issue).
- Remove various C++11'isms.
Reviewed-on: https://gerrit.libreoffice.org/8924
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
(cherry picked from commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c)
Conflicts:
sd/source/ui/remotecontrol/BluetoothServer.cxx
Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32
Reviewed-on: https://gerrit.libreoffice.org/8929
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index c87f1b8..0367b51 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -12,6 +12,8 @@
#include iostream
#include iomanip
+#include boost/scoped_ptr.hpp
+
#include sal/log.hxx
#ifdef LINUX_BLUETOOTH
@@ -89,25 +91,40 @@ struct DBusObject {
}
};
+static DBusObject* getBluez5Adapter(DBusConnection *pConnection);
+
struct sd::BluetoothServer::Impl {
// the glib mainloop running in the thread
GMainContext *mpContext;
DBusConnection *mpConnection;
DBusObject *mpService;
volatile bool mbExitMainloop;
+enum BluezVersion { BLUEZ4, BLUEZ5, UNKNOWN };
+BluezVersion maBluezVersion;
Impl()
: mpContext( g_main_context_new() )
, mpConnection( NULL )
, mpService( NULL )
, mbExitMainloop( false )
+, maBluezVersion( UNKNOWN )
{ }
DBusObject *getAdapter()
{
-if( !mpService )
+if (mpService)
+{
+DBusObject* pAdapter = mpService-cloneForInterface(
org.bluez.Adapter );
+return pAdapter;
+}
+else if (spServer-mpImpl-maBluezVersion == BLUEZ5)
+{
+return getBluez5Adapter(mpConnection);
+}
+else
+{
return NULL;
-return mpService-cloneForInterface( org.bluez.Adapter );
+}
}
};
@@ -155,37 +172,181 @@ sendUnrefAndWaitForReply( DBusConnection *pConnection,
DBusMessage *pMsg )
return pMsg;
}
+static bool
+isBluez5Available(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+
+// Simplest wasy to check whether we have Bluez 5+ is to check
+// that we can obtain adapters using the new interfaces.
+// The first two error checks however don't tell us anything as they should
+// succeed as long as dbus is working correctly.
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No GetManagedObjects call created);
+return false;
+}
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No reply received);
+return false;
+}
+
+// If dbus is working correctly and we aren't on bluez 5 this is where we
+// should actually get the error.
+if (dbus_message_get_error_name( pMsg ))
+{
+SAL_INFO( sdremote.bluetooth, GetManagedObjects call failed with \
+ dbus_message_get_error_name( pMsg )
+ \ -- we don't seem to have Bluez 5 available);
+return false;
+}
+SAL_INFO(sdremote.bluetooth, GetManagedObjects call seems to have
succeeded -- we must be on Bluez 5);
+dbus_message_unref(pMsg);
+return true;
+}
+
+
+static DBusObject*
+getBluez5Adapter(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+// This returns a list of objects where we need to find the first
+// org.bluez.Adapter1 .
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+return NULL;
+
+const gchar* pInterfaceType = org.bluez.Adapter1;
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+
+DBusMessageIter aObjectIterator;
+if (pMsg dbus_message_iter_init(pMsg, aObjectIterator))
+{
+if (DBUS_TYPE_ARRAY ==
[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk
pyuno/Module_pyuno.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 211b04ed4f0ada2fc9d8cccdc15db3e00c4e3cbf Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 11:28:38 2014 +0100 wait until a bit later to run the import ssl test Change-Id: Ic18917ce16b27b35347c19d6b9fa5889dc00f2d5 diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 9b966e5..4d38442 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -67,7 +67,7 @@ $(eval $(call gb_Module_add_targets,pyuno, \ endif ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS))) -$(eval $(call gb_Module_add_targets,pyuno, \ +$(eval $(call gb_Module_add_slowcheck_targets,pyuno, \ PythonTest_pytests \ PythonTest_pyuno_pytests_insertremovecells \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/dapiuno.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 1a9463277006e8e5a8c0b82bbf5d5ab2d5ea15ac
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 11:33:31 2014 +0100
coverity#704274 Logically dead code
Change-Id: I211f24d34a0fc9b3efb6f575eb6884c334733969
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 6845eec..4aebc8a 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -3230,6 +3230,7 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const
OUString aName )
{
SolarMutexGuard aGuard;
ReferenceXNameAccess xMembers = GetMembers();
+Any aRet;
if (xMembers.is())
{
ReferenceXIndexAccess xMembersIndex(new ScNameToIndexAccess(
xMembers ));
@@ -3240,13 +3241,16 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const
OUString aName )
{
ReferenceXNamed xMember(xMembersIndex-getByIndex(nItem),
UNO_QUERY);
if (xMember.is() (aName == xMember-getName()))
-return Any( Reference XPropertySet ( GetObjectByIndex_Impl(
nItem ) ) );
+{
+aRet = Any( Reference XPropertySet ( GetObjectByIndex_Impl(
nItem ) ) );
+break;
+}
++nItem;
}
if (!bFound)
throw NoSuchElementException();
}
-return Any();
+return aRet;
}
SequenceOUString SAL_CALL ScDataPilotItemsObj::getElementNames()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk
pyuno/Module_pyuno.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fb46a354250fca80fbbfac20128551fd1c530747 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 11:45:55 2014 +0100 tweak the other one Change-Id: Ib85724173c0bf6d45776d5407220a415da9c591b diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 4d38442..da0f55b 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -61,13 +61,13 @@ endif endif # SYSTEM_PYTHON ifneq ($(DISABLE_PYTHON),TRUE) -$(eval $(call gb_Module_add_targets,pyuno, \ +$(eval $(call gb_Module_add_slowcheck_targets,pyuno, \ PythonTest_pyuno_pytests_ssl \ )) endif ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS))) -$(eval $(call gb_Module_add_slowcheck_targets,pyuno, \ +$(eval $(call gb_Module_add_targets,pyuno, \ PythonTest_pytests \ PythonTest_pyuno_pytests_insertremovecells \ )) ___ 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' - sd/source
sd/source/ui/remotecontrol/Communicator.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit bd10baa8565ac4ea8697a4e9ed8c5a489ae7a4fb Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 16 20:41:44 2014 +0100 coverity#1202882 Dereference before null check Change-Id: Ie61df08c11b687c0b4a3ae212b3f9a6c95171396 (cherry picked from commit c152349f69acfb6bb873ed1cd12ca1b6dc325f1f) Reviewed-on: https://gerrit.libreoffice.org/9095 Tested-by: Andrzej Hunt andrzej.h...@collabora.com Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx index d3af697..bf399ca 100644 --- a/sd/source/ui/remotecontrol/Communicator.cxx +++ b/sd/source/ui/remotecontrol/Communicator.cxx @@ -122,10 +122,9 @@ void Communicator::execute() pTransmitter-join(); pTransmitter = NULL; -if( mpSocket ) -mpSocket-close(); +mpSocket-close(); delete mpSocket; - +mpSocket = NULL; RemoteServer::removeCommunicator( this ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac download.lst external/libgltf external/Module_external.mk Makefile.fetch RepositoryExternal.mk
Makefile.fetch |1 RepositoryExternal.mk| 18 + configure.ac |1 download.lst |1 external/Module_external.mk |1 external/libgltf/Makefile| 14 external/libgltf/Module_libgltf.mk | 17 + external/libgltf/README |1 external/libgltf/StaticLibrary_libgltf.mk| 47 ++ external/libgltf/UnpackedTarball_libgltf.mk | 28 external/libgltf/patches/adress_of_temporary.patch | 13 external/libgltf/patches/extra_qualification.patch | 12 +++ external/libgltf/patches/include_path_freetype.patch | 12 +++ external/libgltf/patches/include_path_glew.patch | 48 +++ external/libgltf/patches/include_typo_texture.patch | 12 +++ external/libgltf/patches/missing_include_cstring.patch | 11 +++ external/libgltf/patches/unneeded_context_handling.patch | 12 +++ external/libgltf/patches/win_only_variables.patch| 40 18 files changed, 288 insertions(+), 1 deletion(-) New commits: commit 62fd63050c355b06b449e58134fa482866102134 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Apr 18 12:55:56 2014 +0200 Integrate libgltf for rendering gltf models Change-Id: I7c30dbcf276052c01bb15f3b8c77a2406260aa7b diff --git a/Makefile.fetch b/Makefile.fetch index 636a924..3efe2b5 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -146,6 +146,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LANGUAGETOOL,$(LANGUAGETOOL_TARBALL)) \ $(call fetch_Optional,LCMS2,$(LCMS2_TARBALL)) \ $(call fetch_Optional,LIBEXTTEXTCAT,$(LIBEXTTEXTCAT_TARBALL)) \ + $(call fetch_Optional,LIBGLTF,$(LIBGLTF_TARBALL)) \ $(call fetch_Optional,LIBLANGTAG,$(LIBLANGTAG_TARBALL)) \ $(call fetch_Optional,LIBXML2,$(LIBXML_TARBALL)) \ $(LIBXMLSEC_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a371f2f..c9e04fa 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -21,7 +21,7 @@ # depending on the configure options these may be taken from the system, # or the internal/bundled copy may be built. -# for every external, a function gb_LinkTarget_use__FOO is defined, +# for every external, a function gb_LinkTarget__use_FOO is defined, # once for the system case, once for the internal case. # in the system case, no libraries should be registered, but the target-local @@ -3087,6 +3087,22 @@ endif # SYSTEM_NSS endif # DESKTOP + +ifeq ($(ENABLE_GLTF),TRUE) + +define gb_LinkTarget__use_libgltf +$(call gb_LinkTarget_set_include,$(1),\ +-I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \ +$$(INCLUDE) \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + libgltf \ +) +endef + +endif + ### Jars ifneq ($(SYSTEM_HSQLDB),) diff --git a/configure.ac b/configure.ac index 50c8117..693d102 100644 --- a/configure.ac +++ b/configure.ac @@ -10368,6 +10368,7 @@ AC_MSG_CHECKING([whether to enable glTF support]) if test $enable_opengl = yes; then ENABLE_GLTF=TRUE AC_MSG_RESULT([yes]) +BUILD_TYPE=$BUILD_TYPE LIBGLTF if test $test_freetype = no; then BUILD_TYPE=$BUILD_TYPE FREETYPE fi diff --git a/download.lst b/download.lst index 40f9ff2..b3b48fa 100644 --- a/download.lst +++ b/download.lst @@ -88,6 +88,7 @@ export JPEG_TARBALL := 52654eb3b2e60c35731ea8fc87f1bd29-jpegsrc.v8d.tar.gz export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_TARBALL := 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 +export LIBGLTF_TARBALL := 8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz diff --git a/external/Module_external.mk b/external/Module_external.mk index e9e90c4..02f6595 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBEOT,libeot) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBGLTF,libgltf) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |5 -
include/vcl/print.hxx |2 ++
vcl/source/gdi/print.cxx | 22 ++
vcl/source/outdev/font.cxx | 18 --
vcl/source/outdev/text.cxx |8
5 files changed, 36 insertions(+), 19 deletions(-)
New commits:
commit f4e8bca336ad8b26cc9ba9e6d5ef9d665cc164d6
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Fri Apr 18 20:55:59 2014 +1000
fdo#74702 Allow Printer to handle ImplInitFont and rename
Renamed ImplInitFont() to InitFont, made it protected. Moved printer
handling to Printer class.
Change-Id: I42ebf6188d075993b5d2e14f55a7e530201acdd6
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c98ff3a..c2e9686 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -653,9 +653,12 @@ public:
*/
///@{
SAL_DLLPRIVATE bool ImplNewFont() const;
-SAL_DLLPRIVATE void ImplInitFont() const;
SAL_DLLPRIVATE void ImplInitTextColor();
+protected:
+virtual voidInitFont() const;
+
+public:
static
SAL_DLLPRIVATE void ImplDrawText( OutputDevice rTargetDevice,
const Rectangle rRect,
const OUString rOrigStr,
sal_uInt16 nStyle,
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 23c656d..ef4bec7 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -303,6 +303,8 @@ protected:
virtual voidEmulateDrawTransparent( const PolyPolygon
rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE;
+virtual voidInitFont() const SAL_OVERRIDE;
+
public:
Printer();
Printer( const JobSetup rJobSetup );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index d25a28e..b741faa 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -33,6 +33,7 @@
#include vcl/gdimtf.hxx
#include vcl/metaact.hxx
#include vcl/print.hxx
+#include vcl/settings.hxx
#include salinst.hxx
#include salvd.hxx
@@ -1812,4 +1813,25 @@ bool Printer::UsePolyPolygonForComplexGradient()
return true;
}
+void Printer::InitFont() const
+{
+DBG_TESTSOLARMUTEX();
+
+if (!mpFontEntry)
+return;
+
+if ( mbInitFont )
+{
+// decide if antialiasing is appropriate
+bool bNonAntialiased = (GetAntialiasing() ANTIALIASING_DISABLE_TEXT)
!= 0;
+const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
+bNonAntialiased |= ((rStyleSettings.GetDisplayOptions()
DISPLAY_OPTION_AA_DISABLE) != 0);
+bNonAntialiased |=
(int(rStyleSettings.GetAntialiasingMinPixelHeight())
mpFontEntry-maFontSelData.mnHeight);
+mpFontEntry-maFontSelData.mbNonAntialiased = bNonAntialiased;
+
+// select font in the device layers
+mpFontEntry-mnSetFontFlags = mpGraphics-SetFont(
(mpFontEntry-maFontSelData), 0 );
+mbInitFont = false;
+}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 7123f35..7b4db77 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1153,7 +1153,7 @@ void OutputDevice::ImplInitFontList() const
}
}
-void OutputDevice::ImplInitFont() const
+void OutputDevice::InitFont() const
{
DBG_TESTSOLARMUTEX();
@@ -1162,16 +1162,6 @@ void OutputDevice::ImplInitFont() const
if ( mbInitFont )
{
-if ( meOutDevType != OUTDEV_PRINTER )
-{
-// decide if antialiasing is appropriate
-bool bNonAntialiased = (GetAntialiasing()
ANTIALIASING_DISABLE_TEXT) != 0;
-const StyleSettings rStyleSettings =
GetSettings().GetStyleSettings();
-bNonAntialiased |= ((rStyleSettings.GetDisplayOptions()
DISPLAY_OPTION_AA_DISABLE) != 0);
-bNonAntialiased |=
(int(rStyleSettings.GetAntialiasingMinPixelHeight())
mpFontEntry-maFontSelData.mnHeight);
-mpFontEntry-maFontSelData.mbNonAntialiased = bNonAntialiased;
-}
-
// select font in the device layers
mpFontEntry-mnSetFontFlags = mpGraphics-SetFont(
(mpFontEntry-maFontSelData), 0 );
mbInitFont = false;
@@ -1237,7 +1227,7 @@ bool OutputDevice::ImplNewFont() const
// select font when it has not been initialized yet
if ( !pFontEntry-mbInit )
{
-ImplInitFont();
+InitFont();
// get metric data from device layers
if ( pGraphics )
@@ -2303,7 +2293,7 @@ bool OutputDevice::GetFontCapabilities( FontCapabilities
rFontCapabilities ) co
if( mbNewFont )
ImplNewFont();
if( mbInitFont )
-ImplInitFont();
+InitFont();
if( !mpFontEntry )
return false;
@@ -2321,7 +2311,7 @@ bool OutputDevice::GetFontCharMap( FontCharMap
rFontCharMap ) const
if( mbNewFont )
[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk
pyuno/Module_pyuno.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 5741e67a00dcaa6864089f44f09b65daca060ee8 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 12:17:56 2014 +0100 sigh, unclear how to make python tests depend on python Change-Id: I28884169cb633d2aa9ad11d4b31ab9424776b0f1 diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index da0f55b..98cc84a 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -61,7 +61,11 @@ endif endif # SYSTEM_PYTHON ifneq ($(DISABLE_PYTHON),TRUE) -$(eval $(call gb_Module_add_slowcheck_targets,pyuno, \ +# TODO: add dependencies to the PythonTest stuff to +# depend on internal python getting installed +# into instdir becore running python tests, +# for now bodge this into a damn subsequentcheck +$(eval $(call gb_Module_add_subsequentcheck_targets,pyuno, \ PythonTest_pyuno_pytests_ssl \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sfx2/source svtools/source sw/source
sfx2/source/appl/newhelp.cxx |2 +-
sfx2/source/control/thumbnailview.cxx |2 +-
svtools/source/control/valueset.cxx |4 ++--
sw/source/core/docnode/ndtbl.cxx |6 --
sw/source/core/edit/editsh.cxx| 21 +
5 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit 71e71d4b5a9e8f92fc6cdb743d960145600aee46
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 12:11:09 2014 +0100
coverity#1202830 Out-of-bounds access
Change-Id: I25edea176b69c1c1f87bdbff790a39298a813660
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 8f2d13a..dde9409 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -798,12 +798,25 @@ void SwEditShell::SetNumberingRestart()
SwTxtNode* pTxtNd( static_castSwTxtNode*(pNd) );
SwNumRule* pNumRule( pTxtNd-GetNumRule() );
-if ( pNumRule pTxtNd-GetNum()
+bool bIsNodeNum =
+ ( pNumRule pTxtNd-GetNum()
( pTxtNd-HasNumber() || pTxtNd-HasBullet()
)
pTxtNd-IsCountedInList()
- !pTxtNd-IsListRestart()
- pTxtNd-GetNum()-GetNumber() ==
-pNumRule-Get(
static_castsal_uInt16(pTxtNd-GetActualListLevel()) ).GetStart() )
+ !pTxtNd-IsListRestart() );
+if (bIsNodeNum)
+{
+int nListLevel = pTxtNd-GetActualListLevel();
+
+if (nListLevel 0)
+nListLevel = 0;
+
+if (nListLevel = MAXLEVEL)
+nListLevel = MAXLEVEL - 1;
+
+ bIsNodeNum = pTxtNd-GetNum()-GetNumber() ==
+pNumRule-Get(
static_castsal_uInt16(nListLevel) ).GetStart();
+}
+if (bIsNodeNum)
{
// now set a the start value as attribute
SwPosition aCurrentNode(*pNd);
commit 635823696f07956dda22bcc584bd4a133476710c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 11:57:25 2014 +0100
coverity#1202785 Division or modulo by zero
Change-Id: I5ede52be101a7603d4edad30b7a1f8ee0fc4b07d
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index b54060d..4bfa3f3 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2784,7 +2784,7 @@ void SfxHelpWindow_Impl::InitSizes()
else
{
nCollapseWidth = aRect.Width;
-nExpandWidth = nCollapseWidth * 100 / nTextSize;
+nExpandWidth = nTextSize ? nCollapseWidth * 100 / nTextSize : 0;
}
}
}
commit 12c0d40f82edb6bcc49cb3aa537fade6277047b8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 11:56:20 2014 +0100
coverity#1202784 Division or modulo by zero
Change-Id: I982b72abd92584b9ed97de593c17f2cf0b8b3667
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 3326334..a6115fd 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -723,7 +723,7 @@ void ThumbnailView::MakeItemVisible( sal_uInt16 nItemId )
bFound = true;
}
}
-sal_uInt16 nRow = nPos / mnCols;
+sal_uInt16 nRow = mnCols ? nPos / mnCols : 0;
// Move the visible rows as little as possible to include that one
if ( nRow mnFirstLine )
commit 902cafe656a017b996e72313274e412bfa0ba838
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 11:54:31 2014 +0100
coverity#1202783 Division or modulo by zero
Change-Id: I183416ad3db39108e52c1e69b60fb547448b21a8
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index dde1579..b649278 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1736,8 +1736,8 @@ Rectangle ValueSet::ImplGetItemRect( size_t nPos ) const
nPos -= nVisibleBegin;
-const size_t row = nPos/mnCols;
-const size_t col = nPos%mnCols;
+const size_t row = mnCols ? nPos/mnCols : 0;
+const size_t col = mnCols ? nPos%mnCols : 0;
const long x = maItemListRect.Left()+col*(mnItemWidth+mnSpacing);
const long y = maItemListRect.Top()+row*(mnItemHeight+mnSpacing);
commit b061dbd76bc3a09edd42b5e580a80ae93d62eb1b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 11:49:21 2014 +0100
coverity#704523 Division or modulo by zero
and coverity#704522
Change-Id:
[Libreoffice-commits] core.git: external/freetype RepositoryExternal.mk
RepositoryExternal.mk|2 +- external/freetype/Module_freetype.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 9b9f1a5f0642a8ccffb67bd53dc18025f99950c7 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Apr 18 13:24:00 2014 +0200 Fix android build: fix condition Change-Id: I5e20375791f038b38ef079712204a1afed07c39c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c9e04fa..878d4b7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1254,7 +1254,7 @@ endef gb_ExternalProject__use_freetype := -else ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) +else ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index 9ff2582..f6e316d 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,freetype)) -ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) +ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libgltf
external/libgltf/UnpackedTarball_libgltf.mk |1 +
external/libgltf/patches/avoid_c++11.patch | 12
2 files changed, 13 insertions(+)
New commits:
commit 17f082fe00983c3ef1a5f71611c9278cb16dab20
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Apr 18 13:53:19 2014 +0200
Avoid C++11 solutions from libgltf code
Change-Id: I097798a52157fc688ae520a7f3a0dda84000e20b
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index 44496d1..1fbe09d 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/unneeded_context_handling.patch \
external/libgltf/patches/include_typo_texture.patch \
external/libgltf/patches/adress_of_temporary.patch \
+ external/libgltf/patches/avoid_c++11.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/avoid_c++11.patch
b/external/libgltf/patches/avoid_c++11.patch
new file mode 100644
index 000..827e4f5
--- /dev/null
+++ b/external/libgltf/patches/avoid_c++11.patch
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp2014-04-18 13:47:18.006783834 +0200
libgltf/src/Shaders.cpp2014-04-18 13:49:20.175779328 +0200
+@@ -219,7 +219,7 @@
+
+ bool ShaderProgram::readShaderFile(const std::string fileName, std::string
value)
+ {
+- std::ifstream shaderStream(fileName, std::ios::in);
++ std::ifstream shaderStream(fileName.c_str(), std::ios::in);
+ if (!shaderStream.is_open())
+ {
+ 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-4' - svgio/source
svgio/source/svgreader/svgstyleattributes.cxx | 16 +++-
svgio/source/svgreader/svgsvgnode.cxx |3 ++-
2 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 0462b477b7e1006282b28ec96ce6f4bcaa1a3dd0
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Wed Apr 16 09:40:29 2014 +0200
fdo#74743 avoid infinite loop when gathering svg element styles
Change-Id: Ifcfd0c64302b9174510e3d774607f5ca60173885
Signed-off-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 8d15b2c3dbad718782d3923ece0eb6816beafab0)
Reviewed-on: https://gerrit.libreoffice.org/9062
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index ecddfbf..0fae736 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -205,17 +205,15 @@ namespace svgio
const SvgStyleAttributes* SvgStyleAttributes::getParentStyle() const
{
-if(getCssStyleParent())
-{
-return getCssStyleParent();
-}
+const SvgStyleAttributes* pParentStyle = getCssStyleParent();
-if(mrOwner.getParent())
-{
-return mrOwner.getParent()-getSvgStyleAttributes();
-}
+// no parent style set, check parent for its style attributes
+if(pParentStyle == NULL mrOwner.getParent() != NULL)
+ pParentStyle = mrOwner.getParent()-getSvgStyleAttributes();
-return 0;
+if (pParentStyle != this) // to prevent infinite loop
+return pParentStyle;
+return NULL;
}
void SvgStyleAttributes::add_text(
diff --git a/svgio/source/svgreader/svgsvgnode.cxx
b/svgio/source/svgreader/svgsvgnode.cxx
index 8e107c6..cde5387 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -60,7 +60,8 @@ namespace svgio
const SvgStyleAttributes* SvgSvgNode::getSvgStyleAttributes() const
{
-return checkForCssStyle(OUString(svg), maSvgStyleAttributes);
+checkForCssStyle(OUString(svg), maSvgStyleAttributes);
+return maSvgStyleAttributes.getCssStyleParent();
}
void SvgSvgNode::parseAttribute(const OUString rTokenName, SVGToken
aSVGToken, const OUString aContent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_TiledLibreOffice_app.mk solenv/gbuild sw/source
ios/CustomTarget_TiledLibreOffice_app.mk |6 ++
solenv/gbuild/platform/IOS_ARM_GCC.mk|2 +-
sw/source/core/layout/paintfrm.cxx | 20 +++-
3 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit d7aef2407a0d9e8ff3bf72e198feb55a71307733
Author: Tor Lillqvist t...@collabora.com
Date: Fri Apr 18 15:07:41 2014 +0300
Add silly workaround for weird Clang (Xcode 5.1.1) problem with -Oz
Change-Id: I4fc5997504d3fb847518317abd5bf80fda4467d5
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index c975039..5e70d16 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -162,6 +162,14 @@ public:
bool MakeUnion( const SwRect rRect );
};
+#ifdef IOS
+static void dummy_function()
+{
+pid_t pid = getpid();
+(void) pid;
+}
+#endif
+
class SwLineRects
{
public:
@@ -171,7 +179,17 @@ public:
typedef std::vector SwLineRect ::reverse_iterator reverse_iterator;
typedef std::vector SwLineRect ::size_type size_type;
size_t nLastCount; //avoid unnecessary cycles in PaintLines
-SwLineRects() : nLastCount( 0 ) {}
+SwLineRects() : nLastCount( 0 )
+{
+#ifdef IOS
+// Work around what is either a compiler bug in Xcode 5.1.1,
+// or some unknown problem in this file. If I ifdef out this
+// call, I get a crash in SwSubsRects::PaintSubsidiary: the
+// address of the rLi reference variable is claimed to be
+// 0x400!
+dummy_function();
+#endif
+}
void AddLineRect( const SwRect rRect, const Color *pColor, const
SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol );
void ConnectEdges( OutputDevice *pOut );
commit 37466b015d549b630e3965e371cde5c9dbe4a45e
Author: Tor Lillqvist t...@collabora.com
Date: Fri Apr 18 15:06:09 2014 +0300
Include the newly required custom shape data files
Change-Id: I3a83be864819a0dea98263ca399789ffd007f405
diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk
b/ios/CustomTarget_TiledLibreOffice_app.mk
index 618b4cc..5ca37a9 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -62,6 +62,12 @@ TiledLibreOffice_setup:
# Japanese and Chinese dict files
cp $(WORKDIR)/CustomTarget/i18npool/breakiterator/dict_*.data
$(TiledLibreOffice_resource)/share
+ # Drawing ML custom shape data files
+ mkdir -p $(TiledLibreOffice_resource)/share/filter
+ cp $(INSTDIR)/share/filter/oox-drawingml-adj-names
$(TiledLibreOffice_resource)/share/filter
+ cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets
$(TiledLibreOffice_resource)/share/filter
+ cp $(INSTDIR)/share/filter/vml-shape-types
$(TiledLibreOffice_resource)/share/filter
+
# registry
cp -R $(INSTDIR)/share/registry $(TiledLibreOffice_resource)/share
commit 634979bb51163f072e09a1cbc7fd9b414f02e1e3
Author: Tor Lillqvist t...@collabora.com
Date: Fri Apr 18 15:03:42 2014 +0300
Let's try to use -Oz after all
It gives such substantial code space savings. We will just have to
work around the few problems it seems to cause.
Change-Id: I31031dfea049c7d28624c76ec876d9383df6
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index a85a4b6..27659c4 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -26,7 +26,7 @@ ifeq ($(CXX),)
$(error You must set CXX in the environment. See README.cross for example.)
endif
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILERDEFAULTOPTFLAGS := -Oz
include $(GBUILDDIR)/platform/com_GCC_defs.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpfilter.cxx | 66 ---
1 file changed, 66 deletions(-)
New commits:
commit 8b7aff3d430649eed279a81984cb6f5c8a1a4f66
Author: Tor Lillqvist t...@collabora.com
Date: Fri Apr 18 13:36:34 2014 +0300
Unused functions
Change-Id: I6c1f8dc33e3ba3257044889d7aae1223572590e9
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx
b/lotuswordpro/source/filter/lwpfilter.cxx
index edf53d5..6f5ef47 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -97,9 +97,6 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;
-sal_Bool IsWordproFile( uno::ReferenceXInputStream rInputStream);
-sal_Bool IsWordproFile(const OUString file);
-
LWPFilterReader::LWPFilterReader()
{
}
@@ -255,67 +252,4 @@ int ReadWordproFile(SvStream rStream,
uno::ReferenceXDocumentHandler xHandle
}
}
-/**
- * @descr Compare if pBuf equals with the first 16 bytes
- * @param pBuf that contains the file data
- * @return if equals with the Word Pro characteristic strings
- */
-sal_Bool IsWordProStr(const sal_Int8 *pBuf)
-{
-sal_Bool bRet = sal_True;
-const sal_Int8 pLotusLwp[] =
-{
-0x57, 0x6F, 0x72, 0x64,
-0x50, 0x72, 0x6F
-};
-for(size_t i=0; isizeof(pLotusLwp); ++i)
-{
-if( pBuf[i] != pLotusLwp[i] )
-{
-bRet = sal_False;
-}
-}
-return bRet;
-}
-
-sal_Bool IsWordproFile(const OUString file)
-{
-sal_Bool bRet = sal_False;
-SfxMedium aMedium( file, STREAM_STD_READ);
-SvStream* pStm = aMedium.GetInStream();
-
-if(pStm)
-{
-sal_Int8 buf[16];
-bRet = sal_True;
-
-pStm-SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-pStm-Seek(STREAM_SEEK_TO_BEGIN);
-sal_Size nRead = pStm-Read(buf, sizeof(buf));
-if( nRead sizeof(buf) )
-bRet = sal_False;
-else
-bRet = IsWordProStr(buf);
-}
-return bRet;
-}
-
-sal_Bool IsWordproFile( uno::ReferenceXInputStream rInputStream)
-{
-Sequencesal_Int8 aData;
-sal_Bool bRet = sal_False;
-
-sal_Int32 nRead = rInputStream-readBytes(aData, 16);
-if( nRead != 16 )
-{
-bRet = sal_False;
-}
-else
-{
-const sal_Int8 *data = aData.getConstArray();
-bRet = IsWordProStr(data);
-}
-return bRet;
-}
-
/* 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: include/svx svx/source
include/svx/gridctrl.hxx |2 +-
svx/source/fmcomp/gridcell.cxx |4 ++--
svx/source/fmcomp/gridctrl.cxx |6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 99ec48b163b560f057b78a317906908b876ff15f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 13:16:09 2014 +0100
fix build problem with ambiguous InitFont
Change-Id: Ib2fa1dd8136e489765e80f174fcf21d7110ec3c2
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index e222f04..8fb2dbb 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -116,7 +116,7 @@ protected:
enum InitWindowFacet
{
-InitFont= 0x01,
+InitFontFacet = 0x01,
InitForeground = 0x02,
InitBackground = 0x04,
InitWritingMode = 0x08,
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index d730dd6..166540b 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -736,7 +736,7 @@ void DbCellControl::ImplInitWindow( Window rParent, const
InitWindowFacet _eIni
}
}
-if ( ( _eInitWhat InitFont ) != 0 )
+if ( ( _eInitWhat InitFontFacet ) != 0 )
{
for (size_t i=0; i sizeof(pWindows)/sizeof(pWindows[0]); ++i)
{
@@ -761,7 +761,7 @@ void DbCellControl::ImplInitWindow( Window rParent, const
InitWindowFacet _eIni
}
}
-if ( ( ( _eInitWhat InitFont ) != 0 )
+if ( ( ( _eInitWhat InitFontFacet ) != 0 )
|| ( ( _eInitWhat InitForeground ) != 0 )
)
{
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index a2b0339..7b17de5 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -972,7 +972,7 @@ void DbGridControl::StateChanged( StateChangedType nType )
case STATE_CHANGE_ZOOM:
{
-ImplInitWindow( InitFont );
+ImplInitWindow( InitFontFacet );
// and give it a chance to rearrange
Point aPoint = GetControlArea().TopLeft();
@@ -982,7 +982,7 @@ void DbGridControl::StateChanged( StateChangedType nType )
}
break;
case STATE_CHANGE_CONTROLFONT:
-ImplInitWindow( InitFont );
+ImplInitWindow( InitFontFacet );
Invalidate();
break;
case STATE_CHANGE_CONTROLFOREGROUND:
@@ -1035,7 +1035,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet
_eInitWhat )
}
}
-if ( ( _eInitWhat InitFont ) != 0 )
+if ( ( _eInitWhat InitFontFacet ) != 0 )
{
if ( m_bNavigationBar )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/uiview/view.cxx |8 +---
sw/source/core/uibase/web/wview.cxx |4
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 4d3455e06e03363c1c46d2251e25751792659cd2
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Apr 18 14:19:50 2014 +0200
non-desktop: Avoid instantiation of huge amount of 'shells'.
Change-Id: Ic179924f437dd9197a0839f23ee4ba39a8a62f34
diff --git a/sw/source/core/uibase/uiview/view.cxx
b/sw/source/core/uibase/uiview/view.cxx
index 9212872..b592a92 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -221,11 +221,12 @@ IMPL_LINK_NOARG(SwView, FormControlActivated)
void SwView::SelectShell()
{
+#if HAVE_FEATURE_DESKTOP
+// Attention: Maintain the SelectShell for the WebView additionally
-// Attention: Maintain the SelectShell for the WebView additionally
-
- if(m_bInDtor)
+if(m_bInDtor)
return;
+
// Decision if the UpdateTable has to be called
sal_Bool bUpdateTable = sal_False;
const SwFrmFmt* pCurTableFmt = m_pWrtShell-GetTableFmt();
@@ -450,6 +451,7 @@ void SwView::SelectShell()
m_pWrtShell-UpdateTable();
GetViewImpl()-GetUNOObject_Impl()-NotifySelChanged();
+#endif
}
// Interaction: AttrChangedNotify() and TimeoutHdl.
diff --git a/sw/source/core/uibase/web/wview.cxx
b/sw/source/core/uibase/web/wview.cxx
index db19b8b..8c3eebf 100644
--- a/sw/source/core/uibase/web/wview.cxx
+++ b/sw/source/core/uibase/web/wview.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include sfx2/msg.hxx
#include svl/srchitem.hxx
#include sfx2/dispatch.hxx
@@ -93,6 +95,7 @@ SwWebView::~SwWebView()
void SwWebView::SelectShell()
{
+#if HAVE_FEATURE_DESKTOP
// Decision whether UpdateTable must be called
bool bUpdateTable = false;
const SwFrmFmt* pCurTableFmt = GetWrtShell().GetTableFmt();
@@ -283,6 +286,7 @@ void SwWebView::SelectShell()
//now the table update
if(bUpdateTable)
GetWrtShell().UpdateTable();
+#endif
}
/* 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 - pyuno/Module_pyuno.mk solenv/gbuild
pyuno/Module_pyuno.mk |8 +--- solenv/gbuild/PythonTest.mk |2 +- 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit 1a02692e7f87047e294e5a6699915227380fd60a Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 14:50:50 2014 +0200 test for enabled python is already handled by PythonTest Change-Id: I23ada017f4294fbd34e9b245d012700021914881 diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 658e5d7..8cd37a1 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -60,11 +60,9 @@ endif endif # SYSTEM_PYTHON -ifneq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_Module_add_check_targets,pyuno, \ PythonTest_pyuno_pytests_ssl \ )) -endif ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS))) $(eval $(call gb_Module_add_targets,pyuno, \ commit 6980da37549d9ae0a89812aeccfa5365c9f7a9b9 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 14:49:13 2014 +0200 move pyuno ssl test back to check targets Change-Id: Ib256217aa014693c73b233a4d8be4c0224287739 diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 98cc84a..658e5d7 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -61,11 +61,7 @@ endif endif # SYSTEM_PYTHON ifneq ($(DISABLE_PYTHON),TRUE) -# TODO: add dependencies to the PythonTest stuff to -# depend on internal python getting installed -# into instdir becore running python tests, -# for now bodge this into a damn subsequentcheck -$(eval $(call gb_Module_add_subsequentcheck_targets,pyuno, \ +$(eval $(call gb_Module_add_check_targets,pyuno, \ PythonTest_pyuno_pytests_ssl \ )) endif commit e661730ed0b4145ec25486ddccd8b0a52ca261b3 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 14:45:18 2014 +0200 PythonTest must depend on bundled python stuff Change-Id: I8957392a08bf7f39ef0cfac39484157c6a8f048d diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index f8c13d2..cd12661 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -29,7 +29,7 @@ ifneq ($(DISABLE_PYTHON),TRUE) # pass a hard-coded 139 to the gdb postprocess script to match soffice.bin # signal exit values (assumption: non-0 exit value here means it crashed) .PHONY : $(call gb_PythonTest_get_target,%) -$(call gb_PythonTest_get_target,%) : +$(call gb_PythonTest_get_target,%) : $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$*,$(true),PYT,2) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_PythonTest_get_target,$*)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/qa
filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras |binary 1 file changed New commits: commit a684161be397e61979ada3b6495741c5273bcaff Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 14:02:34 2014 +0100 add a Sun raster format test case Change-Id: I0e6885b6d9fa23ed4cea2ff4f7b26599fdc368dc diff --git a/filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras b/filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras new file mode 100644 index 000..effd654 Binary files /dev/null and b/filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - sc/source
sc/source/core/data/cellvalues.cxx |7 ++-
sc/source/core/data/table3.cxx |2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit af09b858439e121c9e965b8b62732ce8cdc80076
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 18 09:11:28 2014 -0400
Copy formula cells as well.
Change-Id: I5f7e5747336c7104004083e4d23f621a00d4b494
diff --git a/sc/source/core/data/cellvalues.cxx
b/sc/source/core/data/cellvalues.cxx
index 38ce4e8..43c251c 100644
--- a/sc/source/core/data/cellvalues.cxx
+++ b/sc/source/core/data/cellvalues.cxx
@@ -10,6 +10,7 @@
#include cellvalues.hxx
#include column.hxx
#include cellvalue.hxx
+#include sharedformula.hxx
#include cassert
#include boost/noncopyable.hpp
@@ -95,9 +96,13 @@ void CellValues::append( ScRefCellValue rVal, const
CellTextAttr* pAttr )
case CELLTYPE_FORMULA:
{
mpImpl-maCells.resize(n+1);
+CellStoreType::iterator itBlk = mpImpl-maCells.set(n,
rVal.mpFormula-Clone());
-// TODO : Handle this.
+size_t nOffset = n - itBlk-position;
+CellStoreType::position_type aPos(itBlk, nOffset);
+SharedFormulaUtil::joinFormulaCellAbove(aPos);
}
+break;
default:
bAppendAttr = false;
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 169fa90..4642cf6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -425,7 +425,7 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress )
// a copy before updating the document.
size_t nColCount = aSortParam.nCol2 - aSortParam.nCol1 + 1;
-boost::ptr_vectorsc::CellValues aSortedCols;
+boost::ptr_vectorsc::CellValues aSortedCols; // storage for copied
cells.
aSortedCols.reserve(nColCount);
for (size_t i = 0; i nColCount; ++i)
aSortedCols.push_back(new sc::CellValues);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/qa vcl/qa
filter/qa/cppunit/data/pict/fail/CVE-2008-1097-1.pct |binary vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-1.jpg |binary vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-2.jpg |binary vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-3.jpg |binary vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-4.jpg |binary vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-5.jpg |binary 6 files changed New commits: commit 4008c660821ac79983cfd409b12164abbc136415 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 14:18:09 2014 +0100 add some jpeg format tests Change-Id: I17347c638b5c6c72e740aaa995339a8ff33609bc diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-1.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-1.jpg new file mode 100644 index 000..c03c852 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-1.jpg differ diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-2.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-2.jpg new file mode 100644 index 000..1a24da3 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-2.jpg differ diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-3.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-3.jpg new file mode 100644 index 000..794ff52 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-3.jpg differ diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-4.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-4.jpg new file mode 100644 index 000..8911646 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-4.jpg differ diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-5.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-5.jpg new file mode 100644 index 000..c5373df Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-1097-5.jpg differ commit 3f4cd87ff104edadd0ee69f58b972781d9c0306a Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 14:08:25 2014 +0100 add a Pict format test case Change-Id: Ibcbb275d6c6a19b3e8ef86c9ab8d5da038d026a6 diff --git a/filter/qa/cppunit/data/pict/fail/CVE-2008-1097-1.pct b/filter/qa/cppunit/data/pict/fail/CVE-2008-1097-1.pct new file mode 100644 index 000..73943c9 Binary files /dev/null and b/filter/qa/cppunit/data/pict/fail/CVE-2008-1097-1.pct differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/CppunitTest_filter_ppm_test.mk filter/Module_filter.mk filter/qa
filter/CppunitTest_filter_ppm_test.mk | 41 +++
filter/Module_filter.mk |1
filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm |binary
filter/qa/cppunit/data/ppm/indeterminate/.gitignore |1
filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm |binary
filter/qa/cppunit/filters-ppm-test.cxx | 71
6 files changed, 114 insertions(+)
New commits:
commit 58b76a188368f0035e5654657f3bcd90fba2543f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 14:26:49 2014 +0100
add ppm regression test
Change-Id: Ifd5f68a3b0dec16f8d992f75fba8c9920700f351
diff --git a/filter/CppunitTest_filter_ppm_test.mk
b/filter/CppunitTest_filter_ppm_test.mk
new file mode 100644
index 000..cce9041
--- /dev/null
+++ b/filter/CppunitTest_filter_ppm_test.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_ppm_test))
+
+$(eval $(call gb_CppunitTest_use_external,filter_ppm_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_ppm_test, \
+filter/qa/cppunit/filters-ppm-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \
+ipb \
+ sal \
+ test \
+ tl \
+ unotest \
+ vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,filter_ppm_test,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_ppm_test))
+
+$(eval $(call gb_CppunitTest_use_components,filter_ppm_test,\
+configmgr/source/configmgr \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_ppm_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index eeab593..1cb203f 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -85,6 +85,7 @@ ifneq ($(DISABLE_CVE_TESTS),TRUE)
$(eval $(call gb_Module_add_check_targets,filter,\
CppunitTest_filter_pcx_test \
CppunitTest_filter_pict_test \
+CppunitTest_filter_ppm_test \
CppunitTest_filter_psd_test \
CppunitTest_filter_ras_test \
CppunitTest_filter_tiff_test \
diff --git a/filter/qa/cppunit/data/ppm/fail/.gitignore
b/filter/qa/cppunit/data/ppm/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm
b/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm
new file mode 100644
index 000..4572895
Binary files /dev/null and
b/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm differ
diff --git a/filter/qa/cppunit/data/ppm/indeterminate/.gitignore
b/filter/qa/cppunit/data/ppm/indeterminate/.gitignore
new file mode 100644
index 000..583b009c
--- /dev/null
+++ b/filter/qa/cppunit/data/ppm/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/filter/qa/cppunit/data/ppm/pass/.gitignore
b/filter/qa/cppunit/data/ppm/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm
b/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm
new file mode 100644
index 000..828b972
Binary files /dev/null and b/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm
differ
diff --git a/filter/qa/cppunit/filters-ppm-test.cxx
b/filter/qa/cppunit/filters-ppm-test.cxx
new file mode 100644
index 000..9b281ab
--- /dev/null
+++ b/filter/qa/cppunit/filters-ppm-test.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include unotest/filters-test.hxx
+#include test/bootstrapfixture.hxx
+#include vcl/FilterConfigItem.hxx
+#include tools/stream.hxx
+#include vcl/graph.hxx
+
+#include osl/file.hxx
+#include osl/process.h
+
+extern C
+{
+SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport(SvStream rStream, Graphic rGraphic,
+FilterConfigItem*);
+}
+
+using namespace ::com::sun::star;
+
+/* Implementation of Filters test */
+
+class PpmFilterTest
+: public test::FiltersTest
+, public test::BootstrapFixture
+{
+public:
+PpmFilterTest() : BootstrapFixture(true, false) {}
+
+virtual bool load(const OUString ,
+const OUString rURL, const OUString ,
+unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+
+/**
+ * Ensure CVEs remain unbroken
+ */
+void testCVEs();
+
+CPPUNIT_TEST_SUITE(PpmFilterTest);
+CPPUNIT_TEST(testCVEs);
+CPPUNIT_TEST_SUITE_END();
+};
[Libreoffice-commits] core.git: extensions/source
extensions/source/abpilot/abspage.cxx |4
extensions/source/abpilot/abspage.hxx |1 +
2 files changed, 5 insertions(+)
New commits:
commit 14137bcf7305eb9d06cbfb33cf5a951fd6b9e416
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 18 14:46:28 2014 +0100
create an entry point for .ui-ification of the address book wizard pages
Change-Id: Ief87c7acacb08ee1debebea5085e9de208f29445
diff --git a/extensions/source/abpilot/abspage.cxx
b/extensions/source/abpilot/abspage.cxx
index f1277a8..687f527 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -36,6 +36,10 @@ namespace abp
{
}
+AddressBookSourcePage::AddressBookSourcePage(OAddessBookSourcePilot*
_pParent, const OString rID, const OUString rUIXMLDescription)
+:AddressBookSourcePage_Base(_pParent, rID, rUIXMLDescription)
+{
+}
void AddressBookSourcePage::DeactivatePage()
{
diff --git a/extensions/source/abpilot/abspage.hxx
b/extensions/source/abpilot/abspage.hxx
index 0eb7368..e4af502 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -43,6 +43,7 @@ namespace abp
{
protected:
AddressBookSourcePage( OAddessBookSourcePilot* _pParent, const ResId
_rId );
+AddressBookSourcePage(OAddessBookSourcePilot *pParent, const OString
rID, const OUString rUIXMLDescription);
protected:
// helper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk
pyuno/Module_pyuno.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 89f6ff4c296de5e61d5bfb0cfef55e482839e227 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 18 15:08:22 2014 +0100 python depend only working under windows so revert 6980da37549d9ae0a89812aeccfa5365c9f7a9b9 for the moment Change-Id: I1c6e6d74bee6d3008e32c48c0da4a7faf90c8f60 diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 8cd37a1..fcd69b0 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -60,7 +60,11 @@ endif endif # SYSTEM_PYTHON -$(eval $(call gb_Module_add_check_targets,pyuno, \ +# TODO: add dependencies to the PythonTest stuff to +# depend on internal python getting installed +# into instdir becore running python tests, +# for now bodge this into a damn subsequentcheck +$(eval $(call gb_Module_add_subsequentcheck_targets,pyuno, \ PythonTest_pyuno_pytests_ssl \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - sc/inc sc/source
sc/inc/cellvalues.hxx |2 +-
sc/inc/formulacell.hxx |1 +
sc/source/core/data/cellvalues.cxx |4 ++--
sc/source/core/data/formulacell.cxx |5 +
sc/source/core/data/table3.cxx |3 ++-
5 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 818e441318205eb2a26b872c27376f7a66b7711e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 18 10:16:32 2014 -0400
Correctly set the positions of sorted formula cells.
Change-Id: I21cc7aa2cc521203f4da6f754a2ad7b4e985dd67
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 8de0b04..c2bf1d3 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -49,7 +49,7 @@ public:
void copyTo( ScColumn rCol, SCROW nRow ) const;
void assign( const std::vectordouble rVals );
-void append( ScRefCellValue rVal, const CellTextAttr* pAttr );
+void append( ScRefCellValue rVal, const CellTextAttr* pAttr, const
ScAddress rPos );
size_t size() const;
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 57f249d..8e067a80 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -160,6 +160,7 @@ public:
virtual ~ScFormulaCell();
ScFormulaCell* Clone() const;
+ScFormulaCell* Clone( const ScAddress rPos ) const;
ScFormulaCell( ScDocument* pDoc, const ScAddress rPos );
diff --git a/sc/source/core/data/cellvalues.cxx
b/sc/source/core/data/cellvalues.cxx
index 43c251c..0740ab5 100644
--- a/sc/source/core/data/cellvalues.cxx
+++ b/sc/source/core/data/cellvalues.cxx
@@ -65,7 +65,7 @@ void CellValues::assign( const std::vectordouble rVals )
mpImpl-maCellTextAttrs.set(0, aDefaults.begin(), aDefaults.end());
}
-void CellValues::append( ScRefCellValue rVal, const CellTextAttr* pAttr )
+void CellValues::append( ScRefCellValue rVal, const CellTextAttr* pAttr,
const ScAddress rPos )
{
assert(mpImpl-maCells.size() == mpImpl-maCellTextAttrs.size());
@@ -96,7 +96,7 @@ void CellValues::append( ScRefCellValue rVal, const
CellTextAttr* pAttr )
case CELLTYPE_FORMULA:
{
mpImpl-maCells.resize(n+1);
-CellStoreType::iterator itBlk = mpImpl-maCells.set(n,
rVal.mpFormula-Clone());
+CellStoreType::iterator itBlk = mpImpl-maCells.set(n,
rVal.mpFormula-Clone(rPos));
size_t nOffset = n - itBlk-position;
CellStoreType::position_type aPos(itBlk, nOffset);
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9a21066..56d0a78 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -841,6 +841,11 @@ ScFormulaCell* ScFormulaCell::Clone() const
return new ScFormulaCell(*this, *pDocument, aPos);
}
+ScFormulaCell* ScFormulaCell::Clone( const ScAddress rPos ) const
+{
+return new ScFormulaCell(*this, *pDocument, rPos);
+}
+
size_t ScFormulaCell::GetHash() const
{
return pCode-GetHash();
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 4642cf6..bb793dc 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -437,7 +437,8 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress )
{
ScSortInfoArray::Cell rCell = (*pRow)[nCol];
sc::CellValues rStore = aSortedCols.at(nCol);
-rStore.append(rCell.maCell, rCell.mpAttr);
+ScAddress aCellPos(aSortParam.nCol1 + nCol, aSortParam.nRow1 +
i, nTab);
+rStore.append(rCell.maCell, rCell.mpAttr, aCellPos);
}
if (pProgress)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/freetype
external/freetype/ExternalPackage_freetype.mk | 20 external/freetype/ExternalProject_freetype.mk |9 + external/freetype/Module_freetype.mk |1 + 3 files changed, 30 insertions(+) New commits: commit 49fa9c93e1245439724641b2668f109d1f494511 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Apr 18 16:14:41 2014 +0200 use the visual studio project file Change-Id: Ie0914715676830f073cce869183d8db6260fe208 diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk new file mode 100644 index 000..5e2f381 --- /dev/null +++ b/external/freetype/ExternalPackage_freetype.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype)) + +$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype)) + +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_files,freetype,$(call gb_UnpackedTarball_get_dir,freetype/instdir), \ + objs/win32/vc2010/freetype248.lib \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 11fcba5..464a221 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -13,6 +13,14 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\ build \ )) +ifeq ($(OS)$(COM),WNTMSC) +$(call gb_ExternalProject_get_state_target,freetype,build) : + $(call gb_ExternalProject_run,build,\ + cd ../builds/win32/vc2010/ \ + msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \ + ,objs) +else $(call gb_ExternalProject_get_state_target,freetype,build) : $(call gb_ExternalProject_run,build,\ ./configure \ @@ -25,5 +33,6 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : chmod +x builds/unix/freetype-config \ $(MAKE) install \ touch $@ ) +endif # vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index f6e316d..cb9bbc9 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -14,6 +14,7 @@ ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ UnpackedTarball_freetype \ + ExternalPackage_freetype \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - solenv/gbuild
solenv/gbuild/ExternalPackage.mk |8 solenv/gbuild/PythonTest.mk |8 +++- 2 files changed, 15 insertions(+), 1 deletion(-) New commits: commit fbcdc3ec24e107736f4952b3d42504f9f8035b63 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 17:06:23 2014 +0200 fix deps for PythonTest System python can be used for build even if the bundled python is enabled, c.f. --enable-python=internal vs. fully-internal. We need to use the python that is used at runtime, not for building. Change-Id: Ia1cd0b787d23645ce469e6975d90f01239256b9b diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 23bcd16..24554f2 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -12,9 +12,15 @@ ifeq ($(SYSTEM_PYTHON),) gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE) gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB) +ifeq ($(OS),MACOSX) +gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target_for_build,python3) +else +gb_PythonTest_DEPS := $(call gb_Package_get_target_for_build,python3) +endif else gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD) gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD) +gb_PythonTest_DEPS := endif gb_PythonTest_COMMAND := $(gb_PythonTest_EXECUTABLE) -m unittest @@ -29,7 +35,7 @@ ifneq ($(DISABLE_PYTHON),TRUE) # pass a hard-coded 139 to the gdb postprocess script to match soffice.bin # signal exit values (assumption: non-0 exit value here means it crashed) .PHONY : $(call gb_PythonTest_get_target,%) -$(call gb_PythonTest_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,python) +$(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS) $(call gb_Output_announce,$*,$(true),PYT,2) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_PythonTest_get_target,$*)) \ commit 1961b699400f09f5ae83dac105a1ba1f6334db53 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 16:22:48 2014 +0200 order-only dep is enough Change-Id: Ie040f95a92eb2fc3b68e5310103388a01cfd4fdf diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index cd12661..23bcd16 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -29,7 +29,7 @@ ifneq ($(DISABLE_PYTHON),TRUE) # pass a hard-coded 139 to the gdb postprocess script to match soffice.bin # signal exit values (assumption: non-0 exit value here means it crashed) .PHONY : $(call gb_PythonTest_get_target,%) -$(call gb_PythonTest_get_target,%) : $(call gb_ExternalExecutable_get_dependencies,python) +$(call gb_PythonTest_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$*,$(true),PYT,2) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_PythonTest_get_target,$*)) \ commit 3f2d15387da499f465e3e345dc7b97ecf296c65c Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 16:17:02 2014 +0200 add missing function Change-Id: I911d1131a91f0a5baea3324c0d48cb4fa5c5c344 diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index b80bc11..670106b 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -184,6 +184,14 @@ $(call gb_ExternalPackage__add_files,$(1),$(3)) endef +# Package files from unpacked tarball of an external project +# +# gb_ExternalPackage_use_unpacked package unpacked +define gb_ExternalPackage_use_unpacked +$(call gb_Package_use_unpacked,$(1),$(2)) + +endef + # Package files from build of an external project # # gb_ExternalPackage_use_external_project package external ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo75735.rtf |8
sw/qa/extras/rtfimport/rtfimport.cxx |7 +++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
writerfilter/source/rtftok/rtfsprm.cxx |6 +-
writerfilter/source/rtftok/rtfsprm.hxx |2 +-
5 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 6b6e4d471c2954d34d280398ed1c986d7fb27ae1
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Apr 18 16:47:14 2014 +0200
fdo#75735 RTF import: fix COW when writing a nested structure
Regression from a48e2fd9049797110b3b2505c363557284987ca8 (fdo#44736 -
convert RTFSprms to a copy-on-write structure., 2012-12-07)
Change-Id: I2538f440e29cef6d40db2ea914e4afcbfe411890
diff --git a/sw/qa/extras/rtfimport/data/fdo75735.rtf
b/sw/qa/extras/rtfimport/data/fdo75735.rtf
new file mode 100644
index 000..7d844bd
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo75735.rtf
@@ -0,0 +1,8 @@
+{\rtf1\ansi
+{\fonttbl \f0\froman Times;}
+\pard\tx1440\plain
+{\tx360\tx720\tx1080\tab\tab\tab\tab This is line one.\
+}
+{\tx480\tx960\tab\tab\tab This is line two.\
+}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 19196a0..1e3ad95 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -22,6 +22,7 @@
#include com/sun/star/style/LineSpacing.hpp
#include com/sun/star/style/LineSpacingMode.hpp
#include com/sun/star/style/ParagraphAdjust.hpp
+#include com/sun/star/style/TabStop.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/table/BorderLineStyle.hpp
#include com/sun/star/text/RelOrientation.hpp
@@ -1656,6 +1657,12 @@ DECLARE_RTFIMPORT_TEST(testFdo77267, fdo77267.rtf)
CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_caststyle::ParagraphAdjust(getPropertysal_Int16(getParagraph(1),
ParaAdjust)));
}
+DECLARE_RTFIMPORT_TEST(testFdo75735, fdo75735.rtf)
+{
+// Number of tabstops in the second paragraph should be 3, was 6.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty
uno::Sequencestyle::TabStop (getParagraph(2), ParaTabStops).getLength());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1a0fd1a..7fffb14 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -77,7 +77,7 @@ static Id lcl_getParagraphBorder(sal_uInt32 nIndex)
static void lcl_putNestedAttribute(RTFSprms rSprms, Id nParent, Id nId,
RTFValue::Pointer_t pValue,
RTFOverwrite eOverwrite = OVERWRITE_YES, bool bAttribute = true)
{
-RTFValue::Pointer_t pParent = rSprms.find(nParent);
+RTFValue::Pointer_t pParent = rSprms.find(nParent, /*bFirst=*/true,
/*bForWrite=*/true);
if (!pParent.get())
{
RTFSprms aAttributes;
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index dc55aca..48ce468 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -79,9 +79,13 @@ std::string RTFSprm::toString() const
return aBuf.makeStringAndClear().getStr();
}
-RTFValue::Pointer_t RTFSprms::find(Id nKeyword, bool bFirst)
+RTFValue::Pointer_t RTFSprms::find(Id nKeyword, bool bFirst, bool bForWrite)
{
RTFValue::Pointer_t pValue;
+
+if (bForWrite)
+ensureCopyBeforeWrite();
+
for (RTFSprms::Iterator_t i = m_pSprms-begin(); i != m_pSprms-end(); ++i)
if (i-first == nKeyword)
{
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx
b/writerfilter/source/rtftok/rtfsprm.hxx
index 6b25fa4..de5cd59 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -61,7 +61,7 @@ namespace writerfilter {
RTFSprms(const RTFSprms rSprms);
~RTFSprms();
RTFSprms operator=(const RTFSprms rOther);
-RTFValue::Pointer_t find(Id nKeyword, bool bFirst = true);
+RTFValue::Pointer_t find(Id nKeyword, bool bFirst = true, bool
bForWrite = false);
/// Does the same as -push_back(), except that it can overwrite
or ignore existing entries.
void set(Id nKeyword, RTFValue::Pointer_t pValue, RTFOverwrite
eOverwrite = OVERWRITE_YES);
bool erase(Id nKeyword);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk
pyuno/Module_pyuno.mk |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 8dd3739ad57645dfd199ede9fe0fa4018dcd7f4d Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 17:37:09 2014 +0200 Revert python depend only working under windows so This reverts commit 89f6ff4c296de5e61d5bfb0cfef55e482839e227. diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index fcd69b0..8cd37a1 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -60,11 +60,7 @@ endif endif # SYSTEM_PYTHON -# TODO: add dependencies to the PythonTest stuff to -# depend on internal python getting installed -# into instdir becore running python tests, -# for now bodge this into a damn subsequentcheck -$(eval $(call gb_Module_add_subsequentcheck_targets,pyuno, \ +$(eval $(call gb_Module_add_check_targets,pyuno, \ PythonTest_pyuno_pytests_ssl \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Need help for fdo#490941
Hello everyone, I'm working on fdo#49091 (https://bugs.freedesktop.org/show_bug.cgi?id=49091), according to the comment posted on it recently, when a table is being edited and the user presses Alt+Left, then the default action is to reduce the column width. But if the user has assigned a separate action to Alt+Left, then that action is to be performed as well? Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk | 10 +- solenv/gbuild/ExternalExecutable.mk | 14 +- solenv/gbuild/TargetLocations.mk|1 + 3 files changed, 15 insertions(+), 10 deletions(-) New commits: commit dbac8f5a075a8e39068d5e21ab63de224f818eca Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 18:34:40 2014 +0200 restore deps on bins from bundled projects used during build Change-Id: Ibd97268e4aaa61ec896135bf780173a18536101d diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 878d4b7..f11407e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3467,7 +3467,7 @@ gb_ExternalExecutable__register_xmllint := else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint -$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2) $(call gb_ExternalExecutable_add_dependencies,xmllint,$(call gb_Package_get_target,xml2)) endef @@ -3481,7 +3481,7 @@ gb_ExternalExecutable__register_xsltproc := else # ! SYSTEM_LIBXSLT_FOR_BUILD define gb_ExternalExecutable__register_xsltproc -$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt) $(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt)) endef @@ -3543,7 +3543,7 @@ endef else # ! SYSTEM_GENBRK define gb_ExternalExecutable__register_genbrk -$(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build),icu) $(call gb_ExternalExecutable_set_precommand,genbrk,$(subst $$,,$(gb_ICU_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,genbrk,\ $(call gb_Package_get_target_for_build,icu) \ @@ -3563,7 +3563,7 @@ endef else # ! SYSTEM_GENCCODE define gb_ExternalExecutable__register_genccode -$(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build),icu) $(call gb_ExternalExecutable_set_precommand,genccode,$(subst $$,,$(gb_ICU_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,genccode,\ $(call gb_Package_get_target_for_build,icu) \ @@ -3583,7 +3583,7 @@ endef else # ! SYSTEM_GENCMN define gb_ExternalExecutable__register_gencmn -$(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build),icu) $(call gb_ExternalExecutable_set_precommand,gencmn,$(subst $$,,$(gb_ICU_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,gencmn,\ $(call gb_Package_get_target_for_build,icu) \ diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index 014e011..c1b3503 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -111,10 +111,11 @@ endef # FIXME need to subst in some more $$ in gb_Helper_set_ld_path here - ugly # but other uses (gb_CppunitTest_CPPTESTPRECOMMAND) require less $$ - ugly -# FIXME hack to avoid dependency into workdir - those must be added explicitly define gb_ExternalExecutable__set_internal +$(if $(3),,$(if $(filter $(WORKDIR_FOR_BUILD)/UnpackedTarball,$(2)),\ + $(call gb_Output_error,depending directly on executable $(2) from UnpackedTarball is not allowed. Use the UnpackedTarball target as dependency.))) gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) -gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(findstring $(WORKDIR_FOR_BUILD),$(2)),,$(2)) +gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(3),$(2)) gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,,$(gb_Helper_set_ld_path)) $(BUILDTOOLTRACE) endef @@ -123,11 +124,14 @@ endef # # Optionally set a specific executable target to use (if the target # $(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build) is -# not suitable). +# not suitable). Also optionally, set the ExternalProject that builds +# the executable. This
Re: Build fail on master
On 18/04/2014 11:00, Miklos Vajna wrote: Hi Julien, On Thu, Apr 17, 2014 at 11:53:43PM -0700, julien2412 serval2...@yahoo.fr wrote: On pc Debian x86-64 with master sources updated today + make clean, I've got this: In file included from /home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:41:0: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx: In function ‘void SbRtl_CallByName(StarBASIC*, SbxArray, sal_Bool)’: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx:351:10: error: ‘void SbiRuntime::StepSET_Impl(SbxVariableRef, SbxVariableRef, bool)’ is private What is the exact commit? Seeing that http://tinderbox.libreoffice.org/MASTER/status.html is quite green, one wonders if you just need to pull and try again. :-) I git updated again (I6c1f8dc33e3ba3257044889d7aae1223572590e9) and had the same: In file included from /home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:41:0: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx: In function ‘void SbRtl_CallByName(StarBASIC*, SbxArray, sal_Bool)’: /home/julien/compile-libreoffice/libo/basic/source/inc/runtime.hxx:351:10: error: ‘void SbiRuntime::StepSET_Impl(SbxVariableRef, SbxVariableRef, bool)’ is private void StepSET_Impl( SbxVariableRef refVal, SbxVariableRef refVar, bool bDefaultHandling = false ); ^ /home/julien/compile-libreoffice/libo/basic/source/runtime/methods1.cxx:184:65: error: within this context pRT-StepSET_Impl( pValVar, rFindVar, false ); ^ make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/CxxObject/basic/source/runtime/methods1.o] Erreur 1 make[1]: *** Attente des tâches non terminées Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. make: *** [build] Erreur 2 julien@julienPC:~/compile-libreoffice/libo$ git log -1 commit 8b7aff3d430649eed279a81984cb6f5c8a1a4f66 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 18 13:36:34 2014 +0300 Unused functions Change-Id: I6c1f8dc33e3ba3257044889d7aae1223572590e9 julien@julienPC:~/compile-libreoffice/libo$ Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/ExternalExecutable.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e43c823599afc02109faf8753be31cc8f496c096 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 18:46:38 2014 +0200 do what i meant, not what i wrote Change-Id: I266e9ba3fb72489986d7d8cef4cb59b8c09dd51f diff --git a/solenv/gbuild/ExternalExecutable.mk b/solenv/gbuild/ExternalExecutable.mk index c1b3503..7a0fd99 100644 --- a/solenv/gbuild/ExternalExecutable.mk +++ b/solenv/gbuild/ExternalExecutable.mk @@ -115,7 +115,7 @@ define gb_ExternalExecutable__set_internal $(if $(3),,$(if $(filter $(WORKDIR_FOR_BUILD)/UnpackedTarball,$(2)),\ $(call gb_Output_error,depending directly on executable $(2) from UnpackedTarball is not allowed. Use the UnpackedTarball target as dependency.))) gb_ExternalExecutable_$(1)_EXECUTABLE := $(2) -gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(3),$(2)) +gb_ExternalExecutable_$(1)_DEPENDENCIES := $(if $(3),$(call gb_Executable_get_target_for_build,$(3)),$(2)) gb_ExternalExecutable_$(1)_PRECOMMAND := $(subst $$,,$(gb_Helper_set_ld_path)) $(BUILDTOOLTRACE) endef @@ -131,7 +131,7 @@ endef # # gb_ExternalExecutable_set_internal executable call? external? define gb_ExternalExecutable_set_internal -$(call gb_ExternalExecutable__set_internal,$(1),$(if $(strip $(2)),$(2),$(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build)),$(call gb_ExternalProject_get_target_for_build,$(strip $(3 +$(call gb_ExternalExecutable__set_internal,$(1),$(if $(strip $(2)),$(2),$(gb_Executable_BINDIR_FOR_BUILD)/$(1)$(gb_Executable_EXT_for_build)),$(strip $(3))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - avmedia/source chart2/source external/libgltf include/vcl vcl/source
avmedia/source/opengl/oglmanager.cxx |9 ++--
avmedia/source/opengl/oglplayer.cxx | 11 -
avmedia/source/opengl/oglplayer.hxx |6 ++-
chart2/source/view/main/OpenGLRender.cxx | 21 --
external/libgltf/UnpackedTarball_libgltf.mk |1
external/libgltf/patches/charbuffer_used_as_cstring.patch | 12 ++
include/vcl/opengl/OpenGLHelper.hxx |2 +
vcl/source/opengl/OpenGLHelper.cxx| 28 ++
8 files changed, 61 insertions(+), 29 deletions(-)
New commits:
commit 8afabd394214bb7c772c88b08ec3cadb56771cce
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Apr 18 15:24:25 2014 +0200
Extract code of BitmapEx - RGBA buffer conversion to OpenGLHelper
Needed by gltf rendering.
Change-Id: I1aa974f3c515c5fb19a07b54ff655331138553cb
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 8ab05b7..79e408c 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -900,26 +900,7 @@ int OpenGLRender::CreateTextTexture(const BitmapEx
rBitmapEx, const awt::Point
long bmpWidth = rBitmapEx.GetSizePixel().Width();
long bmpHeight = rBitmapEx.GetSizePixel().Height();
-
-Bitmap aBitmap (rBitmapEx.GetBitmap());
-AlphaMask aAlpha (rBitmapEx.GetAlpha());
-boost::scoped_arraysal_uInt8 bitmapBuf(new sal_uInt8[4* bmpWidth *
bmpHeight ]);
-Bitmap::ScopedReadAccess pReadAccces( aBitmap );
-AlphaMask::ScopedReadAccess pAlphaReadAccess( aAlpha );
-
-size_t i = 0;
-for (long ny = 0; ny bmpHeight; ny++)
-{
-Scanline pAScan = pAlphaReadAccess-GetScanline(ny);
-for(long nx = 0; nx bmpWidth; nx++)
-{
-BitmapColor aCol = pReadAccces-GetColor( ny, nx );
-bitmapBuf[i++] = aCol.GetRed();
-bitmapBuf[i++] = aCol.GetGreen();
-bitmapBuf[i++] = aCol.GetBlue();
-bitmapBuf[i++] = 255 - *pAScan++;
-}
-}
+boost::scoped_arraysal_uInt8
bitmapBuf(OpenGLHelper::ConvertBitmapExToRGBABuffer(rBitmapEx));
TextInfo aTextInfo;
aTextInfo.rotation = -(double)rotation / 360.0 * 2* GL_PI;
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 77d1b28..5cb1078 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -12,6 +12,7 @@
#include GL/glew.h
#include vcl/vclopengl_dllapi.hxx
+#include vcl/bitmapex.hxx
#include rtl/ustring.hxx
@@ -20,6 +21,7 @@ class VCLOPENGL_DLLPUBLIC OpenGLHelper
public:
static GLint LoadShaders(const OUString rVertexShaderName, const
OUString rFragmentShaderName);
+static sal_uInt8* ConvertBitmapExToRGBABuffer(const BitmapEx rBitmapEx);
};
#endif
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 0042231..35760f2 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -12,6 +12,8 @@
#include osl/file.hxx
#include rtl/bootstrap.hxx
#include config_folders.h
+#include vcl/salbtype.hxx
+#include vcl/bmpacc.hxx
#include vector
@@ -140,4 +142,30 @@ GLint OpenGLHelper::LoadShaders(const OUString
rVertexShaderName,const OUString
return ProgramID;
}
+sal_uInt8* OpenGLHelper::ConvertBitmapExToRGBABuffer(const BitmapEx rBitmapEx)
+{
+long nBmpWidth = rBitmapEx.GetSizePixel().Width();
+long nBmpHeight = rBitmapEx.GetSizePixel().Height();
+
+Bitmap aBitmap (rBitmapEx.GetBitmap());
+AlphaMask aAlpha (rBitmapEx.GetAlpha());
+sal_uInt8* pBitmapBuf(new sal_uInt8[4* nBmpWidth * nBmpHeight ]);
+Bitmap::ScopedReadAccess pReadAccces( aBitmap );
+AlphaMask::ScopedReadAccess pAlphaReadAccess( aAlpha );
+size_t i = 0;
+for (long ny = 0; ny nBmpHeight; ny++)
+{
+Scanline pAScan = pAlphaReadAccess ? pAlphaReadAccess-GetScanline(ny)
: 0;
+for(long nx = 0; nx nBmpWidth; nx++)
+{
+BitmapColor aCol = pReadAccces-GetColor( ny, nx );
+pBitmapBuf[i++] = aCol.GetRed();
+pBitmapBuf[i++] = aCol.GetGreen();
+pBitmapBuf[i++] = aCol.GetBlue();
+pBitmapBuf[i++] = pAScan ? 255 - *pAScan++ : 255;
+}
+}
+return pBitmapBuf;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9cf12d7544d501e6794cfbb6eabf508603d59966
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Apr 18 15:12:09 2014 +0200
Patching libgltf: character buffer is used as cstring
Change-Id: If0213fc5406ec9cbdc72be36ffc693fcbbf8ffcc
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index 1fbe09d..e83486d 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -24,6 +24,7 @@ $(eval
[Libreoffice-commits] core.git: filter/source include/vcl vcl/source
filter/source/msfilter/msdffimp.cxx | 11 ---
include/vcl/bitmap.hxx |6 +-
include/vcl/bitmapex.hxx|6 +-
include/vcl/gdimtf.hxx |2 +-
vcl/source/gdi/bitmap3.cxx | 28 +---
vcl/source/gdi/bitmapex.cxx |4 ++--
vcl/source/gdi/gdimtf.cxx | 25 ++---
7 files changed, 60 insertions(+), 22 deletions(-)
New commits:
commit 1139d618b8bc6ab823a96184bd0f0257980aad24
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Fri Apr 18 20:46:34 2014 +0200
handle strange brightness+contrast adjustment from msoffice (fdo#38410)
LO uses basically the formula
newpixel=(oldpixel-128)*contrast+128+brightness,
i.e. contrast is applied first. It looks like there's no oficial formula
for this,
so a formula that applies brightness first would be ok too. MSO for some
weird reason
apparently uses a formula that applies half of brightness before contrast
and
half afterwards (insert funny political correctness or compromise joke
here).
While the result is the same like with the LO formula if only either
brightness
or contrast is adjusted, the result is different if both are involved. Just
modify
the image using the MSO algorithm if this is the case.
Change-Id: I55fe8f395832685b90f024cf2f58b0797c1ba588
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index eb2e91d..30d0ec6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3818,7 +3818,12 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream
rSt, SfxItemSet rSet, cons
if ( nContrast || nBrightness || ( nGamma != 0x1 ) || (
eDrawMode != GRAPHICDRAWMODE_STANDARD ) )
{
-if ( ( rObjData.nSpFlags SP_FOLESHAPE ) == 0 )
+// MSO uses a different algorithm for contrast+brightness, LO
applies contrast before brightness,
+// while MSO apparently applies half of brightness before
contrast and half after. So if only
+// contrast or brightness need to be altered, the result is
the same, but if both are involved,
+// there's no way to map that, so just force a conversion of
the image.
+bool needsConversion = nContrast != 0 nBrightness != 0;
+if ( ( rObjData.nSpFlags SP_FOLESHAPE ) == 0
!needsConversion )
{
if ( nBrightness )
rSet.Put( SdrGrafLuminanceItem( nBrightness ) );
@@ -3843,7 +3848,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream rSt,
SfxItemSet rSet, cons
{
BitmapExaBitmapEx( aGraf.GetBitmapEx() );
if ( nBrightness || nContrast || ( nGamma !=
0x1 ) )
-aBitmapEx.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, false );
+aBitmapEx.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, false, true );
if ( eDrawMode == GRAPHICDRAWMODE_GREYS )
aBitmapEx.Convert( BMP_CONVERSION_8BIT_GREYS );
else if ( eDrawMode == GRAPHICDRAWMODE_MONO )
@@ -3857,7 +3862,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream rSt,
SfxItemSet rSet, cons
{
GDIMetaFile aGdiMetaFile( aGraf.GetGDIMetaFile() );
if ( nBrightness || nContrast || ( nGamma !=
0x1 ) )
-aGdiMetaFile.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, false );
+aGdiMetaFile.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, false, true );
if ( eDrawMode == GRAPHICDRAWMODE_GREYS )
aGdiMetaFile.Convert(
MTF_CONVERSION_8BIT_GREYS );
else if ( eDrawMode == GRAPHICDRAWMODE_MONO )
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 9485a5a..222cffa 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -778,6 +778,9 @@ public:
@param bInvert
If true, invert the channel values with the logical 'not' operator
+@param msoBrightness
+Use the same formula for brightness as used by MSOffice.
+
@return true, if the operation was completed successfully.
*/
boolAdjust( short nLuminancePercent = 0,
@@ -786,7 +789,8 @@ public:
short nChannelGPercent = 0,
short nChannelBPercent = 0,
double fGamma = 1.0,
-bool
Re: Need help for fdo#490941
Perhaps, in an ideal world, it is user configurable (the user gets to choose) whether, in case of conflict, system default key-assignments can be overridden by custom user assignments or not. ? On Fri, Apr 18, 2014 at 5:59 PM, Rachit Gupta rachitgupta1...@gmail.com wrote: Hello everyone, I'm working on fdo#49091 (https://bugs.freedesktop.org/show_bug.cgi?id=49091), according to the comment posted on it recently, when a table is being edited and the user presses Alt+Left, then the default action is to reduce the column width. But if the user has assigned a separate action to Alt+Left, then that action is to be performed as well? Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need help for fdo#490941
But the comment#4 on the report ( https://bugs.freedesktop.org/show_bug.cgi?id=49091#c4) specifically says to make sure the existing bindings should still work after any changes are made. What to do in such a case? On Sat, Apr 19, 2014 at 12:34 AM, John Smith lbalba...@gmail.com wrote: Perhaps, in an ideal world, it is user configurable (the user gets to choose) whether, in case of conflict, system default key-assignments can be overridden by custom user assignments or not. ? On Fri, Apr 18, 2014 at 5:59 PM, Rachit Gupta rachitgupta1...@gmail.com wrote: Hello everyone, I'm working on fdo#49091 (https://bugs.freedesktop.org/show_bug.cgi?id=49091), according to the comment posted on it recently, when a table is being edited and the user presses Alt+Left, then the default action is to reduce the column width. But if the user has assigned a separate action to Alt+Left, then that action is to be performed as well? Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/PythonTest.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 859e42a98fd73c84edc20c87868d50747a2da123 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 21:42:00 2014 +0200 add missing dep Change-Id: Ibc97c8d082b154faed48efa81fb48d5247fc7b6d diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 24554f2..8c346a5 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -17,6 +17,7 @@ gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target_for_build,python3) else gb_PythonTest_DEPS := $(call gb_Package_get_target_for_build,python3) endif +gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target_for_build,python_shell)) else gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD) gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD) ___ 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.1' - filter/source include/vcl vcl/source
filter/source/msfilter/msdffimp.cxx | 11 ---
include/vcl/bitmap.hxx |6 +-
include/vcl/bitmapex.hxx|7 ++-
include/vcl/gdimtf.hxx |2 +-
vcl/source/gdi/bitmap3.cxx | 28 +---
vcl/source/gdi/bitmapex.cxx |4 ++--
vcl/source/gdi/gdimtf.cxx | 25 ++---
7 files changed, 61 insertions(+), 22 deletions(-)
New commits:
commit b5fd2f9ff7c869065d424aa3b0632549480eb5b6
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Fri Apr 18 20:46:34 2014 +0200
handle strange brightness+contrast adjustment from msoffice (fdo#38410)
LO uses basically the formula
newpixel=(oldpixel-128)*contrast+128+brightness,
i.e. contrast is applied first. It looks like there's no oficial formula
for this,
so a formula that applies brightness first would be ok too. MSO for some
weird reason
apparently uses a formula that applies half of brightness before contrast
and
half afterwards (insert funny political correctness or compromise joke
here).
While the result is the same like with the LO formula if only either
brightness
or contrast is adjusted, the result is different if both are involved. Just
modify
the image using the MSO algorithm if this is the case.
Conflicts:
filter/source/msfilter/msdffimp.cxx
include/vcl/bitmap.hxx
include/vcl/bitmapex.hxx
include/vcl/gdimtf.hxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/gdimtf.cxx
Change-Id: I55fe8f395832685b90f024cf2f58b0797c1ba588
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 09f15c0..f37a555 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3816,7 +3816,12 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream
rSt, SfxItemSet rSet, cons
if ( nContrast || nBrightness || ( nGamma != 0x1 ) || (
eDrawMode != GRAPHICDRAWMODE_STANDARD ) )
{
-if ( ( rObjData.nSpFlags SP_FOLESHAPE ) == 0 )
+// MSO uses a different algorithm for contrast+brightness, LO
applies contrast before brightness,
+// while MSO apparently applies half of brightness before
contrast and half after. So if only
+// contrast or brightness need to be altered, the result is
the same, but if both are involved,
+// there's no way to map that, so just force a conversion of
the image.
+bool needsConversion = nContrast != 0 nBrightness != 0;
+if ( ( rObjData.nSpFlags SP_FOLESHAPE ) == 0
!needsConversion )
{
if ( nBrightness )
rSet.Put( SdrGrafLuminanceItem( nBrightness ) );
@@ -3841,7 +3846,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream rSt,
SfxItemSet rSet, cons
{
BitmapExaBitmapEx( aGraf.GetBitmapEx() );
if ( nBrightness || nContrast || ( nGamma !=
0x1 ) )
-aBitmapEx.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, sal_False );
+aBitmapEx.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, false, true );
if ( eDrawMode == GRAPHICDRAWMODE_GREYS )
aBitmapEx.Convert( BMP_CONVERSION_8BIT_GREYS );
else if ( eDrawMode == GRAPHICDRAWMODE_MONO )
@@ -3855,7 +3860,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream rSt,
SfxItemSet rSet, cons
{
GDIMetaFile aGdiMetaFile( aGraf.GetGDIMetaFile() );
if ( nBrightness || nContrast || ( nGamma !=
0x1 ) )
-aGdiMetaFile.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, sal_False );
+aGdiMetaFile.Adjust( nBrightness,
(sal_Int16)nContrast, 0, 0, 0, (double)nGamma / 0x1, false, true );
if ( eDrawMode == GRAPHICDRAWMODE_GREYS )
aGdiMetaFile.Convert(
MTF_CONVERSION_8BIT_GREYS );
else if ( eDrawMode == GRAPHICDRAWMODE_MONO )
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index d555d04e..4759937 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -796,6 +796,9 @@ public:
If sal_True, invert the channel values with the logical 'not' operator
@return sal_True, if the operation was completed successfully.
+
+@param msoBrightness
+Use the same formula for brightness as used by MSOffice.
*/
sal_BoolAdjust( short nLuminancePercent = 0,
[Libreoffice-commits] mso-dumper.git: 4 commits - msodumper/emfrecord.py
msodumper/emfrecord.py | 84 ++---
1 file changed, 80 insertions(+), 4 deletions(-)
New commits:
commit b51ee751c3af1b73e44adb7eb19eeff83af3bcb9
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Apr 18 22:20:26 2014 +0200
dump EmrDeleteobject
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index 38773f6..d96bedb 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -295,6 +295,24 @@ class EmrSelectobject(EMFRecord):
assert self.pos - posOrig == self.Size
+class EmrDeleteobject(EMFRecord):
+Specifies the index of the object to be deleted from the EMF Object
+Table.
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet(Type, self.readuInt32())
+self.printAndSet(Size, self.readuInt32(), hexdump=False)
+ihObject = self.getuInt32(pos=self.pos)
+if ihObject 0x8000:
+self.printAndSet(ihObject, self.readuInt32())
+else:
+self.printAndSet(ihObject, self.readuInt32(), dict=StockObject)
+assert self.pos - posOrig == self.Size
+
+
class EmrPolygon16(EMFRecord):
Draws a polygon consisting of two or more vertexes connected by
straight lines.
def __init__(self, parent):
@@ -521,7 +539,7 @@ RecordType = {
0x0025: ['EMR_SELECTOBJECT', EmrSelectobject],
0x0026: ['EMR_CREATEPEN'],
0x0027: ['EMR_CREATEBRUSHINDIRECT', EmrCreatebrushindirect],
-0x0028: ['EMR_DELETEOBJECT'],
+0x0028: ['EMR_DELETEOBJECT', EmrDeleteobject],
0x0029: ['EMR_ANGLEARC'],
0x002A: ['EMR_ELLIPSE'],
0x002B: ['EMR_RECTANGLE'],
commit 1f8d9a66c2996d9b2fc68cbbc924c6995730efa6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Apr 18 22:15:53 2014 +0200
dump EmrSelectclippath
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index 2b2933d..38773f6 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -336,6 +336,21 @@ class EmrPolypolygon16(EMFRecord):
assert self.pos - posOrig == self.Size
+class EmrSelectclippath(EMFRecord):
+Specifies the current path as a clipping region for the playback device
+context, combining the new region with any existing clipping region using
+the specified mode.
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet(Type, self.readuInt32())
+self.printAndSet(Size, self.readuInt32(), hexdump=False)
+self.printAndSet(RegionMode, self.readuInt32(), dict=RegionMode)
+assert self.pos - posOrig == self.Size
+
+
class EmrBeginpath(EMFRecord):
This record opens a path bracket in the current playback device
context.
def __init__(self, parent):
@@ -533,7 +548,7 @@ RecordType = {
0x0040: ['EMR_STROKEPATH'],
0x0041: ['EMR_FLATTENPATH'],
0x0042: ['EMR_WIDENPATH'],
-0x0043: ['EMR_SELECTCLIPPATH'],
+0x0043: ['EMR_SELECTCLIPPATH', EmrSelectclippath],
0x0044: ['EMR_ABORTPATH'],
0x0046: ['EMR_COMMENT', EmrComment],
0x0047: ['EMR_FILLRGN'],
commit 098d3fe8c00f666ef68e5ad0208979b90488c46f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Apr 18 22:06:18 2014 +0200
dump EmrPolypolygon16
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index 288cfdd..2b2933d 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -313,6 +313,29 @@ class EmrPolygon16(EMFRecord):
assert self.pos - posOrig == self.Size
+class EmrPolypolygon16(EMFRecord):
+Paints a series of closed polygons.
+def __init__(self, parent):
+EMFRecord.__init__(self, parent)
+
+def dump(self):
+posOrig = self.pos
+self.printAndSet(Type, self.readuInt32())
+self.printAndSet(Size, self.readuInt32(), hexdump=False)
+wmfrecord.RectL(self, Bounds).dump()
+self.printAndSet(NumberOfPolygons, self.readuInt32(), hexdump=False)
+self.printAndSet(Count, self.readuInt32(), hexdump=False)
+print 'PolygonPointCounts'
+for i in range(self.NumberOfPolygons):
+self.printAndSet(PolygonPointCount, self.readuInt32(),
hexdump=False)
+print '/PolygonPointCounts'
+print 'aPoints'
+for i in range(self.Count):
+wmfrecord.PointS(self, aPoint).dump()
+print '/aPoints'
+assert self.pos - posOrig == self.Size
+
+
class EmrBeginpath(EMFRecord):
This record opens a path bracket in the current playback device
context.
def __init__(self, parent):
@@ -533,7 +556,7 @@ RecordType = {
0x0058: ['EMR_POLYBEZIERTO16'],
0x0059: ['EMR_POLYLINETO16'],
0x005A: ['EMR_POLYPOLYLINE16'],
-0x005B: ['EMR_POLYPOLYGON16'],
+0x005B: ['EMR_POLYPOLYGON16', EmrPolypolygon16],
[Libreoffice-commits] core.git: 2 commits - pyuno/qa solenv/gbuild
pyuno/qa/pytests/ssl.py |2 -- solenv/gbuild/PythonTest.mk |6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit d5556631e9acbd4af310e6300f4442ae9ab3b5da Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 22:04:17 2014 +0200 this test apparently does not need pyuno Change-Id: I6000620bec95f32ec357a3e56e14f3255da978af diff --git a/pyuno/qa/pytests/ssl.py b/pyuno/qa/pytests/ssl.py index a67f532..f0a0a37 100644 --- a/pyuno/qa/pytests/ssl.py +++ b/pyuno/qa/pytests/ssl.py @@ -1,7 +1,5 @@ import unittest -from org.libreoffice.unotest import pyuno - #I want to ensure that import ssl works on all platforms class SSLTest(unittest.TestCase): def test_ssl_import(self): commit a72fb7f912fcf4e6ca5ef17406c6b08aac2c1f73 Author: David Tardon dtar...@redhat.com Date: Fri Apr 18 22:02:23 2014 +0200 don't bother with _for_build here The tests cannot be run on cross-compilation anyway. Change-Id: I89afe30067e3f06fe090e529e6072c79ea696038 diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 8c346a5..c0a1f2f 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -13,11 +13,11 @@ ifeq ($(SYSTEM_PYTHON),) gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE) gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB) ifeq ($(OS),MACOSX) -gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target_for_build,python3) +gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target,python3) else -gb_PythonTest_DEPS := $(call gb_Package_get_target_for_build,python3) +gb_PythonTest_DEPS := $(call gb_Package_get_target,python3) endif -gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target_for_build,python_shell)) +gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target,python_shell)) else gb_PythonTest_EXECUTABLE := $(PYTHON_FOR_BUILD) gb_PythonTest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Need help for fdo#490941
Hi Rachit,, Rachit Gupta schrieb: But the comment#4 on the report (https://bugs.freedesktop.org/show_bug.cgi?id=49091#c4) specifically says to make sure the existing bindings should still work after any changes are made. What to do in such a case? Only those shortcut, which are gray in the customize menu, should not be changeable. They are needed for help, for accessibility, or bind by the operating system. I'm not sure, whether the other shortcuts should be changeable. The user cannot see in the customize dialog, that they have an action assigned in some situation. I meant in my comment, if the user does not change anything, then the default actions need to be still in place, whatever changes you will make to the code. Kind regards Regina On Sat, Apr 19, 2014 at 12:34 AM, John Smith lbalba...@gmail.com mailto:lbalba...@gmail.com wrote: Perhaps, in an ideal world, it is user configurable (the user gets to choose) whether, in case of conflict, system default key-assignments can be overridden by custom user assignments or not. ? On Fri, Apr 18, 2014 at 5:59 PM, Rachit Gupta rachitgupta1...@gmail.com mailto:rachitgupta1...@gmail.com wrote: Hello everyone, I'm working on fdo#49091 (https://bugs.freedesktop.org/show_bug.cgi?id=49091), according to the comment posted on it recently, when a table is being edited and the user presses Alt+Left, then the default action is to reduce the column width. But if the user has assigned a separate action to Alt+Left, then that action is to be performed as well? Regards, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org mailto:LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - 4 commits - sc/inc sc/source
sc/inc/cellvalues.hxx |1
sc/inc/column.hxx |5 +
sc/inc/table.hxx |3
sc/source/core/data/cellvalues.cxx | 54
sc/source/core/data/column2.cxx| 11 +++
sc/source/core/data/column3.cxx| 65 ++-
sc/source/core/data/table2.cxx | 13 +++
sc/source/core/data/table3.cxx | 122 -
8 files changed, 201 insertions(+), 73 deletions(-)
New commits:
commit f64f40d7e932d43afd03d30dfef4633fc4664c53
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Apr 18 16:39:35 2014 -0400
Use correct index to access row arrays, to prevent out-of-range access.
Change-Id: Ia74c0f07c7f1021de92f77fdb93b2279a3b8462c
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 5bdc653..fb44fe0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -292,7 +292,7 @@ public:
{
// Swap rows in data table.
RowsType rRows = *mpRows;
-std::swap(rRows[nInd1], rRows[nInd2]);
+std::swap(rRows[n1], rRows[n2]);
}
}
@@ -341,16 +341,16 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW
nInd1, SCCOLROW nInd2 )
// Filll row-wise data table.
ScSortInfoArray::RowsType rRows = pArray-InitDataRows(
-aSortParam.nRow2 - aSortParam.nRow1 + 1, aSortParam.nCol2 -
aSortParam.nCol1 + 1);
+nInd2 - nInd1 + 1, aSortParam.nCol2 - aSortParam.nCol1 + 1);
for (SCCOL nCol = aSortParam.nCol1; nCol = aSortParam.nCol2; ++nCol)
{
ScColumn rCol = aCol[nCol];
sc::ColumnBlockConstPosition aBlockPos;
rCol.InitBlockPosition(aBlockPos);
-for (SCROW nRow = aSortParam.nRow1; nRow = aSortParam.nRow2;
++nRow)
+for (SCROW nRow = nInd1; nRow = nInd2; ++nRow)
{
-ScSortInfoArray::RowType rRow = *rRows[nRow-aSortParam.nRow1];
+ScSortInfoArray::RowType rRow = *rRows[nRow-nInd1];
ScSortInfoArray::Cell rCell = rRow[nCol-aSortParam.nCol1];
rCell.maCell = rCol.GetCellValue(aBlockPos, nRow);
@@ -431,12 +431,13 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress )
if (aSortParam.bByRow)
{
+SCROW nRow1 = aSortParam.nRow1 + (aSortParam.bHasHeader ? 1 : 0);
ScSortInfoArray::RowsType* pRows = pArray-GetDataRows();
assert(pRows); // In sort-by-row mode we must have data rows already
populated.
// Detach all formula cells within the sorted range first.
sc::EndListeningContext aCxt(*pDocument);
-DetachFormulaCells(aCxt, aSortParam.nCol1, aSortParam.nRow1,
aSortParam.nCol2, aSortParam.nRow2);
+DetachFormulaCells(aCxt, aSortParam.nCol1, nRow1, aSortParam.nCol2,
aSortParam.nRow2);
// Cells in the data rows only reference values in the document. Make
// a copy before updating the document.
@@ -450,11 +451,11 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress )
for (size_t i = 0; i pRows-size(); ++i)
{
ScSortInfoArray::RowType* pRow = (*pRows)[i];
-for (size_t nCol = 0; nCol pRow-size(); ++nCol)
+for (size_t j = 0; j pRow-size(); ++j)
{
-ScSortInfoArray::Cell rCell = (*pRow)[nCol];
+ScSortInfoArray::Cell rCell = (*pRow)[j];
-sc::CellStoreType rCellStore = aSortedCols.at(nCol).maCells;
+sc::CellStoreType rCellStore = aSortedCols.at(j).maCells;
size_t n = rCellStore.size();
rCellStore.resize(n+1);
switch (rCell.maCell.meType)
@@ -474,7 +475,7 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress )
case CELLTYPE_FORMULA:
{
assert(rCell.mpAttr);
-ScAddress aCellPos(aSortParam.nCol1 + nCol,
aSortParam.nRow1 + i, nTab);
+ScAddress aCellPos(aSortParam.nCol1 + j, nRow1 + i,
nTab);
sc::CellStoreType::iterator itBlk = rCellStore.set(n,
rCell.maCell.mpFormula-Clone(aCellPos));
size_t nOffset = n - itBlk-position;
@@ -486,7 +487,7 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress )
assert(!rCell.mpAttr);
}
-sc::CellTextAttrStoreType rAttrStore =
aSortedCols.at(nCol).maCellTextAttrs;
+sc::CellTextAttrStoreType rAttrStore =
aSortedCols.at(j).maCellTextAttrs;
rAttrStore.resize(n+1);
if (rCell.mpAttr)
rAttrStore.set(n, *rCell.mpAttr);
@@ -494,7 +495,7 @@ void ScTable::SortReorder( ScSortInfoArray* pArray,
ScProgress* pProgress
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jorendc jore...@libreoffice.org changed: What|Removed |Added Depends on||75519 --- Comment #128 from Jorendc jore...@libreoffice.org --- Hereby I nominate Bug 77537 - FILESAVE: Character formatting is not preserved when file is saved, closed, and re-opened. (Even) reproducible with .ods file format, and a regression vs 4.1-versions -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/shells/drawsh.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit d70a358db32340f42dcb0d9b1308754fc31f23ad Author: Julien Nabet serval2...@yahoo.fr Date: Sat Apr 19 01:47:01 2014 +0200 cpplint: [build/include] svx/svdoashp.hxx already included Change-Id: I28b1dac22a3cc4ea7b087aeed98c81ed48240c3c diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx index 2091c92..8906cea 100644 --- a/sw/source/core/uibase/shells/drawsh.cxx +++ b/sw/source/core/uibase/shells/drawsh.cxx @@ -47,7 +47,6 @@ #include svx/svdoashp.hxx #include svx/xtable.hxx #include sfx2/sidebar/EnumContext.hxx -#include svx/svdoashp.hxx #include svx/svdoole2.hxx #include sfx2/opengrf.hxx #include svx/svdograf.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/source
dev/null |binary 1 file changed New commits: commit 9ef07c55bc2803423e6b79aa45f9a1b44eb59c63 Author: Takeshi Abe t...@fixedpoint.jp Date: Sat Apr 19 08:34:32 2014 +0900 This file seems unused since the 20th century Change-Id: Idc26e03d51e37adbd23fb3c77d8ebe63ed8c3de3 diff --git a/idl/source/svidl.dat b/idl/source/svidl.dat deleted file mode 100644 index 4750475..000 Binary files a/idl/source/svidl.dat and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |1 +
include/vcl/print.hxx |1 +
vcl/source/gdi/print.cxx |6 ++
vcl/source/outdev/font.cxx | 23 ++-
4 files changed, 22 insertions(+), 9 deletions(-)
New commits:
commit 891e6a0be8e835edb102ecb272debe9c4e00b8e8
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Apr 19 12:19:39 2014 +1000
fdo#74702 Allow Printer OutputDevice to handle font orientation
Printer handles setting font orientation differently to how a Window
or VirtualDevice handles it.
Change-Id: I2903b971651fe56f8d262d3467e76baef617455c
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c2e9686..0af54185e 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -393,6 +393,7 @@ private:
protected:
virtual void ImplReleaseFonts();
+ virtual void SetFontOrientation( ImplFontEntry* const
pFontEntry ) const;
public:
/** @name Initialization and accessor functions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index ef4bec7..4065935 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -304,6 +304,7 @@ protected:
virtual voidEmulateDrawTransparent( const PolyPolygon
rPolyPoly, sal_uInt16 nTransparencePercent ) SAL_OVERRIDE;
virtual voidInitFont() const SAL_OVERRIDE;
+virtual voidSetFontOrientation( ImplFontEntry* const
pFontEntry ) const SAL_OVERRIDE;
public:
Printer();
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b741faa..12a0638 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1834,4 +1834,10 @@ void Printer::InitFont() const
mbInitFont = false;
}
}
+
+void Printer::SetFontOrientation( ImplFontEntry* const pFontEntry ) const
+{
+pFontEntry-mnOrientation = pFontEntry-maMetric.mnOrientation;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 7b4db77..c5973d3 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1242,15 +1242,7 @@ bool OutputDevice::ImplNewFont() const
pFontEntry-mnLineHeight = pFontEntry-maMetric.mnAscent +
pFontEntry-maMetric.mnDescent;
-if( pFontEntry-maFontSelData.mnOrientation
- !pFontEntry-maMetric.mnOrientation
- (meOutDevType != OUTDEV_PRINTER) )
-{
-pFontEntry-mnOwnOrientation =
sal::static_int_castshort(pFontEntry-maFontSelData.mnOrientation);
-pFontEntry-mnOrientation = pFontEntry-mnOwnOrientation;
-}
-else
-pFontEntry-mnOrientation = pFontEntry-maMetric.mnOrientation;
+SetFontOrientation( pFontEntry );
}
}
@@ -1331,6 +1323,19 @@ bool OutputDevice::ImplNewFont() const
return true;
}
+void OutputDevice::SetFontOrientation( ImplFontEntry* const pFontEntry ) const
+{
+if( pFontEntry-maFontSelData.mnOrientation
!pFontEntry-maMetric.mnOrientation )
+{
+pFontEntry-mnOwnOrientation =
sal::static_int_castshort(pFontEntry-maFontSelData.mnOrientation);
+pFontEntry-mnOrientation = pFontEntry-mnOwnOrientation;
+}
+else
+{
+pFontEntry-mnOrientation = pFontEntry-maMetric.mnOrientation;
+}
+}
+
bool ImplFontAttributes::operator==(const ImplFontAttributes rOther) const
{
if (maName != rOther.maName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basebmp/source reportdesign/source vcl/source
basebmp/source/bitmapdevice.cxx |6 ++
reportdesign/source/ui/inspection/GeometryHandler.cxx |3 +--
reportdesign/source/ui/misc/toolboxcontroller.cxx |3 +--
reportdesign/source/ui/report/StartMarker.cxx |3 +--
reportdesign/source/ui/report/dlgedfunc.cxx |3 +--
vcl/source/outdev/outdev.cxx |3 +--
6 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 52f296ac1a77cded6d4318a5f5d13bbf1c4f6877
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Apr 19 12:57:58 2014 +1000
Remove gcc3 workaround for bug long since fixed in gcc
Change-Id: Ieb1c41481a79ab8713663caee3d5373640ff0ec8
Reviewed-on: https://gerrit.libreoffice.org/9102
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index e2836de..bf3de07 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1616,8 +1616,7 @@ void BitmapDevice::drawMaskedColor( Color
aSrcColor,
BitmapDeviceSharedPtr pAlphaCopy(
cloneBitmapDevice( aSize,
shared_from_this()) );
-basegfx::B2ITuple aGcc3WorkaroundTemporary;
-const basegfx::B2IBox aAlphaRange( aGcc3WorkaroundTemporary,
+const basegfx::B2IBox aAlphaRange( basegfx::B2ITuple(),
aSize );
pAlphaCopy-drawBitmap(rAlphaMask,
aSrcRange,
@@ -1669,8 +1668,7 @@ void BitmapDevice::drawMaskedColor( Color
aSrcColor,
BitmapDeviceSharedPtr pAlphaCopy(
cloneBitmapDevice( aSize,
shared_from_this()) );
-basegfx::B2ITuple aGcc3WorkaroundTemporary;
-const basegfx::B2IBox aAlphaRange( aGcc3WorkaroundTemporary,
+const basegfx::B2IBox aAlphaRange( basegfx::B2ITuple(),
aSize );
pAlphaCopy-drawBitmap(rAlphaMask,
aSrcRange,
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fe06103..b255925 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1580,8 +1580,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow(
OUString _out_rSelectedClause,
// create the dialog
uno::Reference ui::dialogs::XExecutableDialog xDialog =
sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet,
xInspectorWindow);
-const OUString aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER));
-const OUString sPropertyUIName( aGcc3WorkaroundTemporary );
+const OUString sPropertyUIName(OUString(ModuleRes(RID_STR_FILTER)));
// initialize the dialog
xDialog-setTitle( sPropertyUIName );
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx
b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index e01a092..b0e312b 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -247,8 +247,7 @@ void SAL_CALL OToolboxController::statusChanged( const
FeatureStateEvent Event
{
util::Color nColor(COL_TRANSPARENT);
Event.State = nColor;
-::Color aGcc3WorkaroundTemporary( nColor);
-SvxColorItem aColorItem(aGcc3WorkaroundTemporary,1);
+SvxColorItem aColorItem(::Color(nColor), 1);
if ( SID_ATTR_CHAR_COLOR2 == m_nSlotId )
static_castSvxColorExtToolBoxControl*(m_pToolbarController.get())-StateChanged(m_nSlotId,Event.IsEnabled
? SFX_ITEM_SET : SFX_ITEM_DISABLED,aColorItem);
else
diff --git a/reportdesign/source/ui/report/StartMarker.cxx
b/reportdesign/source/ui/report/StartMarker.cxx
index cf25877..27dc3e0 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -113,8 +113,7 @@ void OStartMarker::Paint( const Rectangle rRect )
SetClipRegion(Region(PixelToLogic(Rectangle(Point(),Size(nSize,aSize.Height());
}
-const Point aGcc3WorkaroundTemporary;
-Rectangle aWholeRect(aGcc3WorkaroundTemporary,aSize);
+Rectangle aWholeRect(Point(),aSize);
{
const ColorChanger aColors( this, m_nTextBoundaries, m_nColor );
PolyPolygon aPoly;
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 34
connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx |2
2 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 1c0f94abb59296ec9e686dd3ea6b2cd963923631
Author: David Tardon dtar...@redhat.com
Date: Sat Apr 19 07:40:53 2014 +0200
blind fix for breaking windows build
error C2556: 'sal_Bool MNS_InitXPCOM(sal_Bool *)' : overloaded function
differs only by return type from 'bool MNS_InitXPCOM(sal_Bool *)'
error C2371: 'MNS_InitXPCOM' : redefinition; different basic types
error C2440: 'initializing' : cannot convert from 'bool *' to 'sal_Bool *'
Change-Id: Ica225dd47e8d90833ce56c0bd4ee38e5013196f6
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index ee64f6c..81030a73 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -36,7 +36,7 @@
static nsIServiceManager* sServiceManager = nsnull;
static sal_Int32sInitCounter = 0;
-static sal_Bool s_bProfilePresentAfterInitialized = sal_False;
+static bool s_bProfilePresentAfterInitialized = false;
static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
@@ -93,7 +93,7 @@ extern C void NS_SetupRegistry();
}
-sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
+bool MNS_InitXPCOM(bool* aProfileExists)
{
nsresult rv;
OSL_TRACE( IN : MNS_InitXPCOM() );
@@ -126,7 +126,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
nsDependentCString sPath(path2.getStr());
rv = NS_NewNativeLocalFile(sPath, PR_TRUE, getter_AddRefs(binDir));
if (NS_FAILED(rv))
-return sal_False;
+return false;
}
@@ -135,7 +135,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
NS_InitXPCOM2(sServiceManager, binDir, NULL);
// if (!sServiceManager)
-// return sal_False;
+// return false;
#ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
sXPCOMInitializedFlag = PR_TRUE;
@@ -151,7 +151,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
nsCOMPtrnsIEventQueueService eventQService(
do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, rv));
if (NS_FAILED(rv))
- return NS_SUCCEEDED( rv ) ? sal_True : sal_False;
+ return NS_SUCCEEDED( rv ) ? true : false;
eventQService-CreateThreadEventQueue();
@@ -179,12 +179,12 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
{
OSL_TRACE(Created an nsIPref i/f);
thePref-ReadUserPrefs( nsnull );
-*aProfileExists = sal_True ;
-s_bProfilePresentAfterInitialized = sal_True;
+*aProfileExists = true;
+s_bProfilePresentAfterInitialized = true;
}
OSL_TRACE( OUT : MNS_InitXPCOM() - XPCOM Init );
-return sal_True;
+return true;
}
void MNS_XPCOM_EventLoop()
@@ -232,7 +232,7 @@ extern C void MNS_Mozilla_UI_Thread( void *arg )
aLive=1;
OSL_TRACE( IN : MNS_Mozilla_UI_Thread() );
UI_Thread_ARGS * args = (UI_Thread_ARGS*) arg;
-sal_Bool* aProfileExists=args-bProfileExists;
+bool* aProfileExists=args-bProfileExists;
delete args;
args=NULL;
@@ -264,9 +264,9 @@ extern C void MNS_Mozilla_UI_Thread( void *arg )
}
-sal_Bool MNS_Init(sal_Bool aProfileExists)
+bool MNS_Init(bool aProfileExists)
{
-aProfileExists = sal_False ;
+aProfileExists = false;
OSL_TRACE( IN : MNS_Init() );
// Reentrant calls to this method do nothing except increment a counter
@@ -278,7 +278,7 @@ sal_Bool MNS_Init(sal_Bool aProfileExists)
OSL_TRACE( OUT : MNS_Init() : counter = %d, sInitCounter );
aProfileExists = s_bProfilePresentAfterInitialized;
-return sal_True;
+return true;
}
UI_Thread_ARGS * args = new UI_Thread_ARGS;
@@ -287,7 +287,7 @@ sal_Bool MNS_Init(sal_Bool aProfileExists)
m_aUI_Thread_Condition.reset();
if (osl_createThread(MNS_Mozilla_UI_Thread, (void*)args) == 0)
{
-return sal_False;
+return false;
}
//wait for xpcom to be initted
@@ -298,10 +298,10 @@ sal_Bool MNS_Init(sal_Bool aProfileExists)
OSL_TRACE( OUT : MNS_Init() - First Init );
-return sal_True;
+return true;
}
-sal_Bool MNS_Term(sal_Bool aForce)
+bool MNS_Term(bool aForce)
{
// Reentrant calls to this method do nothing except decrement a counter
OSL_TRACE( IN : MNS_Term() );
@@ -309,7 +309,7 @@ sal_Bool MNS_Term(sal_Bool aForce)
{
--sInitCounter;
OSL_TRACE( OUT : MNS_Term() : counter = %d, sInitCounter );
-return sal_True;
+return true;
}
sInitCounter = 0;
@@ -321,7 +321,7 @@ sal_Bool MNS_Term(sal_Bool aForce)
OSL_TRACE( OUT : MNS_Term() - Final Term );
-return sal_True;
Re: [Libreoffice-qa] Mail Merge Wizard
ok, so to clarify I tried to use Mail Merge both on : - Mac Mavericks (Mac Book Pro 64 bits) / LibreOffice production release 4.1.5 - MS Windows 7 Enterprise SP1 64 bits / LibreOffice 4.2.3.3 In both cases, when configuring the mail merge settins with SMTP/SSL, it always fails and LibreOffice freezes. From what I understood from you I shall confirm this bug at http://bugs.freedesktop.org/ About my wish to save each document with a specific name , in my case that would be a workaround of the above issue as I can not send the documents by mail, my idea was to generate all the files MyFile_customerID1.pdf, MyFile_customerID2.pdf, MyFile_customerID3.pdf, MyFile_customerID4.pdf etc ... and then create a dummy PHP script to send each document by mail to the right recipient. But I imagine that ability to save documents with a specific name ( having a field from the DataSource used to create the document template) could be usefull in many other cases; would you consider such RFE ? Thanks, Steve On 17 April 2014 14:59, Robinson Tryon bishop.robin...@gmail.com wrote: On Thu, Apr 17, 2014 at 12:05 AM, Steve jav...@gmail.com wrote: Hi, As I have not found in the FAQ how to raise a Request For Enhancement, may I add ask you through this mailing list : Enhancement requests may be made on the bugtracker, e.g. filing a new LibreOffice bug with Severity: enhancement here: http://bugs.freedesktop.org/ The mail merge wizard can not be used on LibreOffice 4.1/4.2 (the SMTP connection always fails), see the here under bug reports : https://bugs.freedesktop.org/show_bug.cgi?id=59249 https://bugs.freedesktop.org/show_bug.cgi?id=69337#c19 https://bugs.freedesktop.org/show_bug.cgi?id=70196 http://listarchives.libreoffice.org/global/users/msg21016.html http://ask.libreoffice.org/en/question/13337/problems-using-mail-merge-with-email/ https://bugs.freedesktop.org/show_bug.cgi?id=63388#c5 https://bugs.freedesktop.org/show_bug.cgi?id=64098 https://bugs.freedesktop.org/show_bug.cgi?id=65307 At least half of those bug reports are resolved, marked as duplicates of other bugs, or otherwise appear as though they may be out of date. Have you confirmed your SMTP connection failure under the latest builds of the 4.1 or 4.2 release branches? Please find 4.1.5 and 4.2.3 (plus a 4.1.6 pre-release) here: https://www.libreoffice.org/download/ So here is my RFE : when using the mail merge wizard, at step 8 (see page 29 of documentation https://wiki.documentfoundation.org/images/f/fe/0211WG34-UsingMailMerge.pdf ) when you want to save merge documents save as individuals documents, instead of generating file_0.doc , file_1.doc, file_2.doc etc ... I would like to save each document with a specific name MyFile_XXX.doc where XXX is a field (a customerID for instance) from the DataSource used to create the document template (an Excel file for instance), that would be really usefull and really great ! Apologies for my confusion here: What's the relationship between The mail merge wizard can not be used on LibreOffice 4.1/4.2 (the SMTP connection always fails) and your desire to save each document with a specific name ? By the way, do you plan to fix the Writer MailMerge SMTP bug in next 4.2 or 4.3 release ? Which bug? Have you tested the problem under LO 4.2.3? Specific details help us to narrow-in on the particular problem and fix it more quickly :-) Best, -- Robinson Tryon LibreOffice Community Outreach Herald The Document Foundation qu...@libreoffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] vector::_M_range_check error
On Fri, 2014-04-18 at 09:22 -0400, Kohei Yoshida wrote: Hi there, Just FYI, the error message vector::_M_range_check [snip] So, no need to close such bug reports as duplicates, or link them together in some ways just because of this error message. Kohei, Thank you for the guidance. I have written a note to myself and shall try to remember this hereafter. Meanwhile, I am responsible for creating a tangle among bugs - 76008 out_of_range exception from: copy formula, paste, delete - 76148 vector::_M_range_check crash after pasting broken formulas - 76470 out_of_range_exception when inserting/deleting rows with absolute reference I have removed the see-also linkages. However, I have not touched the resolutions--76008 and 76148 both being DUP's of 76470--as I am impressed by the reported problems disappearing in an interval which includes commit c78d1bb fdo#76470: Avoid joining new formula cells individually.. Do we care about the distinction between resolutions DUP vs. WORKSFORME? Further guidance welcome (but only if you care). Terry. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 77603] * key wildcard autocorrection should be an option
https://bugs.freedesktop.org/show_bug.cgi?id=77603 --- Comment #2 from tommy27 ba...@quipo.it --- hi Joel, let me respectfully disagree. I don't think the autocorrection option are that much overcrowded see screenshot in attachment 97481. as we already have autocorrect options about double space, capital letters and all other stuff, I think that an option for wildcards which may have an even deeper impact on autocorrection in respect to other existing option is needed. regarding me I have no troubles using current 4.2.x since I know that I must avoid that asterisk key in my replacement table but I'm thinking about less experienced users who will be probably completely unaware of autocorrect wildcard feature which is unpublished in the release notes and uncited in the autocorrect GUI option page. this new feature at the moment is known only to a few developers and QA guys but largely unknown by the user base and can cause unexplainable issues like the one I have experienced. I'd like to hear Lazlo opinion about it. by the way could you set status to this enhancement request as NEW? then Lazlo will decide if it's a WONTFIX or ASSIGNED task. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69051] Other: Text Frames with wrong font size after pdf import: fonts have direct formatting; font setting text frame is not used
https://bugs.freedesktop.org/show_bug.cgi?id=69051 --- Comment #4 from vv...@yandex.ru --- Now font size property applied also to text frame. https://gerrit.libreoffice.org/9091 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72028] FILEOPEN: Opening PDF in Writer adds a space after each letter
https://bugs.freedesktop.org/show_bug.cgi?id=72028 --- Comment #11 from vv...@yandex.ru --- I have ported some Draw import changes to Writer. But I want to note one thing: Writer import feature presently way behind Draw's one. Because Writer import is hidden and not developers nor testers don't know about it. https://gerrit.libreoffice.org/9091 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77458] EDITING: Fatal Error Invalid vector T subscript attempting Delete Selected Rows
https://bugs.freedesktop.org/show_bug.cgi?id=77458 John john32...@gmail.com changed: What|Removed |Added CC||john32...@gmail.com --- Comment #5 from John john32...@gmail.com --- I have found this problem, and the same message when inserting. Until I found the insert problem, I got round the delete problem by inserting rows before after the one I wanted to delete then I could delete all 3 (or more) together. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77459] Other: Insert Rows Above produces crash with vector::_M_range_check error
https://bugs.freedesktop.org/show_bug.cgi?id=77459 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added CC||jbf.fa...@sud-ouest.org See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=76607 Component|WWW |Spreadsheet --- Comment #1 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- wrong component. Same error message as bug 76607. Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77122] FORMATTING: Link between textboxes is not being preserved
https://bugs.freedesktop.org/show_bug.cgi?id=77122 Umesh Kadam umesh.ka...@synerzip.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |umesh.ka...@synerzip.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77584] libreoffice-mysql-connector doesn't work over SSH tunnel from the internet
https://bugs.freedesktop.org/show_bug.cgi?id=77584 edonkey2001-libreoff...@yahoo.it changed: What|Removed |Added Summary|libreoffice-mysql-connector |libreoffice-mysql-connector |doesn't work in LAN over|doesn't work over SSH |SSH |tunnel from the internet -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69051] Other: Text Frames with wrong font size after pdf import: fonts have direct formatting; font setting text frame is not used
https://bugs.freedesktop.org/show_bug.cgi?id=69051 vv...@yandex.ru changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #5 from vv...@yandex.ru --- Fixed here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=efaa53bc980c92054ae39f4317b8acc607fd6a34 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77643] New: PRINTING: Highlighting not printed when commented text contains a line break.
https://bugs.freedesktop.org/show_bug.cgi?id=77643 Priority: medium Bug ID: 77643 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: PRINTING: Highlighting not printed when commented text contains a line break. Severity: normal Classification: Unclassified OS: All Reporter: stephanv...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 97558 -- https://bugs.freedesktop.org/attachment.cgi?id=97558action=edit Sample document containing 2 lines of commented text. How to reproduce: 1: Load the example document 2: Choose File - Print from the main menu 3: In the Print dialog on the General tab: choose Comments - Place in margins 4: Print the document Expected result: The commented text is highlighted in the print-out Actual result: The commented text is not highlighted in the print-out. Sometimes the border of the highlighting is visible. Note: Normal highlighting does work with line breaks present. Tested on openSuSE 12.3 (64-bit) and 13.1 (64-bit) LOdev version: 4.3.0.0.alpha0+ Build ID: 7bda5f04a693c7943bc4201c11e73ca45bead661 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77584] libreoffice-mysql-connector doesn't work over SSH tunnel from the internet
https://bugs.freedesktop.org/show_bug.cgi?id=77584 --- Comment #2 from edonkey2001-libreoff...@yahoo.it --- I changed the subject to reflect the fact it does work on the same LAN by installing the version 1.0.2+LibO4.1.4-2~bpo70+1 (requires Libreoffice from backports) but not from the internet. I admit my previous comment may have been a bit misleading. What I meant with very same settings was referred to the configuration in LO Base, of course not to the establishment of a remote tunnel vs a local one. For the sake of clarity I repeat that I can SSH remotely from outside the LAN and the tunnel test correctly in this setting, just LO Base can't use it. I've been asked to point out that exist a version of this extension for AOO http://extensions.openoffice.org/en/project/mysql-connector-openofficeorg or http://extensions.openoffice.org/en/node/5644 that, according to comment #6 by jph on https://bugs.launchpad.net/ubuntu/+source/libreoffice/+bug/1276442 should already be fixed. But these extensions can't be installed on Debian stable. For completeness, here's the bug report I filed on Debian BTS: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745101 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77644] New: Inserting a hyperlink leads to doubled text
https://bugs.freedesktop.org/show_bug.cgi?id=77644 Priority: medium Bug ID: 77644 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Inserting a hyperlink leads to doubled text Severity: normal Classification: Unclassified OS: Windows (All) Reporter: stgohi-lob...@yahoo.de Hardware: Other Status: UNCONFIRMED Version: 4.2.3.3 release Component: Spreadsheet Product: LibreOffice Problem Description: If you insert a hyperlink to a text then in specific cases the text will be doubled. Steps to Reproduce: 1. Open CALC 2. Go to any cell in CALC and type Test 3. Press CTRL + A to select the whole word 4. Go to INSERT - HYPERLINK 5. In the section INTERNET insert in the TARGET field any webpage link (Keep attention that in the field TEXT below only Test is shown as expected - correct) 6. Press APPLY Result: The cell shows now TestTest with the second word having the hyperlink. Expected Behavior: The cell should only show Test with the hyperlink. Note: Take care to follow exactly the steps, otherwise it would not be reproducible, e.g. if you select the text in step 3 with the mouse instead of CTRL + A then it is not reproducible. Reproduced on LO 4.2.3.3, Win 8.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77645] New: Impossible to insert text in the text field with right mouse click
https://bugs.freedesktop.org/show_bug.cgi?id=77645 Priority: medium Bug ID: 77645 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Impossible to insert text in the text field with right mouse click Severity: enhancement Classification: Unclassified OS: Windows (All) Reporter: stgohi-lob...@yahoo.de Hardware: Other Status: UNCONFIRMED Version: 4.2.3.3 release Component: Spreadsheet Product: LibreOffice Problem Description: Currently it is not possible to insert text in the text field at the top with a right mouse click. Steps to Reproduce: 1. Open CALC 2. Copy text from any software application (like MS Editor, LO Writer, etc.) into the clipboard 3. Go to any cell in the CALC spreadsheet and put the cursor in the text field at the top 4. Try to make a right mouse click to insert the text from the clipboard Current Behavior: Nothing happens, no context menu opens. Expected Behavior: It would be good to have the possibilty to copy text from the clipboard with a right mouse click like you can do it via EDIT - PASTE or via pressing CTRL + V. Reproduced on LO 4.2.3.3, Win 8.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77643] PRINTING: Highlighting not printed when commented text contains a line break.
https://bugs.freedesktop.org/show_bug.cgi?id=77643 Stephan van den Akker stephanv...@gmail.com changed: What|Removed |Added CC||caol...@redhat.com See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=36815 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77530] FILESAVE: saving a new file
https://bugs.freedesktop.org/show_bug.cgi?id=77530 --- Comment #9 from thejun...@gmail.com --- Created attachment 97560 -- https://bugs.freedesktop.org/attachment.cgi?id=97560action=edit libreoffice calc crash log -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77530] FILESAVE: saving a new file
https://bugs.freedesktop.org/show_bug.cgi?id=77530 --- Comment #10 from thejun...@gmail.com --- From the console at crash time $ soffice --backtrace GNU gdb (GDB) 7.6.2 (Debian 7.6.2-1) Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type show copying and show warranty for details. This GDB was configured as x86_64-linux-gnu. For bug reporting instructions, please see: http://www.gnu.org/software/gdb/bugs/... Reading symbols from /usr/lib/libreoffice/program/soffice.bin...(no debugging symbols found)...done. log will be saved as gdbtrace.log, this will take some time, patience... Object::connect: No such signal org::freedesktop::UPower::DeviceAdded(QDBusObjectPath) Object::connect: No such signal org::freedesktop::UPower::DeviceRemoved(QDBusObjectPath) /org/freedesktop/UDisks2/drives/ST9500420AS_5VJ5NLNT : property Drive does not exist /org/freedesktop/UDisks2/drives/TEAC_DVD_ROM_DV18SA_10051621092906 : property Drive does not exist /org/freedesktop/UDisks2/drives/ST9500420AS_5VJ5NLNT : property DeviceNumber does not exist /org/freedesktop/UDisks2/drives/ST9500420AS_5VJ5NLNT : property Device does not exist :~$ Don't know if it helps -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77530] FILESAVE: saving a new file
https://bugs.freedesktop.org/show_bug.cgi?id=77530 --- Comment #11 from thejun...@gmail.com --- Oh yea, I forgot In the process of installing libreoffice-dbg I also updated the system with a few patches. One of them was libreoffice. So now I am on Version: 4.1.5.3 Build ID: 410m0(Build:3) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77647] New: EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows
https://bugs.freedesktop.org/show_bug.cgi?id=77647 Priority: medium Bug ID: 77647 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows Severity: critical Classification: Unclassified OS: Windows (All) Reporter: v...@xs4all.nl Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.2.0.4 release Component: Spreadsheet Product: LibreOffice Created attachment 97561 -- https://bugs.freedesktop.org/attachment.cgi?id=97561action=edit Test-file LO 4.2.3.3 and earlier windows 7 64 bit step to reproduce in test file: 1) select rows 40 to 45 and insert rows 2) go to m56 (was m50) and the formula sum isn't correct range When insert select rows 47 to 48 or 43 to 44 it is correct. I hope you can solve the issue -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77647] EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows
https://bugs.freedesktop.org/show_bug.cgi?id=77647 vlb v...@xs4all.nl changed: What|Removed |Added Keywords||regression -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77647] EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows
https://bugs.freedesktop.org/show_bug.cgi?id=77647 vlb v...@xs4all.nl changed: What|Removed |Added Priority|medium |high -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77647] EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows
https://bugs.freedesktop.org/show_bug.cgi?id=77647 --- Comment #1 from vlb v...@xs4all.nl --- In LO 4.1.5 it was oke -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77590] Make LO's start screen available from within components
https://bugs.freedesktop.org/show_bug.cgi?id=77590 --- Comment #3 from David Parton da...@lochnevis.com --- You are right, closing the last document reveals the 'start screen'. I would want to be able to get to the screen without closing documents, e.g. to open a new one or look at a previous one. Thanks for looking at the suggestion David -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72028] FILEOPEN: Opening PDF in Writer adds a space after each letter
https://bugs.freedesktop.org/show_bug.cgi?id=72028 vv...@yandex.ru changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #12 from vv...@yandex.ru --- Fixed here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=efaa53bc980c92054ae39f4317b8acc607fd6a34 --- Comment #13 from vv...@yandex.ru --- Fixed here: http://cgit.freedesktop.org/libreoffice/core/commit/?id=efaa53bc980c92054ae39f4317b8acc607fd6a34 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75735] RTF: FILEOPEN: RTF import sometimes fails to unstack tabs
https://bugs.freedesktop.org/show_bug.cgi?id=75735 Miklos Vajna vmik...@collabora.co.uk changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |vmik...@collabora.co.uk |desktop.org | --- Comment #2 from Miklos Vajna vmik...@collabora.co.uk --- Regression from a48e2fd9049797110b3b2505c363557284987ca8, the problem is that when we set an attribute in a nested structure, then ensureCopyBeforeWrite() before set() is only called for the child, not for the parent. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77647] EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows
https://bugs.freedesktop.org/show_bug.cgi?id=77647 thack...@nexgo.de changed: What|Removed |Added Attachment #97561|text/plain |application/vnd.oasis.opend mime type||ocument.spreadsheet --- Comment #2 from thack...@nexgo.de --- Comment on attachment 97561 -- https://bugs.freedesktop.org/attachment.cgi?id=97561 Test-file Hello, for whatever reason, your attachment was added as text/plain, so I could not open it ... :( I hope, my edit will fix it ... ;) Sorry for the inconvenience Thomas. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76148] vector::_M_range_check crash after pasting broken formulas
https://bugs.freedesktop.org/show_bug.cgi?id=76148 Terrence Enger lo_b...@iseries-guru.com changed: What|Removed |Added See Also|https://bugs.freedesktop.or | |g/show_bug.cgi?id=76008 | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76008] out_of_range exception from: copy formula, paste, delete
https://bugs.freedesktop.org/show_bug.cgi?id=76008 Terrence Enger lo_b...@iseries-guru.com changed: What|Removed |Added See Also|https://bugs.freedesktop.or | |g/show_bug.cgi?id=76470,| |https://bugs.freedesktop.or | |g/show_bug.cgi?id=76148 | --- Comment #8 from Terrence Enger lo_b...@iseries-guru.com --- The coincidental appearance of _M_range_check is uninteresting. So I am removing see-also 76470 and 76148. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59901] UI: Name of each language in target language
https://bugs.freedesktop.org/show_bug.cgi?id=59901 --- Comment #9 from Urmas davian...@gmail.com --- And how they should be sorted? By ISO code? They are often nothing like the language name? By Unicode order? It is culturally insulting, moving such important world languages like Greek and Russian after c..p on XYZ. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77647] EDITING: calc 4.2.3.3 formula sum isn't work correct when insert rows
https://bugs.freedesktop.org/show_bug.cgi?id=77647 thack...@nexgo.de changed: What|Removed |Added Hardware|x86-64 (AMD64) |All OS|Windows (All) |All Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #3 from thack...@nexgo.de --- Hello vlb, *, I can confirm your bug with LO Version: 4.2.4.1 Build ID: d4c441391e20647b3d2e8dde4d20aa868e77e515 (parallel installed, following the instructions from https://wiki.documentfoundation.org/Installing_in_parallel) with Germanophone lang- as well as helppack under Debian Testing i686, so I will change Platform to All, as it is not only a Win 64bit bug ... ;) Interestingly, if I use my also parallel installed Version: 4.1.6.1 Build ID: a59ce81388f477fc89db57f0c27f222f31884eb (also with Germanophone lang- as well as helppack on the same system), I see, that the sum at cell m56 stays the same (with the value 7,6). This is also the case with my installed version of LO Version: 4.1.5.3 Build-ID: 1c1366bba2ba2b554cd2ca4d87c06da81c05d24, so this seems a regression ... :( Better description for the steps to reproduce: 0. Download the attached document (Issue-som.ods from https://bugs.freedesktop.org/attachment.cgi?id=97561) 1. start Calc 2. click on the header of row 40 to mark the whole row 3. press Shift and click on the header of row 45 4. rightclick on the marked headers of these rows and select Insert Rows Above 5. Now look at cell m56 (which changed its value) 6. Go to cell M56. You will see, that the sum formular changed as well (=SUM(M45:M55)) ... ( In both older versions, the sum formular just changed from =SUM(M45:M49) to =SUM(M51:M55), adding 6 cells to both sides of the sum formular instead of staying at M45 and enhancing its range to M55 ... :( HTH Thomas. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
