[Libreoffice-commits] core.git: 2 commits - writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk|1
writerfilter/inc/dmapper/DomainMapper.hxx |7 --
writerfilter/inc/dmapper/DomainMapperFactory.hxx| 48
writerfilter/source/dmapper/DomainMapper.cxx| 14 +
writerfilter/source/dmapper/domainmapperfactory.cxx | 31
writerfilter/source/filter/ImportFilter.cxx |6 --
writerfilter/source/filter/RtfFilter.cxx|5 +-
7 files changed, 98 insertions(+), 14 deletions(-)
New commits:
commit c953690b9adaf632f830dbf67e078ea00747894d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 12 09:04:08 2014 +0100
writerfilter: let ImportFilter only assume that DomainMapper is a Stream
Change-Id: I2e0db194357657df81d8cd94f42cdfbd2c3a2664
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 28f43fb..4e06ded 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -169,6 +169,20 @@ DomainMapper::~DomainMapper()
// Apply the document settings after everything else
m_pImpl-GetSettingsTable()-ApplyProperties(
m_pImpl-GetTextDocument( ) );
+
+// Grab-bag handling
+comphelper::SequenceAsHashMap aProperties;
+// Add the saved w:themeFontLang setting
+aProperties[ThemeFontLangProps] =
uno::makeAny(GetThemeFontLangProperties());
+// Add the saved compat settings
+aProperties[CompatSettings] = uno::makeAny(GetCompatSettings());
+uno::Referencebeans::XPropertySet
xDocProps(m_pImpl-GetTextDocument(), uno::UNO_QUERY);
+if (xDocProps.is())
+{
+comphelper::SequenceAsHashMap
aGrabBag(xDocProps-getPropertyValue(InteropGrabBag));
+aGrabBag.update(aProperties);
+xDocProps-setPropertyValue(InteropGrabBag,
uno::Any(aGrabBag.getAsConstPropertyValueList()));
+}
}
catch( const uno::Exception rEx )
{
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index eb8801f..93ed71f 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -121,9 +121,6 @@ sal_Bool WriterFilter::filter( const uno::Sequence
beans::PropertyValue aDes
aGrabBagProperties[OOXActiveX] = uno::makeAny(
pDocument-getActiveXDomList() );
aGrabBagProperties[OOXActiveXBin] = uno::makeAny(
pDocument-getActiveXBinList() );
-// Adding the saved w:themeFontLang setting
-aGrabBagProperties[ThemeFontLangProps] = uno::makeAny(
aDomainMapper-GetThemeFontLangProperties() );
-
// Adding the saved Glossary Documnet DOM to the document's grab bag
aGrabBagProperties[OOXGlossary] = uno::makeAny(
pDocument-getGlossaryDocDom() );
aGrabBagProperties[OOXGlossaryDom] = uno::makeAny(
pDocument-getGlossaryDomList() );
@@ -131,9 +128,6 @@ sal_Bool WriterFilter::filter( const uno::Sequence
beans::PropertyValue aDes
// Adding the saved embedding document to document's grab bag
aGrabBagProperties[OOXEmbeddings] = uno::makeAny(
pDocument-getEmbeddingsList() );
-// Adding the saved compat settings
-aGrabBagProperties[CompatSettings] = uno::makeAny(
aDomainMapper-GetCompatSettings() );
-
putPropertiesToDocumentGrabBag( aGrabBagProperties );
writerfilter::ooxml::OOXMLStream::Pointer_t
pVBAProjectStream(writerfilter::ooxml::OOXMLDocumentFactory::createStream(
pDocStream, writerfilter::ooxml::OOXMLStream::VBAPROJECT ));
commit eb14f3d4e4da72ba19e28eb9ee796c04ab3b8d84
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 12 09:02:19 2014 +0100
writerfilter: add a factory for DomainMapper
Ideally the XFilter implementations should only know that DomainMapper
implements Stream, nothing more. Add a factory and use it in RtfFilter.
When ImportFilter will do the same, then the DomainMapper class
definition can be an implementation detail.
Change-Id: If19cf23e61c2f78189d834261d57c569b9173b12
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 63d17f0..2c6d01e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/DomainMapperTableHandler \
writerfilter/source/dmapper/DomainMapperTableManager \
writerfilter/source/dmapper/DomainMapper_Impl \
+ writerfilter/source/dmapper/domainmapperfactory \
writerfilter/source/dmapper/FFDataHandler \
writerfilter/source/dmapper/FontTable \
writerfilter/source/dmapper/FormControlHelper \
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 94f233f..6564e32 100644
---
[Libreoffice-commits] libvisio.git: src/test
src/test/importtest.cpp |3 +++ src/test/xmldrawinggenerator.cpp |1 + 2 files changed, 4 insertions(+) New commits: commit c31e6cf3618f40ab4d1ec655e4e6f7c7590834ab Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Dec 12 09:05:20 2014 +0100 VSDX: test import of dcterms:created and dcterms:modified Change-Id: I78e6cc1811a2f0815f27d8780cf5f96208115b24 diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp index 1560fef..d9100bc 100644 --- a/src/test/importtest.cpp +++ b/src/test/importtest.cpp @@ -136,6 +136,9 @@ void ImportTest::testVsdxMetadataTitle() m_doc = parse(fdo86664.vsdx, m_buffer); // The setDocumentMetaData() call was missing, so the node did not exist. assertXPath(m_doc, /document/setDocumentMetaData, title, mytitle); + // Test dcterms:created and dcterms:modified. + assertXPath(m_doc, /document/setDocumentMetaData, creation-date, 2014-11-24T10:35:17Z); + assertXPath(m_doc, /document/setDocumentMetaData, date, 2014-11-24T10:41:22Z); } CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest); diff --git a/src/test/xmldrawinggenerator.cpp b/src/test/xmldrawinggenerator.cpp index b64c564..5711c64 100644 --- a/src/test/xmldrawinggenerator.cpp +++ b/src/test/xmldrawinggenerator.cpp @@ -29,6 +29,7 @@ void XmlDrawingGenerator::startDocument(const librevenge::RVNGPropertyList prop xmlTextWriterWriteAttribute(m_writer, BAD_CAST(xmlns:dc), BAD_CAST(urn:oasis:names:tc:opendocument:xmlns:meta:1.0)); xmlTextWriterWriteAttribute(m_writer, BAD_CAST(xmlns:draw), BAD_CAST(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0)); xmlTextWriterWriteAttribute(m_writer, BAD_CAST(xmlns:svg), BAD_CAST(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0)); + xmlTextWriterWriteAttribute(m_writer, BAD_CAST(xmlns:meta), BAD_CAST(urn:oasis:names:tc:opendocument:xmlns:meta:1.0)); librevenge::RVNGPropertyList::Iter i(propList); for (i.rewind(); i.next();) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter sd/source
filter/source/msfilter/svdfppt.cxx |8 +++--
include/filter/msfilter/svdfppt.hxx | 44 +++-
sd/source/filter/ppt/pptin.cxx | 56 ++--
3 files changed, 57 insertions(+), 51 deletions(-)
New commits:
commit f5c5bab09f2e3a7e13a6b397faf4bdfcb898f295
Author: Tobias Madl tobias.madl@gmail.com
Date: Thu Dec 11 14:45:53 2014 +
fdo#84938 replace PPT_LAYOUT_ constants with enum
Change-Id: I3c77e7e551bd4b657cb58fdfeead73d50441e890
Reviewed-on: https://gerrit.libreoffice.org/13437
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 0400f5b..c74fc49 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -293,14 +293,16 @@ SvStream ReadPptDocumentAtom(SvStream rIn,
PptDocumentAtom rAtom)
void PptSlideLayoutAtom::Clear()
{
-eLayout = 0;
+eLayout = PptSlideLayout::TITLESLIDE;
for ( sal_uInt16 i = 0; i 8; i++ )
aPlaceholderId[ i ] = 0;
}
SvStream ReadPptSlideLayoutAtom( SvStream rIn, PptSlideLayoutAtom rAtom )
{
-rIn.ReadInt32( rAtom.eLayout );
+sal_Int32 nTmp;
+rIn.ReadInt32(nTmp);
+rAtom.eLayout = static_castPptSlideLayout(nTmp);
rIn.Read( rAtom.aPlaceholderId, 8 );
return rIn;
}
@@ -988,7 +990,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream rSt,
DffObjData rObjData, voi
case TSS_TYPE_PAGETITLE :
case TSS_TYPE_TITLE :
{
-if ( GetSlideLayoutAtom()-eLayout ==
PPT_LAYOUT_TITLEMASTERSLIDE )
+if ( GetSlideLayoutAtom()-eLayout ==
PptSlideLayout::TITLEMASTERSLIDE )
nDestinationInstance = TSS_TYPE_TITLE;
else
nDestinationInstance = TSS_TYPE_PAGETITLE;
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index c7a1912..43c846a 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -54,6 +54,7 @@ class SvxMSDffManager;
class PPTTextObj;
class DffRecordHeader;
class SvxBulletItem;
+enum class PptSlideLayout;
#define PPT_IMPORTFLAGS_NO_TEXT_ASSERT 1
@@ -194,7 +195,7 @@ public:
struct PptSlideLayoutAtom
{
-sal_Int32 eLayout;// 0..18
+PptSlideLayout eLayout;// 0..18
sal_uInt8 aPlaceholderId[ 8 ];
public:
@@ -1574,25 +1575,28 @@ public :
#define PPT_CharAttr_Escapement 19 //0008
// values for PptSlideLayoutAtom.eLayout
-#define PPT_LAYOUT_TITLESLIDE 0 // The slide is a title slide
-#define PPT_LAYOUT_TITLEANDBODYSLIDE1 // Title and body slide
-#define PPT_LAYOUT_TITLEMASTERSLIDE 2 // Title master slide
-#define PPT_LAYOUT_MASTERSLIDE 3 // Master slide layout
-#define PPT_LAYOUT_MASTERNOTES 4 // Master notes layout
-#define PPT_LAYOUT_NOTESTITLEBODY 5 // Notes title/body layout
-#define PPT_LAYOUT_HANDOUTLAYOUT6 // Handout layout, therefore
it doesn't have placeholders except header, footer, and date
-#define PPT_LAYOUT_ONLYTITLE7 // Only title placeholder
-#define PPT_LAYOUT_2COLUMNSANDTITLE 8 // Body of the slide has 2
columns and a title
-#define PPT_LAYOUT_2ROWSANDTITLE9 // Slide's body has 2 rows and
a title
-#define PPT_LAYOUT_RIGHTCOLUMN2ROWS 10 // Body contains 2 columns,
right column has 2 rows
-#define PPT_LAYOUT_LEFTCOLUMN2ROWS 11 // Body contains 2 columns,
left column has 2 rows
-#define PPT_LAYOUT_BOTTOMROW2COLUMNS12 // Body contains 2 rows,
bottom row has 2 columns
-#define PPT_LAYOUT_TOPROW2COLUMN13 // Body contains 2 rows, top
row has 2 columns
-#define PPT_LAYOUT_4OBJECTS 14 // 4 objects
-#define PPT_LAYOUT_BIGOBJECT15 // Big object
-#define PPT_LAYOUT_BLANCSLIDE 16 // Blank slide
-#define PPT_LAYOUT_TITLERIGHTBODYLEFT 17 // Vertical title on the
right, body on the left
-#define PPT_LAYOUT_TITLERIGHT2BODIESLEFT18 // Vertical title on the
right, body on the left split into 2 rows
+enum class PptSlideLayout
+{
+TITLESLIDE = 0, // The slide is a title slide
+TITLEANDBODYSLIDE = 1, // Title and body slide
+TITLEMASTERSLIDE = 2, // Title master slide
+MASTERSLIDE= 3, // Master slide layout
+MASTERNOTES= 4, // Master notes layout
+NOTESTITLEBODY = 5, // Notes title/body layout
+HANDOUTLAYOUT = 6, // Handout layout, therefore it doesn't
have placeholders except header, footer, and date
+ONLYTITLE = 7, // Only title placeholder
+
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #12 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Tobias Madl committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f5c5bab09f2e3a7e13a6b397faf4bdfcb898f295 fdo#84938 replace PPT_LAYOUT_ constants with enum It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source dtrans/source editeng/source
desktop/source/deployment/registry/component/dp_component.cxx |2 +-
desktop/source/pkgchk/unopkg/unopkg_app.cxx |3 +--
dtrans/source/win32/workbench/XTDo.cxx|2 +-
editeng/source/editeng/editdoc.cxx|3 +--
editeng/source/editeng/impedit2.cxx |3 +--
editeng/source/editeng/impedit4.cxx |3 +--
editeng/source/items/xmlcnitm.cxx |3 +--
editeng/source/outliner/outliner.cxx |3 +--
8 files changed, 8 insertions(+), 14 deletions(-)
New commits:
commit 04b183a9bc792a53a9f081353a79486faa4f3872
Author: Michael Weghorn m.wegh...@posteo.de
Date: Thu Dec 11 23:32:12 2014 +0100
fdo#39440 reduce scope of local variables
This addresses some cppcheck warnings.
Change-Id: Ifbc5a7a562e714f48dcfd51a75e9a4e0bfcde81c
Reviewed-on: https://gerrit.libreoffice.org/13443
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 5c13755..26018f4 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1307,10 +1307,10 @@ BackendImpl::ComponentPackageImpl::isRegistered_(
if (m_registered == REG_UNINIT)
{
m_registered = REG_NOT_REGISTERED;
-bool bAmbiguousComponentName = false;
const Referenceregistry::XSimpleRegistry xRDB( getRDB() );
if (xRDB.is())
{
+bool bAmbiguousComponentName = false;
// lookup rdb for location URL:
const Referenceregistry::XRegistryKey xRootKey(
xRDB-getRootKey() );
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 04dcac8..5bef9ed 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -187,7 +187,6 @@ extern C DESKTOP_DLLPUBLIC int unopkg_main()
bool option_verbose = false;
bool option_bundled = false;
bool option_suppressLicense = false;
-bool subcmd_add = false;
bool subcmd_gui = false;
OUString logFile;
OUString repository;
@@ -239,7 +238,7 @@ extern C DESKTOP_DLLPUBLIC int unopkg_main()
osl_getCommandArg( nPos, subCommand.pData );
++nPos;
subCommand = subCommand.trim();
-subcmd_add = subCommand == add;
+bool subcmd_add = subCommand == add;
subcmd_gui = subCommand == gui;
// sun-command options and packages:
diff --git a/dtrans/source/win32/workbench/XTDo.cxx
b/dtrans/source/win32/workbench/XTDo.cxx
index 83b4464..8961285 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/dtrans/source/win32/workbench/XTDo.cxx
@@ -127,12 +127,12 @@ STDMETHODIMP CXTDataObject::GetData( LPFORMATETC
pFormatetc, LPSTGMEDIUM pmedium
return E_INVALIDARG;
HRESULT hr = E_FAIL;
-charpBuff[] = Test OleClipboard;
if ( CF_TEXT == pFormatetc-cfFormat )
{
CHGlobalHelper hGlobHlp( TRUE );
+charpBuff[] = Test OleClipboard;
hGlobHlp.Write( pBuff, sizeof( pBuff ), NULL );
pmedium-tymed = TYMED_HGLOBAL;
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 9e2e29f..85419c6 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1434,7 +1434,6 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex,
sal_Int32 nDeleted, SfxItemP
// Since features are treated differently than normal character attributes,
// can also the order of the start list be change!
bool bResort = false;
-bool bDelAttr = false;
sal_Int32 nEndChanges = nIndex+nDeleted;
sal_Int32 nAttr = 0;
@@ -1442,7 +1441,7 @@ void ContentNode::CollapsAttribs( sal_Int32 nIndex,
sal_Int32 nDeleted, SfxItemP
EditCharAttrib* pAttrib = GetAttrib(rAttribs, nAttr);
while ( pAttrib )
{
-bDelAttr = false;
+bool bDelAttr = false;
if ( pAttrib-GetEnd() = nIndex )
{
// Move all Attribute behind the insert point...
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index db8fe9c..1e2c2fc 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3002,13 +3002,12 @@ EditPaM ImpEditEngine::GetPaM( Point aDocPos, bool
bSmart )
OSL_ENSURE( GetUpdateMode(), Must not be reached when Update=FALSE:
GetPaM );
long nY = 0;
-long nTmpHeight;
EditPaM aPaM;
sal_Int32 nPortion;
for ( nPortion = 0; nPortion GetParaPortions().Count(); nPortion++ )
{
ParaPortion* pPortion = GetParaPortions()[nPortion];
-
[Bug 39440] cppcheck cleanliness
https://bugs.freedesktop.org/show_bug.cgi?id=39440 --- Comment #25 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Weghorn committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=04b183a9bc792a53a9f081353a79486faa4f3872 fdo#39440 reduce scope of local variables It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/runner
qadevOOo/Jar_OOoRunner.mk| 82 qadevOOo/Jar_OOoRunnerLight.mk | 82 qadevOOo/runner/base/java_cmp.java | 74 qadevOOo/runner/complexlib/Assurance.java| 37 qadevOOo/runner/complexlib/MethodThread.java | 13 qadevOOo/runner/convwatch/BorderRemover.java | 261 -- qadevOOo/runner/convwatch/BuildID.java | 127 - qadevOOo/runner/convwatch/ConvWatch.java | 372 --- qadevOOo/runner/convwatch/ConvWatchCancelException.java | 32 qadevOOo/runner/convwatch/ConvWatchException.java| 33 qadevOOo/runner/convwatch/ConvWatchStarter.java | 387 --- qadevOOo/runner/convwatch/CrashLoopTest.java | 50 qadevOOo/runner/convwatch/DB.java| 254 -- qadevOOo/runner/convwatch/DBHelper.java | 29 qadevOOo/runner/convwatch/DateHelper.java| 48 qadevOOo/runner/convwatch/DirectoryHelper.java | 125 - qadevOOo/runner/convwatch/DocumentConverter.java | 242 -- qadevOOo/runner/convwatch/EnhancedComplexTestCase.java | 101 qadevOOo/runner/convwatch/FileHelper.java| 342 -- qadevOOo/runner/convwatch/FilenameHelper.java| 364 --- qadevOOo/runner/convwatch/GfxCompare.java| 177 - qadevOOo/runner/convwatch/GlobalLogWriter.java |5 qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java | 339 -- qadevOOo/runner/convwatch/GraphicalTestArguments.java| 682 - qadevOOo/runner/convwatch/HTMLOutputter.java | 178 - qadevOOo/runner/convwatch/INIOutputter.java | 190 - qadevOOo/runner/convwatch/ImageHelper.java | 98 qadevOOo/runner/convwatch/IniFile.java | 238 -- qadevOOo/runner/convwatch/LISTOutputter.java | 85 qadevOOo/runner/convwatch/MSOfficePrint.java | 867 --- qadevOOo/runner/convwatch/NameHelper.java| 80 qadevOOo/runner/convwatch/OfficePrint.java | 1162 -- qadevOOo/runner/convwatch/PRNCompare.java| 504 qadevOOo/runner/convwatch/PerformanceContainer.java | 221 - qadevOOo/runner/convwatch/PixelCounter.java | 138 - qadevOOo/runner/convwatch/PropertyName.java | 58 qadevOOo/runner/convwatch/ReferenceBuilder.java | 257 -- qadevOOo/runner/convwatch/ReportDesignerTest.java| 535 qadevOOo/runner/convwatch/SimpleFileSemaphore.java | 180 - qadevOOo/runner/convwatch/StatusHelper.java | 88 qadevOOo/runner/convwatch/TimeHelper.java| 35 qadevOOo/runner/convwatch/TriState.java | 68 qadevOOo/runner/convwatch/ValueNotFoundException.java| 27 qadevOOo/runner/graphical/BuildID.java | 143 - qadevOOo/runner/graphical/DateHelper.java| 48 qadevOOo/runner/graphical/DirectoryHelper.java | 126 - qadevOOo/runner/graphical/EnhancedComplexTestCase.java | 454 --- qadevOOo/runner/graphical/FileHelper.java| 503 qadevOOo/runner/graphical/GlobalLogWriter.java | 54 qadevOOo/runner/graphical/GraphicalComparator.java | 37 qadevOOo/runner/graphical/HTMLResult.java| 190 - qadevOOo/runner/graphical/IOffice.java | 43 qadevOOo/runner/graphical/ImageHelper.java | 102 qadevOOo/runner/graphical/IniFile.java | 544 qadevOOo/runner/graphical/JPEGComparator.java| 653 - qadevOOo/runner/graphical/JPEGCreator.java | 356 --- qadevOOo/runner/graphical/JPEGEvaluator.java | 59 qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 686 - qadevOOo/runner/graphical/Office.java| 148 - qadevOOo/runner/graphical/OfficeException.java | 36 qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 384 --- qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 631 - qadevOOo/runner/graphical/ParameterHelper.java | 347 -- qadevOOo/runner/graphical/PerformanceContainer.java | 237 -- qadevOOo/runner/graphical/PixelCounter.java | 155 - qadevOOo/runner/graphical/PostscriptCreator.java | 78
[Libreoffice-commits] core.git: qadevOOo/qa
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 181
qadevOOo/qa/complex/junitskeleton/TestDocument.java | 32 --
qadevOOo/qa/complex/junitskeleton/justatest.java| 43 --
qadevOOo/qa/complex/junitskeleton/makefile.mk | 54 ---
qadevOOo/qa/complex/junitskeleton/test_documents/README.txt |1
qadevOOo/qa/unoapi/Test.java| 44 --
qadevOOo/qa/unoapi/knownissues.xcl |1
qadevOOo/qa/unoapi/qadevOOo.sce | 18 -
8 files changed, 374 deletions(-)
New commits:
commit 2d724f086f0ac9ee9a340610e0fa2c4fff110565
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 11 08:33:09 2014 +0200
java: remove the unit test skeleton code
much easier to copy and paste an existing test anyhow, and more likely
to be accurate and up-to-date
Change-Id: I4deed6d14b0e860e394a537e2a2092387c62b657
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
deleted file mode 100644
index e15a29c..000
--- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-package complex.junitskeleton;
-
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XCloseable;
-import java.io.File;
-import java.io.RandomAccessFile;
-
-import lib.TestParameters;
-
-import util.SOfficeFactory;
-
-// -- junit imports -
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-
-public class Skeleton
-{
-/**
- * The test parameters
- */
-private static TestParameters param = null;
-
-@Test public void check() {
-assertTrue(Couldn't open document, open());
-System.out.println(check);
-assertTrue(Couldn't close document, close());
-String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
-System.out.println(temp dir URL is: + tempDirURL);
-String tempDir =
graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
-assertTrue(Temp directory doesn't exist., new
File(tempDir).exists());
-}
-
-private boolean open()
-{
-System.out.println(open());
-// get multiservicefactory
-
-final XMultiServiceFactory xMsf = getMSF();
-
-SOfficeFactory.getFactory(xMsf);
-
-// some Tests need the qadevOOo TestParameters, it is like a
Hashmap for Properties.
-param = new TestParameters();
-param.put(ServiceFactory, xMsf); // some qadevOOo functions need
the ServiceFactory
-
-return true;
-}
-
-private boolean close()
-{
-System.out.println(close());
-return true;
-}
-
-// marked as test
-@Test public void checkDocument()
-{
-System.out.println(checkDocument());
-final String sREADME = TestDocument.getUrl(README.txt);
-System.out.println(README is in: + sREADME);
-File aFile = new File(sREADME);
-if (! aFile.exists())
-{
-// It is a little bit stupid that office urls not compatible
to java file urls
-System.out.println(java.io.File can't access Office file
urls.);
-String sREADMESystemPath =
graphical.FileHelper.getSystemPathFromFileURL(sREADME);
-aFile = new File(sREADMESystemPath);
-assertTrue(File ' + sREADMESystemPath + ' doesn't exists.,
aFile.exists());
-}
-
-try
-{
-RandomAccessFile aAccess = new RandomAccessFile(aFile, r);
-long nLength = aAccess.length();
-System.out.println(File length: + nLength);
-assertTrue(File length wrong, nLength 0);
-
Re: [Libreoffice-commits] core.git: 2 commits - desktop/source reportdesign/source
On Thu, Dec 11, 2014 at 10:02:11AM +0100, Miklos Vajna vmik...@collabora.co.uk wrote: If we have to choose between an empty Writer document in case there is nothing to restore and unwanted document imports, I would choose the previous. ;-) I would say if the empty Writer document is annoying for you, then please fix it without calling doRestore() when OOO_DISABLE_RECOVERY is set. FWIW, this is addressed with https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=fbe9accf36ac4c52ef5bcb84d455b4d06c317668. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cli_ure/source desktop/source sal/osl vcl/generic
cli_ure/source/climaker/climaker_app.cxx |6 ---
desktop/source/app/app.cxx |2 -
desktop/source/splash/unxsplash.cxx |3 -
sal/osl/unx/signal.cxx | 62 ++-
sal/osl/w32/profile.cxx |5 +-
vcl/generic/app/gensys.cxx |6 +--
6 files changed, 37 insertions(+), 47 deletions(-)
New commits:
commit df46ec0580b625efe8bd747bed54bc4d4d71f073
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 09:28:47 2014 +0100
osl_getCommandArg always returns osl_Process_E_None
Change-Id: I0ff1e44f17976fd3a3060d8ee7fe15d77c918b79
diff --git a/cli_ure/source/climaker/climaker_app.cxx
b/cli_ure/source/climaker/climaker_app.cxx
index c39f4b9..7d5b808 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -344,11 +344,7 @@ SAL_IMPLEMENT_MAIN()
!read_argument( keyfile, info_keyfile, nPos )
!read_argument( delaySign, info_delaySign, nPos ))
{
-if ( osl_getCommandArg( nPos, cmd_arg.pData ) !=
- osl_Process_E_None )
-{
-OSL_ASSERT( false );
-}
+osl_getCommandArg( nPos, cmd_arg.pData );
++nPos;
cmd_arg = cmd_arg.trim();
if (cmd_arg.getLength() 0)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e22f0a4..e5f0a84 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1152,7 +1152,7 @@ void restartOnMac(bool passArguments) {
sal_uInt32 n = osl_getCommandArgCount();
for (sal_uInt32 i = 0; i n; ++i) {
OUString arg;
-OSL_VERIFY(osl_getCommandArg(i, arg.pData) == osl_Process_E_None);
+osl_getCommandArg(i, arg.pData);
if (arg.match(--accept=)) {
wait = true;
}
diff --git a/desktop/source/splash/unxsplash.cxx
b/desktop/source/splash/unxsplash.cxx
index 0673286..9f34c41 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -103,8 +103,7 @@ UnxSplashScreen::initialize( const
::com::sun::star::uno::Sequence ::com::sun::
for ( sal_uInt32 i = 0; i osl_getCommandArgCount(); i++ )
{
OUString aArg;
-if ( osl_getCommandArg( i, aArg.pData ) )
-break;
+osl_getCommandArg( i, aArg.pData );
if ( aArg.matchIgnoreAsciiCaseAsciiL( PIPE_ARG, sizeof( PIPE_ARG ) -
1, 0 ) )
{
OUString aNum = aArg.copy( sizeof( PIPE_ARG ) - 1 );
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index c97162b..d5098a2 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -494,46 +494,42 @@ static int ReportCrash( int Signal )
for ( argi = 0; argi argc; argi++ )
{
-if ( osl_Process_E_None == osl_getCommandArg( argi, ustrCommandArg ) )
+osl_getCommandArg( argi, ustrCommandArg );
+if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr( ustrCommandArg
), --nocrashreport ) )
{
-if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr(
ustrCommandArg ), --nocrashreport ) )
-{
-rtl_uString_release( ustrCommandArg );
-return -1;
-}
-else if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr(
ustrCommandArg ), --autocrashreport ) )
-{
-bAutoCrashReport = true;
-}
-else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength(
-rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength(
ustrCommandArg ),
-REPORTENV_PARAM, strlen(REPORTENV_PARAM) )
-)
-{
-rtl_uString *ustrEnvironment = NULL;
-rtl_String *strEnv = NULL;
-
-rtl_uString_newFromStr( ustrEnvironment, rtl_uString_getStr(
ustrCommandArg ) + strlen(REPORTENV_PARAM) );
+rtl_uString_release( ustrCommandArg );
+return -1;
+}
+else if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr(
ustrCommandArg ), --autocrashreport ) )
+{
+bAutoCrashReport = true;
+}
+else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength(
+rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength(
ustrCommandArg ),
+REPORTENV_PARAM, strlen(REPORTENV_PARAM) )
+)
+{
+rtl_uString *ustrEnvironment = NULL;
+rtl_String *strEnv = NULL;
-if ( ustrEnvironment )
-{
-rtl_uString2String(
-strEnv,
-rtl_uString_getStr( ustrEnvironment ),
rtl_uString_getLength( ustrEnvironment ),
-osl_getThreadTextEncoding(),
OUSTRING_TO_OSTRING_CVTFLAGS
-
[Libreoffice-commits] core.git: include/oox oox/source sc/source
include/oox/dump/dumperbase.hxx | 21 --
include/oox/helper/binaryinputstream.hxx | 43 --
include/oox/helper/binaryoutputstream.hxx | 23 ++--
include/oox/ole/axbinaryreader.hxx|4 ++
include/oox/ole/axbinarywriter.hxx|5 +++
oox/source/crypto/DocumentDecryption.cxx | 25 -
oox/source/crypto/DocumentEncryption.cxx |4 +-
oox/source/crypto/Standard2007Engine.cxx |4 +-
oox/source/dump/dffdumper.cxx |6 ++--
oox/source/dump/dumperbase.cxx| 17 ++-
oox/source/dump/oledumper.cxx | 12
oox/source/helper/binaryinputstream.cxx |8 -
oox/source/ole/axbinaryreader.cxx |4 +-
oox/source/ole/axcontrol.cxx | 37 -
oox/source/ole/olehelper.cxx | 16 +++
oox/source/ole/vbacontrol.cxx |3 +-
oox/source/ole/vbahelper.cxx |3 +-
oox/source/ole/vbainputstream.cxx |2 -
sc/source/filter/inc/biffinputstream.hxx |2 -
sc/source/filter/oox/biffinputstream.cxx |8 ++---
sc/source/filter/oox/stylesbuffer.cxx |5 ++-
21 files changed, 139 insertions(+), 113 deletions(-)
New commits:
commit aa2f02a4dc8a05f49e679a26f2beebb9d66b2325
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 12 10:45:32 2014 +0200
remove operator and operator methods
in favour of ReadXXX/WriteXXX methods
Change-Id: I69eebee3a8ce5b40301db7940a1d85915c0bf6f4
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index a747de5..9a89f0a 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -1557,8 +1557,7 @@ typedef ::boost::shared_ptr InputObjectBase
InputObjectRef;
template typename Type
Type InputObjectBase::dumpName( const String rName, const NameListWrapper
rListWrp )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeNameItem( rName, nData, rListWrp );
return nData;
}
@@ -1566,8 +1565,7 @@ Type InputObjectBase::dumpName( const String rName,
const NameListWrapper rLis
template typename Type
Type InputObjectBase::dumpDec( const String rName, const NameListWrapper
rListWrp )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeDecItem( rName, nData, rListWrp );
return nData;
}
@@ -1575,8 +1573,7 @@ Type InputObjectBase::dumpDec( const String rName, const
NameListWrapper rList
template typename Type
Type InputObjectBase::dumpHex( const String rName, const NameListWrapper
rListWrp )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeHexItem( rName, nData, rListWrp );
return nData;
}
@@ -1584,8 +1581,7 @@ Type InputObjectBase::dumpHex( const String rName, const
NameListWrapper rList
template typename Type
Type InputObjectBase::dumpBin( const String rName, const NameListWrapper
rListWrp )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeBinItem( rName, nData, rListWrp );
return nData;
}
@@ -1593,8 +1589,7 @@ Type InputObjectBase::dumpBin( const String rName, const
NameListWrapper rList
template typename Type
Type InputObjectBase::dumpFix( const String rName, const NameListWrapper
rListWrp )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeFixItem( rName, nData, rListWrp );
return nData;
}
@@ -1602,8 +1597,7 @@ Type InputObjectBase::dumpFix( const String rName, const
NameListWrapper rList
template typename Type
Type InputObjectBase::dumpBool( const String rName, const NameListWrapper
rListWrp )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeDecBoolItem( rName, nData, rListWrp );
return nData;
}
@@ -1611,8 +1605,7 @@ Type InputObjectBase::dumpBool( const String rName,
const NameListWrapper rLis
template typename Type
Type InputObjectBase::dumpValue( const ItemFormat rItemFmt )
{
-Type nData;
-*mxStrm nData;
+Type nData = mxStrm-readValueType();
writeValueItem( rItemFmt, nData );
return nData;
}
diff --git a/include/oox/helper/binaryinputstream.hxx
b/include/oox/helper/binaryinputstream.hxx
index 0ddc1ab..4918605 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -78,28 +78,19 @@ public:
All data types supported by the ByteOrderConverter class can be used.
*/
template typename Type
-voidreadValue( Type ornValue );
-
-/** Reads a value from the stream and converts it to platform byte order.
-All data types supported by the ByteOrderConverter class can be used.
- */
-template typename Type
-Type readValue() { Type nValue; readValue( nValue ); return
nValue; }
-
-/** Stream operator
Re: Minutes of the Design Hangout: 2014-12-10
Hi Jan-Marek, Jan-Marek Glogowski píše v Čt 11. 12. 2014 v 15:59 +0100: * KDE5 vclplug + working on it + when is the next release? (Jonathan) + 4.5 in 6 months So somebody started a real KDE5 backend? From scratch or based on KDE4? Because the KDE4 backhand has some limits. Most of the stuff in the following list is implemented in the Gtk+ backend. Yes, Jonathan (CC'd) has - at the Munich hackfest :-) Initially he's started with the KDE4 backend from what I know (it is always easier to start with something that at least somehow works), but not sure what are his next plans - Jonathan? - No modal native dialogs LO VCL KDE4 doesn't use QWidgets, so AFAIK there is no way to implement the modal for the file picker . Gtk+ wraps the LO widgets in GtkWidgets, so modal native dialogs work. - No native widgets LO VCL KDE4 basically just uses some painting methods to render stuff. But we miss quite some stuff and others - like Oxygen menus can't really be used. But the KDE4 plugin can reimplement the SalMenu, like Gtk does to get the real background from the engine. - Slow All drawing operations are performed on a single image and copied to X. This image is always destroyed and there is basically no caching. Gtk+ keeps a caching widget per type around. - Use KIO Currently LO sets X-KDE-Protocols=file,http,ftp,webdav. Even smb was included for some time. But actually this depends on the native load / save dialog settings, and even the VCL backend, because the KDE4 file picker / VCL backend doesn't support neither smb nor webdav without KIO. See http://lists.freedesktop.org/archives/libreoffice/2014-September/063621.html http://lists.freedesktop.org/archives/libreoffice/2014-October/063876.html AFAIK there are still also Qt5 patches missing - same stuff that is was fixed for Qt4, but also isn't in (yet). All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: qadevOOo/qa
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 181
qadevOOo/qa/complex/junitskeleton/TestDocument.java | 32 ++
qadevOOo/qa/complex/junitskeleton/justatest.java| 43 ++
qadevOOo/qa/complex/junitskeleton/makefile.mk | 54 +++
qadevOOo/qa/complex/junitskeleton/test_documents/README.txt |1
qadevOOo/qa/unoapi/Test.java| 44 ++
qadevOOo/qa/unoapi/knownissues.xcl |1
qadevOOo/qa/unoapi/qadevOOo.sce | 18 +
8 files changed, 374 insertions(+)
New commits:
commit 4d58121e6da309ac083fd45f4d816c05d697dfc0
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 12 10:54:27 2014 +0200
Revert java: remove the unit test skeleton code
This reverts commit 2d724f086f0ac9ee9a340610e0fa2c4fff110565.
Apparently other bits of code are referencing the default .sce
file
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
new file mode 100644
index 000..e15a29c
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@ -0,0 +1,181 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+package complex.junitskeleton;
+
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.util.XCloseable;
+import java.io.File;
+import java.io.RandomAccessFile;
+
+import lib.TestParameters;
+
+import util.SOfficeFactory;
+
+// -- junit imports -
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+
+public class Skeleton
+{
+/**
+ * The test parameters
+ */
+private static TestParameters param = null;
+
+@Test public void check() {
+assertTrue(Couldn't open document, open());
+System.out.println(check);
+assertTrue(Couldn't close document, close());
+String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
+System.out.println(temp dir URL is: + tempDirURL);
+String tempDir =
graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
+assertTrue(Temp directory doesn't exist., new
File(tempDir).exists());
+}
+
+private boolean open()
+{
+System.out.println(open());
+// get multiservicefactory
-
+final XMultiServiceFactory xMsf = getMSF();
+
+SOfficeFactory.getFactory(xMsf);
+
+// some Tests need the qadevOOo TestParameters, it is like a
Hashmap for Properties.
+param = new TestParameters();
+param.put(ServiceFactory, xMsf); // some qadevOOo functions need
the ServiceFactory
+
+return true;
+}
+
+private boolean close()
+{
+System.out.println(close());
+return true;
+}
+
+// marked as test
+@Test public void checkDocument()
+{
+System.out.println(checkDocument());
+final String sREADME = TestDocument.getUrl(README.txt);
+System.out.println(README is in: + sREADME);
+File aFile = new File(sREADME);
+if (! aFile.exists())
+{
+// It is a little bit stupid that office urls not compatible
to java file urls
+System.out.println(java.io.File can't access Office file
urls.);
+String sREADMESystemPath =
graphical.FileHelper.getSystemPathFromFileURL(sREADME);
+aFile = new File(sREADMESystemPath);
+assertTrue(File ' + sREADMESystemPath + ' doesn't exists.,
aFile.exists());
+}
+
+try
+{
+RandomAccessFile aAccess = new RandomAccessFile(aFile, r);
+long nLength = aAccess.length();
+System.out.println(File length: + nLength);
+assertTrue(File length wrong, nLength 0);
+String sLine =
[Libreoffice-commits] core.git: libreofficekit/qa
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 1a77081b3d88a222c70634c266dbaabbc444d660 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 12 09:43:14 2014 +0100 lok_init can fail (in which case it printed sth to stderr already) Change-Id: I1c59a4fabf2f48f5f3637077496be5e252794b60 diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index e6a8d82..8f804f0 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -208,6 +208,8 @@ int main( int argc, char* argv[] ) } pOffice = lok_init( argv[1] ); +if ( pOffice == NULL ) +return 1; gtk_init( argc, argv ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - xmloff/source
xmloff/source/text/txtparae.cxx | 201
1 file changed, 105 insertions(+), 96 deletions(-)
New commits:
commit 46e59e55eca5a32f9f1b4471809ed182da495a32
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 10 16:06:21 2014 +0100
xmloff: make the export of the horrible field marks aware of auto-styles
When exporting the .DOC bugdoc of fdo#87110 to ODF, the auto-styles
export will iterate over the fieldmarks in the page header and add the
attributes for them but not export the elements, so the first auto-style
gets a bunch of duplicate attributes.
Change-Id: I3fcf39f03e3d9ae5fca661efa7eb4bbb3eab9f5c
(cherry picked from commit 06f85d41d02ebef76487b230f35f2ec638c46c8b)
Reviewed-on: https://gerrit.libreoffice.org/13426
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 7c91085..00954d6 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2291,130 +2291,139 @@ void
XMLTextParagraphExport::exportTextRangeEnumeration(
Reference ::com::sun::star::text::XFormField
xFormField(xPropSet-getPropertyValue(sBookmark), UNO_QUERY);
/* As of now, textmarks are a proposed extension to the
OpenDocument standard. */
-if ( GetExport().getDefaultVersion()
SvtSaveOptions::ODFVER_012 )
+if (!bAutoStyles)
{
-ReferenceXNamed
xBookmark(xPropSet-getPropertyValue(sBookmark), UNO_QUERY);
-if (xBookmark.is())
+if (GetExport().getDefaultVersion()
SvtSaveOptions::ODFVER_012)
{
-GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
xBookmark-getName());
-}
-
-if (xFormField.is())
-{
-GetExport().AddAttribute(XML_NAMESPACE_FIELD,
XML_TYPE, xFormField-getFieldType());
-}
-
-GetExport().StartElement(XML_NAMESPACE_FIELD,
XML_FIELDMARK_START, false);
-if (xFormField.is())
-{
-FieldParamExporter(GetExport(),
xFormField-getParameters()).Export();
-}
-GetExport().EndElement(XML_NAMESPACE_FIELD,
XML_FIELDMARK_START, false);
-}
-/* The OpenDocument standard does not include support for
TextMarks for now, so use bookmarks instead. */
-else
-{
-if (xFormField.is())
-{
-OUString sName;
-Reference ::com::sun::star::container::XNameAccess
xParameters(xFormField-getParameters(), UNO_QUERY);
-if (xParameters.is() xParameters-hasByName(Name))
+ReferenceXNamed
xBookmark(xPropSet-getPropertyValue(sBookmark), UNO_QUERY);
+if (xBookmark.is())
{
-const Any aValue = xParameters-getByName(Name);
-aValue = sName;
+GetExport().AddAttribute(XML_NAMESPACE_TEXT,
XML_NAME, xBookmark-getName());
}
-if (sName.isEmpty())
-{ // name attribute is mandatory, so have to pull a
-// rabbit out of the hat here
-sName = sFieldMarkName + OUString::number(
-m_pImpl-AddFieldMarkStart(xFormField));
-}
-GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME,
-sName);
-SvXMLElementExport aElem( GetExport(), !bAutoStyles,
-XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
-false, false );
-const OUString sFieldType = xFormField-getFieldType();
-if (sFieldType == ODF_FORMTEXT)
+
+if (xFormField.is())
{
-openFieldMark = TEXT;
+GetExport().AddAttribute(XML_NAMESPACE_FIELD,
XML_TYPE, xFormField-getFieldType());
}
-else if (sFieldType == ODF_FORMCHECKBOX)
+
+GetExport().StartElement(XML_NAMESPACE_FIELD,
XML_FIELDMARK_START, false);
+if (xFormField.is())
{
-openFieldMark = CHECK;
+FieldParamExporter(GetExport(),
xFormField-getParameters()).Export();
}
-else
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx | 10 +-
xmloff/source/text/txtimp.cxx |8 ++--
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit f3fee25f5767f01a7d3e7edcddc145ebf1326e9b
Author: Michael Stahl mst...@redhat.com
Date: Wed Dec 10 14:10:16 2014 +0100
fdo#87110: xmloff: don't catch IllegalArgumentException here
There are at least 2 callers of InsertTextContent() that have
non-trivial catch handlers for this exception, which aren't called now.
(regression from bebf8ccfba37f77d6a43c7874249b31736467b17)
Change-Id: I085b710dfd5877e9b7e71610951543eddf6a6e46
(cherry picked from commit b86f5530161a417d31e28e75408ee80352fadad7)
Reviewed-on: https://gerrit.libreoffice.org/13425
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index c16c38b..eb24cfd 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -759,7 +759,15 @@ void XMLTextFrameContext_Impl::Create( bool
/*bHRefOrBase64*/ )
XML_TEXT_FRAME_FLOATING_FRAME != nType)
{
Reference XTextContent xTxtCntnt( xPropSet, UNO_QUERY );
-xTextImportHelper-InsertTextContent( xTxtCntnt );
+try
+{
+xTextImportHelper-InsertTextContent(xTxtCntnt);
+}
+catch (lang::IllegalArgumentException const e)
+{
+SAL_WARN(xmloff.text, Cannot import part of the text - probably
an image in the text frame? e.Message);
+return;
+}
}
// #107848#
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 5c5e17e..191e81a 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1154,12 +1154,8 @@ void XMLTextImportHelper::InsertTextContent(
DBG_ASSERT(m_pImpl-m_xCursorAsRange.is(), no range);
if (m_pImpl-m_xText.is())
{
-try {
-m_pImpl-m_xText-insertTextContent( m_pImpl-m_xCursorAsRange,
xContent, sal_False);
-} catch ( const lang::IllegalArgumentException )
-{
-SAL_WARN( xmloff, Cannot import part of the text - probably an
image in the text frame? );
-}
+// note: this may throw IllegalArgumentException and callers handle it
+m_pImpl-m_xText-insertTextContent( m_pImpl-m_xCursorAsRange,
xContent, sal_False);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - editeng/source
editeng/source/editeng/editundo.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14ef5e63d6353f18f540ccbb37ad9b9173a682fe Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 10 15:58:42 2014 + Resolves: fdo#87141 Remove deletes the node, release doesn't regression from introduction of boost::ptr_vector originally one had to Remove and delete the return to delete it, while now the Remove automatically delete it. This bare Remove to just release it seems to have been overlooked Change-Id: I175f7c95862ce47402993e5e3b8feaa93af43e75 (cherry picked from commit efcbb12a27a380a442292f17c7f508555a66d4af) (cherry picked from commit a27bb66382687ce348db5f57a1e64ee6afcb5c43) Reviewed-on: https://gerrit.libreoffice.org/13422 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 55d3b5c3..a0f7d16 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -187,7 +187,7 @@ void EditUndoDelContent::Redo() pEE-RemoveParaPortion(nNode); // Do not delete node, depends on the undo! -pEE-GetEditDoc().Remove( nNode ); +pEE-GetEditDoc().Release( nNode ); if (pEE-IsCallParaInsertedOrDeleted()) pEE-ParagraphDeleted( nNode ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basic/source
basic/source/sbx/sbxvar.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit c3d625af537dcb5ca380b7fb30345d0cbd90e4b1 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 9 14:11:07 2014 + Resolves: fdo#86843 avoid getting deleted before finishing Broadcast Change-Id: I19181f9e2fbd5f906e6e5d807b1b2483e7881cf0 (cherry picked from commit 19d0950451f909086c3732ce29812c4cda513908) Reviewed-on: https://gerrit.libreoffice.org/13420 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index c0de91f..88997cc 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -166,6 +166,11 @@ void SbxVariable::Broadcast( sal_uIntPtr nHintId ) return; } } + +//fdo#86843 Add a ref during the following block to guard against +//getting deleted before completing this method +SbxVariableRef aBroadcastGuard(this); + // Avoid further broadcasting SfxBroadcaster* pSave = pCst; pCst = NULL; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - avmedia/source basic/source comphelper/source cppuhelper/source cpputools/source
avmedia/source/macavf/macavfuno.mm|4 -
avmedia/source/vlc/wrapper/SymbolLoader.hxx |4 -
basic/source/basmgr/basmgr.cxx| 11 +--
basic/source/classes/eventatt.cxx |8 +-
basic/source/classes/sb.cxx | 28
+-
basic/source/runtime/runtime.cxx |4 -
basic/source/sbx/sbxform.cxx | 28
+++---
basic/source/sbx/sbxvalue.cxx |2
comphelper/source/misc/documentinfo.cxx |2
comphelper/source/officeinstdir/officeinstallationdirectories.cxx |3 -
cppuhelper/source/factory.cxx |4 -
cpputools/source/unoexe/unoexe.cxx|8 --
12 files changed, 45 insertions(+), 61 deletions(-)
New commits:
commit dbe8aaa9b93950d148d2417b6d8627e696c0db53
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 10:22:56 2014 +0100
cpputools: Use appropriate OUString functions on string constants
Change-Id: Iea0f7b4ee3ef867a061c159d90efb5d210ae92a4
diff --git a/cpputools/source/unoexe/unoexe.cxx
b/cpputools/source/unoexe/unoexe.cxx
index e5944ae..94c0e11 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -195,16 +195,12 @@ static Reference XInterface loadComponent(
OUString aExt( rLocation.copy( nDot +1 ) );
-if (aExt.equalsAscii( dll ) ||
-aExt.equalsAscii( exe ) ||
-aExt.equalsAscii( dylib ) ||
-aExt.equalsAscii( so ) )
+if (aExt == dll || aExt == exe || aExt == dylib || aExt == so)
{
createInstance(
xLoader, xContext,
OUString(com.sun.star.loader.SharedLibrary) );
}
-else if (aExt.equalsAscii( jar ) ||
- aExt.equalsAscii( class ) )
+else if (aExt == jar || aExt == class)
{
createInstance(
xLoader, xContext, OUString(com.sun.star.loader.Java) );
commit 1be14f1a0085e7895cc1201504d5e57715494dfb
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 10:22:33 2014 +0100
cppuhelper: Use appropriate OUString functions on string constants
Change-Id: I7957898ed3172e79888bdb793e304359b10d75d7
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 29100b6..e288dad 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -790,9 +790,9 @@ Reference XInterface
ORegistryFactoryHelper::createModuleFactory()
if( nPos != -1 )
{
aActivatorName = aLocation.copy( 0, nPos );
-if( aActivatorName.equalsAscii( java ) )
+if( aActivatorName == java )
aActivatorName = com.sun.star.loader.Java;
-else if( aActivatorName.equalsAscii( module ) )
+else if( aActivatorName == module )
aActivatorName = com.sun.star.loader.SharedLibrary;
aLocation = aLocation.copy( nPos + 3 );
}
commit 85bcf0616009853ef57dd019b53fc811b3311be9
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 10:22:13 2014 +0100
comphelper: Use appropriate OUString functions on string constants
Change-Id: Ia09f122d4d968318fc0208b64b9bf7a0bc131f8a
diff --git a/comphelper/source/misc/documentinfo.cxx
b/comphelper/source/misc/documentinfo.cxx
index 4ddf1f2..6e72b73 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -95,7 +95,7 @@ namespace comphelper {
// work around a problem with embedded objects, which sometimes
return
// private:object as URL
sDocURL = _rxDocument-getURL();
-if ( sDocURL.matchAsciiL( private:, 8 ) )
+if ( sDocURL.startsWithIgnoreAsciiCase( private: ) )
sDocURL.clear();
// 2. if the document is not saved, yet, check the frame title
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index cb79e94..044eeaa 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -46,8 +46,7 @@ using namespace comphelper;
static bool makeCanonicalFileURL( OUString rURL )
{
-OSL_ENSURE( rURL.matchAsciiL( file:, sizeof( file: ) - 1 , 0 ) ,
-File URL expected! );
+OSL_ENSURE(rURL.startsWithIgnoreAsciiCase(file:), File URL expected!);
OUString aNormalizedURL;
if ( osl::FileBase::getAbsoluteFileURL( OUString(),
commit 898c4147000edc83598523cfe25d81ecdcfe82c6
Author: Stephan Bergmann sberg...@redhat.com
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - drawinglayer/source
drawinglayer/source/processor2d/vclprocessor2d.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5149e714c44182e22236d1f8daca719c318aad49
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 10 14:29:20 2014 +
Resolves: fdo#87189 don't draw negative canvas sizes
Change-Id: Ia52bc54084883817ffdd8ade06c3079865d52f70
(cherry picked from commit 6624484a608ed43fdeea1596f254915add671e08)
(cherry picked from commit 63a2168a6ea783d2c3824cdde8983dbfad147417)
Reviewed-on: https://gerrit.libreoffice.org/13414
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 97e088c..310523e 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -830,7 +830,7 @@ namespace drawinglayer
// Prepare target output size
Size aDestSize(aDestRectView.GetSize());
-if(aDestSize.getWidth() aDestSize.getHeight())
+if(aDestSize.getWidth() 0 aDestSize.getHeight() 0)
{
// Get preferred Metafile output size. When it's very equal to
the output size, it's probably
// a rounding error somewhere, so correct it to get a 1:1
output without single pixel scalings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/layout/frmtool.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 793580e9625fd0a86f0e88669ac2db9168874ff7
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 10 09:38:35 2014 +
Resolves: fdo#53460 crashes after casting SwTxtFrm to unrelated SwLayoutFrm
We still can't use ctrl+up to shrink the height of a row that has a table in
it, but it doesn't crash anymore.
This code presumably isn't truly table-in-table aware and should somehow
step
over the embedded table and not into it, which is what I guess it is
doing
here.
(cherry picked from commit 5141f2e0d89a8a10f0009bea40cc5cd15bf4fcc8)
Conflicts:
sw/source/core/layout/frmtool.cxx
Change-Id: I0e4c757c75438a89eb7721de32990f2f21c1ad8b
(cherry picked from commit c1a5e49bdb0d6c1533d33520ea7c01a660a5d1f4)
Reviewed-on: https://gerrit.libreoffice.org/13412
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 3418f3d..d7f6588 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -3129,12 +3129,11 @@ static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm
*pCell )
{
long nRstHeight = 0;
SwFrm *pLow = pCell-Lower();
-do
-{ nRstHeight += ::CalcRowRstHeight( (SwLayoutFrm*)pLow );
+while (pLow pLow-IsLayoutFrm())
+{
+nRstHeight += ::CalcRowRstHeight(static_castSwLayoutFrm*(pLow));
pLow = pLow-GetNext();
-
-} while ( pLow );
-
+}
return nRstHeight;
}
}
@@ -3142,11 +3141,11 @@ static SwTwips lcl_CalcCellRstHeight( SwLayoutFrm
*pCell )
SwTwips CalcRowRstHeight( SwLayoutFrm *pRow )
{
SwTwips nRstHeight = LONG_MAX;
-SwLayoutFrm *pLow = (SwLayoutFrm*)pRow-Lower();
-while ( pLow )
+SwFrm *pLow = pRow-Lower();
+while (pLow pLow-IsLayoutFrm())
{
-nRstHeight = std::min( nRstHeight, ::lcl_CalcCellRstHeight( pLow ) );
-pLow = (SwLayoutFrm*)pLow-GetNext();
+nRstHeight = std::min(nRstHeight,
::lcl_CalcCellRstHeight(static_castSwLayoutFrm*(pLow)));
+pLow = pLow-GetNext();
}
return nRstHeight;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/editeng/textconv.cxx |7 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit db897383b4034cd4b5e00d0b954a8075b43ed8bd
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 10:36:10 2014 +
Resolves: fdo#86931 wrong offsets used to set language
after Chinese conversion. the _aOldSel is the one
that has the start and end index set to the end of the
replacement text and so the calculation only makes
sense on that selection
Change-Id: I152067550d7741579bfc6ca026072b16ac7c2dd6
(cherry picked from commit 6d10a42d5b1690b3b1ed81d99a3a1bc9b65c30d9)
Reviewed-on: https://gerrit.libreoffice.org/13373
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 3140c16..05fe8cc 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3953,7 +3953,7 @@ long ImpEditEngine::GetXPos(
if( pLine-GetCharPosArray().size() )
{
sal_Int32 nPos = nIndex - 1 - pLine-GetStart();
-if( nPos = (sal_Int32)pLine-GetCharPosArray().size() )
+if (nPos 0 || nPos =
(sal_Int32)pLine-GetCharPosArray().size())
{
nPos = pLine-GetCharPosArray().size()-1;
OSL_FAIL(svx::ImpEditEngine::GetXPos(), index out of
range!);
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index 307d0e8..7fd5e62 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -374,11 +374,11 @@ void TextConvWrapper::ReplaceUnit(
// remember current original language for kater use
ImpEditEngine *pImpEditEng = m_pEditView-GetImpEditEngine();
-ESelection _aOldSel = m_pEditView-GetSelection();
+ESelection aOldSel = m_pEditView-GetSelection();
//EditSelection aOldEditSel =
pEditView-GetImpEditView()-GetEditSelection();
#ifdef DBG_UTIL
-LanguageType nOldLang = pImpEditEng-GetLanguage(
pImpEditEng-CreateSel( _aOldSel ).Min() );
+LanguageType nOldLang = pImpEditEng-GetLanguage(
pImpEditEng-CreateSel( aOldSel ).Min() );
#endif
pImpEditEng-UndoActionStart( EDITUNDO_INSERT );
@@ -388,7 +388,7 @@ void TextConvWrapper::ReplaceUnit(
// Thus we do this only for Chinese translation...
bool bIsChineseConversion = IsChinese( GetSourceLanguage() );
if (bIsChineseConversion)
-ChangeText( aNewTxt, rOrigText, rOffsets, _aOldSel );
+ChangeText( aNewTxt, rOrigText, rOffsets, aOldSel );
else
ChangeText( aNewTxt, rOrigText, NULL, NULL );
@@ -398,7 +398,6 @@ void TextConvWrapper::ReplaceUnit(
DBG_ASSERT( GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED ||
GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL,
TextConvWrapper::ReplaceUnit : unexpected target language );
-ESelection aOldSel = m_pEditView-GetSelection();
ESelection aNewSel( aOldSel );
aNewSel.nStartPos = aNewSel.nStartPos - aNewTxt.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 38 ++--
1 file changed, 25 insertions(+), 13 deletions(-)
New commits:
commit e123ffd66088783ce74a7b5f15e9d324b39ecf67
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 10:49:28 2014 +0100
fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLs
...but apparently wants pathnames instead, cf. the other use of it in
WinSalInstance::AddToRecentDocumentList (vcl/win/source/app/salinst.cxx).
Change-Id: Iaa64ff82915f7cbfee55b4389387b226f7adc919
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index b0cfdc4..9716c1e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -51,6 +51,28 @@ HWND choose_parent_window()
return hwnd_parent;
}
+namespace {
+
+bool createFolderItem(OUString const url, ComPtrIShellItem folder) {
+OUString path;
+if (osl::FileBase::getSystemPathFromFileURL(url, path)
+!= osl::FileBase::E_None)
+{
+return false;
+}
+#if defined __MINGW32__
+HRESULT res = SHCreateItemFromParsingName(
+reinterpret_castLPCTSTR(path.getStr()), NULL, IID_IShellItem,
+reinterpret_castvoid **(folder));
+#else
+HRESULT res = SHCreateItemFromParsingName(
+path.getStr(), NULL, IID_PPV_ARGS(folder));
+#endif
+return SUCCEEDED(res);
+}
+
+}
+
namespace fpicker{
namespace win32{
namespace vista{
@@ -681,12 +703,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const
RequestRef rRequest)
// - SYNCHRONIZED
ComPtr IShellItem pFolder;
-#ifdef __MINGW32__
-HRESULT hResult = SHCreateItemFromParsingName (
reinterpret_castLPCTSTR(sDirectory.getStr()), NULL, IID_IShellItem,
reinterpret_castvoid**(pFolder) );
-#else
-HRESULT hResult = SHCreateItemFromParsingName ( sDirectory.getStr(), NULL,
IID_PPV_ARGS(pFolder) );
-#endif
-if ( FAILED(hResult) )
+if ( !createFolderItem(sDirectory, pFolder) )
return;
if ( m_bInExecute || bForce )
@@ -878,12 +895,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const
RequestRef rRequest)
if( m_sDirectory.getLength())
{
ComPtr IShellItem pFolder;
-#ifdef __MINGW32__
-HRESULT hResult = SHCreateItemFromParsingName (
reinterpret_castLPCTSTR(m_sDirectory.getStr()), NULL, IID_IShellItem,
reinterpret_castvoid**(pFolder) );
-#else
-HRESULT hResult = SHCreateItemFromParsingName (
m_sDirectory.getStr(), NULL, IID_PPV_ARGS(pFolder) );
-#endif
-if ( SUCCEEDED(hResult) )
+if ( createFolderItem(m_sDirectory, pFolder) )
{
if (m_sFilename.getLength())
{
@@ -931,7 +943,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const
RequestRef rRequest)
FindClose( hFind );
}
else
-hResult = iDialog-AddPlace(pFolder, FDAP_TOP);
+iDialog-AddPlace(pFolder, FDAP_TOP);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 38 ++--
1 file changed, 25 insertions(+), 13 deletions(-)
New commits:
commit 483e7103e895f4da84aa7de94938b373b5fcd64b
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 10:49:28 2014 +0100
fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLs
...but apparently wants pathnames instead, cf. the other use of it in
WinSalInstance::AddToRecentDocumentList (vcl/win/source/app/salinst.cxx).
Change-Id: Iaa64ff82915f7cbfee55b4389387b226f7adc919
(cherry picked from commit e123ffd66088783ce74a7b5f15e9d324b39ecf67)
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index b0cfdc4..9716c1e 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -51,6 +51,28 @@ HWND choose_parent_window()
return hwnd_parent;
}
+namespace {
+
+bool createFolderItem(OUString const url, ComPtrIShellItem folder) {
+OUString path;
+if (osl::FileBase::getSystemPathFromFileURL(url, path)
+!= osl::FileBase::E_None)
+{
+return false;
+}
+#if defined __MINGW32__
+HRESULT res = SHCreateItemFromParsingName(
+reinterpret_castLPCTSTR(path.getStr()), NULL, IID_IShellItem,
+reinterpret_castvoid **(folder));
+#else
+HRESULT res = SHCreateItemFromParsingName(
+path.getStr(), NULL, IID_PPV_ARGS(folder));
+#endif
+return SUCCEEDED(res);
+}
+
+}
+
namespace fpicker{
namespace win32{
namespace vista{
@@ -681,12 +703,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const
RequestRef rRequest)
// - SYNCHRONIZED
ComPtr IShellItem pFolder;
-#ifdef __MINGW32__
-HRESULT hResult = SHCreateItemFromParsingName (
reinterpret_castLPCTSTR(sDirectory.getStr()), NULL, IID_IShellItem,
reinterpret_castvoid**(pFolder) );
-#else
-HRESULT hResult = SHCreateItemFromParsingName ( sDirectory.getStr(), NULL,
IID_PPV_ARGS(pFolder) );
-#endif
-if ( FAILED(hResult) )
+if ( !createFolderItem(sDirectory, pFolder) )
return;
if ( m_bInExecute || bForce )
@@ -878,12 +895,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const
RequestRef rRequest)
if( m_sDirectory.getLength())
{
ComPtr IShellItem pFolder;
-#ifdef __MINGW32__
-HRESULT hResult = SHCreateItemFromParsingName (
reinterpret_castLPCTSTR(m_sDirectory.getStr()), NULL, IID_IShellItem,
reinterpret_castvoid**(pFolder) );
-#else
-HRESULT hResult = SHCreateItemFromParsingName (
m_sDirectory.getStr(), NULL, IID_PPV_ARGS(pFolder) );
-#endif
-if ( SUCCEEDED(hResult) )
+if ( createFolderItem(m_sDirectory, pFolder) )
{
if (m_sFilename.getLength())
{
@@ -931,7 +943,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const
RequestRef rRequest)
FindClose( hFind );
}
else
-hResult = iDialog-AddPlace(pFolder, FDAP_TOP);
+iDialog-AddPlace(pFolder, FDAP_TOP);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - filter/source fpicker/source include/vcl offapi/com vcl/Library_vcl.mk vcl/source xmlsecurity/source
filter/source/pdf/impdialog.cxx | 18 filter/source/pdf/impdialog.hrc |3 filter/source/pdf/impdialog.src | 10 filter/source/pdf/pdfexport.cxx |2 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 38 + include/vcl/pdfwriter.hxx |5 offapi/com/sun/star/security/CertificateCharacters.idl |4 offapi/com/sun/star/security/CertificateException.idl |5 offapi/com/sun/star/security/CertificateValidity.idl |4 offapi/com/sun/star/security/CryptographyException.idl |5 offapi/com/sun/star/security/DocumentDigitalSignatures.idl |3 offapi/com/sun/star/security/EncryptionException.idl |5 offapi/com/sun/star/security/ExtAltNameType.idl |2 offapi/com/sun/star/security/KeyException.idl |5 offapi/com/sun/star/security/NoPasswordException.idl |7 offapi/com/sun/star/security/SignatureException.idl |8 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl |5 offapi/com/sun/star/security/XSanExtension.idl |4 offapi/com/sun/star/security/XSerialNumberAdapter.idl |2 offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl |5 offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl |5 offapi/com/sun/star/xml/crypto/XMLEncryption.idl |4 offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl |8 offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl |5 offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl |5 offapi/com/sun/star/xml/crypto/XMLSignature.idl |5 offapi/com/sun/star/xml/crypto/XMLSignatureException.idl |8 offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl |5 offapi/com/sun/star/xml/crypto/XUriBinding.idl |5 offapi/com/sun/star/xml/crypto/XXMLEncryption.idl |5 offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl |6 offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl |5 offapi/com/sun/star/xml/crypto/XXMLSignature.idl |4 offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl |5 offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl |4 offapi/com/sun/star/xml/crypto/sax/Decryptor.idl |5 offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl |4 offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl |5 offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl |5 offapi/com/sun/star/xml/crypto/sax/Encryptor.idl |5 offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl |5 offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl |3 offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl |7 offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl |5 offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl |5 offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl |5 offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl |5 offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl |5 offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl |2 offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl |5 offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl |5 offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl |5 offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl |5 offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl |5 offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl |5 offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl |5
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 38 ++--
1 file changed, 25 insertions(+), 13 deletions(-)
New commits:
commit 975c0abd7c019f24b9a4887b78874dadb2e44287
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 10:49:28 2014 +0100
fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLs
...but apparently wants pathnames instead, cf. the other use of it in
WinSalInstance::AddToRecentDocumentList (vcl/win/source/app/salinst.cxx).
Change-Id: Iaa64ff82915f7cbfee55b4389387b226f7adc919
(cherry picked from commit e123ffd66088783ce74a7b5f15e9d324b39ecf67)
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 22a5b9d..579ec54 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -51,6 +51,28 @@ HWND choose_parent_window()
return hwnd_parent;
}
+namespace {
+
+bool createFolderItem(OUString const url, ComPtrIShellItem folder) {
+OUString path;
+if (osl::FileBase::getSystemPathFromFileURL(url, path)
+!= osl::FileBase::E_None)
+{
+return false;
+}
+#if defined __MINGW32__
+HRESULT res = SHCreateItemFromParsingName(
+reinterpret_castLPCTSTR(path.getStr()), NULL, IID_IShellItem,
+reinterpret_castvoid **(folder));
+#else
+HRESULT res = SHCreateItemFromParsingName(
+path.getStr(), NULL, IID_PPV_ARGS(folder));
+#endif
+return SUCCEEDED(res);
+}
+
+}
+
namespace fpicker{
namespace win32{
namespace vista{
@@ -683,12 +705,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const
RequestRef rRequest)
// - SYNCHRONIZED
ComPtr IShellItem pFolder;
-#ifdef __MINGW32__
-HRESULT hResult = SHCreateItemFromParsingName (
reinterpret_castLPCTSTR(sDirectory.getStr()), NULL, IID_IShellItem,
reinterpret_castvoid**(pFolder) );
-#else
-HRESULT hResult = SHCreateItemFromParsingName ( sDirectory.getStr(), NULL,
IID_PPV_ARGS(pFolder) );
-#endif
-if ( FAILED(hResult) )
+if ( !createFolderItem(sDirectory, pFolder) )
return;
if ( m_bInExecute || bForce )
@@ -876,12 +893,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const
RequestRef rRequest)
if( m_sDirectory.getLength())
{
ComPtr IShellItem pFolder;
-#ifdef __MINGW32__
-HRESULT hResult = SHCreateItemFromParsingName (
reinterpret_castLPCTSTR(m_sDirectory.getStr()), NULL, IID_IShellItem,
reinterpret_castvoid**(pFolder) );
-#else
-HRESULT hResult = SHCreateItemFromParsingName (
m_sDirectory.getStr(), NULL, IID_PPV_ARGS(pFolder) );
-#endif
-if ( SUCCEEDED(hResult) )
+if ( createFolderItem(m_sDirectory, pFolder) )
{
if (m_sFilename.getLength())
{
@@ -929,7 +941,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const
RequestRef rRequest)
FindClose( hFind );
}
else
-hResult = iDialog-AddPlace(pFolder, FDAP_TOP);
+iDialog-AddPlace(pFolder, FDAP_TOP);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/helper/binaryinputstream.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7948b273a9725c546e0dc32bece296dc872bdc04
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 12 12:48:44 2014 +0200
fix commit
fix my commit aa2f02a4dc8a05f49e679a26f2beebb9d66b232
remove operator and operator methods
I incorrectly inverted the conditional
Change-Id: Iade05b88bdedb7e5b0cff25a80d3b88ff4a0235f
diff --git a/oox/source/helper/binaryinputstream.cxx
b/oox/source/helper/binaryinputstream.cxx
index 7597981..3c41921 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -45,7 +45,7 @@ OUString BinaryInputStream::readNulUnicodeArray()
for (;;)
{
sal_uInt16 nChar = readuInt16();
- if ( mbEof || (nChar 0) ) break;
+ if ( mbEof || (nChar == 0) ) break;
aBuffer.append( static_cast sal_Unicode ( nChar ) );
}
return aBuffer.makeStringAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/jobset.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 554ba09f76ca1b7b29c0fc19aa4df443840b02d3
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 12:25:01 2014 +0100
vcl: Use appropriate OUString functions on string constants
Change-Id: Ie230115d71bffeb08fc13380648e8216c43f3a5d
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ec1f44f..d9fca22 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -277,15 +277,15 @@ SvStream ReadJobSetup( SvStream rIStream, JobSetup
rJobSetup )
{
OUString aKey =
read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
OUString aValue =
read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
-if( aKey.equalsAscii( COMPAT_DUPLEX_MODE ) )
+if( aKey == COMPAT_DUPLEX_MODE )
{
-if( aValue.equalsAscii( DUPLEX_UNKNOWN ) )
+if( aValue == DUPLEX_UNKNOWN )
pJobData-meDuplexMode = DUPLEX_UNKNOWN;
-else if( aValue.equalsAscii( DUPLEX_OFF ) )
+else if( aValue == DUPLEX_OFF )
pJobData-meDuplexMode = DUPLEX_OFF;
-else if( aValue.equalsAscii( DUPLEX_SHORTEDGE ) )
+else if( aValue == DUPLEX_SHORTEDGE )
pJobData-meDuplexMode = DUPLEX_SHORTEDGE;
-else if( aValue.equalsAscii( DUPLEX_LONGEDGE ) )
+else if( aValue == DUPLEX_LONGEDGE )
pJobData-meDuplexMode = DUPLEX_LONGEDGE;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 10 commits - i18npool/source i18nutil/source include/svl include/toolkit linguistic/source pyuno/source sal/qa svl/source svtools/source testtools/source toolkit/source
i18npool/source/breakiterator/breakiteratorImpl.cxx |6
i18npool/source/breakiterator/breakiterator_cjk.cxx |2
i18npool/source/collator/collator_unicode.cxx |2
i18npool/source/indexentry/indexentrysupplier.cxx |4
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx |8
i18npool/source/localedata/LocaleNode.cxx | 12 -
i18npool/source/nativenumber/nativenumbersupplier.cxx |6
i18npool/source/ordinalsuffix/ordinalsuffix.cxx |4
i18npool/source/search/textsearch.cxx |5
i18nutil/source/utility/paper.cxx | 28 +-
include/svl/inettype.hxx | 16 -
include/toolkit/controls/dialogcontrol.hxx| 12 -
include/toolkit/controls/formattedcontrol.hxx |4
include/toolkit/controls/roadmapcontrol.hxx |4
include/toolkit/controls/tkscrollbar.hxx |4
include/toolkit/controls/unocontrolcontainer.hxx |2
include/toolkit/controls/unocontrolcontainermodel.hxx |2
include/toolkit/controls/unocontrols.hxx | 62 ++---
include/toolkit/helper/macros.hxx |2
include/toolkit/helper/servicenames.hxx | 98 -
linguistic/source/lngsvcmgr.cxx | 32 +--
pyuno/source/module/pyuno_adapter.cxx |6
sal/qa/osl/condition/osl_Condition_Const.h|2
sal/qa/osl/file/osl_File_Const.h |7
svl/source/misc/inettype.cxx | 24 +-
svl/source/numbers/numfmuno.cxx | 42 ++--
svl/source/numbers/zformat.cxx|6
svl/source/uno/pathservice.cxx|3
svtools/source/control/vclxaccessibleheaderbar.cxx|4
svtools/source/graphic/provider.cxx | 15 -
svtools/source/java/javacontext.cxx |2
svtools/source/svhtml/parhtml.cxx |4
svtools/source/uno/addrtempuno.cxx|6
testtools/source/bridgetest/bridgetest.cxx|2
testtools/source/bridgetest/currentcontextchecker.cxx |7
toolkit/source/controls/controlmodelcontainerbase.cxx | 104 --
toolkit/source/controls/dialogcontrol.cxx | 14 -
toolkit/source/controls/tree/treecontrol.cxx |6
toolkit/source/controls/tree/treecontrol.hxx |2
toolkit/source/controls/unocontrols.cxx | 16 -
toolkit/source/helper/property.cxx| 10
toolkit/source/helper/servicenames.cxx| 55 -
unotools/source/config/eventcfg.cxx |2
unotools/source/config/saveopt.cxx|4
unotools/source/ucbhelper/tempfile.cxx|2
unotools/source/ucbhelper/ucblockbytes.cxx|6
46 files changed, 289 insertions(+), 377 deletions(-)
New commits:
commit 6088eb600bf68b65b4fe6eb89224d3cf66361cbf
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 12:24:35 2014 +0100
unotools: Use appropriate OUString functions on string constants
Change-Id: I14d3a3187b8528e3ff9743245b869773c2eb5e98
diff --git a/unotools/source/config/eventcfg.cxx
b/unotools/source/config/eventcfg.cxx
index b93dd9e..ef1f984 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -240,7 +240,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const
OUString aName, cons
sal_Int32 nPropCount = props.getLength();
for( sal_Int32 index = 0; index nPropCount; ++index )
{
-if ( props[ index ].Name.equalsAscii( Script ) )
+if ( props[ index ].Name == Script )
props[ index ].Value = macroURL;
}
m_eventBindingHash[ aName ] = macroURL;
diff --git a/unotools/source/config/saveopt.cxx
b/unotools/source/config/saveopt.cxx
index f1427cf..fa7e065 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -771,7 +771,7 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl()
, bLoadUserDefinedSettings( false )
{
Sequence OUString aNames(1);
-aNames[0] = OUString::createFromAscii(cUserDefinedSettings);
+aNames[0] = cUserDefinedSettings;
Sequence Any aValues = GetProperties( aNames );
EnableNotification( aNames );
const Any* pValues = aValues.getConstArray();
@@ -787,7 +787,7 @@ SvtLoadOptions_Impl::~SvtLoadOptions_Impl()
void SvtLoadOptions_Impl::Commit()
{
Sequence OUString aNames(1);
-
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/DocumentSettingsContext.cxx |6 ++--
xmloff/source/core/RDFaImportHelper.cxx |6 ++--
xmloff/source/core/xmlmultiimagehelper.cxx | 16 +--
xmloff/source/draw/XMLImageMapExport.cxx| 14 ++---
xmloff/source/draw/shapeexport.cxx |2 -
xmloff/source/draw/ximpcustomshape.cxx | 24
xmloff/source/draw/ximpshap.cxx | 34
xmloff/source/forms/layerimport.cxx |2 -
xmloff/source/forms/propertyexport.cxx |2 -
xmloff/source/style/xmlnumfi.cxx|4 +-
xmloff/source/text/XMLSectionExport.cxx |8 +
xmloff/source/text/XMLTextFrameContext.cxx |2 -
xmloff/source/text/XMLTextMarkImportContext.cxx | 17 +---
xmloff/source/text/txtflde.cxx | 11 +++
xmloff/source/text/txtimp.cxx |6 ++--
xmloff/source/text/txtparae.cxx |2 -
xmloff/source/transform/Oasis2OOo.cxx |9 ++
17 files changed, 74 insertions(+), 91 deletions(-)
New commits:
commit 513108bd57bc64091f1faaa640c0f026b7d91001
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 12:25:35 2014 +0100
xmloff: Use appropriate OUString functions on string constants
Change-Id: Idbe6ac27a4125bd9d9acb01ac42b60396abf0c81
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx
b/xmloff/source/core/DocumentSettingsContext.cxx
index 4e60385..f49e938 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -376,7 +376,7 @@ void XMLDocumentSettingsContext::EndElement()
bool bFound(false);
while((i = 0) !bFound)
{
-if (aSeqViewProps[i].Name.equalsAscii(Views))
+if (aSeqViewProps[i].Name == Views)
{
bFound = true;
uno::Referencecontainer::XIndexAccess xIndexAccess;
@@ -404,13 +404,13 @@ void XMLDocumentSettingsContext::EndElement()
{
OUString sProp( aSeqConfigProps[i].Name );
-if ( sProp.equalsAscii(PrinterName) )
+if ( sProp == PrinterName )
{
OUString sEmpty;
aSeqConfigProps[i].Value = uno::makeAny( sEmpty );
nFound++;
}
-else if ( sProp.equalsAscii(PrinterSetup) )
+else if ( sProp == PrinterSetup )
{
uno::Sequence sal_Int8 aEmpty;
aSeqConfigProps[i].Value = uno::makeAny( aEmpty );
diff --git a/xmloff/source/core/RDFaImportHelper.cxx
b/xmloff/source/core/RDFaImportHelper.cxx
index 81ef976..61b7169 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -247,7 +247,7 @@ RDFaReader::ReadURIOrSafeCURIE(OUString const
i_rURIOrSafeCURIE) const
}
else
{
-if (i_rURIOrSafeCURIE.matchAsciiL(_:, 2)) // blank node
+if (i_rURIOrSafeCURIE.startsWith(_:)) // blank node
{
SAL_INFO(xmloff.core, ReadURIOrSafeCURIE: invalid URI: scheme
is _ );
return OUString();
@@ -273,7 +273,7 @@ RDFaInserter::LookupBlankNode(OUString const i_rNodeId )
uno::Reference rdf::XURI
RDFaInserter::MakeURI( OUString const i_rURI) const
{
-if (i_rURI.matchAsciiL(_:, 2)) // blank node
+if (i_rURI.startsWith(_:)) // blank node
{
SAL_INFO(xmloff.core, MakeURI: cannot create URI for blank node);
return 0;
@@ -295,7 +295,7 @@ RDFaInserter::MakeURI( OUString const i_rURI) const
uno::Reference rdf::XResource
RDFaInserter::MakeResource( OUString const i_rResource)
{
-if (i_rResource.matchAsciiL(_:, 2)) // blank node
+if (i_rResource.startsWith(_:)) // blank node
{
// we cannot use the blank node label as-is: it must be distinct
// from labels in other graphs, so create fresh ones per XML stream
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx
b/xmloff/source/core/xmlmultiimagehelper.cxx
index 8ada292..b0607a2 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -29,37 +29,37 @@ namespace
sal_uInt32 nRetval(0);
// pixel formats first
-if(rString.endsWithAsciiL(.bmp, 4))
+if(rString.endsWith(.bmp))
{
return 10;
}
-if(rString.endsWithAsciiL(.gif, 4))
+if(rString.endsWith(.gif))
{
return 20;
}
-if(rString.endsWithAsciiL(.jpg, 4))
+if(rString.endsWith(.jpg))
{
return 30;
}
-if(rString.endsWithAsciiL(.png, 4))
+if(rString.endsWith(.png))
{
return 40;
}
// vector formats, prefer always
-if(rString.endsWithAsciiL(.svm, 4))
+
Fedor Kudasov license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/test odk/examples xmerge/source
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
|2 +-
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
|2 +-
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
|2 +-
odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
|2 +-
odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
|2 +-
odk/examples/java/Inspector/InspectorAddon.java
|2 +-
odk/examples/java/Inspector/ProtocolHandlerAddon.java
|2 +-
odk/examples/java/MinimalComponent/MinimalComponent.java
|2 +-
odk/examples/java/ToDo/ToDo.java
|2 +-
xmerge/source/bridge/java/XMergeBridge.java
|2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7320714922b2d68f668283747faf1b98e7d2b15b
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 12 13:37:47 2014 +0200
java: fix non-public UNO implementation classes
which I messed up in commit 70f56bc22fe952c
java: reduce scope, make member classes private
Change-Id: I817b2a571e2124f551ccd5c0d8e1099d89f0ec46
diff --git
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
index abd49d5..17c6244 100644
---
a/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
+++
b/desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
@@ -43,7 +43,7 @@ import com.sun.star.util.XChangesBatch;
*/
public class OptionsEventHandler {
-private static class _OptionsEventHandler extends WeakBase
+public static class _OptionsEventHandler extends WeakBase
implements XServiceInfo, XContainerWindowEventHandler {
static private final String __serviceName =
diff --git
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
index 083347c..253ca60 100644
---
a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
+++
b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
@@ -65,7 +65,7 @@ import com.sun.star.test.XTestDialogHandler;
// ComponentBase, see implementation of TestComponentA.
public class DialogComponent {
-private static class _DialogComponent
+public static class _DialogComponent
implements XTypeProvider, XServiceInfo, XTestDialogHandler,
XDialogEventHandler {
private static final String __serviceName=
com.sun.star.test.TestDialogHandler;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 7930f85..bf3cea5 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -67,7 +67,7 @@ import com.sun.star.document.XFilter;
public class AsciiReplaceFilter
{
-private static class _AsciiReplaceFilter extends WeakBase
+public static class _AsciiReplaceFilter extends WeakBase
implements XInitialization ,
XServiceInfo,
XNamed ,
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
index a3a2e09..e6d6830 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java
@@ -108,7 +108,7 @@ class ExampleAddInThread extends Thread
public class ExampleAddIn
{
-static private class _ExampleAddIn extends
com.sun.star.lib.uno.helper.WeakBase
+static public class _ExampleAddIn extends
com.sun.star.lib.uno.helper.WeakBase
implements org.openoffice.sheet.addin.XExampleAddIn,
com.sun.star.sheet.XAddIn,
com.sun.star.lang.XServiceName,
diff --git
a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
index 445b75d..bea38f1 100644
---
[Libreoffice-commits] core.git: 3 commits - include/svl lotuswordpro/source package/inc package/source svl/source unusedcode.easy
include/svl/style.hxx | 11 +--
include/svl/zforlist.hxx| 12 ++-
lotuswordpro/source/filter/lwpsvstream.cxx | 18 -
lotuswordpro/source/filter/lwpsvstream.hxx |4 -
package/inc/ByteChucker.hxx | 37 +--
package/inc/ByteGrabber.hxx | 16 +++-
package/source/zipapi/ByteChucker.cxx | 47 --
package/source/zipapi/ByteGrabber.cxx | 90
package/source/zipapi/MemoryByteGrabber.hxx | 79 ++--
package/source/zipapi/ZipFile.cxx | 87 ---
svl/source/items/style.cxx |6 -
svl/source/numbers/zforlist.cxx |6 -
unusedcode.easy |1
13 files changed, 144 insertions(+), 270 deletions(-)
New commits:
commit efa5db0755f0a0af41b9958ef3d5edeaddaed056
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 09:46:25 2014 +
leave this Clone as inline
so code isn't generated for it unless the new_clone is required,
which it isn't under gcc.
Change-Id: I07e0b3e4b2e07625509b51ba7d37e24440f56cfe
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 4b06d40..e2df52d 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -255,7 +255,7 @@ public:
sal_Unicode cZero );
~NfCurrencyEntry() {}
-NfCurrencyEntry* Clone() const;
+inline NfCurrencyEntry* Clone() const;
/// Symbols and language identical
booloperator==( const NfCurrencyEntry r ) const;
@@ -305,9 +305,15 @@ public:
};
/**
- * Necessary for ptr_vector on Windows. Please don't remove this, or at
- * least check it on Windows before attempting to remove it.
+ * Necessary for ptr_vector on Windows. Please don't remove these, or at
+ * least check it on Windows before attempting to remove them.
*/
+NfCurrencyEntry* NfCurrencyEntry::Clone() const
+{
+return new NfCurrencyEntry(
+ aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat,
nDigits, cZeroChar);
+}
+
inline NfCurrencyEntry* new_clone( const NfCurrencyEntry r )
{
return r.Clone();
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index b9672a0..cb7af29 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3837,12 +3837,6 @@ NfCurrencyEntry::NfCurrencyEntry(
nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt),
nDigits(nDig), cZeroChar(cZero) {}
-NfCurrencyEntry* NfCurrencyEntry::Clone() const
-{
-return new NfCurrencyEntry(
- aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat,
nDigits, cZeroChar);
-}
-
bool NfCurrencyEntry::operator==( const NfCurrencyEntry r ) const
{
return aSymbol == r.aSymbol
diff --git a/unusedcode.easy b/unusedcode.easy
index ee18f77..0c3074a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -8,7 +8,6 @@ GDriveSession::GDriveSession()
ImpBitmap::ImplCrop(Rectangle const)
ImpBitmap::ImplErase(Color const)
ImpBitmap::ImplSetSalBitmap(SalBitmap*)
-NfCurrencyEntry::Clone() const
OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int)
OpenGLContext::renderToFile()
OpenGLContext::requestSingleBufferedRendering()
commit 2c2e80da68efcee5bffdb61d9c078f9360a639a4
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 09:42:47 2014 +
callcatcher: remove newly unused code
and rework reads to just return the read value
Change-Id: I5d2f01064465c65859ec4ba031ec9dfa16403487
diff --git a/lotuswordpro/source/filter/lwpsvstream.cxx
b/lotuswordpro/source/filter/lwpsvstream.cxx
index b65696f..e49b8b1 100644
--- a/lotuswordpro/source/filter/lwpsvstream.cxx
+++ b/lotuswordpro/source/filter/lwpsvstream.cxx
@@ -88,24 +88,6 @@ LwpSvStream LwpSvStream::ReadUInt32( sal_uInt32 rUInt32 )
return *this;
}
-LwpSvStream LwpSvStream::ReadInt8( sal_Int8 rInt8 )
-{
-m_pStream-ReadSChar( rInt8 );
-return *this;
-}
-
-LwpSvStream LwpSvStream::ReadInt16( sal_Int16 rInt16 )
-{
-m_pStream-ReadInt16( rInt16 );
-return *this;
-}
-
-LwpSvStream LwpSvStream::ReadInt32( sal_Int32 rInt32 )
-{
-m_pStream-ReadInt32( rInt32 );
-return *this;
-}
-
/**
* @descr SeekRel in stream
*/
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx
b/lotuswordpro/source/filter/lwpsvstream.hxx
index 0917cd4..40cb435 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/source/filter/lwpsvstream.hxx
@@ -76,10 +76,6 @@ public:
LwpSvStream ReadUInt16( sal_uInt16 rUInt16 );
LwpSvStream ReadUInt32( sal_uInt32 rUInt32 );
-LwpSvStream ReadInt8( sal_Int8 rInt8 );
-LwpSvStream ReadInt16( sal_Int16 rInt16 );
-LwpSvStream ReadInt32( sal_Int32 rInt32 );
-
static const sal_uInt32
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - vcl/source
vcl/source/gdi/pdfwriter_impl.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 9efaaa57d73367ba737be151de8ecc3730374230
Author: Tor Lillqvist t...@collabora.com
Date: Wed Dec 3 14:00:38 2014 +0200
PDF signing feature backported from 4.4
Cherry picked from:
840f75065918c4584fa9159fdc90242b5374ab37
1fe9ee73a758603ee0e1465931352c41ef8bd999
d8a8ff8177df628636d80c4dc1d8f597f6677dfc
bfa01d8a8248f7e44675de5ed1f85a1d17105022
bbb18f679f5a50e9c709520d6c3260d3d9db5aa9
c4cc31b5b55019aabad4045c8174b45e1b27073a
7e3c931786c3cbe83ee170b8b0746d141b520ce6
070c93af73df9aa4eb333265c81060d123b530b9
6e91763769a562b2a4c2a94b1367c6ed4866
Change-Id: Ib4b67eec0fb7f032a395b5463b481a5680287768
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index c0791f6..e1fe341 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6192,7 +6192,7 @@ bool PDFWriterImpl::finalizeSignature()
#else
// Prepare buffer and calculate PDF file digest
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
+CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut,
0)));
PCCERT_CONTEXT pCertContext =
CertCreateCertificateContext(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
reinterpret_castconst BYTE*(n_derArray), n_derLength);
if (pCertContext == NULL)
@@ -6204,7 +6204,7 @@ bool PDFWriterImpl::finalizeSignature()
boost::scoped_arraychar buffer1(new char[m_nSignatureContentOffset - 1]);
sal_uInt64 bytesRead1;
-if (osl::File::E_None != m_aFile.read(buffer1.get(),
m_nSignatureContentOffset - 1 , bytesRead1) ||
+if (osl_File_E_None != osl_readFile(m_aFile, buffer1.get(),
m_nSignatureContentOffset - 1 , bytesRead1) ||
bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1)
{
SAL_WARN(vcl.pdfwriter, PDF Signing: First buffer read failed!);
@@ -6215,8 +6215,8 @@ bool PDFWriterImpl::finalizeSignature()
boost::scoped_arraychar buffer2(new char[nLastByteRangeNo]);
sal_uInt64 bytesRead2;
-if (osl::File::E_None != m_aFile.setPos(osl_Pos_Absolut,
m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) ||
-osl::File::E_None != m_aFile.read(buffer2.get(), nLastByteRangeNo,
bytesRead2) ||
+if (osl_File_E_None != osl_setFilePos(m_aFile, osl_Pos_Absolut,
m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1) ||
+osl_File_E_None != osl_readFile(m_aFile, buffer2.get(),
nLastByteRangeNo, bytesRead2) ||
bytesRead2 != (sal_uInt64) nLastByteRangeNo)
{
SAL_WARN(vcl.pdfwriter, PDF Signing: Second buffer read failed!);
@@ -6279,10 +6279,10 @@ bool PDFWriterImpl::finalizeSignature()
// Set file pointer to the m_nSignatureContentOffset, we're ready to
overwrite PKCS7 object
nWritten = 0;
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut,
m_nSignatureContentOffset)) );
-m_aFile.write(cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), nWritten);
+CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut,
m_nSignatureContentOffset)) );
+osl_writeFile(m_aFile, cms_hexbuffer.getStr(), cms_hexbuffer.getLength(),
nWritten);
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut,
nOffset)) );
+CHECK_RETURN( (osl_File_E_None == osl_setFilePos(m_aFile, osl_Pos_Absolut,
nOffset)) );
return true;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/source sw/source
sc/source/filter/excel/xetable.cxx | 11 +++
sc/source/filter/lotus/tool.cxx|4
sw/source/core/doc/doccomp.cxx |2 ++
sw/source/core/draw/dpage.cxx |2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit 886f962d3a0875729d02a4ba4f169f7ab9400a42
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:20:50 2014 +
coverity#1257108 Explicit null dereferenced
Change-Id: Ic4d9c99c8a2b994cec8828808d02a46ec6a18e2c
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index ac547c5..24f2d35 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -79,7 +79,7 @@ void SwDPage::lateInit(const SwDPage rPage, SwDrawModel*
const pNewModel)
FmFormPage::lateInit( rPage, pNewModel );
SwDrawModel* pSwDrawModel = pNewModel;
-if ( !pModel )
+if (!pSwDrawModel)
{
pSwDrawModel = dynamic_castSwDrawModel(*GetModel());
assert( pSwDrawModel );
commit 956de90c043ac43c21fb6043be338f50c4d7e055
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:13:39 2014 +
coverity#1242728 Use of untrusted scalar value
and
coverity#1242836 Use of untrusted scalar value
coverity#1242927 Use of untrusted scalar value
coverity#1242937 Use of untrusted scalar value
coverity#1242942 Use of untrusted scalar value
Change-Id: I66b602c27ee78ba80baab74dfb49ae90df45cbdc
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 3bc635c..03751d2 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -85,6 +85,10 @@ void PutFormString(LotusContext rContext, SCCOL nCol, SCROW
nRow, SCTAB nTab, s
void SetFormat(LotusContext rContext, SCCOL nCol, SCROW nRow, SCTAB nTab,
sal_uInt8 nFormat, sal_uInt8 nSt)
{
+nCol = SanitizeCol(nCol);
+nRow = SanitizeRow(nRow);
+nRow = SanitizeTab(nTab);
+
// PREC: nSt = default number of decimal places
rContext.pDoc-ApplyAttr(nCol, nRow, nTab,
*(rContext.pValueFormCache-GetAttr(nFormat, nSt)));
commit 4f8029066aff39c2b0be5081bff6de79aa2f0002
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:05:48 2014 +
coverity#1257735 Logically dead code
Change-Id: Ia96d9b4ead01e6ba68d97e933cae7c97a75efdf1
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 84fdaec..059d4d9 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2065,12 +2065,15 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData
rDefRowData, const ScfUInt
GetProgressBar().ActivateFinalRowsSegment();
+#if 0
// This is staggeringly slow, and each element operates only
// on its own data.
-size_t nRows = maRowMap.size();
-size_t nThreads = std::max( std::thread::hardware_concurrency(), 1U );
-nThreads = 1; // globally disable multi-threading for now.
-if ( nThreads == 1 || nRows 128 )
+const size_t nRows = maRowMap.size();
+const size_t nThreads = nRows 128 ? 1 :
std::max(std::thread::hardware_concurrency(), 1U);
+#else
+const size_t nThreads = 1; // globally disable multi-threading for now.
+#endif
+if (nThreads == 1)
{
RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd =
maRowMap.end();
for (itr = itrBeg; itr != itrEnd; ++itr)
commit 11a0890b6cfeea9c3609ea454882194a2f05d943
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:00:42 2014 +
coverity#1257736 Explicit null dereferenced
Change-Id: I2cd312255f80e22ead614d0ea12a2130fb8bbeaa
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 1fab4e4..65073dd 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1935,6 +1935,8 @@ sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM*
pLastDestRedline)
break;
case POS_OUTSIDE:
+assert(pDestRedl is this actually impossible);
+if (pDestRedl)
{
SwRangeRedline* pCpyRedl = new SwRangeRedline(
pDestRedl-GetRedlineData(), *pDStt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 51741] EDIITING: Deleting bookmark is not seen as a modification of document
https://bugs.freedesktop.org/show_bug.cgi?id=51741 Matúš Kukan matus.ku...@collabora.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #12 from Matúš Kukan matus.ku...@collabora.com --- Marking as fixed. Thanks Renato! -- 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: Changes to 'private/matus/4-1-bookmarks'
New branch 'private/matus/4-1-bookmarks' available with the following commits: commit 7095ebccd57865dbc010607e137605b316d5b20d Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Dec 10 12:06:49 2014 +0100 sw: Unit test for cycle in lcl_CreatePortions Reviewed on: https://gerrit.libreoffice.org/13413 Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx (cherry picked from commit 4a3328a98f00818044694a9b6a0f7cda392273c6) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I26a8707046d7f30381fb51c41e49f8dee4796ba7 commit 9c6bedf6dcd0e9b4eee9cd7ae70212251ba0f889 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Dec 10 16:08:05 2014 +0100 sw UNO API: fix infinite loop when building portions of a bookmark range The problem was that in case the bookmark range points to a number of characters in a text node, where neither the start or the end is the paragraph start and end, and in case there is an at-char anchored object at the beginning of the paragraph, then lcl_CreatePortions() never ended. It is assumed that the loop in lcl_CreatePortions() will end at some stage, as every iteration moves the cursor forward. But this wasn't true in the above situation: the first frame was anchored at char pos 0, the range was char positions 1..7, and we failed to ignore frames which are anchored before start: so position was constantly 1. Fix the problem by explicitly ignoring frames before the current position, so lcl_ExportFrames() properly returns -1 when there are no anchored objects in the current range. Testcase is in the next commit. Change-Id: I73662e09cd09ee7e0ea4575b1150beb40f1ccc3a (cherry picked from commit 6d65e30fbaba383cbb9e1db6230a04865897ac8f) commit 5092d914b9d1b91d5d049c5103f8ba764d06906a Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Dec 11 15:24:40 2014 +0100 Add undo operation for deleting a bookmark, related fdo#51741 (cherry picked from commit 9338bea6e8dfab8d360fe8ab19dd5d75071bfc2a) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/doc/docbm.cxx Change-Id: I79d8d3c30b6b0b2cc253963fdd50019aec033e12 commit 8e9a5e2292dbb5d74e013491d780682006c1a33e Author: Renato Ferreira renato.w...@gmail.com Date: Sat Nov 15 00:22:57 2014 -0500 fdo#51741 Mark document as modified on bookmark rename / delete Deletion: overrided DdeBookmark::DeregisterFromDoc in Bookmark Renaming: in MarkManager::renameMark Reviewed-on: https://gerrit.libreoffice.org/12436 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com (cherry picked from commit f0c4cd51cb160492d78c2796f71ecd88da25fa59) Conflicts: sw/source/core/doc/docbm.cxx sw/source/core/inc/bookmrk.hxx sw/source/core/unocore/unobkm.cxx Change-Id: I378037ea546d0f2dc4ab9e0b0e6f9bf65c8db5b4 commit 9c43f2a57473c7502237d8ba645f46d69505a6e5 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Nov 26 11:58:13 2014 +0100 Writer: Set document as modified and add undo when renaming bookmarks (cherry picked from commit c7fa6687e544e7f9702da23aadbd31c1f2e0115e) Change-Id: Id0d4695b6a7c5eae0493e679345bd41d4687d6d7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sc/source svl/source
sc/source/filter/lotus/op.cxx |2 ++
sc/source/filter/lotus/tool.cxx |2 +-
sc/source/filter/starcalc/scflt.cxx |7 +++
svl/source/items/poolio.cxx |7 ++-
4 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 1a858eabef5dda2368c51a155209e5303c2f0547
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 13:43:10 2014 +
fix typo, thanks to Matteo
Change-Id: I6fd3f69cc56672fe2639ee575f9ed0cdf45490bd
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 03751d2..f09182c 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -87,7 +87,7 @@ void SetFormat(LotusContext rContext, SCCOL nCol, SCROW
nRow, SCTAB nTab, sal_u
{
nCol = SanitizeCol(nCol);
nRow = SanitizeRow(nRow);
-nRow = SanitizeTab(nTab);
+nTab = SanitizeTab(nTab);
// PREC: nSt = default number of decimal places
rContext.pDoc-ApplyAttr(nCol, nRow, nTab,
*(rContext.pValueFormCache-GetAttr(nFormat, nSt)));
commit 6daf1083c2e4c0273449430db05ef8aba9648248
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:46:50 2014 +
coverity#1242875 Untrusted pointer write
Change-Id: I197a67320bd6cd8f0e6735b8cd24deebcdf190f1
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 66f5ed7..1ccba90 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -696,7 +696,11 @@ SvStream SfxItemPool::Load(SvStream rStream)
sal_uInt16 SfxItemPool::GetIndex_Impl(sal_uInt16 nWhich) const
{
-assert(nWhich = pImp-mnStart nWhich = pImp-mnEnd);
+if (nWhich pImp-mnStart || nWhich pImp-mnEnd)
+{
+assert(false missing bounds check before use);
+return 0;
+}
return nWhich - pImp-mnStart;
}
commit 9785fd625f4799019ee0fb52868321b177526497
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:35:24 2014 +
silence coverity#1242911 Untrusted loop bound
Change-Id: Ifab75371cbedd26d510f162efe2c9247e37893ed
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 4a026cf..66f5ed7 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -377,6 +377,7 @@ void SfxItemPool_Impl::readTheItems (
not an item content );
// Fill up missing ones
+// coverity[tainted_data] - ignore this, though we should finally kill
off this format
for ( pItem = 0, n = nLastSurrogate+1; n nSurrogate; ++n )
pNewArr-push_back( (SfxPoolItem*) pItem );
nLastSurrogate = nSurrogate;
commit bab07202fcf5ea23d771ddb73180316524c63574
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:32:03 2014 +
coverity#1242775 Use of untrusted scalar value
Change-Id: Iaaf92c4be9b41c5824a1b1474fbce19a1afa49ae
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 69fa71b..69a9214 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -175,6 +175,8 @@ void OP_ColumnWidth(LotusContext rContext, SvStream r,
sal_uInt16 /*n*/)
if (ValidCol(nCol))
{
+nCol = SanitizeCol(nCol);
+
sal_uInt16 nBreite;
if( nWidthSpaces )
// assuming 10cpi character set
commit 24d2831e69b86023ee4786a970cb988cbf610f9d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 12:27:07 2014 +
coverity#1242895 Untrusted loop bound
Change-Id: If01f0edecca8988087386507717ea8222058bab8
diff --git a/sc/source/filter/starcalc/scflt.cxx
b/sc/source/filter/starcalc/scflt.cxx
index 25b350d..0355701 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1456,6 +1456,13 @@ void Sc10Import::LoadTables()
return;
}
rStream.ReadUInt16( DataCount );
+const sal_Size nMaxPossibleRecords = rStream.remainingSize() /
(sizeof(sal_uInt16)*2);
+if (DataCount nMaxPossibleRecords)
+{
+SAL_WARN(sc, Parsing error: nMaxPossibleRecords
+ max possible pairs, but DataCount claimed,
truncating);
+DataCount = nMaxPossibleRecords;
+}
DataStart = 0;
for (i=0; i DataCount; i++)
{
___
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/filter/xml/xmlfilti.cxx | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4 Author: Eike Rathke er...@redhat.com Date: Fri Dec 12 14:49:09 2014 +0100 resolved fdo#86809 connect filter conditions correctly Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a single filter stack were OR connected, regardless whether filter-and was given in the file. Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 75b0730..f89b033 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -178,12 +178,19 @@ bool ScXMLFilterContext::GetConnection() // secondary item gets the current connection. return rItem.mbOr; +// The next condition of this stack will get the current connection. +++rItem.mnCondCount; + if (maConnStack.size() 2) // There is no last stack. Likely the first condition in the first -// stack whose connection is not used. -return true; +// stack whose connection is not used. Default in +// ScQueryEntry::eConnect is SC_AND, so return false (AND instead of +// OR) here. Otherwise, when saving the document again, we'd write a +// uselessly stacked +// table:filter-ortable:filter-and.../table:filter-and/table:filter-or +// for two conditions connected with AND. +return false; -++rItem.mnCondCount; std::vectorConnStackItem::reverse_iterator itr = maConnStack.rbegin(); ++itr; return itr-mbOr; // connection of the last stack. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/filter/xml/xmlfilti.cxx | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) New commits: commit ff62f81e6795b68e53b2f96963745c4e98d9aaf7 Author: Eike Rathke er...@redhat.com Date: Fri Dec 12 14:49:09 2014 +0100 resolved fdo#86809 connect filter conditions correctly Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a single filter stack were OR connected, regardless whether filter-and was given in the file. Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c (cherry picked from commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4) diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 75b0730..f89b033 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -178,12 +178,19 @@ bool ScXMLFilterContext::GetConnection() // secondary item gets the current connection. return rItem.mbOr; +// The next condition of this stack will get the current connection. +++rItem.mnCondCount; + if (maConnStack.size() 2) // There is no last stack. Likely the first condition in the first -// stack whose connection is not used. -return true; +// stack whose connection is not used. Default in +// ScQueryEntry::eConnect is SC_AND, so return false (AND instead of +// OR) here. Otherwise, when saving the document again, we'd write a +// uselessly stacked +// table:filter-ortable:filter-and.../table:filter-and/table:filter-or +// for two conditions connected with AND. +return false; -++rItem.mnCondCount; std::vectorConnStackItem::reverse_iterator itr = maConnStack.rbegin(); ++itr; return itr-mbOr; // connection of the last stack. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 86809, which changed state. Bug 86809 Summary: Filter operator AND cannot be restored after FILEOPEN https://bugs.freedesktop.org/show_bug.cgi?id=86809 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen9.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7a85674c93150d6f5a59e998158909365b47d761
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 12 15:01:06 2014 +
Resolves: fdo#87245 crash because clip doc doesn't own DocumentPool
multiple documents sharing the same doc pool so can't unset its
secondary here.
Here the assumption is that SharePooledResources has always been called on
Clip
or Undo docs (otherwise persumably need a flag which SharePooledResources
toggles on)
Change-Id: Ibcdbe5f698102dc683c290d3bd581c31e214765f
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 8a23df1..4fe1a11 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -242,7 +242,7 @@ void ScDocument::DeleteDrawLayer()
{
// remove DrawingLayer's SfxItemPool from Calc's SfxItemPool where
// it is registered as secondary pool
-if(xPoolHelper.is())
+if (xPoolHelper.is() !IsClipOrUndo()) //Using IsClipOrUndo as a proxy
for SharePooledResources called
{
ScDocumentPool* pLocalPool = xPoolHelper-GetDocPool();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/column4.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit c3e1708ca41148daa717baa38a4e21cc5b15d971
Author: Eike Rathke er...@redhat.com
Date: Sat Dec 20 23:48:52 2014 +0100
fdo#86215 pool new ScPatternAttr if source and destination are different
docs
(cherry picked from commit d9c15867e914d91a7e86c499ffb6ee62f5b443f6)
Conflicts:
sc/source/core/data/column4.cxx
Change-Id: Icdb68af83a0b208f9a427ee61ae18020c8835a41
Reviewed-on: https://gerrit.libreoffice.org/13428
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index aeaecb0..19c2c2c 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -148,6 +148,8 @@ void ScColumn::CopyOneCellFromClip(
sc::CopyFromClipContext rCxt, SCROW nRow1,
if (!pBlockPos)
return;
+bool bSameDocPool = (rCxt.getClipDoc()-GetPool() == pDocument-GetPool());
+
ScCellValue rSrcCell = rCxt.getSingleCell();
sal_uInt16 nFlags = rCxt.getInsertFlag();
@@ -156,7 +158,8 @@ void ScColumn::CopyOneCellFromClip(
sc::CopyFromClipContext rCxt, SCROW nRow1,
{
if (!rCxt.isSkipAttrForEmptyCells() || rSrcCell.meType !=
CELLTYPE_NONE)
{
-const ScPatternAttr* pAttr = rCxt.getSingleCellPattern();
+const ScPatternAttr* pAttr = (bSameDocPool ?
rCxt.getSingleCellPattern() :
+rCxt.getSingleCellPattern()-PutInPool( pDocument,
rCxt.getClipDoc()));
pAttrArray-SetPatternArea(nRow1, nRow2, pAttr, true);
}
}
@@ -181,8 +184,7 @@ void ScColumn::CopyOneCellFromClip(
sc::CopyFromClipContext rCxt, SCROW nRow1,
{
// Compare the ScDocumentPool* to determine if we are copying
within the
// same document. If not, re-intern shared strings.
-svl::SharedStringPool* pSharedStringPool =
(rCxt.getClipDoc()-GetPool() != pDocument-GetPool()) ?
-pDocument-GetSharedStringPool() : NULL;
+svl::SharedStringPool* pSharedStringPool = (bSameDocPool ?
NULL : pDocument-GetSharedStringPool());
svl::SharedString aStr = (pSharedStringPool ?
pSharedStringPool-intern(
rSrcCell.mpString-getString()) :
*rSrcCell.mpString);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source
chart2/source/controller/dialogs/tp_DataSource.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit ddcf6367240d564e7daf4078e0a4caf0adde9043
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Thu Jun 19 15:34:50 2014 +0200
fix range input in chart data source dialog
Change-Id: I9c139c6298d25c7a7072d0d0538f1945518d36f2
Reviewed-on: https://gerrit.libreoffice.org/13402
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 99903a2..f8c93b4 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -725,8 +725,17 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl)
IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit*, pEdit )
{
+// note: isValid sets the color of the edit field
if( isRangeFieldContentValid( *pEdit ))
+{
setDirty();
+updateModelFromControl( pEdit );
+if( pEdit == m_pEDT_RANGE )
+{
+if( ! lcl_UpdateCurrentSeriesName( *m_pLB_SERIES ))
+fillSeriesListBox();
+}
+}
// enable/disable OK button
isValid();
@@ -741,7 +750,7 @@ IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit*,
pEdit )
{
setDirty();
updateModelFromControl( pEdit );
-if( pEdit== m_pEDT_RANGE )
+if( pEdit == m_pEDT_RANGE )
{
if( ! lcl_UpdateCurrentSeriesName( *m_pLB_SERIES ))
fillSeriesListBox();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: binaryurp/qa binaryurp/source include/com
binaryurp/qa/test-unmarshal.cxx | 42 +-
binaryurp/source/bridgefactory.cxx|3 --
include/com/sun/star/uno/Sequence.h | 14 +++
include/com/sun/star/uno/Sequence.hxx | 11
4 files changed, 43 insertions(+), 27 deletions(-)
New commits:
commit d79b96cf6564187c96f5a1451ca98e2c93adee77
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 12 17:00:50 2014 +0100
css::uno::Sequence ctor with initializer_list
(though LIBO_INTERNAL_ONLY, as it needs C++11, so cannot in general be used
in
URE client code; I think it's better to not offer it outside LO at all, than
based on a feature-check macro, and thus catch accidental misuses of it via
CppunitTest_odk_checkapi)
...plus adapting binaryurp/ to use the new feature
Change-Id: I9a88a0e9eac5daf72896470e8b6a1deb1a6fc88f
diff --git a/binaryurp/qa/test-unmarshal.cxx b/binaryurp/qa/test-unmarshal.cxx
index 759b120..13ab9f6 100644
--- a/binaryurp/qa/test-unmarshal.cxx
+++ b/binaryurp/qa/test-unmarshal.cxx
@@ -50,20 +50,15 @@ private:
void Test::testTypeOfBooleanSequence() {
binaryurp::ReaderState state;
-css::uno::Sequence sal_Int8 buf(13);
-buf[0] = static_cast sal_Int8 (static_cast sal_uInt8 (20 | 0x80)); //
sequence type | cache flag
-buf[1] = static_cast sal_Int8 (static_cast sal_uInt8
(binaryurp::cache::ignore 8));
-buf[2] = static_cast sal_Int8 (static_cast sal_uInt8
(binaryurp::cache::ignore 0xFF));
-buf[3] = RTL_CONSTASCII_LENGTH([]boolean);
-buf[4] = '[';
-buf[5] = ']';
-buf[6] = 'b';
-buf[7] = 'o';
-buf[8] = 'o';
-buf[9] = 'l';
-buf[10] = 'e';
-buf[11] = 'a';
-buf[12] = 'n';
+css::uno::Sequencesal_Int8 buf{
+static_castsal_Int8(static_castsal_uInt8(20 | 0x80)),
+// sequence type | cache flag
+static_castsal_Int8(
+static_castsal_uInt8(binaryurp::cache::ignore 8)),
+static_castsal_Int8(
+static_castsal_uInt8(binaryurp::cache::ignore 0xFF)),
+RTL_CONSTASCII_LENGTH([]boolean),
+ '[', ']', 'b', 'o', 'o', 'l', 'e', 'a', 'n' };
binaryurp::Unmarshal m(rtl::Reference binaryurp::Bridge (), state, buf);
css::uno::TypeDescription t(m.readType());
CPPUNIT_ASSERT(
@@ -75,17 +70,14 @@ void Test::testTypeOfBooleanSequence() {
void Test::testTypeOfVoidSequence() {
binaryurp::ReaderState state;
-css::uno::Sequence sal_Int8 buf(10);
-buf[0] = static_cast sal_Int8 (static_cast sal_uInt8 (20 | 0x80)); //
sequence type | cache flag
-buf[1] = static_cast sal_Int8 (static_cast sal_uInt8
(binaryurp::cache::ignore 8));
-buf[2] = static_cast sal_Int8 (static_cast sal_uInt8
(binaryurp::cache::ignore 0xFF));
-buf[3] = RTL_CONSTASCII_LENGTH([]void);
-buf[4] = '[';
-buf[5] = ']';
-buf[6] = 'v';
-buf[7] = 'o';
-buf[8] = 'i';
-buf[9] = 'd';
+css::uno::Sequencesal_Int8 buf{
+static_castsal_Int8(static_castsal_uInt8(20 | 0x80)),
+// sequence type | cache flag
+static_castsal_Int8(
+static_castsal_uInt8(binaryurp::cache::ignore 8)),
+static_castsal_Int8(
+static_castsal_uInt8(binaryurp::cache::ignore 0xFF)),
+RTL_CONSTASCII_LENGTH([]void), '[', ']', 'v', 'o', 'i', 'd' };
binaryurp::Unmarshal m(rtl::Reference binaryurp::Bridge (), state, buf);
try {
m.readType();
diff --git a/binaryurp/source/bridgefactory.cxx
b/binaryurp/source/bridgefactory.cxx
index 6b8994d..c9d0a04 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -52,8 +52,7 @@ OUString BridgeFactory::static_getImplementationName() {
css::uno::Sequence OUString
BridgeFactory::static_getSupportedServiceNames() {
-OUString name(com.sun.star.bridge.BridgeFactory);
-return css::uno::Sequence OUString (name, 1);
+return css::uno::SequenceOUString{ com.sun.star.bridge.BridgeFactory };
}
void BridgeFactory::removeBridge(
diff --git a/include/com/sun/star/uno/Sequence.h
b/include/com/sun/star/uno/Sequence.h
index fa2aa96..21e3e9d 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -26,6 +26,10 @@
#include new
+#if defined LIBO_INTERNAL_ONLY
+#include initializer_list
+#endif
+
namespace rtl
{
class ByteSequence;
@@ -109,6 +113,16 @@ public:
*/
inline explicit Sequence( sal_Int32 len );
+#if defined LIBO_INTERNAL_ONLY
+/** Create a sequence with the given elements.
+
+@param init an initializer_list
+
+@since LibreOffice 4.5
+ */
+inline Sequence(std::initializer_listE init);
+#endif
+
/** Destructor: Releases sequence handle. Last handle will destruct
elements and free memory.
*/
diff --git a/include/com/sun/star/uno/Sequence.hxx
b/include/com/sun/star/uno/Sequence.hxx
index 1ee59ae..dce2609 100644
--- a/include/com/sun/star/uno/Sequence.hxx
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/pdfwriter_impl.cxx | 39 +-
1 file changed, 26 insertions(+), 13 deletions(-)
New commits:
commit cbf0c9f8332be9abfed6016f9708e3260331eb2d
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 12 17:57:19 2014 +0200
Tentative fix for fdo#83937
One clear bug in the code, in my opinion, was that
PDFSigningPKCS7PasswordCallback() returned its argument as such. However, a
PK11PasswordFunc should return a pointer to the password. This memory must
have been allocated with PR_Malloc or PL_strdup, says
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/SSL_functions/pkfnc.html
.
I could not test this fix fully before my hardware token decided to block
itself, thanks to too many wrong PIN attempts. Possibly it would work to
even
just pass NULL for the password callback function and its argument to
NSS_CMSEncoder_Start(). After all, at least with the hardware token and
associated software that I tested with, the software itself pops up a dialog
asking for the PIN (password).
Change-Id: I85a8b2833cfdd1a1d7b7779016fefb71dd53ab80
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 457af31..72c8f2e 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5980,20 +5980,22 @@ bool PDFWriterImpl::emitSignature()
#if !defined(ANDROID) !defined(IOS) !defined(_WIN32)
+namespace {
+
char *PDFSigningPKCS7PasswordCallback(PK11SlotInfo * /*slot*/, PRBool
/*retry*/, void *arg)
{
-return (char *)arg;
+return PL_strdup((char *)arg);
}
-namespace {
-class HashContextScope {
-HASHContext *mpPtr;
-public:
-HashContextScope(HASHContext *pPtr) : mpPtr(pPtr) {}
-~HashContextScope() { clear(); }
-void clear() { if (mpPtr) { HASH_Destroy(mpPtr); } mpPtr = NULL; }
-HASHContext *get() { return mpPtr; }
-};
+class HashContextScope {
+HASHContext *mpPtr;
+public:
+HashContextScope(HASHContext *pPtr) : mpPtr(pPtr) {}
+~HashContextScope() { clear(); }
+void clear() { if (mpPtr) { HASH_Destroy(mpPtr); } mpPtr = NULL; }
+HASHContext *get() { return mpPtr; }
+};
+
}
#endif
@@ -6109,8 +6111,6 @@ bool PDFWriterImpl::finalizeSignature()
HASH_End(hc.get(), digest.data, digest.len, SHA1_LENGTH);
hc.clear();
-OString pass = OUStringToOString( m_aContext.SignPassword,
RTL_TEXTENCODING_UTF8 );
-
NSSCMSMessage *cms_msg = NSS_CMSMessage_Create(NULL);
if (!cms_msg)
{
@@ -6184,20 +6184,33 @@ bool PDFWriterImpl::finalizeSignature()
NSSCMSEncoderContext *cms_ecx;
//FIXME: Check if password is passed correctly to
SEC_PKCS7CreateSignedData function
-cms_ecx = NSS_CMSEncoder_Start(cms_msg, NULL, NULL, cms_output, arena,
(PK11PasswordFunc)::PDFSigningPKCS7PasswordCallback, (void *)pass.getStr(),
NULL, NULL, NULL, NULL);
+
+// Inded, it was not, I think, and that caused a crash as described in
fdo#83937.
+// Unfortunately I could not test this fix fully before my hardware token
decided to
+// block itself thanks to too many wrong PIN attempts. Possibly it would
work to
+// even just pass NULL for the password callback function and its argument
here.
+// After all, at least with the hardware token and associated software I
tested
+// with, the software itself pops up a dialog asking for the PIN
(password).
+
+char *pass(strdup(OUStringToOString( m_aContext.SignPassword,
RTL_TEXTENCODING_UTF8 ).getStr()));
+cms_ecx = NSS_CMSEncoder_Start(cms_msg, NULL, NULL, cms_output, arena,
PDFSigningPKCS7PasswordCallback, pass, NULL, NULL, NULL, NULL);
if (!cms_ecx)
{
SAL_WARN(vcl.pdfwriter, PDF Signing: can't start DER encoder.);
+free(pass);
return false;
}
if (NSS_CMSEncoder_Finish(cms_ecx) != SECSuccess)
{
SAL_WARN(vcl.pdfwriter, PDF Signing: can't finish DER encoder.);
+free(pass);
return false;
}
+free(pass);
+
OStringBuffer cms_hexbuffer;
for (unsigned int i = 0; i cms_output.len ; i++)
___
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/docshell/impex.cxx | 69 +++-
sc/source/ui/inc/impex.hxx |4 ++
sc/source/ui/view/viewfun5.cxx |2 -
3 files changed, 52 insertions(+), 23 deletions(-)
New commits:
commit bf97980c8d5d5fbc63a08b8834c10fe903152b75
Author: David Tardon dtar...@redhat.com
Date: Fri Dec 12 17:09:45 2014 +0100
rhbz#1116534 crash when pasting over a formula
When pasting CSV data into existing document, we cannot use the
ScImportExport optimization for insertion, because the cells can already
have content (a grouped formula in this case). So use appropriate
ScDocument functions, even if that means the import is slower.
This is a regression from commit 93959db4d8846cfdfb87ab647c4d457fb09bb869
use DocumentImport for csv import, related fdo#69006.
Change-Id: I92f70abca0542d796e3aa674b28a31053fff00d0
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 75c7566..0d2aa7b1 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -85,7 +85,8 @@ ScImportExport::ScImportExport( ScDocument* p )
bFormulas( false ), bIncludeFiltered( true ),
bAll( true ), bSingle( true ), bUndo( false ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -99,7 +100,8 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScAddress rPt )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -114,7 +116,8 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScRange r )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( false ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -130,7 +133,8 @@ ScImportExport::ScImportExport( ScDocument* p, const
OUString rPos )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -927,7 +931,8 @@ bool ScImportExport::Text2Doc( SvStream rStrm )
// Extended Ascii-Import
static bool lcl_PutString(
-ScDocumentImport rDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const
OUString rStr, sal_uInt8 nColFormat,
+ScDocumentImport rDocImport, bool bUseDocImport,
+SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString rStr, sal_uInt8
nColFormat,
SvNumberFormatter* pFormatter, bool bDetectNumFormat,
::utl::TransliterationWrapper rTransliteration, CalendarWrapper
rCalendar,
::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper*
pSecondCalendar )
@@ -951,17 +956,24 @@ static bool lcl_PutString(
pDoc-ApplyPattern(nCol, nRow, nTab, aNewAttrs);
}
-if(ScStringUtil::isMultiline(rStr))
+if ( bUseDocImport )
{
-ScFieldEditEngine rEngine = pDoc-GetEditEngine();
-rEngine.SetText(rStr);
-rDocImport.setEditCell(ScAddress(nCol, nRow, nTab),
rEngine.CreateTextObject());
-return true;
-}
-else
+if(ScStringUtil::isMultiline(rStr))
+{
+ScFieldEditEngine rEngine = pDoc-GetEditEngine();
+rEngine.SetText(rStr);
+rDocImport.setEditCell(ScAddress(nCol, nRow, nTab),
rEngine.CreateTextObject());
+return true;
+}
+else
+{
+rDocImport.setStringCell(ScAddress(nCol, nRow, nTab), rStr);
+return false;
+}
+} else
{
-rDocImport.setStringCell(ScAddress(nCol, nRow, nTab), rStr);
-return false;
+pDoc-SetTextCell(ScAddress(nCol, nRow, nTab), rStr);
+return bMultiLine;
}
}
@@ -975,7 +987,10 @@ static bool lcl_PutString(
if ( pDocFormatter-IsNumberFormat( rStr, nEnglish, fVal ) )
{
//
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/ui/docshell/impex.cxx | 69 +++-
sc/source/ui/inc/impex.hxx |4 ++
sc/source/ui/view/viewfun5.cxx |2 -
3 files changed, 52 insertions(+), 23 deletions(-)
New commits:
commit e6810aec53ec2042d726e7d77335b3b5c94eaa07
Author: David Tardon dtar...@redhat.com
Date: Fri Dec 12 17:09:45 2014 +0100
rhbz#1116534 crash when pasting over a formula
When pasting CSV data into existing document, we cannot use the
ScImportExport optimization for insertion, because the cells can already
have content (a grouped formula in this case). So use appropriate
ScDocument functions, even if that means the import is slower.
This is a regression from commit 93959db4d8846cfdfb87ab647c4d457fb09bb869
use DocumentImport for csv import, related fdo#69006.
Change-Id: I92f70abca0542d796e3aa674b28a31053fff00d0
(cherry picked from commit bf97980c8d5d5fbc63a08b8834c10fe903152b75)
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index ca4a6ef..a8cc074 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -85,7 +85,8 @@ ScImportExport::ScImportExport( ScDocument* p )
bFormulas( false ), bIncludeFiltered( true ),
bAll( true ), bSingle( true ), bUndo( false ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -99,7 +100,8 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScAddress rPt )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -114,7 +116,8 @@ ScImportExport::ScImportExport( ScDocument* p, const
ScRange r )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( false ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -130,7 +133,8 @@ ScImportExport::ScImportExport( ScDocument* p, const
OUString rPos )
bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != NULL ),
bOverflowRow( false ), bOverflowCol( false ), bOverflowCell( false ),
- mbApi( true ), mbImportBroadcast(false), mExportTextOptions()
+ mbApi( true ), mbImportBroadcast(false), mbOverwriting( false ),
+ mExportTextOptions()
{
pUndoDoc = NULL;
pExtOptions = NULL;
@@ -928,7 +932,8 @@ bool ScImportExport::Text2Doc( SvStream rStrm )
// Extended Ascii-Import
static bool lcl_PutString(
-ScDocumentImport rDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const
OUString rStr, sal_uInt8 nColFormat,
+ScDocumentImport rDocImport, bool bUseDocImport,
+SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString rStr, sal_uInt8
nColFormat,
SvNumberFormatter* pFormatter, bool bDetectNumFormat,
::utl::TransliterationWrapper rTransliteration, CalendarWrapper
rCalendar,
::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper*
pSecondCalendar )
@@ -952,17 +957,24 @@ static bool lcl_PutString(
pDoc-ApplyPattern(nCol, nRow, nTab, aNewAttrs);
}
-if(ScStringUtil::isMultiline(rStr))
+if ( bUseDocImport )
{
-ScFieldEditEngine rEngine = pDoc-GetEditEngine();
-rEngine.SetText(rStr);
-rDocImport.setEditCell(ScAddress(nCol, nRow, nTab),
rEngine.CreateTextObject());
-return true;
-}
-else
+if(ScStringUtil::isMultiline(rStr))
+{
+ScFieldEditEngine rEngine = pDoc-GetEditEngine();
+rEngine.SetText(rStr);
+rDocImport.setEditCell(ScAddress(nCol, nRow, nTab),
rEngine.CreateTextObject());
+return true;
+}
+else
+{
+rDocImport.setStringCell(ScAddress(nCol, nRow, nTab), rStr);
+return false;
+}
+} else
{
-rDocImport.setStringCell(ScAddress(nCol, nRow, nTab), rStr);
-return false;
+pDoc-SetTextCell(ScAddress(nCol, nRow, nTab), rStr);
+return bMultiLine;
}
}
@@ -976,7 +988,10 @@ static bool lcl_PutString(
if (
[Libreoffice-commits] core.git: vcl/Library_vcl.mk
vcl/Library_vcl.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 77d844c9a92fdc1b8ffa043f46ea50bc1cfa7e05 Author: Tor Lillqvist t...@collabora.com Date: Fri Dec 12 18:35:47 2014 +0200 Add plc4 for PL_strdup Change-Id: I2a2f18d76b0deb5f6cfd68b36699d940703372b3 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 69db0a3..e8df725 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -61,7 +61,8 @@ $(eval $(call gb_Library_use_custom_headers,vcl,\ $(eval $(call gb_Library_use_externals,vcl,\ jpeg \ $(if $(filter-out WNT,$(OS)), \ - nss3) \ + nss3 \ + plc4) \ libeot \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - connectivity/qa connectivity/source desktop/source extensions/source framework/inc framework/source include/connectivity sax/source sfx2/source svx/source u
connectivity/qa/connectivity/mork/DriverTest.cxx|8 - connectivity/source/drivers/file/FConnection.cxx|8 - connectivity/source/drivers/flat/EConnection.cxx| 12 +- connectivity/source/drivers/hsqldb/HConnection.cxx |2 connectivity/source/drivers/hsqldb/HTable.cxx |4 connectivity/source/drivers/mork/MDriver.cxx|8 - connectivity/source/drivers/mork/MResultSet.cxx |3 connectivity/source/drivers/odbc/OConnection.cxx|2 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |4 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 12 +- desktop/source/app/appinit.cxx | 12 +- desktop/source/app/cmdlinehelp.cxx | 10 +- desktop/source/deployment/inc/dp_ucb.h |3 desktop/source/deployment/manager/dp_manager.cxx|9 - desktop/source/offacc/acceptor.cxx |6 - desktop/source/splash/unxsplash.cxx |6 - extensions/source/bibliography/datman.cxx |5 - extensions/source/bibliography/general.cxx |2 extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 10 +- extensions/source/propctrlr/eformspropertyhandler.cxx | 12 +- extensions/source/propctrlr/eventhandler.cxx|2 extensions/source/propctrlr/formcomponenthandler.cxx| 35 +++ extensions/source/propctrlr/genericpropertyhandler.cxx |2 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx|4 extensions/source/update/check/updatecheckconfig.cxx|2 extensions/source/update/check/updatehdl.cxx| 20 ++-- framework/inc/jobs/joburl.hxx |3 framework/source/fwe/classes/actiontriggercontainer.cxx |6 - framework/source/fwe/classes/addonmenu.cxx |4 framework/source/fwe/classes/rootactiontriggercontainer.cxx |6 - framework/source/fwe/xml/statusbardocumenthandler.cxx | 10 +- framework/source/fwe/xml/toolboxdocumenthandler.cxx | 17 +-- framework/source/jobs/joburl.cxx|8 + framework/source/services/desktop.cxx |4 framework/source/services/frame.cxx |4 framework/source/services/sessionlistener.cxx |4 framework/source/uielement/generictoolbarcontroller.cxx |6 - framework/source/uielement/menubarmanager.cxx | 48 ++ include/connectivity/CommonTools.hxx|4 include/connectivity/sqlnode.hxx|2 sax/source/expatwrap/saxwriter.cxx |2 sfx2/source/appl/helpdispatch.cxx |2 sfx2/source/control/unoctitm.cxx|2 sfx2/source/doc/DocumentMetadataAccess.cxx | 40 +++- sfx2/source/doc/doctemplates.cxx|6 - sfx2/source/doc/printhelper.cxx | 25 ++--- sfx2/source/doc/sfxbasemodel.cxx|2 sfx2/source/doc/zoomitem.cxx|6 - sfx2/source/sidebar/CommandInfoProvider.cxx |2 sfx2/source/sidebar/Context.cxx |4 sfx2/source/sidebar/ResourceManager.cxx | 18 +-- svx/source/accessibility/AccessibleOLEShape.cxx |6 - svx/source/accessibility/AccessibleShape.cxx|2 svx/source/form/fmscriptingenv.cxx |4 svx/source/form/fmshimp.cxx |2 svx/source/items/viewlayoutitem.cxx |4 svx/source/items/zoomslideritem.cxx |8 - svx/source/svdraw/svdoashp.cxx |3 ucb/source/core/ucbcmds.cxx |4 ucb/source/sorter/sortresult.cxx| 15 +-- ucb/source/ucp/file/filrset.cxx |2 ucb/source/ucp/file/prov.cxx| 14 +- ucb/source/ucp/ftp/ftpcontent.cxx | 32 +++--- ucb/source/ucp/ftp/ftpresultsetI.cxx| 16 +-- ucb/source/ucp/webdav-neon/DateTimeHelper.cxx | 24 ++--- 65 files changed, 258 insertions(+), 316 deletions(-) New commits: commit fbcb2556be11225d14e62fb1849930f5953588dc Author: Stephan Bergmann sberg...@redhat.com
[Libreoffice-commits] core.git: 4 commits - reportbuilder/java reportdesign/source
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|3
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
| 138 +++---
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
|7
reportdesign/source/filter/xml/xmlExport.cxx
| 15 +
4 files changed, 127 insertions(+), 36 deletions(-)
New commits:
commit 1e10f6d229587ffc2a955c225b489645f8016e23
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 17:49:53 2013 +0200
fdo#67930 work around fdo#68024
don't emit string-value attribute
Change-Id: I3668b88437451523f2b6bb3c2c82e1929f7ba3d8
Reviewed-on: https://gerrit.libreoffice.org/5371
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit 76408b0f0d7e91cddb8b056069a2ee547109b156)
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index 8eecd85..d20927f 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -170,7 +170,8 @@ public class FormatValueUtility
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, string);
}
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
+// work around fdo#68024
+//variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
}
else
{
commit d6ce95ae2288859fe74d601f1bdaf616ab1ee7f0
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 12 17:32:46 2014 +0100
fdo#87044: reportbuilder: Revert fdo#67930 don't use variables ...
... for formattedtext in header/footer
This reverts commit b0e3c6b8fa548defd5a3af2b8bf88b0b49589753.
This reverts commit fc92c1abebcfe9b18649d35b76bf22e001e332da.
The other fix from the libreoffice-4-1 branch seems to work better.
Change-Id: Idc5d7543c11dff74977729dab5afd978197dab6a
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 8c1f619..afd8a59 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -99,39 +99,30 @@ public class FormattedTextLayoutController
DataSourceException
{
final FormattedTextElement element = (FormattedTextElement) getNode();
-// LEM 20130812 I have absolutely no clue why it wants to go via
-// a variable like that. It complicates things, is fragile
-// (because the variable-set is done in *every* detail section
-// again and again. This in itself is not that bad, but when
-// the detail section is of height zero, the set is never done...
-// and this whole schema fails). For now, keep the code in case
-// something break. If we survive the 4.2 cycle (in its entirety)
-// without regression traced to this, then remove it (for 4.4 or
-// something like that).
-// final VariablesCollection vc = getVariablesCollection();
-// if (vc != null)
-// {
-// final String name = vc.addVariable(element);
-// final AttributeMap variablesGet = new AttributeMap();
-// variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
-// Element.TYPE_ATTRIBUTE, variable-get);
-// variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
-// Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS);
-// variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, name,
name);
-
-// final String dataStyleName = computeValueStyle();
-// if (dataStyleName != null)
-// {
-// variablesGet.setAttribute(OfficeNamespaces.STYLE_NS,
data-style-name, dataStyleName);
-// }
-
-// final String valueType = computeValueType();
-// variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS,
FormatValueUtility.VALUE_TYPE, valueType);
-// target.startElement(variablesGet);
-
-// target.endElement(variablesGet);
-// }
-// else
+final VariablesCollection vc = getVariablesCollection();
+if (vc != null)
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 4 commits - reportbuilder/java reportdesign/source
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
|3
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
| 138 +++---
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/VariablesCollection.java
|7
reportdesign/source/filter/xml/xmlExport.cxx
| 15 +
4 files changed, 127 insertions(+), 36 deletions(-)
New commits:
commit c582a7b280afc96ecf897356e0885d2bcf289710
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 17:49:53 2013 +0200
fdo#67930 work around fdo#68024
don't emit string-value attribute
Change-Id: I3668b88437451523f2b6bb3c2c82e1929f7ba3d8
Reviewed-on: https://gerrit.libreoffice.org/5371
Tested-by: Miklos Vajna vmik...@suse.cz
Reviewed-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit 76408b0f0d7e91cddb8b056069a2ee547109b156)
(cherry picked from commit 1e10f6d229587ffc2a955c225b489645f8016e23)
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index 8eecd85..d20927f 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -170,7 +170,8 @@ public class FormatValueUtility
{
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, string);
}
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
+// work around fdo#68024
+//variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
STRING_VALUE, String.valueOf(value));
}
else
{
commit 0efdc1504c3e8cb4644cefadd86bc131e78e4d2e
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 12 17:32:46 2014 +0100
fdo#87044: reportbuilder: Revert fdo#67930 don't use variables ...
... for formattedtext in header/footer
This reverts commit b0e3c6b8fa548defd5a3af2b8bf88b0b49589753.
This reverts commit fc92c1abebcfe9b18649d35b76bf22e001e332da.
The other fix from the libreoffice-4-1 branch seems to work better.
Change-Id: Idc5d7543c11dff74977729dab5afd978197dab6a
(cherry picked from commit d6ce95ae2288859fe74d601f1bdaf616ab1ee7f0)
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 8c1f619..afd8a59 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -99,39 +99,30 @@ public class FormattedTextLayoutController
DataSourceException
{
final FormattedTextElement element = (FormattedTextElement) getNode();
-// LEM 20130812 I have absolutely no clue why it wants to go via
-// a variable like that. It complicates things, is fragile
-// (because the variable-set is done in *every* detail section
-// again and again. This in itself is not that bad, but when
-// the detail section is of height zero, the set is never done...
-// and this whole schema fails). For now, keep the code in case
-// something break. If we survive the 4.2 cycle (in its entirety)
-// without regression traced to this, then remove it (for 4.4 or
-// something like that).
-// final VariablesCollection vc = getVariablesCollection();
-// if (vc != null)
-// {
-// final String name = vc.addVariable(element);
-// final AttributeMap variablesGet = new AttributeMap();
-// variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
-// Element.TYPE_ATTRIBUTE, variable-get);
-// variablesGet.setAttribute(JFreeReportInfo.REPORT_NAMESPACE,
-// Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.TEXT_NS);
-// variablesGet.setAttribute(OfficeNamespaces.TEXT_NS, name,
name);
-
-// final String dataStyleName = computeValueStyle();
-// if (dataStyleName != null)
-// {
-// variablesGet.setAttribute(OfficeNamespaces.STYLE_NS,
data-style-name, dataStyleName);
-// }
-
-// final String valueType = computeValueType();
-// variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS,
FormatValueUtility.VALUE_TYPE, valueType);
-// target.startElement(variablesGet);
-
-//
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e570cd7a293ceee175949dcc9656cdf776ae3c37 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 11 17:22:11 2014 +0200 Make IPHONEOS_DEPLOYMENT_TARGET match configure.ac Change-Id: Ie81075e1e392facfd281acdd652f6fcc6076c70e diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 9a2a69d..1805751 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -2387,7 +2387,7 @@ $(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive, $(LO_WORKDIR)/UnpackedTarball/icu/source/common, ); - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = $(LINK_LDFLAGS); SDKROOT = iphoneos; @@ -2430,7 +2430,7 @@ $(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive, $(LO_WORKDIR)/UnpackedTarball/icu/source/common, ); - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = $(LINK_LDFLAGS); SDKROOT = iphoneos; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 53583] Helper tool collecting user configuration
https://bugs.freedesktop.org/show_bug.cgi?id=53583 --- Comment #5 from Luuk luu...@gmail.com --- A profile is attached to https://bugs.freedesktop.org/show_bug.cgi?id=87159 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 85486] Clean up unnecessary enumerations from xenum.hxx
https://bugs.freedesktop.org/show_bug.cgi?id=85486 --- Comment #6 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Radu Ioan committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3c77eba67b61b4f78f2c8ccec6c78622ee173b61 fdo#85486 - Clean up unnecessary enumerations from xenum.hxx It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source include/svx sd/source svx/source
cui/source/tabpages/tphatch.cxx|8
include/svx/xenum.hxx |1 -
include/svx/xhatch.hxx | 12 ++--
sd/source/ui/view/drviews9.cxx |6 +++---
svx/source/sdr/primitive2d/sdrattributecreator.cxx |8
svx/source/svdraw/svdfmtf.cxx |8
svx/source/unodraw/XPropertyTable.cxx |2 +-
svx/source/xoutdev/xattr.cxx | 10 +-
svx/source/xoutdev/xtabhtch.cxx| 12 ++--
9 files changed, 33 insertions(+), 34 deletions(-)
New commits:
commit 3c77eba67b61b4f78f2c8ccec6c78622ee173b61
Author: Radu Ioan ioan.rad...@gmail.com
Date: Thu Dec 11 23:45:38 2014 +0200
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XHatchStyle
Change-Id: I89e7edadc4f408e5a50840aaa1a13965b8503afb
Reviewed-on: https://gerrit.libreoffice.org/13442
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index a08bcbf..2f988e4 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -299,7 +299,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
else
{
pXHatch.reset(new XHatch(
m_pLbLineColor-GetSelectEntryColor(),
- (XHatchStyle)
m_pLbLineType-GetSelectEntryPos(),
+ (css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() *
10) ));
}
@@ -366,7 +366,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
}
XHatch aXHatch( m_pLbLineColor-GetSelectEntryColor(),
-(XHatchStyle) m_pLbLineType-GetSelectEntryPos(),
+(css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() * 10) );
@@ -513,7 +513,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
if( !nError )
{
XHatch aXHatch( m_pLbLineColor-GetSelectEntryColor(),
-(XHatchStyle) m_pLbLineType-GetSelectEntryPos(),
+(css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() * 10) );
XHatchEntry* pEntry = new XHatchEntry( aXHatch, aName );
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
{
bLoop = false;
XHatch aXHatch( m_pLbLineColor-GetSelectEntryColor(),
-(XHatchStyle)
m_pLbLineType-GetSelectEntryPos(),
+(css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() *
10) );
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index 52f7a4f..a849bc5 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_XENUM_HXX
-enum XHatchStyle{ XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE };
enum XFormTextStyle { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY,
XFT_NONE };
enum XFormTextAdjust{ XFT_LEFT, XFT_RIGHT, XFT_AUTOSIZE, XFT_CENTER };
diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx
index 9dc725d..52010cd 100644
--- a/include/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_SVX_XHATCH_HXX
#define INCLUDED_SVX_XHATCH_HXX
-#include svx/xenum.hxx
#include tools/color.hxx
#include svx/svxdllapi.h
+#include com/sun/star/drawing/HatchStyle.hpp
// class XHatch
@@ -31,24 +31,24 @@
class SVX_DLLPUBLIC XHatch
{
protected:
-XHatchStyle eStyle;
+css::drawing::HatchStyle eStyle;
Color aColor;
longnDistance;
longnAngle;
public:
-XHatch() : eStyle(XHATCH_SINGLE), nDistance(0), nAngle(0)
{}
-XHatch(const Color rCol, XHatchStyle eStyle =
XHATCH_SINGLE,
+XHatch() : eStyle(css::drawing::HatchStyle_SINGLE),
nDistance(0), nAngle(0) {}
+XHatch(const Color rCol, css::drawing::HatchStyle eStyle
= css::drawing::HatchStyle_SINGLE,
long nDistance = 20, long nAngle = 0);
bool operator==(const XHatch rHatch) const;
-voidSetHatchStyle(XHatchStyle eNewStyle) { eStyle =
[Bug 85486] Clean up unnecessary enumerations from xenum.hxx
https://bugs.freedesktop.org/show_bug.cgi?id=85486 Miklos Vajna vmik...@collabora.co.uk changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |ioan.rad...@gmail.com |desktop.org | --- Comment #7 from Miklos Vajna vmik...@collabora.co.uk --- Marking as fixed, well done! :-) -- 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
Build error on Mac OS X Yosemite 10.10.1 Xcode 6.1.1
Hi, I am currently unable to build LibreOffice on my Mac... I am not sure if the problem arose from any modification on the project itself or some external factor. Although Xcode had an update recently, I think it was related to Swift stuff. Here is the error I get: /Users/renato/lo/core/sw/source/core/swg/SwXMLBlockImport.cxx:32:10: fatal error: 'tokens.cxx' file not found #include tokens.cxx ^ 1 error generated. make[1]: *** [/Users/renato/lo/core/workdir/CxxObject/sw/source/core/swg/SwXMLBlockImport.o] Error 1 Searching for tokens.cxx gives me the following files: ./workdir/CustomTarget/editeng/generated/tokens.cxx ./workdir/CustomTarget/filter/source/svg/tokens.cxx Which I don't quite understand, why should I only find them in the workdir? Is there any include path not configured properly, maybe, or something of that sort? Has anybody faced something similar, or could provide a better insight on what is causing this? Thanks, Renato Ferreira. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build error on Mac OS X Yosemite 10.10.1 Xcode 6.1.1
Hi, On 12 December 2014 at 21:59, Renato Ferreira renato.w...@gmail.com wrote: /Users/renato/lo/core/sw/source/core/swg/SwXMLBlockImport.cxx:32:10: fatal error: 'tokens.cxx' file not found #include tokens.cxx ^ 1 error generated. make[1]: *** [/Users/renato/lo/core/workdir/CxxObject/sw/source/core/swg/SwXMLBlockImport.o] Error 1 Searching for tokens.cxx gives me the following files: ./workdir/CustomTarget/editeng/generated/tokens.cxx ./workdir/CustomTarget/filter/source/svg/tokens.cxx Which I don't quite understand, why should I only find them in the workdir? Is there any include path not configured properly, maybe, or something of that sort? They are generated files. It's strange. I don't see why it would not work. cd sw make CustomTarget_sw/generated should create workdir/CustomTarget/sw/generated/tokens.cxx Does it fail for you? To clean the directory you can use (in sw): make CustomTarget_sw/generated.clean And then when compiling I have -I$W/CustomTarget/sw/generated HTH, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 801408c4412eb6151a3b4c92e6f7cc98503fad65 Author: Tor Lillqvist t...@collabora.com Date: Fri Dec 12 23:51:17 2014 +0200 Define gb_LinkTarget__use_plc4 for Android build Change-Id: Ib44177a27b58e1f11fc98bfe0852f381251e436e diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b32b06d..3b6d490 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3243,6 +3243,7 @@ gb_ExternalProject__use_nss3:= ifeq ($(OS),ANDROID) gb_LinkTarget__use_nss3:= +gb_LinkTarget__use_plc4:= else ___ 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.3' - filter/source include/vcl vcl/Library_vcl.mk vcl/source
filter/source/pdf/impdialog.cxx | 18 +--
filter/source/pdf/impdialog.hrc |4
filter/source/pdf/impdialog.src | 10 +
filter/source/pdf/pdfexport.cxx |2
include/vcl/pdfwriter.hxx |5
vcl/Library_vcl.mk|4
vcl/source/gdi/pdfwriter_impl.cxx | 202 --
7 files changed, 203 insertions(+), 42 deletions(-)
New commits:
commit 4ffc81782072148f8ffeb9793c4bf4421866eefe
Author: Tor Lillqvist t...@collabora.com
Date: Wed Dec 3 14:00:38 2014 +0200
PDF signing feature backported from 4.4
Cherry picked from:
840f75065918c4584fa9159fdc90242b5374ab37
1fe9ee73a758603ee0e1465931352c41ef8bd999
d8a8ff8177df628636d80c4dc1d8f597f6677dfc
bfa01d8a8248f7e44675de5ed1f85a1d17105022
bbb18f679f5a50e9c709520d6c3260d3d9db5aa9
c4cc31b5b55019aabad4045c8174b45e1b27073a
7e3c931786c3cbe83ee170b8b0746d141b520ce6
070c93af73df9aa4eb333265c81060d123b530b9
6e91763769a562b2a4c2a94b1367c6ed4866
Change-Id: Ie8ac5e1e067f8e3b15e2f11389bd0517d348f1e3
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 0825ea0..7cffddd 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -251,11 +251,6 @@ ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent,
Sequence PropertyValue rFi
mnInterfacePageId = AddTabPage(userinterface,
ImpPDFTabViewerPage::Create, 0);
mnViewPageId = AddTabPage(initialview, ImpPDFTabOpnFtrPage::Create, 0);
-//remove tabpage if experimentalmode is not set
-SvtMiscOptions aMiscOptions;
-if (!aMiscOptions.IsExperimentalMode())
-RemoveTabPage(mnSigningPageId);
-
//last queued is the first to be displayed (or so it seems..)
mnGeneralPageId = AddTabPage(general, ImpPDFTabGeneralPage::Create, 0 );
@@ -322,11 +317,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog()
RemoveTabPage(mnViewPageId);
RemoveTabPage(mnLinksPage);
RemoveTabPage(mnSecurityPageId);
-
-//remove tabpage if experimentalmode is set
-SvtMiscOptions aMiscOptions;
-if (aMiscOptions.IsExperimentalMode())
-RemoveTabPage(mnSigningPageId);
+RemoveTabPage(mnSigningPageId);
}
@@ -1495,6 +1486,13 @@ ImplErrorDialog::ImplErrorDialog(const std::set
vcl::PDFWriter::ErrorCode rE
m_pErrors-SetEntryData( nPos, new OUString( PDFFilterResId(
STR_WARN_TRANSP_CONVERTED ) ) );
}
break;
+case vcl::PDFWriter::Error_Signature_Failed:
+{
+sal_uInt16 nPos = m_pErrors-InsertEntry( OUString(
PDFFilterResId( STR_ERR_SIGNATURE_FAILED ) ),
+aErrImg );
+m_pErrors-SetEntryData( nPos, new OUString( PDFFilterResId(
STR_ERR_PDF_EXPORT_ABORTED ) ) );
+}
+break;
default:
break;
}
diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc
index 0927cb0..3b03503 100644
--- a/filter/source/pdf/impdialog.hrc
+++ b/filter/source/pdf/impdialog.hrc
@@ -19,6 +19,9 @@
#include filter.hrc
+#define STR_ERR_SIGNATURE_FAILED(RID_PDF_DIALOG_START + 0)
+#define STR_ERR_PDF_EXPORT_ABORTED (RID_PDF_DIALOG_START + 1)
+
#define RID_PDF_WARNPDFAPASSWORD(RID_PDF_DIALOG_START + 6)
//strings for PDF security, user password management
@@ -39,5 +42,6 @@
#define IMG_ERR (RID_PDF_DIALOG_START + 18)
//ATTENTION: maximum allowed value is (RID_PDF_DIALOG_START + 19)
+//(see filter/inc/filter.hrc)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 32d81a4..1aee2df 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -79,6 +79,16 @@ String STR_WARN_TRANSP_CONVERTED_SHORT
Text [en-US] = Transparencies removed;
};
+String STR_ERR_SIGNATURE_FAILED
+{
+Text [en-US] = Signature generation failed;
+};
+
+String STR_ERR_PDF_EXPORT_ABORTED
+{
+Text [en-US] = PDF export aborted;
+};
+
Bitmap IMG_WARN
{
File = ballgreen_7.png;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 8aceae6..164eff9 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -915,7 +915,7 @@ bool PDFExport::Export( const OUString rFile, const
Sequence PropertyValue
if( bRet )
{
pPDFExtOutDevData-PlayGlobalActions( *pPDFWriter );
-pPDFWriter-Emit();
+bRet = pPDFWriter-Emit();
aErrors = pPDFWriter-GetErrors();
}
pOut-SetExtOutDevData( NULL );
diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx
index d4b6e90..9357c91 100644
--- a/include/vcl/pdfwriter.hxx
+++ b/include/vcl/pdfwriter.hxx
@@ -215,7 +215,10 @@ public:
// transparent objects were converted to a bitmap in order
[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-1-6+backports' - 35 commits - chart2/source desktop/source drawinglayer/Library_drawinglayer.mk drawinglayer/source filter/source inc
chart2/source/controller/main/DragMethod_RotateDiagram.cxx |3 desktop/source/app/app.cxx | 59 --- drawinglayer/Library_drawinglayer.mk |1 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx | 112 +++ drawinglayer/source/processor2d/processor2dtools.cxx | 63 drawinglayer/source/tools/converters.cxx | 80 ++--- filter/source/msfilter/util.cxx| 44 -- include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx |3 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx| 65 include/drawinglayer/processor2d/linegeometryextractor2d.hxx |2 include/drawinglayer/processor2d/processor2dtools.hxx | 79 + include/drawinglayer/processor2d/vclmetafileprocessor2d.hxx|2 include/drawinglayer/processor2d/vclpixelprocessor2d.hxx |2 include/drawinglayer/processor2d/vclprocessor2d.hxx|2 include/drawinglayer/processor3d/defaultprocessor3d.hxx|2 include/drawinglayer/processor3d/zbufferprocessor3d.hxx|2 include/filter/msfilter/util.hxx |1 include/svtools/optionsdrawinglayer.hxx|5 include/svx/sdr/overlay/overlayanimatedbitmapex.hxx|9 include/svx/sdr/overlay/overlayobject.hxx |3 include/svx/sdr/overlay/overlaypolypolygon.hxx | 13 include/svx/sdr/overlay/overlayrectangle.hxx | 87 + include/svx/sdr/overlay/overlaytools.hxx | 21 - include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx |2 include/svx/svdview.hxx|6 include/tools/datetimeutils.hxx| 20 + include/unotools/localfilehelper.hxx |3 sc/source/ui/view/gridwin.cxx | 20 - sd/source/ui/view/sdview2.cxx |8 sd/source/ui/view/sdview3.cxx | 97 -- svtools/source/config/optionsdrawinglayer.cxx | 21 + svx/Library_svxcore.mk |2 svx/source/engine3d/dragmt3d.cxx |3 svx/source/engine3d/view3d.cxx |3 svx/source/sdr/contact/objectcontactofobjlistpainter.cxx |9 svx/source/sdr/contact/objectcontactofpageview.cxx |7 svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 15 - svx/source/sdr/overlay/overlayhatchrect.cxx| 71 svx/source/sdr/overlay/overlaymanager.cxx | 20 - svx/source/sdr/overlay/overlayobject.cxx | 14 svx/source/sdr/overlay/overlaypolypolygon.cxx | 33 +- svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx|2 svx/source/sdr/overlay/overlayrectangle.cxx| 150 ++ svx/source/sdr/overlay/overlayrollingrectangle.cxx | 26 + svx/source/sdr/overlay/overlaytools.cxx| 119 +-- svx/source/svdraw/svdcrtv.cxx |9 svx/source/svdraw/svddrgmt.cxx | 23 + svx/source/svdraw/svdedxv.cxx | 79 ++--- svx/source/svdraw/svdhdl.cxx | 21 - svx/source/svdraw/svdmrkv.cxx | 46 +-- svx/source/svdraw/svdobj.cxx | 54 ++- svx/source/svdraw/svdview.cxx | 31 +- svx/source/table/svdotable.cxx |2 svx/source/table/tablehandles.cxx | 31 +- svx/source/table/tablehandles.hxx |8 sw/inc/doc.hxx | 13 sw/inc/frmfmt.hxx | 27 + sw/inc/index.hxx | 14 sw/inc/iodetect.hxx|5 sw/qa/extras/inc/swmodeltestbase.hxx |4 sw/qa/extras/odfimport/data/uno-cycle.odt |binary sw/qa/extras/odfimport/odfimport.cxx | 16 + sw/source/core/attr/swatrset.cxx | 27 + sw/source/core/bastyp/index.cxx|9 sw/source/core/crsr/bookmrk.cxx
Re: Build error on Mac OS X Yosemite 10.10.1 Xcode 6.1.1
They are generated files. It's strange. I don't see why it would not work. cd sw make CustomTarget_sw/generated should create workdir/CustomTarget/sw/generated/tokens.cxx Does it fail for you? To clean the directory you can use (in sw): make CustomTarget_sw/generated. clean And then when compiling I have -I$W/CustomTarget/sw/generated Oh, now I realize what was wrong... Since the ooxmlexport and ooxmlimport unit tests have been failing in my OS for some time (I don't know why, actually), I had commented them from the sw Makefile. It turns out that doing so ended up removing the trigger to generate the required file :( Sorry about that. This is probably better for another thread, but it would also be good to understand what went wrong with said unit tests. I spotted one commit that changed an expected value and removed an #ifdef directive for OS X in ooxmlexport, but it isn't clear to me what is going wrong. Anyway, as soon as my now fixed build finishes or presumably fails in the re-enabled tests, I can post the details. Thanks, Renato. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Failing unit test in Mac OS X Yosemite 10.10.1
Hi everybody, As I had mentioned in another thread, a unit test has been failing in my machine for some time. This is not a fatal error, but I think it would be beneficial to understand where the problem comes from. The test is CppunitTest_sw_ooxmlexport (ooxmlimport failed for some time, but apparently got fixed). It fails on the following condition: Test name: testCropPixel::Import_Export_Import assertion failed - Expression: getXPath(pXmlDoc, //a:srcRect, l).toInt32() = 21856 Failures !!! Run: 106 Failure total: 1 Failures: 1 Errors: 0 warn:fwk:98596:1:framework/source/services/desktop.cxx:1020: Desktop disposed before terminating it 2014-12-12 17:37:13.640 cppunittester[98596:7597699] *** -[NSAutoreleasePool release]: This pool has already been released, do not drain it (double release). warn:legacy.osl:98596:1:unotools/source/config/configmgr.cxx:167: OSL_ASSERT: items_.empty() Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=lldb -- # for interactive debugging on OSX export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_sw_ooxmlexport The following commit may be relevant: commit b1b29ae795ff86097b21907f814d94bd5488929d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 20 12:06:11 2014 +0100 ...at least, that's the value for me on Mac with retina Change-Id: I041b497bab9415b2b33d6b4b91f3c58ea9dbc05f diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 519ad65..96b0d0ee 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -484,9 +484,7 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, crop-pixel.docx) // This is 17667 in the original document, was 504666 (so the image // become invisible), now is around 19072. (void) pXmlDoc; -#ifndef MACOSX -CPPUNIT_ASSERT(getXPath(pXmlDoc, //a:srcRect, l).toInt32() 2); -#endif +CPPUNIT_ASSERT(getXPath(pXmlDoc, //a:srcRect, l).toInt32() = 21856); } } My Mac (Retina 13) gives the value 22452, but I'm not able to tell which value is valid, or on which Mac with retina the other value was produced. Does anybody else use OS X Yosemite here? Thanks, Renato. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failing unit test in Mac OS X Yosemite 10.10.1
On Fri, 2014-12-12 at 23:44 +, Renato Ferreira wrote: Test name: testCropPixel::Import_Export_Import assertion failed - Expression: getXPath(pXmlDoc, //a:srcRect, l).toInt32() = 21856 ... My Mac (Retina 13) gives the value 22452, but I'm not able to tell which value is valid, or on which Mac with retina the other value was produced. Does anybody else use OS X Yosemite here? I do, and I'm getting exactly the same thing. Every time. And I've been meaning to take a closer look but, so far no action (been lazy lately). :-P I'm not a Writer developer so I don't immediately know what the error is about. Usually, each import export test has an associated file you can open, then by comparing the content of the file and the code in the test, one can perhaps make a best effort guess of what the test expects, and what expectation is incorrect and/or whether there is a real bug in it... Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango sd/uiconfig
icon-themes/galaxy/cmd/lc_presentationcurrentslide.png |binary icon-themes/galaxy/cmd/sc_presentationcurrentslide.png |binary icon-themes/tango/cmd/lc_presentationcurrentslide.png |binary icon-themes/tango/cmd/lc_presentationcurrentslide2.png |binary icon-themes/tango/cmd/lc_presentationcurrentslide2.svg | 921 + icon-themes/tango/cmd/sc_presentationcurrentslide.png |binary sd/uiconfig/simpress/toolbar/commontaskbar.xml | 10 7 files changed, 926 insertions(+), 5 deletions(-) New commits: commit 56cc4c4f4c6e1807ab47965f9e40357b5b6eaf9d Author: Yousuf Philips philip...@hotmail.com Date: Sat Dec 13 09:18:15 2014 +0400 fdo#84909 enable start from current slide and add its tango icons Change-Id: I2af37e19f5f54557415b80d9aad2bba38d381a87 Reviewed-on: https://gerrit.libreoffice.org/13462 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com diff --git a/icon-themes/galaxy/cmd/lc_presentationcurrentslide.png b/icon-themes/galaxy/cmd/lc_presentationcurrentslide.png new file mode 100644 index 000..f8fae7b Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_presentationcurrentslide.png differ diff --git a/icon-themes/galaxy/cmd/sc_presentationcurrentslide.png b/icon-themes/galaxy/cmd/sc_presentationcurrentslide.png new file mode 100644 index 000..aef558a Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_presentationcurrentslide.png differ diff --git a/icon-themes/tango/cmd/lc_presentationcurrentslide.png b/icon-themes/tango/cmd/lc_presentationcurrentslide.png new file mode 100644 index 000..f8fae7b Binary files /dev/null and b/icon-themes/tango/cmd/lc_presentationcurrentslide.png differ diff --git a/icon-themes/tango/cmd/lc_presentationcurrentslide2.png b/icon-themes/tango/cmd/lc_presentationcurrentslide2.png new file mode 100644 index 000..814d281 Binary files /dev/null and b/icon-themes/tango/cmd/lc_presentationcurrentslide2.png differ diff --git a/icon-themes/tango/cmd/lc_presentationcurrentslide2.svg b/icon-themes/tango/cmd/lc_presentationcurrentslide2.svg new file mode 100644 index 000..e458ebe --- /dev/null +++ b/icon-themes/tango/cmd/lc_presentationcurrentslide2.svg @@ -0,0 +1,921 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + inkscape:export-ydpi=90 + inkscape:export-xdpi=90 + inkscape:export-filename=/home/jimmac/src/cvs/ooo/ooo_custom_images/tango/res/lo03123.png + sodipodi:docname=lc_presentation.svg + inkscape:version=0.48.5 r + sodipodi:version=0.32 + id=svg249 + height=24 + width=24 + version=1.0 + inkscape:output_extension=org.inkscape.output.svg.inkscape + sodipodi:modified=true + defs + id=defs3 +linearGradient + id=linearGradient3871 + stop + id=stop3873 + offset=0 + style=stop-color:#4e9a06;stop-opacity:1; / + stop + id=stop3875 + offset=1 + style=stop-color:#73d216;stop-opacity:1; / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient5716 + stop + style=stop-color:#ff;stop-opacity:1; + offset=0 + id=stop5718 / + stop + style=stop-color:#ff;stop-opacity:0; + offset=1 + id=stop5720 / +/linearGradient +linearGradient + id=linearGradient5706 + stop + style=stop-color:#3465a4;stop-opacity:1; + offset=0 + id=stop5708 / + stop + style=stop-color:#6a97d0;stop-opacity:1; + offset=1 + id=stop5710 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient4875 + stop + style=stop-color:#555753;stop-opacity:1; + offset=0 + id=stop4877 / + stop + style=stop-color:#555753;stop-opacity:0; + offset=1 + id=stop4879 / +/linearGradient +linearGradient + id=linearGradient15662 + stop + id=stop15664 + offset=0.000 + style=stop-color:#ff;stop-opacity:1.000; / + stop + id=stop15666 + offset=1.000 + style=stop-color:#f8f8f8;stop-opacity:1.000; / +/linearGradient +linearGradient + id=linearGradient269 + stop + id=stop270 + offset=0.000 + style=stop-color:#a3a3a3;stop-opacity:1.000; / + stop + id=stop271 + offset=1 + style=stop-color:#8a8a8a;stop-opacity:1; / +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/galaxy icon-themes/tango sd/uiconfig
icon-themes/galaxy/cmd/lc_presentationcurrentslide.png |binary icon-themes/galaxy/cmd/sc_presentationcurrentslide.png |binary icon-themes/tango/cmd/lc_presentationcurrentslide.png |binary icon-themes/tango/cmd/lc_presentationcurrentslide2.png |binary icon-themes/tango/cmd/lc_presentationcurrentslide2.svg | 921 + icon-themes/tango/cmd/sc_presentationcurrentslide.png |binary sd/uiconfig/simpress/toolbar/commontaskbar.xml | 10 7 files changed, 926 insertions(+), 5 deletions(-) New commits: commit c43db003ddac6bb35287ef078fbaa013bb5fd208 Author: Yousuf Philips philip...@hotmail.com Date: Sat Dec 13 09:18:15 2014 +0400 fdo#84909 enable start from current slide and add its tango icons Change-Id: I2af37e19f5f54557415b80d9aad2bba38d381a87 Reviewed-on: https://gerrit.libreoffice.org/13462 Reviewed-by: Yousuf Philips philip...@hotmail.com Tested-by: Yousuf Philips philip...@hotmail.com (cherry picked from commit 56cc4c4f4c6e1807ab47965f9e40357b5b6eaf9d) Reviewed-on: https://gerrit.libreoffice.org/13463 diff --git a/icon-themes/galaxy/cmd/lc_presentationcurrentslide.png b/icon-themes/galaxy/cmd/lc_presentationcurrentslide.png new file mode 100644 index 000..f8fae7b Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_presentationcurrentslide.png differ diff --git a/icon-themes/galaxy/cmd/sc_presentationcurrentslide.png b/icon-themes/galaxy/cmd/sc_presentationcurrentslide.png new file mode 100644 index 000..aef558a Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_presentationcurrentslide.png differ diff --git a/icon-themes/tango/cmd/lc_presentationcurrentslide.png b/icon-themes/tango/cmd/lc_presentationcurrentslide.png new file mode 100644 index 000..f8fae7b Binary files /dev/null and b/icon-themes/tango/cmd/lc_presentationcurrentslide.png differ diff --git a/icon-themes/tango/cmd/lc_presentationcurrentslide2.png b/icon-themes/tango/cmd/lc_presentationcurrentslide2.png new file mode 100644 index 000..814d281 Binary files /dev/null and b/icon-themes/tango/cmd/lc_presentationcurrentslide2.png differ diff --git a/icon-themes/tango/cmd/lc_presentationcurrentslide2.svg b/icon-themes/tango/cmd/lc_presentationcurrentslide2.svg new file mode 100644 index 000..e458ebe --- /dev/null +++ b/icon-themes/tango/cmd/lc_presentationcurrentslide2.svg @@ -0,0 +1,921 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + inkscape:export-ydpi=90 + inkscape:export-xdpi=90 + inkscape:export-filename=/home/jimmac/src/cvs/ooo/ooo_custom_images/tango/res/lo03123.png + sodipodi:docname=lc_presentation.svg + inkscape:version=0.48.5 r + sodipodi:version=0.32 + id=svg249 + height=24 + width=24 + version=1.0 + inkscape:output_extension=org.inkscape.output.svg.inkscape + sodipodi:modified=true + defs + id=defs3 +linearGradient + id=linearGradient3871 + stop + id=stop3873 + offset=0 + style=stop-color:#4e9a06;stop-opacity:1; / + stop + id=stop3875 + offset=1 + style=stop-color:#73d216;stop-opacity:1; / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient5716 + stop + style=stop-color:#ff;stop-opacity:1; + offset=0 + id=stop5718 / + stop + style=stop-color:#ff;stop-opacity:0; + offset=1 + id=stop5720 / +/linearGradient +linearGradient + id=linearGradient5706 + stop + style=stop-color:#3465a4;stop-opacity:1; + offset=0 + id=stop5708 / + stop + style=stop-color:#6a97d0;stop-opacity:1; + offset=1 + id=stop5710 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient4875 + stop + style=stop-color:#555753;stop-opacity:1; + offset=0 + id=stop4877 / + stop + style=stop-color:#555753;stop-opacity:0; + offset=1 + id=stop4879 / +/linearGradient +linearGradient + id=linearGradient15662 + stop + id=stop15664 + offset=0.000 + style=stop-color:#ff;stop-opacity:1.000; / + stop + id=stop15666 + offset=1.000 + style=stop-color:#f8f8f8;stop-opacity:1.000; / +/linearGradient +linearGradient + id=linearGradient269 + stop + id=stop270 + offset=0.000 +
Re: minutes of ESC call ...
On Thu, 11 Dec 2014 17:07:33 +0100, Michael Meeks michael.me...@collabora.com wrote: https://bugs.freedesktop.org/showdependencytree.cgi?id=75025hide_resolved=1 * Open 4.2 MAB + 5/208 38/232 63/255 74/261 83/266 81/263 84/262 82/260 80/260 82/260 86/257 ... please anybody help to retest and migrate the very last 4 MABs from the 4.2.x list to the 4.3.x list. me and Robinson have retested most of the original 83 MABs that were still open at the time of 4.2.x EOL. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Problems with document graphics not fully displaying
Oh - EMF and EMF+ are the file formats that we seem to have issues with. Chris Sent from my iPhone On 4 Dec 2014, at 5:05 am, Robinson Tryon bishop.robin...@gmail.com wrote: On Tue, Dec 2, 2014 at 6:00 AM, Chris Sherlock chris.sherloc...@gmail.com wrote: When you see a bug like this one: https://bugs.freedesktop.org/show_bug.cgi?id=80503 (VIEWING: WMF images in DOC file not rendered correctly) then could I request that the person who has reproduced the issue please set the environment variable EMF_PLUS_DISABLE and set it to 1? Hi Chris, Thanks for the ping! There are a lot of different graphics-related bugs that we see in QA, e.g. https://bugs.freedesktop.org/show_bug.cgi?id=86649. To make it easy for QA to determine when to perform the test you described, it would be great to know which graphics formats are relevant to this particular issue: EMF, WMF, ... anything else? Thanks, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald 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] Problems with document graphics not fully displaying
Hi Robinson et al. Basically anything with a drawing that doesn't display properly would be a candidate for this :-) Thanks for the response! Chris Sent from my iPhone On 4 Dec 2014, at 5:05 am, Robinson Tryon bishop.robin...@gmail.com wrote: On Tue, Dec 2, 2014 at 6:00 AM, Chris Sherlock chris.sherloc...@gmail.com wrote: When you see a bug like this one: https://bugs.freedesktop.org/show_bug.cgi?id=80503 (VIEWING: WMF images in DOC file not rendered correctly) then could I request that the person who has reproduced the issue please set the environment variable EMF_PLUS_DISABLE and set it to 1? Hi Chris, Thanks for the ping! There are a lot of different graphics-related bugs that we see in QA, e.g. https://bugs.freedesktop.org/show_bug.cgi?id=86649. To make it easy for QA to determine when to perform the test you described, it would be great to know which graphics formats are relevant to this particular issue: EMF, WMF, ... anything else? Thanks, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald 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] [libreoffice-l10n] [ANN] LibreOffice 4.4.0 Beta2 available
Hi developers, I tried reporting a problem on https://bugs.freedesktop.org/, but I am unsure if I did it right and if anyone is receiving any notice about it. Nobody is assigned and nobody is Cc'ed. The bug is https://bugs.freedesktop.org/show_bug.cgi?id=87250 Do you think the proper people have been informed? Related to my experience reporting a bug: It would be nice if there was a more approachable way to report bugs than that Bugzilla interface for those of us that do not know the source code by heart or just want to report a bug without being almost interrogated with 20 questions… My guess is it could scare many people away from reporting issues. Do other, more simple interfaces to Bugzilla exist? Where the interface only asks the most important questions and allow the user to only answer the questions he or she actually has an answer to, and leaving the rest to those that know what to fill in in the other fields? Jesper 2014-12-09 2:21 GMT+01:00 Christian Lohmaier lohma...@googlemail.com: Dear Community, The Document Foundation is pleased to announce the second Beta release of LibreOffice 4.4.0. The upcoming 4.4.0 will be the ninth major release of LibreOffice, coming with a bunch of new features beside the usual bugfixes. The Beta2 can be installed alongside the stable version, so feel free to give it a try. Beta2 is not ready for production yet, and while Beta1 marks feature freeze, final UI and string freeze is yet to come, and translations are not complete. A work-in-progress list of new features in LibreOffice 4.4 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.4 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.4.0 Beta2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.4.0/Beta2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian -- To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.libreoffice.org/global/l10n/ All messages sent to this list will be publicly archived and cannot be deleted ___ 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-qa] LibreOffice Chinese (Traditional) Team
Your email client cannot read this email. To view it online, please go here: http://samui004.us/display.php?M=190638C=1ba087547e773fe77f3b5275fccbf55eS=5L=5N=22 To stop receiving these emails:http://samui004.us/unsubscribe.php?M=190638C=1ba087547e773fe77f3b5275fccbf55eL=5N=5 !-- #*#*# FLIPMODE! #*#*# -- 67a1aea3fecfd5794e6985514de31273 Description: 4529c5e7617aebaf066cfaf425eb1985 Description: e17eca46f5d824852d653413c4f769bd Description: ___ 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] LibreOffice Chinese (Traditional) Team
Sorry, seemded valid (Title) -- Liebe Grüße, / Yours, Florian Reisinger ___ 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] LibreOffice Chinese (Traditional) Team
2014-12-12 17:25 GMT+01:00 Florian Reisinger flo...@libreoffice.org: Sorry, seemded valid (Title) -- Liebe Grüße, / Yours, Florian Reisinger Well, Florian, you managed to confuse me and intrigue me at the same time - what's teh above all about ?... Henri ___ 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 86408] In Persian, it's impossible to see the full characters vertically, no easy right-to-left line order, and bugs in bilingual lines
https://bugs.freedesktop.org/show_bug.cgi?id=86408 --- Comment #9 from arya...@gmail.com --- (In reply to Urmas from comment #8) Do you have 'Options/Language Settings/Languages - Complex text layout' checkbox set? Thank you, No, it wasn't set (it is now) and CTRL-SHFT-A/D works, and the icons are in the toolbars (after restarting the Writer of course). So, the only thing not resolved yet (if I remember correctly) is (3): In bilingual lines, the line becomes LTR immediately after typing the first western charcter. Thanks again Urmas -- 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 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #12 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Tobias Madl committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f5c5bab09f2e3a7e13a6b397faf4bdfcb898f295 fdo#84938 replace PPT_LAYOUT_ constants with enum It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 87155] Assertion failure when loading a (perhaps pathological) spreadsheet document
https://bugs.freedesktop.org/show_bug.cgi?id=87155 --- Comment #3 from Tor Lillqvist t...@iki.fi --- Well, it fixed the problem for me. I don't know if it was the right fix, though. -- 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 39440] cppcheck cleanliness
https://bugs.freedesktop.org/show_bug.cgi?id=39440 --- Comment #25 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Weghorn committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=04b183a9bc792a53a9f081353a79486faa4f3872 fdo#39440 reduce scope of local variables It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 86408] In Persian, it's impossible to see the full characters vertically, no easy right-to-left line order, and bugs in bilingual lines
https://bugs.freedesktop.org/show_bug.cgi?id=86408 arya...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #10 from arya...@gmail.com --- Nope, I was wrong. After setting language as you said, (3) is solved too. So, All resolves, thanks to you Urmas; thanks a lot. -- 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 76974] Language autodetection bug for empty lines
https://bugs.freedesktop.org/show_bug.cgi?id=76974 Beluga todven...@suomi24.fi changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #9 from Beluga todven...@suomi24.fi --- Thanks. I could finally repro. I went to the empty line and selected all with Ctrl-A and then Tools - Language - For selection did not show Germany when I had German text. Version: 4.5.0.0.alpha0+ Build ID: ffd18eed1fc5b56fecf83fbff3ce09face16bb7e TinderBox: Win-x86@51-TDF, Branch:MASTER, Time: 2014-11-30_00:07:43 -- 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 87260] New: StaticLibrary libglxtest compilation problem
https://bugs.freedesktop.org/show_bug.cgi?id=87260 Bug ID: 87260 Summary: StaticLibrary libglxtest compilation problem Product: LibreOffice Version: 4.3.3.2 release Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Installation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ktamat...@dataways.gr Hello everyone, I'm trying to build libreoffice sources from the following wiki: https://wiki.documentfoundation.org/Development/BuildingOnLinux My system is a debian jessie 32 bit and my configure is this: ./autogen.sh --with-system-libs --enable-mergelibs --without-x --without-java --without-junit --disable-gconf --without-doxygen --disable-postgresql-sdbc --without-boost-date-time --without-boost-iostreams --disable-firebird-sdbc --disable-orcus --disable-lpsolve All dependencies are ok and compilation starts until it breaks at this point: libreoffice/solenv/gbuild/LinkTarget.mk:522: *** used LinkTarget StaticLibrary/libglxtest.a not defined. Stop. I hope you can help me. Kind Regards, Kostas. -- 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 72337] Other: Unable to open document on a network share
https://bugs.freedesktop.org/show_bug.cgi?id=72337 --- Comment #4 from Walter walter.rose...@gmail.com --- LibreOffice 4.2.7.2 on Ubuntu platform still have this limitations. -- 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 87222] Works spreadsheet: wrong encoding
https://bugs.freedesktop.org/show_bug.cgi?id=87222 --- Comment #4 from Julien Nabet serval2...@yahoo.fr --- Thank you for your feedback Urmas. Just by curiosity, where did you find the name LICS? I mean why do you call this encoding LICS? -- 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 72337] Other: Unable to open document on a network share
https://bugs.freedesktop.org/show_bug.cgi?id=72337 --- Comment #5 from Walter walter.rose...@gmail.com --- (In reply to Walter from comment #4) LibreOffice 4.2.7.2 on Ubuntu platform still have this limitations. To bypass this bug comment into /usr/share/applications/libreoffice-*.desktop the line X-KDE-Protocols= I have no idea if this could open furhter limitations or not. This is a WORKAROUND to open files shared with smb protocol on linux platform. -- 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 87222] Works spreadsheet: wrong encoding
https://bugs.freedesktop.org/show_bug.cgi?id=87222 --- Comment #5 from Urmas davian...@gmail.com --- Lotus International Character Set was a proprietary alternative to ASCII to use in Lotus spreadsheets; evidently Works spreadsheet was build around the interoperability with Lotus 1-2-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 87222] Works spreadsheet: wrong encoding
https://bugs.freedesktop.org/show_bug.cgi?id=87222 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||caol...@redhat.com --- Comment #6 from Julien Nabet serval2...@yahoo.fr --- Thank you again Urmas, I found a ref here: http://www.bps-sberbank.by/help/help85_designer.nsf/2e73cbb2141acefa85256b8700688cea/04d08b98c1fe61008525760700600188?OpenDocument Caolan: any idea how to deal with this encoding? (perhaps here http://opengrok.libreoffice.org/xref/core/sal/textenc/tencinfo.cxx ?) -- 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 87234] breeze icon set not respected in formula bar
https://bugs.freedesktop.org/show_bug.cgi?id=87234 GerardF gerard.farg...@orange.fr changed: What|Removed |Added CC||gerard.farg...@orange.fr --- Comment #4 from GerardF gerard.farg...@orange.fr --- I have an old master without breeze icons. Version: 4.5.0.0.alpha0+ Build ID: 7fcbb29db802acd8c0f32e8ff578ef4b2f82c46b TinderBox: Win-x86@39, Branch:master, Time: 2014-11-21_23:39:30 Locale: fr_FR Are you sure that is is related to these icons? When I change icons (any of them), icons in formula bar aren't changed untill I close and re-open LO. -- 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 87260] StaticLibrary libglxtest compilation problem
https://bugs.freedesktop.org/show_bug.cgi?id=87260 --- Comment #1 from Markus Mohrhard markus.mohrh...@googlemail.com --- --without-x is unsupported and won't work in current master/4.4 -- 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 87245] Crash when opening Page dialog, after sorting with a macro
https://bugs.freedesktop.org/show_bug.cgi?id=87245 --- Comment #2 from Laurent BP jumbo4...@yahoo.fr --- @Joel, thanks for the confirmation. Bug seems specific to Format Page dialog: no crash with Format Cells, Tools Options, File Print Preview, File Versions, Data Sort... I was unable to reproduce crash with another dialog. An easy workaround is to open dialog previous starting macro. But this bug may hide some problems. -- 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 37814] FILESAVE Save/Save As dialogs use last save folder (not original) with non-ascii path
https://bugs.freedesktop.org/show_bug.cgi?id=37814 --- Comment #29 from Stephan Bergmann sberg...@redhat.com --- The problem is that fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx:687 HRESULT hResult = SHCreateItemFromParsingName ( sDirectory.getStr(), NULL, IID_PPV_ARGS(pFolder) ); with sDirectory being file:///C:/Folder%20one/Pe%C3$A7as/Folder%20two/ fails with hResult being HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND). -- 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 53460] TABLE: Writer crashes after trying to resize(decrease) the cell height with a table inside it, using the keyboard shortcuts ALT +↑
https://bugs.freedesktop.org/show_bug.cgi?id=53460 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:4.5.0 | target:4.5.0 |target:4.4.0.0.beta3|target:4.4.0.0.beta3 ||target:4.3.6 -- 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 53460] TABLE: Writer crashes after trying to resize(decrease) the cell height with a table inside it, using the keyboard shortcuts ALT +↑
https://bugs.freedesktop.org/show_bug.cgi?id=53460 --- Comment #6 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolán McNamara committed a patch related to this issue. It has been pushed to libreoffice-4-3: http://cgit.freedesktop.org/libreoffice/core/commit/?id=793580e9625fd0a86f0e88669ac2db9168874ff7h=libreoffice-4-3 Resolves: fdo#53460 crashes after casting SwTxtFrm to unrelated SwLayoutFrm It will be available in 4.3.6. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 87260] StaticLibrary libglxtest compilation problem
https://bugs.freedesktop.org/show_bug.cgi?id=87260 --- Comment #2 from Kostas ktamat...@dataways.gr --- What other choices do I have so I can build libreoffice with headless mode? -- 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 37814] FILESAVE Save/Save As dialogs use last save folder (not original) with non-ascii path
https://bugs.freedesktop.org/show_bug.cgi?id=37814 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|| target:4.5.0 -- 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 37814] FILESAVE Save/Save As dialogs use last save folder (not original) with non-ascii path
https://bugs.freedesktop.org/show_bug.cgi?id=37814 --- Comment #30 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Stephan Bergmann committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e123ffd66088783ce74a7b5f15e9d324b39ecf67 fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLs It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 76567] Compatibility problem with an Excel file with scrollbar
https://bugs.freedesktop.org/show_bug.cgi?id=76567 Win wimpac...@hotmail.com changed: What|Removed |Added Version|4.1.5.3 release |4.3.4.1 release --- Comment #2 from Win wimpac...@hotmail.com --- Scroll Bar control does not reach the maximum value set, already open in Excel, works perfect Excel 2013 x LibreOffice 4.3.4.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 37814] FILESAVE Save/Save As dialogs use last save folder (not original) with non-ascii path
https://bugs.freedesktop.org/show_bug.cgi?id=37814 --- Comment #31 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Stephan Bergmann committed a patch related to this issue. It has been pushed to libreoffice-4-4: http://cgit.freedesktop.org/libreoffice/core/commit/?id=483e7103e895f4da84aa7de94938b373b5fcd64bh=libreoffice-4-4 fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLs It will be available in 4.4.0.0.beta3. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are 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 37814] FILESAVE Save/Save As dialogs use last save folder (not original) with non-ascii path
https://bugs.freedesktop.org/show_bug.cgi?id=37814 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:4.5.0 | target:4.5.0 ||target:4.4.0.0.beta3 -- 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 37814] FILESAVE Save/Save As dialogs use last save folder (not original) with non-ascii path
https://bugs.freedesktop.org/show_bug.cgi?id=37814 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |sberg...@redhat.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 87260] StaticLibrary libglxtest compilation problem
https://bugs.freedesktop.org/show_bug.cgi?id=87260 --- Comment #3 from Markus Mohrhard markus.mohrh...@googlemail.com --- (In reply to Kostas from comment #2) What other choices do I have so I can build libreoffice with headless mode? None. That is currently not supported. There is still the runtime headless mode which is different to the without-x build time option. -- 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
