[Bug 70371] Identify unused headers
https://bugs.freedesktop.org/show_bug.cgi?id=70371 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |je...@vdwaa.nl |desktop.org | --- Comment #9 from Björn Michaelsen bjoern.michael...@canonical.com --- Closing this one as fixed as it is clearly working. @Jelle: Congratulations for fixing this Easy Hack. Feel free to file a follow up Easy Hack to: - run this one regularly manually and recheck the list - provide a blacklist of known false positives - create a way to run this e.g. on a tinderbox and check if there are new headers in the list - ... -- 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] dev-tools.git: scripts/regression-hotspots.py
scripts/regression-hotspots.py |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 947c2ee698b1425d142c4902cf28cc6b24b11a4e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Oct 15 10:27:50 2013 +0200
add a fourth level for fun and profit
diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py
index 95eb89f..afb22fc 100755
--- a/scripts/regression-hotspots.py
+++ b/scripts/regression-hotspots.py
@@ -66,5 +66,7 @@ if __name__ == '__main__':
print_counts(get_dir_counts(file_counts, 2))
print('\nthird level dirs:')
print_counts(get_dir_counts(file_counts, 3))
+print('\nfourth level dirs:')
+print_counts(get_dir_counts(file_counts, 4))
print('\nfiles:')
print_counts(file_counts)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/inc/iosys.hxx |6 +++---
basic/source/runtime/iosys.cxx | 18 --
basic/source/runtime/runtime.cxx | 11 ---
3 files changed, 15 insertions(+), 20 deletions(-)
New commits:
commit 458c5a0f475890edcd15a0b2309500203913e7b2
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 10:33:10 2013 +0200
Defer OUString - OString conversion
...to avoid converting back OString - OUString in SbiIoSystem::WriteCon.
Change-Id: I17024891d0babaa589f2c65f1123f1905c4338bb
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index d6d6c6a..9304dba 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -75,11 +75,11 @@ class SbiIoSystem
SbiStream* pChan[ CHANNELS ];
OString aPrompt;
OString aIn;
-OString aOut;
+OUString aOut;
short nChan;
SbError nError;
void ReadCon(OString);
-void WriteCon(const OString);
+void WriteCon(const OUString);
public:
SbiIoSystem();
~SbiIoSystem();
@@ -93,7 +93,7 @@ public:
void Close();
void Read(OString, short = 0);
char Read();
-void Write(const OString, short = 0);
+void Write(const OUString, short = 0);
// 0 == bad channel or no SvStream (nChannel=0..CHANNELS-1)
SbiStream* GetStream( short nChannel ) const;
void CloseAll(); // JSM
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index c4a6d64..511eb11 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -842,15 +842,14 @@ void SbiIoSystem::Shutdown()
// anything left to PRINT?
if( !aOut.isEmpty() )
{
-OUString aOutStr(OStringToOUString(aOut, osl_getThreadTextEncoding()));
#if defined __GNUC__
Window* pParent = Application::GetDefDialogParent();
-MessBox( pParent, WinBits( WB_OK ), OUString(), aOutStr ).Execute();
+MessBox( pParent, WinBits( WB_OK ), OUString(), aOut ).Execute();
#else
-MessBox( GetpApp()-GetDefDialogParent(), WinBits( WB_OK ),
OUString(), aOutStr ).Execute();
+MessBox( GetpApp()-GetDefDialogParent(), WinBits( WB_OK ),
OUString(), aOut ).Execute();
#endif
}
-aOut = OString();
+aOut = OUString();
}
@@ -894,7 +893,7 @@ char SbiIoSystem::Read()
return ch;
}
-void SbiIoSystem::Write(const OString rBuf, short n)
+void SbiIoSystem::Write(const OUString rBuf, short n)
{
if( !nChan )
{
@@ -906,7 +905,7 @@ void SbiIoSystem::Write(const OString rBuf, short n)
}
else
{
-nError = pChan[ nChan ]-Write( rBuf, n );
+nError = pChan[ nChan ]-Write( OUStringToOString(rBuf,
osl_getThreadTextEncoding()), n );
}
}
@@ -963,7 +962,7 @@ void SbiIoSystem::ReadCon(OString rIn)
// output of a MessageBox, if theres a CR in the console-buffer
-void SbiIoSystem::WriteCon(const OString rText)
+void SbiIoSystem::WriteCon(const OUString rText)
{
aOut += rText;
sal_Int32 n1 = aOut.indexOf('\n');
@@ -982,18 +981,17 @@ void SbiIoSystem::WriteCon(const OString rText)
{
n1 = n2;
}
-OString s(aOut.copy(0, n1));
+OUString s(aOut.copy(0, n1));
aOut = aOut.copy(n1);
while (aOut[0] == '\n' || aOut[0] == '\r')
{
aOut = aOut.copy(1);
}
-OUString aStr(OStringToOUString(s, osl_getThreadTextEncoding()));
{
SolarMutexGuard aSolarGuard;
if( !MessBox( GetpApp()-GetDefDialogParent(),
WinBits( WB_OK_CANCEL | WB_DEF_OK ),
-OUString(), aStr ).Execute() )
+OUString(), s ).Execute() )
{
nError = SbERR_USER_ABORT;
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 047c25c..a2c55a8 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -2706,8 +2706,7 @@ void SbiRuntime::StepPRINT()// print TOS
s = ;// one blank before
}
s += s1;
-OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding()));
-pIosys-Write( aByteStr );
+pIosys-Write( s );
Error( pIosys-GetError() );
}
@@ -2722,8 +2721,7 @@ void SbiRuntime::StepPRINTF() // print TOS in field
}
s.append(s1);
comphelper::string::padToLength(s, 14, ' ');
-OString aByteStr(OUStringToOString(s.makeStringAndClear(),
osl_getThreadTextEncoding()));
-pIosys-Write( aByteStr );
+pIosys-Write( s.makeStringAndClear() );
Error( pIosys-GetError() );
}
@@ -2750,8 +2748,7 @@ void SbiRuntime::StepWRITE()// write TOS
{
s += OUString(ch);
}
-OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding()));
-pIosys-Write( aByteStr );
+pIosys-Write( s );
Error( pIosys-GetError() );
}
@@ -3206,7 +3203,7 @@ void SbiRuntime::StepCLOSE(
[Bug 70371] Identify unused headers
https://bugs.freedesktop.org/show_bug.cgi?id=70371 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Bjoern Michaelsen committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e4fbcc549a143992f72333404adb0180afa69e1a fdo#70371: create findunusedheaders target 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] dev-tools.git: gerritbot/send-daily-digest
gerritbot/send-daily-digest | 96 +---
1 file changed, 73 insertions(+), 23 deletions(-)
New commits:
commit 8ef490cebaf16778f18896448fa454c158368cef
Author: Mathias Michel m...@gmx.fr
Date: Fri Sep 13 00:22:02 2013 +0200
Gerrit mailer: generalization
add support for any project
add support for special satellite projects of Libreoffice
do not send if empty
default commandline will handle core, submodules and contrib
Change-Id: I642d9ab027c5067cef0502d2f62fa2440623270f
Reviewed-on: https://gerrit.libreoffice.org/5927
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 5f8d937..ea3f9b5 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -19,12 +19,12 @@ import sh
import smtplib
import sys
-def get_daily_query(status, age):
-return 'project:core branch:master status:%s -age:%dh' % (status, age)
+def get_daily_query(status, project):
+return 'project:%s branch:master status:%s -age:%dh' % (project, status,
args['age'])
-def get_digest(gerrit, query):
+def get_digest(query):
digest = ''
-for line in sh.ssh(gerrit, 'gerrit query --format=JSON -- \'%s\'' %
query).strip().split('\n'):
+for line in sh.ssh(args['gerrit'], 'gerrit query --format=JSON -- \'%s\''
% query).strip().split('\n'):
change = json.loads(line)
if 'url' in change.keys():
digest += '+ %s\n in %s from %s\n' % (change['subject'][:73],
change['url'], change['owner']['name'])
@@ -32,17 +32,55 @@ def get_digest(gerrit, query):
digest = 'None'
return digest
-def create_message(gerrit, age):
+def get_project_body(project):
+none = True
+
+body = '* Open changes on master for project %s changed in the last %d
hours:\n\n' % (project, args['age'])
+dig = get_digest(get_daily_query('open', project))
+if dig != 'None': none = False
+body += dig
+
+body += '\n\n* Merged changes on master for project %s changed in the last
%d hours:\n\n' % (project, args['age'])
+dig = get_digest(get_daily_query('merged', project))
+if dig != 'None': none = False
+body += dig
+
+body += '\n\n* Abandoned changes on master for project %s changed in the
last %d hours:\n\n' % (project, args['age'])
+dig = get_digest(get_daily_query('abandoned', project))
+if dig != 'None': none = False
+body += dig
+
+body += '\n\n* Open changes needing tweaks, but being untouched for more
than a week:\n\n'
+dig = get_digest('project:%s branch:master status:open
(label:Code-Review=-1 OR label:Verified=-1) age:1w' % project)
+if dig != 'None': none = False
+body += dig
+
+if none: return
+else: return body
+
+def send_message_for_project(project):
now = datetime.datetime.now()
+nothing = 'Nothing moved in the project for the last %d hours' %
args['age']
body = 'Moin!\n\n'
-body += '* Open changes on master for project core changed in the last %d
hours:\n\n' % age
-body += get_digest(gerrit, get_daily_query('open', age))
-body += '\n\n* Merged changes on master for project core changed in the
last %d hours:\n\n' % age
-body += get_digest(gerrit, get_daily_query('merged', age))
-body += '\n\n* Abandoned changes on master for project core changed in the
last %d hours:\n\n' % age
-body += get_digest(gerrit, get_daily_query('abandoned', age))
-body += '\n\n* Open changes needing tweaks, but being untouched for more
than a week:\n\n'
-body += get_digest(gerrit, 'project:core branch:master status:open
(label:Code-Review=-1 OR label:Verified=-1) age:1w')
+
+if project == 'submodules':
+dict = get_project_body('dictionaries')
+tran = get_project_body('translations')
+help = get_project_body('help')
+
+if dict + tran + help == : return 'Nothing'
+
+body += '\n\n~~ Project dictionaries ~~\n\n'
+body += dict if bool(dict) else nothing
+body += '\n\n~~ Project translations ~~\n\n'
+body += tran if bool(tran) else nothing
+body += '\n\n~~ Project help ~~\n\n'
+body += help if bool(help) else nothing
+else:
+proj = get_project_body(project)
+if proj == : return 'Nothing'
+body += proj
+
body += '''
Best,
@@ -52,20 +90,32 @@ Your friendly LibreOffice Gerrit Digest Mailer
Note: The bot generating this message can be found and improved here:
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest'''
msg = email.mime.text.MIMEText(body, 'plain', 'UTF-8')
-msg['From'] = 'ger...@libreoffice.org'
-msg['To'] = 'libreoffice@lists.freedesktop.org'
-msg['Cc'] = 'q...@fr.libreoffice.org'
+msg['From'] = msg_from
+msg['To'] = msg_to[0]
+
Re: Changing the object created by imported docx
On 2013-10-15 10:11, Miklos Vajna wrote: Writer bitmaps are only allowed to be rotated in 90º steps, but in Word they can be rotated to any angle. When importing a document containing a 45º bitmap the rotation is lost, and it keeps lost when the document is saved back. Perhaps we should extend the Writer code and the OO document spec to cope with arbitrary rotations? Will take a little longer, what with needing to get the spec change ratified, but it seems like it might be a safer change, long-term, IMO. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/JunitTest_sw_complex.mk sw/qa
sw/JunitTest_sw_complex.mk|6
sw/qa/complex/writer/CheckFields.java | 153
sw/qa/complex/writer/CheckIndex.java | 160 -
sw/qa/complex/writer/VarFields.java | 213 --
4 files changed, 532 deletions(-)
New commits:
commit b122ec243bc5aff15a8e3e9c06aea65d61337ee9
Author: David Ostrovsky da...@ostrovsky.org
Date: Sun Sep 22 22:31:04 2013 +0200
Remove Java unit tests migrated to Python
Change-Id: I6f4792a1fdbd40d016fabf8649c7058adaedd00c
Reviewed-on: https://gerrit.libreoffice.org/6017
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index da9da1c..e9b344c 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -31,15 +31,12 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/writer/CheckBookmarks \
sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckFlies \
-sw/qa/complex/writer/CheckFields \
-sw/qa/complex/writer/CheckIndex \
sw/qa/complex/writer/CheckIndexedPropertyValues \
sw/qa/complex/writer/CheckNamedPropertyValues \
sw/qa/complex/writer/CheckTable \
sw/qa/complex/writer/LoadSaveTest \
sw/qa/complex/writer/TestDocument \
sw/qa/complex/writer/TextPortionEnumerationTest \
-sw/qa/complex/writer/VarFields \
))
$(eval $(call gb_JunitTest_use_jars,sw_complex,\
@@ -54,14 +51,11 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.accessibility.AccessibleRelationSet \
complex.checkColor.CheckChangeColor \
complex.writer.CheckCrossReferences \
-complex.writer.CheckFields\
complex.writer.CheckFlies \
-complex.writer.CheckIndex \
complex.writer.CheckTable \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
complex.writer.TextPortionEnumerationTest \
-complex.writer.VarFields\
))
# FIXME has never worked on windows, hashes are different
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
deleted file mode 100644
index f92438e..000
--- a/sw/qa/complex/writer/CheckFields.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package complex.writer;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XEnumeration;
-import com.sun.star.util.XCloseable;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextField;
-import com.sun.star.text.XTextFieldsSupplier;
-import com.sun.star.text.XTextRange;
-import com.sun.star.text.XTextCursor;
-
-import org.openoffice.test.OfficeConnection;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.util.Set;
-import java.util.HashSet;
-
-
-public class CheckFields
-{
-private static final OfficeConnection connection = new OfficeConnection();
-
-@BeforeClass public static void setUpConnection() throws Exception {
-connection.setUp();
-//Thread.sleep(5000);
-}
-
-@AfterClass public static void tearDownConnection()
-throws InterruptedException, com.sun.star.uno.Exception
-{
-connection.tearDown();
-}
-
-private XMultiServiceFactory m_xMSF = null;
-private XComponentContext m_xContext = null;
-private XTextDocument m_xDoc = null;
-
-@Before public void before() throws Exception
-{
-m_xMSF = UnoRuntime.queryInterface(
-XMultiServiceFactory.class,
-connection.getComponentContext().getServiceManager());
-m_xContext = connection.getComponentContext();
-assertNotNull(could not get component context., m_xContext);
-m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
-}
-
-@After public void after()
-{
-util.DesktopTools.closeDoc(m_xDoc);
-}
-
-@Test
-public void test_fdo39694_load() throws Exception
-{
-PropertyValue[] loadProps = new PropertyValue[2];
-loadProps[0] = new PropertyValue();
-loadProps[0].Name = AsTemplate;
-loadProps[0].Value = new
Re: Development wiki spring (autumn) cleanup
On Mon, Oct 14, 2013 at 09:55:31PM +0200, Philipp Weissenbacher wrote: On 9 okt. 2013, at 12:00, bjoern bjoern.michael...@canonical.com wrote: 26964 Development/Code Overview I tried to turn this into more than just a redirect to the code README page by adding some presentations from Mmeeks' blog. I'd love to also provide some talks/presentations (especially some LibOCon'13) but I was not successful in finding them. :( Maybe someone can show me where we put them? AFAIK slides are still being collected for the 2013 conference and will be published RSN. That said, Michael published his slides on him already IIRC. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/jpeg/Exif.cxx | 48
vcl/source/filter/jpeg/Exif.hxx |3 +-
2 files changed, 41 insertions(+), 10 deletions(-)
New commits:
commit 3ad12d1a540eeb54fbb34afc3b7a76bf9e3207c3
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Oct 15 07:57:52 2013 +0200
fdo#57659: fix exif processing
Change-Id: I93bd132b1d536843d4d8627230bfa9ef22cd623b
Reviewed-on: https://gerrit.libreoffice.org/6245
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index f44b54f..3a4b2d3 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -156,15 +156,20 @@ bool Exif::processJpeg(SvStream rStream, bool bSetValue)
return false;
}
-bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue)
+bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bMoto)
{
ExifIFD* ifd = NULL;
while (aOffset = aLength - 12 aNumberOfTags 0)
{
ifd = (ExifIFD*) pExifData[aOffset];
+sal_uInt16 tag = ifd-tag;
+if (bMoto)
+{
+tag = OSL_SWAPWORD(ifd-tag);
+}
-if (ifd-tag == ORIENTATION)
+if (tag == ORIENTATION)
{
if(bSetValue)
{
@@ -172,10 +177,18 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
ifd-type = 3;
ifd-count = 1;
ifd-offset = maOrientation;
+if (bMoto)
+{
+ifd-tag = OSL_SWAPWORD(ifd-tag);
+ifd-offset = OSL_SWAPWORD(ifd-offset);
+}
}
else
{
-maOrientation = convertToOrientation(ifd-offset);
+sal_uInt32 nIfdOffset = ifd-offset;
+if (bMoto)
+nIfdOffset = OSL_SWAPWORD(ifd-offset);
+maOrientation = convertToOrientation(nIfdOffset);
}
}
@@ -211,20 +224,37 @@ bool Exif::processExif(SvStream rStream, sal_uInt16
aSectionLength, bool bSetVa
TiffHeader* aTiffHeader = (TiffHeader*) aExifData[0];
-if( 0x4949 != aTiffHeader-byteOrder || 0x002A != aTiffHeader-tagAlign )
+if(!(
+(0x4949 == aTiffHeader-byteOrder 0x2A00 != aTiffHeader-tagAlign )
|| // Intel format
+( 0x4D4D == aTiffHeader-byteOrder 0x002A != aTiffHeader-tagAlign
) // Motorola format
+)
+ )
{
delete[] aExifData;
return false;
}
-sal_uInt16 aOffset = aTiffHeader-offset;
+bool bMoto = true; // Motorola, big-endian by default
+
+if (aTiffHeader-byteOrder == 0x4949)
+{
+bMoto = false; // little-endian
+}
+
+sal_uInt16 aOffset = 0;
+aOffset = aTiffHeader-offset;
+if (bMoto)
+{
+aOffset = OSL_SWAPDWORD(aTiffHeader-offset);
+}
sal_uInt16 aNumberOfTags = aExifData[aOffset];
-aNumberOfTags = aExifData[aOffset + 1];
-aNumberOfTags = 8;
-aNumberOfTags += aExifData[aOffset];
+if (bMoto)
+{
+aNumberOfTags = ((aExifData[aOffset] 8) | aExifData[aOffset+1]);
+}
-processIFD(aExifData, aLength, aOffset+2, aNumberOfTags, bSetValue);
+processIFD(aExifData, aLength, aOffset+2, aNumberOfTags, bSetValue, bMoto);
if (bSetValue)
{
diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index 490f144..40faa58 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -20,6 +20,7 @@
#ifndef _EXIF_HXX
#define _EXIF_HXX
+#include osl/endian.h
#include vcl/graph.hxx
#include vcl/fltcall.hxx
#include com/sun/star/uno/Sequence.h
@@ -53,7 +54,7 @@ private:
bool processJpeg(SvStream rStream, bool bSetValue);
bool processExif(SvStream rStream, sal_uInt16 aLength, bool bSetValue);
-bool processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue);
+bool processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bMoto);
struct ExifIFD {
sal_uInt16 tag;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/toolkit
include/toolkit/controls/unocontrols.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0d168764e0299f48ce56970092c990fd44355f8a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 11:19:24 2013 +0200
Remove unused macro
Change-Id: I7e421004c5d9bd7682bca9b748442ce21c017823
diff --git a/include/toolkit/controls/unocontrols.hxx
b/include/toolkit/controls/unocontrols.hxx
index c8a5d7a..1397cad 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -61,7 +61,6 @@
#include boost/optional.hpp
#define UNO_NAME_GRAPHOBJ_URLPREFIX
vnd.sun.star.GraphicObject:
-#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX vnd.sun.star.Package:
class ImageHelper
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sd/source sfx2/source sw/source unusedcode.easy vcl/source
include/sfx2/sidebar/EnumContext.hxx |7
sd/source/ui/framework/configuration/ResourceId.cxx| 16 --
sd/source/ui/framework/factories/TaskPanelResource.cxx | 132 -
sd/source/ui/framework/tools/FrameworkHelper.cxx | 55 ---
sd/source/ui/inc/framework/FrameworkHelper.hxx | 11 -
sd/source/ui/inc/framework/ResourceId.hxx | 11 -
sd/source/ui/inc/framework/TaskPanelResource.hxx | 84 --
sfx2/source/sidebar/EnumContext.cxx| 16 --
sw/source/ui/cctrl/swlbox.cxx |6
sw/source/ui/inc/swlbox.hxx|1
unusedcode.easy| 43 ++---
vcl/source/filter/jpeg/Exif.cxx| 45 +++--
12 files changed, 45 insertions(+), 382 deletions(-)
New commits:
commit 256825346ef710d8ef111d7d75535af8a3c5426e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 15 10:21:35 2013 +0100
swap if the host endianness doesn't match the file formats
Change-Id: I0b4c2ba6679c8d2754f2a7cd8b8f693db335e004
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 3a4b2d3..cf64f9b 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -156,7 +156,7 @@ bool Exif::processJpeg(SvStream rStream, bool bSetValue)
return false;
}
-bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bMoto)
+bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bSwap)
{
ExifIFD* ifd = NULL;
@@ -164,7 +164,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
{
ifd = (ExifIFD*) pExifData[aOffset];
sal_uInt16 tag = ifd-tag;
-if (bMoto)
+if (bSwap)
{
tag = OSL_SWAPWORD(ifd-tag);
}
@@ -177,7 +177,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
ifd-type = 3;
ifd-count = 1;
ifd-offset = maOrientation;
-if (bMoto)
+if (bSwap)
{
ifd-tag = OSL_SWAPWORD(ifd-tag);
ifd-offset = OSL_SWAPWORD(ifd-offset);
@@ -186,7 +186,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
else
{
sal_uInt32 nIfdOffset = ifd-offset;
-if (bMoto)
+if (bSwap)
nIfdOffset = OSL_SWAPWORD(ifd-offset);
maOrientation = convertToOrientation(nIfdOffset);
}
@@ -224,37 +224,46 @@ bool Exif::processExif(SvStream rStream, sal_uInt16
aSectionLength, bool bSetVa
TiffHeader* aTiffHeader = (TiffHeader*) aExifData[0];
-if(!(
-(0x4949 == aTiffHeader-byteOrder 0x2A00 != aTiffHeader-tagAlign )
|| // Intel format
-( 0x4D4D == aTiffHeader-byteOrder 0x002A != aTiffHeader-tagAlign
) // Motorola format
-)
- )
+bool bIntel = aTiffHeader-byteOrder == 0x4949; //big-endian
+bool bMotorola = aTiffHeader-byteOrder == 0x4D4D; //little-endian
+
+if (!bIntel !bMotorola)
{
delete[] aExifData;
return false;
}
-bool bMoto = true; // Motorola, big-endian by default
+bool bSwap = false;
+
+#ifdef OSL_BIGENDIAN
+if (bIntel)
+bSwap = true;
+#else
+if (bMotorola)
+bSwap = true;
+#endif
-if (aTiffHeader-byteOrder == 0x4949)
+if (bSwap)
{
-bMoto = false; // little-endian
+aTiffHeader-tagAlign = OSL_SWAPWORD(aTiffHeader-tagAlign);
+aTiffHeader-offset = OSL_SWAPDWORD(aTiffHeader-offset);
}
-sal_uInt16 aOffset = 0;
-aOffset = aTiffHeader-offset;
-if (bMoto)
+if (aTiffHeader-tagAlign != 0x002A) // TIFF tag
{
-aOffset = OSL_SWAPDWORD(aTiffHeader-offset);
+delete[] aExifData;
+return false;
}
+sal_uInt16 aOffset = aTiffHeader-offset;
+
sal_uInt16 aNumberOfTags = aExifData[aOffset];
-if (bMoto)
+if (bSwap)
{
aNumberOfTags = ((aExifData[aOffset] 8) | aExifData[aOffset+1]);
}
-processIFD(aExifData, aLength, aOffset+2, aNumberOfTags, bSetValue, bMoto);
+processIFD(aExifData, aLength, aOffset+2, aNumberOfTags, bSetValue, bSwap);
if (bSetValue)
{
commit 3962122a5810b7679abf03a7e0c15e56f0b3d9ab
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 15 09:25:25 2013 +0100
callcatcher: update unused code
Change-Id: Ia2452eb82139039e1e6dc98e61ffb32b4091b94f
diff --git a/include/sfx2/sidebar/EnumContext.hxx
b/include/sfx2/sidebar/EnumContext.hxx
index b0b505d..53292fe 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++
I need some help and workaround on the following.
Hey Guys! I just have a friend who faces the following problems on his machine which he needs fixed for his work to move smoothly.He is actually shifting from MS Office to LO , and hence asked me to do some changes to the code so as to solve the following problems. 1. Filter by color caption in LibreCalc not available 2. Print Quality ( MS Vs LibreOffice ) - lighter prints 3. Default Header and Footer in Calc cannot be suppressed 4. Not all complex macros of Excel are recognized by Calc and vice-versa However same function can be done by re-writing in Calc. 5. Print 'Current selection' page – not supported. You have to write the page number to be printed. I have a general idea of the flow of logic that would happen due to prior experience on Impress and Writer. But what i need here is code-pointers so i can finish this work and make LO a better experience. And also restart my work on adding Custom Animations to Master Slides. Happy Hacking ;D Regards, Janit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx | 25 ++---
1 file changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 8c5bf396f4fb8213e0e55d59206fe67bb982dd6d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 15 11:48:20 2013 +0200
sw: include paragraph attributes and style in doc model xml dump
Change-Id: Ib4dd980ffa1836f8873e05779f5d99e4c59da721
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 0eaa082..82a3904 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -17,6 +17,7 @@
#include txatbase.hxx
#include fmtautofmt.hxx
#include charfmt.hxx
+#include paratr.hxx
#include svl/itemiter.hxx
#include svl/intitem.hxx
@@ -294,7 +295,7 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
writer.startElement(item);
writer.writeFormatAttribute(whichId, TMP_FORMAT, pItem-Which());
const char* pWhich = 0;
-boost::optionalsal_Int32 oValue;
+boost::optionalOString oValue;
switch (pItem-Which())
{
case RES_CHRATR_POSTURE: pWhich = character posture; break;
@@ -304,12 +305,13 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
case RES_CHRATR_CTL_POSTURE: pWhich = character ctl posture;
break;
case RES_CHRATR_CTL_WEIGHT: pWhich = character ctl weight; break;
case RES_CHRATR_RSID: pWhich = character rsid; break;
-case RES_PARATR_OUTLINELEVEL: pWhich = paragraph outline level;
oValue = static_castconst SfxUInt16Item*(pItem)-GetValue(); break;
+case RES_PARATR_OUTLINELEVEL: pWhich = paragraph outline level;
oValue = OString::number(static_castconst SfxUInt16Item*(pItem)-GetValue());
break;
+case RES_PARATR_NUMRULE: pWhich = paragraph numbering rule;
oValue = OUStringToOString(static_castconst
SwNumRuleItem*(pItem)-GetValue(), RTL_TEXTENCODING_UTF8); break;
}
if (pWhich)
writer.writeFormatAttribute(which, %s, BAD_CAST(pWhich));
if (oValue)
-writer.writeFormatAttribute(value, TMP_FORMAT, *oValue);
+writer.writeFormatAttribute(value, %s,
BAD_CAST(oValue-getStr()));
pItem = aIter.NextItem();
writer.endElement();
}
@@ -371,6 +373,23 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
OString txt8 = OUStringToOString( txt, RTL_TEXTENCODING_UTF8 );
xmlTextWriterWriteString( writer, BAD_CAST( txt8.getStr()));
+if (GetFmtColl())
+{
+SwTxtFmtColl* pColl = static_castSwTxtFmtColl*(GetFmtColl());
+writer.startElement(swtxtfmtcoll);
+OString aName = OUStringToOString(pColl-GetName(),
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute(name, %s, BAD_CAST(aName.getStr()));
+writer.endElement();
+}
+
+if (HasSwAttrSet())
+{
+writer.startElement(attrset);
+const SwAttrSet rAttrSet = GetSwAttrSet();
+lcl_dumpSfxItemSet(writer, rAttrSet);
+writer.endElement();
+}
+
if (HasHints())
{
writer.startElement(hints);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/inc
chart2/inc/DataSeriesState.hxx | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit b107b8255968449ec461e162dda171cdacd94d77
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 15 12:05:16 2013 +0200
some small cosmetic changes
Change-Id: I2bc8c39f91faf6915c4970a002e4030f81c95bc5
diff --git a/chart2/inc/DataSeriesState.hxx b/chart2/inc/DataSeriesState.hxx
index bfe14c9..64b27d71 100644
--- a/chart2/inc/DataSeriesState.hxx
+++ b/chart2/inc/DataSeriesState.hxx
@@ -20,11 +20,13 @@
namespace chart {
-class DataSeries
+class DataSequence
{
public:
typedef mdds::multi_type_vectormdds::mtv::element_block_func
DataSeriesType;
+// used for fast iteration through data series
+// allows to easily skip empty data ranges
DataSeriesType getDataSeries();
size_t size();
@@ -43,7 +45,11 @@ struct DataSeriesProperties
{
typedef std::map OUString, com::sun::star::uno::Any PropertyMap;
PropertyMap aSeriesProps;
+// we might want to switch to multi_type_vector for better memory usage
+// hopefully this vector is empty most of the time
std::vector PropertyMap aPointProps;
+
+com::sun::star::chart::MissingValueTreatment eMissingValueTreatment;
};
struct Axis
@@ -56,10 +62,13 @@ struct Axis
struct DataSeriesState
{
-DataSeries aXValue;
-DataSeries aYValue;
+// length of the data series is min(aXValue.size(), aYValue.size());
+DataSequence aXValue;
+DataSequence aYValue;
DataSeriesProperties aProperties;
-std::mapOUString, DataSeries aMapProperties;
+// also contains bubble chart bubble size
+// apply values to properties with functor
+std::mapOUString, DataSeries aMappedProperties;
Axis aXAxis;
Axis aYAxis;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/shells/annotsh.cxx |2 +-
sw/source/ui/shells/drwtxtex.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e537049caa30c629092834f6a6d57931dac1dfa0
Author: Noel Grandin n...@peralex.com
Date: Tue Oct 15 12:34:38 2013 +0200
fix some fallout from my OUString conversions
std::min on Windows is a little pickier
Change-Id: I34212839f8b3fd934992278dfca60a3a26af8171
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index d80109c..0eca661 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -1050,7 +1050,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet rSet)
else
{
OUString sSel(pOLV-GetSelected());
-sSel = sSel.copy(0, std::min(255, sSel.getLength()));
+sSel = sSel.copy(0,
std::min(static_castsal_Int32(255), sSel.getLength()));
aHLinkItem.SetName(comphelper::string::stripEnd(sSel,
' '));
}
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index c30db2c..4c5e9e7 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -1013,7 +1013,7 @@ void SwDrawTextShell::StateInsert(SfxItemSet rSet)
else
{
OUString sSel(pOLV-GetSelected());
-sSel = sSel.copy(0, std::min(255, sSel.getLength()));
+sSel = sSel.copy(0,
std::min(static_castsal_Int32(255), sSel.getLength()));
aHLinkItem.SetName(comphelper::string::stripEnd(sSel,
' '));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changing the object created by imported docx
Hi, On Tue, Oct 15, 2013 at 10:39 AM, Noel Grandin n...@peralex.com wrote: Perhaps we should extend the Writer code and the OO document spec to cope with arbitrary rotations? Will take a little longer, what with needing to get the spec change ratified, but it seems like it might be a safer change, long-term, IMO. I don't think a spec change is necessary - just use the same draw:transform as it is done for SwXShape. Word 2013 uses this in ODT for images and if I remember correctly also Calligra uses the same. The problem is only implementation. :) Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc
sw/inc/dbgoutsw.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f85c494b53fc7c9472689a6d94de5f3e185c376e
Author: Noel Grandin n...@peralex.com
Date: Tue Oct 15 12:44:19 2013 +0200
fix OUString conversion in sw/inc/dbgoutsw.hxx
Change-Id: I12fc3a536e7ef46c0a1752f648e2654f9f96cdeb
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 0fb9bdf..118dba8 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -74,7 +74,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwNodeRange rRange);
templatetypename tKey, typename tMember, typename fHashFunction
OUString lcl_dbg_out(const boost::unordered_maptKey, tMember, fHashFunction
rMap)
{
-OUString aResult([, RTL_TEXTENCODING_ASCII_US);
+OUString aResult([);
typename boost::unordered_maptKey, tMember,
fHashFunction::const_iterator aIt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] D-Bus is not thread safe
On Tue, 2013-10-15 at 10:20 +0200, Stephan Bergmann wrote: With the below commit I do not get any spurious D-Bus-related crashes during startup of soffice --impress of my (--enable-avahi --enable-dbus) Linux build any more, but I still get Looks perfect - thanks for that Stephan ! :-) are in D-Bus's internal_bus_get simultaneously (with disastrous consequences, like SEGV) despite the _DBUS_LOCK(bus) there, unless you previously called The people most acquainted with dbus claim that despite the locking it is not thread-safe either [ much like LibreOffice I guess ;-]. Unfortunately, I suspect it's not terribly easy to protect it with our own mutexes either - IIRC gio (used in the file-selector) and dconf for configuration (as/when/if) have some degree of dbus usage too. Other places that (indirectly) use D-Bus (tubes/source/file-transfer-helper.c, vcl/generic/fontmanager/fontconfig.cxx, vcl/unx/gtk/window/gtksalframe.cxx might need this, too. Quite likely. AFAICS we should prolly do this really early in the VCL backend initialization if #ifdef ENABLE_DBUS is true (or any of these other conditionals) ? the earlier the safer I suspect. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/cppunit/test_scanner.cxx | 29 ++-
basic/source/comp/scanner.cxx | 96 ++
2 files changed, 74 insertions(+), 51 deletions(-)
New commits:
commit 66a96c82746118c70a447d7768b0428e15d2f5ad
Author: Eike Rathke er...@redhat.com
Date: Tue Oct 15 12:17:46 2013 +0200
clean up SbiScanner::NextSym() a little, fdo#70319 follow-up
Number recognition was suboptimal and didn't properly resync scan
positions after having detected an error.
Change-Id: I278fdaaf17ed40560785deaaad0e3412a249d90a
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index acf740fb..b19e52e 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -576,10 +576,12 @@ namespace
CPPUNIT_ASSERT(errors == 0);
symbols = getSymbols(source2, errors);
-CPPUNIT_ASSERT(symbols.size() == 2);
-CPPUNIT_ASSERT(symbols[0].number == 1.23);
+CPPUNIT_ASSERT(symbols.size() == 3);
+CPPUNIT_ASSERT(symbols[0].number == 1.2);
CPPUNIT_ASSERT(symbols[0].type == SbxDOUBLE);
-CPPUNIT_ASSERT(symbols[1].text == cr);
+CPPUNIT_ASSERT(rtl::math::round( symbols[1].number, 12) ==
rtl::math::round( .3, 12));
+CPPUNIT_ASSERT(symbols[1].type == SbxDOUBLE);
+CPPUNIT_ASSERT(symbols[2].text == cr);
CPPUNIT_ASSERT(errors == 1);
symbols = getSymbols(source3, errors);
@@ -627,10 +629,11 @@ namespace
CPPUNIT_ASSERT(errors == 0);
symbols = getSymbols(source9, errors);
-CPPUNIT_ASSERT(symbols.size() == 2);
-CPPUNIT_ASSERT(symbols[0].number == 12000);
+CPPUNIT_ASSERT(symbols.size() == 3);
+CPPUNIT_ASSERT(symbols[0].number == 12);
CPPUNIT_ASSERT(symbols[0].type == SbxDOUBLE);
-CPPUNIT_ASSERT(symbols[1].text == cr);
+CPPUNIT_ASSERT(symbols[1].text == OUString(dE3));
+CPPUNIT_ASSERT(symbols[2].text == cr);
CPPUNIT_ASSERT(errors == 1);
symbols = getSymbols(source10, errors);
@@ -647,16 +650,16 @@ namespace
CPPUNIT_ASSERT(symbols[1].text == cr);
CPPUNIT_ASSERT(errors == 0);
-/* FIXME: SbiScanner::NextSym() is total crap, the result of scanning
- * 12e++3 should be something different than this.. */
symbols = getSymbols(source12, errors);
-CPPUNIT_ASSERT(symbols.size() == 4);
+CPPUNIT_ASSERT(symbols.size() == 6);
CPPUNIT_ASSERT(symbols[0].number == 12);
CPPUNIT_ASSERT(symbols[0].type == SbxDOUBLE);
-CPPUNIT_ASSERT(symbols[1].text == OUString(+));
-CPPUNIT_ASSERT(symbols[2].number == 3);
-CPPUNIT_ASSERT(symbols[2].type == SbxINTEGER);
-CPPUNIT_ASSERT(symbols[3].text == cr);
+CPPUNIT_ASSERT(symbols[1].text == OUString(e));
+CPPUNIT_ASSERT(symbols[2].text == OUString(+));
+CPPUNIT_ASSERT(symbols[3].text == OUString(+));
+CPPUNIT_ASSERT(symbols[4].number == 3);
+CPPUNIT_ASSERT(symbols[4].type == SbxINTEGER);
+CPPUNIT_ASSERT(symbols[5].text == cr);
CPPUNIT_ASSERT(errors == 1);
symbols = getSymbols(source13, errors);
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index d966406..0a5a493 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -302,12 +302,12 @@ bool SbiScanner::NextSym()
(nCol + 1 aLine.getLength() aLine[nCol] == '.'
theBasicCharClass::get().isDigit(aLine[nCol + 1] 0xFF)))
{
short exp = 0;
-short comma = 0;
-short ndig = 0;
-short ncdig = 0;
+short dec = 0;
eScanType = SbxDOUBLE;
+bool bScanError = false;
bool bBufOverflow = false;
-while(nCol aLine.getLength() strchr(0123456789.DEde,
aLine[nCol]))
+// All this because of 'D' or 'd' floating point type, sigh..
+while(!bScanError nCol aLine.getLength()
strchr(0123456789.DEde, aLine[nCol]))
{
// from 4.1.1996: buffer full? - go on scanning empty
if( (p-buf) == (BUF_SIZE-1) )
@@ -319,64 +319,84 @@ bool SbiScanner::NextSym()
// point or exponent?
if(aLine[nCol] == '.')
{
-if( ++comma 1 )
-{
-++pLine; ++nCol; continue;
-}
+if( ++dec 1 )
+bScanError = true;
else
-{
-*p = '.';
-++p, ++pLine, ++nCol;
-}
+*p++ = '.';
}
else if(strchr(DdEe, aLine[nCol]))
{
if (++exp 1)
+bScanError = true;
+else
{
-++pLine; ++nCol; continue;
-}
-
-*p = 'E';
-++p, ++pLine, ++nCol;
-
-if(aLine[nCol] == '+')
-++pLine, ++nCol;
-else if(aLine[nCol] == '-')
-{
-*p = '-';
-
[Libreoffice-commits] core.git: sw/source
sw/source/ui/index/cnttab.cxx|4 ++--
sw/source/ui/shells/annotsh.cxx |2 +-
sw/source/ui/shells/drwtxtex.cxx |2 +-
sw/source/ui/shells/textsh.cxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 1014cc94e86cafac31192da384bc41790130debb
Author: Noel Grandin n...@peralex.com
Date: Tue Oct 15 12:54:25 2013 +0200
more fixes for OUString conversion in Windows build
More std::min pickiness, and some ternary operator pickiness.
Change-Id: Ic7feed165c6bb35e08a5e44031d06a1fcb298983
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index feda8ab..4f16407 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3947,9 +3947,9 @@ void SwEntryBrowseBox::WriteEntries(SvStream rOutStr)
sWrite += ;;
sWrite += pEntry-sSecKey;
sWrite += ;;
-sWrite += pEntry-bCase ? 1 : 0;
+sWrite += pEntry-bCase ? OUString(1) : OUString(0);
sWrite += ;;
-sWrite += pEntry-bWord ? 1 : 0;
+sWrite += pEntry-bWord ? OUString(1) : OUString(0);
if( sWrite.getLength() 5 )
rOutStr.WriteByteStringLine( sWrite, eTEnc );
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 0eca661..d01c594 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -1050,7 +1050,7 @@ void SwAnnotationShell::StateInsert(SfxItemSet rSet)
else
{
OUString sSel(pOLV-GetSelected());
-sSel = sSel.copy(0,
std::min(static_castsal_Int32(255), sSel.getLength()));
+sSel = sSel.copy(0, std::minsal_Int32(255,
sSel.getLength()));
aHLinkItem.SetName(comphelper::string::stripEnd(sSel,
' '));
}
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 4c5e9e7..eb8ed5e 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -1013,7 +1013,7 @@ void SwDrawTextShell::StateInsert(SfxItemSet rSet)
else
{
OUString sSel(pOLV-GetSelected());
-sSel = sSel.copy(0,
std::min(static_castsal_Int32(255), sSel.getLength()));
+sSel = sSel.copy(0, std::minsal_Int32(255,
sSel.getLength()));
aHLinkItem.SetName(comphelper::string::stripEnd(sSel,
' '));
}
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 266c03b..49f248e 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -766,7 +766,7 @@ void SwTextShell::StateInsert( SfxItemSet rSet )
else
{
OUString sReturn = rSh.GetSelTxt();
-sReturn = sReturn.copy(0, std::min(255,
sReturn.getLength()));
+sReturn = sReturn.copy(0, std::minsal_Int32(255,
sReturn.getLength()));
aHLinkItem.SetName(comphelper::string::stripEnd(sReturn, ' '));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/xml/xmltexte.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 281dc40522cfb8eb4e4b38304caa4040ee260c59
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 15 13:56:24 2013 +0300
WaE: unused variable 'aNewURL' [loplugin]
Change-Id: Ie6ee864b79c29dd6ed29c4b41858187f3025cb5a
diff --git a/sw/source/filter/xml/xmltexte.cxx
b/sw/source/filter/xml/xmltexte.cxx
index 28344ba..6e4223f 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -205,8 +205,6 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
SwGrfNode *pGrfNd = GetNoTxtNode( rPropSet )-GetGrfNode();
if( !pGrfNd-IsGrfLink() )
{
-OUString aNewURL = vnd.sun.star.Package: + rURL;
-
// #i15411# save-as will swap all graphics in; we need to swap
// them out again, to prevent excessive memory use
pGrfNd-SwapOut();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy officecfg/registry
dev/null |binary icon-themes/galaxy/cmd/lc_presentationminimizer.png |binary icon-themes/galaxy/cmd/sc_presentationminimizer.png |binary officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 3 +++ 4 files changed, 3 insertions(+) New commits: commit 8552e5fa1c56bb3ed7c86ef3c4922635e4178ebc Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 15 13:06:14 2013 +0200 fdo#61950: Add back icon for Tools - Minimize Presentation... menu item Change-Id: I6472dff21bb7e1cbec6efbfc01b74ea593f56afc diff --git a/icon-themes/galaxy/minimizer/opt_26.png b/icon-themes/galaxy/cmd/lc_presentationminimizer.png similarity index 100% rename from icon-themes/galaxy/minimizer/opt_26.png rename to icon-themes/galaxy/cmd/lc_presentationminimizer.png diff --git a/icon-themes/galaxy/minimizer/opt_16.png b/icon-themes/galaxy/cmd/sc_presentationminimizer.png similarity index 100% rename from icon-themes/galaxy/minimizer/opt_16.png rename to icon-themes/galaxy/cmd/sc_presentationminimizer.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index cd60399..fbabdd3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1862,6 +1862,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-USMinimize ~Presentation.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node /node /node ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC face-to-face ...
On 09/25/2013 02:30 AM, Michael Meeks wrote: * release builds (Norbert) + propose continue doing 10.6 for 32bit, and 10.8 for 64bit + more and more SDK pieces are harder and harder to get to work on old releases AI: + switch to 10.8 baseline for 64bit (Norbert) + ultimately, gerrit will do both with DavidO's help One consequence of a Mac OS X 10.8 based build that comes to mind is that Clang does not support GCC's -fno-enforce-eh-specs. So since a 10.8 based build would necessarily(?) use a true Clang, we would be back with a platform where even --disable-dbgutil builds could run into std::unexpected aborts. (Those exception violations appear to be rare in practice, and are bugs that need to be fixed anyway, so this should not be too big an issue; just want to mention it.) (According to e.g. http://dev-builds.libreoffice.org/daily/libreoffice-4-1/MacOSX-Intel@27-OSX_10.7.0-gcc_4.2.1_llvm/2013-10-14_10.42.26/libreoffice-4-1~2013-10-14_10.42.26_build_info.txt checking whether /usr/local/bin/ccache g++-4.2 -m32 -mmacosx-version-min=10.6 -isysroot /Developer/SDKs/MacOSX10.6.sdk supports -fno-enforce-eh-specs... yes the 10.6 based builds apparently use an (Apple-variant) GCC that still supports -fno-enforce-eh-specs.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
move external builds into subfolder (fdo#70393)
Hi, is there any violent opposition to: https://bugs.freedesktop.org/show_bug.cgi?id=70393 if so, we can discuss on the ESC on Thurday. If nobody objects in 24 hours, Ill make that an Easy Hack and push: https://gerrit.libreoffice.org/#/c/6231/ to master. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dtrans/source
dtrans/source/win32/dtobj/DOTransferable.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit b7d59ee36d0786aba13e6b00d93cdfa0045e5379
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 15 10:54:43 2013 +
i123407 Do not insist on CF_DIBV5 for clipboard data, also accept CF_DIB
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index fdbe784..e5d8db7 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -136,6 +136,21 @@ Any SAL_CALL CDOTransferable::getTransferData( const
DataFlavor aFlavor )
Any aAny = makeAny( aUnicodeText );
return aAny;
}
+else if(CF_DIBV5 == fetc.getClipformat())
+{
+// #123407# CF_DIBV5 has priority; if the try to fetch this failed,
+// check CF_DIB availability as an alternative
+fetc.setClipformat(CF_DIB);
+
+try
+{
+clipDataStream = getClipboardData( fetc );
+}
+catch( UnsupportedFlavorException )
+{
+throw; // pass through, tried all possibilities
+}
+}
else
throw; // pass through exception
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Grammar Checker problem
Hi all..bit of a newbie question that I hope someone can help me out with.. I'm implementing a minority language (ga-IE) grammar checker using uno.SpellingAndGrammarDialog it's working as expected bar one problem, when an erroneous word/phrase is 'replaced' ...the replacement text is given in the default language en-US All settings in LO have been set accordingly UI/Text language etc. My question is how do I go about informing the SpellingAndGrammarDialog that I want to use a different Locale? Any help would be hugely appreciated as I'm really stumped on this one. Thanks a million, ciri ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [NEW FEATURE] Access2Base: StarBasic library for Base scripting
Do we have more information on this library anywhere, or should I just poke through it to see what is there? On 10/13/2013 08:00 PM, Lionel Elie Mamane wrote: Just a notice that as per now, master-towards-4.2 contains Access2Base, a StarBasic library that offers an easier API to Base (and Writer forms) compared to our cross-language UNO. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
hanging indent
Would like to assist in restoring the ability to save hanging indent in Impress, but would appreciate info on how to begin. Thank you RussRomans 8:31 ...If God is for us, who can be against us? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/inc/docsh.hxx | 32 +
sc/source/ui/undo/undoblk3.cxx | 18 ---
sc/source/ui/undo/undocell.cxx | 43 +-
sc/source/ui/view/viewfun2.cxx | 36 +++
sc/source/ui/view/viewfun3.cxx |7 +--
sc/source/ui/view/viewfunc.cxx | 95 +++--
6 files changed, 102 insertions(+), 129 deletions(-)
New commits:
commit 1cb01c477cf1e84f6e1b2ca1771a9af53d81dc59
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 15 13:23:28 2013 +0100
Resolves: fdo#47958 shrink cut/paste more and rework a bit
I'm concerned that the scoping of the dtor will cause events to happen in
different order to the original. So rework the require explicit Notify calls
rather than implicit dtor calls instead of going about the place putting in
scoping brackets
Change-Id: I7f3ac4ef3c073da74a9cc49888a59dec12805b0f
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 4159dd5..1e1808b 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -475,32 +475,34 @@ public:
voidSetDocumentModified();
};
-class HelperNotifyChanges
+//#i97876# Spreadsheet data changes are not notified
+namespace HelperNotifyChanges
{
-private:
-ScModelObj* pModelObj;
-bool mbMustPropagateChanges;
-ScRangeList* mpChangeRanges;
-OUString mpOperation;
-
-public:
-HelperNotifyChanges(ScRangeList* pChangeRanges, const OUString pOperation)
+inline ScModelObj* getMustPropagateChangesModel(ScDocShell rDocShell)
{
-mpChangeRanges = pChangeRanges;
-mpOperation = pOperation;
-if ( pModelObj pModelObj-HasChangesListeners() )
-mbMustPropagateChanges = true;
+ScModelObj* pModelObj =
ScModelObj::getImplementation(rDocShell.GetModel());
+if (pModelObj pModelObj-HasChangesListeners())
+return pModelObj;
+return NULL;
}
-~HelperNotifyChanges()
+
+inline void Notify(ScModelObj rModelObj, const ScRangeList rChangeRanges,
+const OUString rType = OUString(cell-change),
+const ::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue rProperties =
+::com::sun::star::uno::Sequence
::com::sun::star::beans::PropertyValue ())
{
-if (mbMustPropagateChanges mpChangeRanges)
-{
-pModelObj-NotifyChanges(mpOperation, *mpChangeRanges);
-}
+rModelObj.NotifyChanges(rType, rChangeRanges, rProperties);
}
-bool getMustPropagateChanges()
+
+inline void NotifyIfChangesListeners(ScDocShell rDocShell, const ScRange
rRange,
+const OUString rType = OUString(cell-change))
{
-return mbMustPropagateChanges;
+if (ScModelObj* pModelObj = getMustPropagateChangesModel(rDocShell))
+{
+ScRangeList aChangeRanges;
+aChangeRanges.Append(rRange);
+Notify(*pModelObj, aChangeRanges, rType);
+}
}
};
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 785a253..53fb213 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -182,12 +182,7 @@ void ScUndoDeleteContents::Undo()
DoChange( sal_True );
EndUndo();
-ScRangeList aChangeRanges;
-HelperNotifyChanges aHelperNotifyChanges(aChangeRanges, cell-change);
-if (aHelperNotifyChanges.getMustPropagateChanges())
-{
-aChangeRanges.Append(aRange);
-}
+HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
}
void ScUndoDeleteContents::Redo()
@@ -196,12 +191,7 @@ void ScUndoDeleteContents::Redo()
DoChange( false );
EndRedo();
-ScRangeList aChangeRanges;
-HelperNotifyChanges aHelperNotifyChanges(aChangeRanges, cell-change);
-if (aHelperNotifyChanges.getMustPropagateChanges())
-{
-aChangeRanges.Append(aRange);
-}
+HelperNotifyChanges::NotifyIfChangesListeners(*pDocShell, aRange);
}
void ScUndoDeleteContents::Repeat(SfxRepeatTarget rTarget)
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 7101056..106a077 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -47,6 +47,25 @@
using ::boost::shared_ptr;
+namespace HelperNotifyChanges
+{
+void NotifyIfChangesListeners(ScDocShell rDocShell, const ScAddress rPos,
+const ScUndoEnterData::ValuesType rOldValues, const OUString rType =
OUString(cell-change))
+{
+if (ScModelObj* pModelObj = getMustPropagateChangesModel(rDocShell))
+{
+ScRangeList aChangeRanges;
+
+for (size_t i = 0, n = rOldValues.size(); i n; ++i)
+{
+aChangeRanges.Append( ScRange(rPos.Col(), rPos.Row(),
rOldValues[i].mnTab));
+}
+
+Notify(*pModelObj, aChangeRanges, rType);
+}
+}
+}
+
TYPEINIT1(ScUndoCursorAttr,
[Libreoffice-commits] core.git: dtrans/source
dtrans/source/win32/dtobj/DOTransferable.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 20658ca9f8dd840a593de727e89b84e27bf90245
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 15 10:54:43 2013 +
Resolves: #i123407# Do not insist on CF_DIBV5 for clipboard data
also accept CF_DIB
(cherry picked from commit b7d59ee36d0786aba13e6b00d93cdfa0045e5379)
Change-Id: Iaafdeab981d6621e6696a642c68e29392af3e200
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 7e35ac2..83a8461 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -116,6 +116,21 @@ Any SAL_CALL CDOTransferable::getTransferData( const
DataFlavor aFlavor )
Any aAny = makeAny( aUnicodeText );
return aAny;
}
+else if(CF_DIBV5 == fetc.getClipformat())
+{
+// #i123407# CF_DIBV5 has priority; if the try to fetch this
failed,
+// check CF_DIB availability as an alternative
+fetc.setClipformat(CF_DIB);
+
+try
+{
+clipDataStream = getClipboardData( fetc );
+}
+catch( UnsupportedFlavorException )
+{
+throw; // pass through, tried all possibilities
+}
+}
else
throw; // pass through exception
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b7/d59ee36d0786aba13e6b00d93cdfa0045e5379
b7/d59ee36d0786aba13e6b00d93cdfa0045e5379 |1 + 1 file changed, 1 insertion(+) New commits: commit 0f5b8a24adc26b91b6a6dc91821b06f33b7d791e Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 15 13:28:41 2013 +0100 Notes added by 'git notes add' diff --git a/b7/d59ee36d0786aba13e6b00d93cdfa0045e5379 b/b7/d59ee36d0786aba13e6b00d93cdfa0045e5379 new file mode 100644 index 000..265efdb --- /dev/null +++ b/b7/d59ee36d0786aba13e6b00d93cdfa0045e5379 @@ -0,0 +1 @@ +merged as: 20658ca9f8dd840a593de727e89b84e27bf90245 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/a11y/atkutil.cxx |2 ++
vcl/unx/gtk/a11y/atkwindow.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit 2f8757e961d6156d529c2ab9131747071236f085
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Oct 9 23:11:28 2013 +0200
Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2
Change-Id: Id3691ab81af466dd21cc86592c5ac0c2c7a1c8f7
Reviewed-on: https://gerrit.libreoffice.org/6244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index e1cb134..adeda2b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -86,7 +86,9 @@ atk_wrapper_focus_idle_handler (gpointer data)
#ifdef ENABLE_TRACING
fprintf(stderr, notifying focus event for %p\n, atk_obj);
#endif
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify(atk_obj);
+SAL_WNODEPRECATED_DECLARATIONS_POP
// #i93269#
// emit text_caret_moved event for XAccessibleText object,
// if cursor is inside the XAccessibleText object.
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 0c927a5..a9e8375 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -122,7 +122,9 @@ static gint
ooo_window_wrapper_clear_focus(gpointer)
{
SolarMutexGuard aGuard;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
atk_focus_tracker_notify( NULL );
+SAL_WNODEPRECATED_DECLARATIONS_POP
return FALSE;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 47958] gross cut/paste signal emission nonsense
https://bugs.freedesktop.org/show_bug.cgi?id=47958 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack,DifficultyInterest |EasyHack,DifficultyInterest |ing,SkillCpp,TopicCleanup |ing,SkillCpp,TopicCleanup ||target:4.2.0 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Julien Nabet committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a1077b3cbdb847a452fccd15d9b834bc262cfb62 fdo#47958: gross cut/paste signal emission nonsense 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
[Bug 47958] gross cut/paste signal emission nonsense
https://bugs.freedesktop.org/show_bug.cgi?id=47958 --- Comment #12 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=1cb01c477cf1e84f6e1b2ca1771a9af53d81dc59 Resolves: fdo#47958 shrink cut/paste more and rework a bit 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
Re: .desktop files
On Mon, Oct 14, 2013 at 07:31:16AM +0200, Jean-Baptiste Faure wrote:
I would like to better understand how .desktop files work. They are in
.../sysui/desktop/menus.
If I read for example writer.desktop I see that the second exec command
(at the end of the file) use the hard coded name libreoffice when the
first one use ${UNIXBASISROOTNAME}. Is it intentional ? Indeed, even
after installation of LO (upstream, build at home) I do not have any
libreoffice command on my system (Ubuntu 13.04).
The second one is for unity quicklist integration (the small popup menu you get
from the dash on the sidebar). It indeed might only work if you use the
Debian/Ubuntu provided packages (which you should anyway, if you want system
integration) as those surely provide a 'libreoffice' executable in the default
path.
HTH,
Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 47958] gross cut/paste signal emission nonsense
https://bugs.freedesktop.org/show_bug.cgi?id=47958 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - configure.ac include/basegfx ios/experimental vcl/coretext
configure.ac |4 -
include/basegfx/point/b2dpoint.hxx | 12 +++--
include/basegfx/polygon/b2dpolygon.hxx | 21
+++-
include/basegfx/polygon/b2dpolypolygon.hxx | 24
--
include/basegfx/range/b2drange.hxx | 12 -
include/basegfx/range/b2ibox.hxx | 16
+-
include/basegfx/range/b2irange.hxx | 16
+-
include/basegfx/vector/b2ivector.hxx | 10 +++-
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj | 10 ++--
vcl/coretext/salgdi2.cxx |4 -
10 files changed, 102 insertions(+), 27 deletions(-)
New commits:
commit 8a8d1e5b4961ada276a660b8b842f2f012a8ae85
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 15 11:27:23 2013 +0300
Add operator to some classes for debugging output
Change-Id: I74a4c1217cc89e9d5da02a47ed45d6ce5fceb815
diff --git a/include/basegfx/point/b2dpoint.hxx
b/include/basegfx/point/b2dpoint.hxx
index ef73c8a..c5b87d9 100644
--- a/include/basegfx/point/b2dpoint.hxx
+++ b/include/basegfx/point/b2dpoint.hxx
@@ -20,12 +20,12 @@
#ifndef _BGFX_POINT_B2DPOINT_HXX
#define _BGFX_POINT_B2DPOINT_HXX
+#include ostream
+
#include basegfx/tuple/b2dtuple.hxx
#include basegfx/point/b2ipoint.hxx
#include basegfx/basegfxdllapi.h
-//
-
namespace basegfx
{
// predeclaration
@@ -129,7 +129,6 @@ namespace basegfx
};
// external operators
-//
/** Transform B2DPoint by given transformation matrix.
@@ -139,7 +138,12 @@ namespace basegfx
BASEGFX_DLLPUBLIC B2DPoint operator*( const B2DHomMatrix rMat, const
B2DPoint rPoint );
} // end of namespace basegfx
-//
+template typename charT, typename traits
+inline std::basic_ostreamcharT, traits operator (
+std::basic_ostreamcharT, traits stream, const basegfx::B2DPoint point
)
+{
+return stream ( point.getX() , point.getY() );
+}
#endif /* _BGFX_POINT_B2DPOINT_HXX */
diff --git a/include/basegfx/polygon/b2dpolygon.hxx
b/include/basegfx/polygon/b2dpolygon.hxx
index 7c854fd..712de77 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -20,13 +20,14 @@
#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
#define _BGFX_POLYGON_B2DPOLYGON_HXX
+#include ostream
+
#include sal/types.h
#include o3tl/cow_wrapper.hxx
#include basegfx/vector/b2enums.hxx
#include basegfx/range/b2drange.hxx
#include basegfx/basegfxdllapi.h
-//
// predeclarations
class ImplB2DPolygon;
@@ -39,8 +40,6 @@ namespace basegfx
class B2DCubicBezier;
} // end of namespace basegfx
-//
-
namespace basegfx
{
class BASEGFX_DLLPUBLIC B2DPolygon
@@ -223,7 +222,21 @@ namespace basegfx
} // end of namespace basegfx
-//
+template typename charT, typename traits
+inline std::basic_ostreamcharT, traits operator (
+std::basic_ostreamcharT, traits stream, const basegfx::B2DPolygon
poly )
+{
+streampoly.count() :;
+for (sal_uInt32 i = 0; i poly.count(); i++)
+{
+if (i 0)
+stream --;
+stream poly.getB2DPoint(i);
+}
+stream ;
+
+return stream;
+}
#endif /* _BGFX_POLYGON_B2DPOLYGON_HXX */
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx
b/include/basegfx/polygon/b2dpolypolygon.hxx
index cd22644..efe5833 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -20,23 +20,23 @@
#ifndef _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
#define _BGFX_POLYGON_B2DPOLYPOLYGON_HXX
+#include ostream
+#include vector
+
#include sal/types.h
#include o3tl/cow_wrapper.hxx
#include basegfx/range/b2drange.hxx
#include basegfx/basegfxdllapi.h
-#include vector
+#include basegfx/polygon/b2dpolygon.hxx
// predeclarations
class ImplB2DPolyPolygon;
namespace basegfx
{
-class B2DPolygon;
class B2DHomMatrix;
} // end of namespace basegfx
-//
-
namespace basegfx
{
class BASEGFX_DLLPUBLIC B2DPolyPolygon
@@ -132,6 +132,22 @@ namespace basegfx
} // end of namespace basegfx
+template typename charT, typename traits
+inline std::basic_ostreamcharT, traits operator (
+std::basic_ostreamcharT, traits stream, const basegfx::B2DPolyPolygon
poly )
+{
+
[Libreoffice-commits] core.git: 2 commits - comphelper/source include/comphelper sfx2/source ucb/source
comphelper/source/misc/mediadescriptor.cxx | 35 +
include/comphelper/mediadescriptor.hxx | 12 +
sfx2/source/doc/objserv.cxx|1
ucb/source/ucp/cmis/cmis_content.cxx |1
4 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 3de7c7b5854335a82948560b3cc5b302171e340f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Oct 15 14:48:09 2013 +0200
CMIS: show commit comment in versions dialog
Change-Id: I0d3b3d8dfe160b00c70acb98bdf4e37d088dc4c6
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 0022a8a..8159018 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1090,6 +1090,7 @@ namespace cmis
aVersions[i].Id = STD_TO_OUSTR( pVersion-getId( ) );
aVersions[i].Author = STD_TO_OUSTR( pVersion-getCreatedBy( )
);
aVersions[i].TimeStamp = lcl_boostToUnoTime(
pVersion-getCreationDate( ) );
+aVersions[i].Comment = STD_TO_OUSTR(
pVersion-getStringProperty(cmis:checkinComment) );
}
return aVersions;
}
commit 319b160320a045b1a5b302dafbc2220ee1d4d3c3
Author: Cao Cuong Ngo cao.cuong@gmail.com
Date: Sat Sep 21 23:36:06 2013 +0200
CMIS file picker: it really does not like ID Mark
The file picker can't go back folder if we use
ID mark in the URL.
Conflicts:
ucb/source/ucp/cmis/cmis_content.cxx
Change-Id: I6985feec71dc23848ee022e0bab9e8515a21ffd2
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 21361f5..b5cd5b6 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -484,6 +484,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool
bLockFile )
css::uno::Reference css::uno::XInterface ());
// Parse URL! Only the main part has to be used further. E.g. a
jumpmark can make trouble
+OUString sNormalizedURL = impl_normalizeURL( sURL );
return impl_openStreamWithURL( removeFragment(sURL), bLockFile );
}
catch(const css::uno::Exception ex)
@@ -723,6 +724,40 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const
OUString sURL, sal_Bool
return xInputStream.is();
}
+OUString MediaDescriptor::impl_normalizeURL(const OUString sURL)
+{
+/* Remove Jumpmarks (fragments) of an URL only here.
+ They are not part of any URL and as a result may be
+ no ucb content can be created then.
+ On the other side arguments must exists ... because
+ they are part of an URL.
+
+ Do not use the URLTransformer service here. Because
+ it parses the URL in another way. It's main part isnt enough
+ and it's complete part contains the jumpmark (fragment) parameter ...
+*/
+
+try
+{
+css::uno::Reference css::uno::XComponentContext xContext=
::comphelper::getProcessComponentContext();
+css::uno::Reference css::uri::XUriReferenceFactory xUriFactory =
css::uri::UriReferenceFactory::create(xContext);;
+css::uno::Reference css::uri::XUriReference xUriRef =
xUriFactory-parse(sURL);
+if (xUriRef.is())
+{
+xUriRef-clearFragment();
+return xUriRef-getUriReference();
+}
+}
+catch(const css::uno::RuntimeException)
+{ throw; }
+catch(const css::uno::Exception)
+{}
+
+// If an error ocurred ... return the original URL.
+// It's a try .-)
+return sURL;
+}
+
} // namespace comphelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/mediadescriptor.hxx
b/include/comphelper/mediadescriptor.hxx
index 5f353e5..5409f14 100644
--- a/include/comphelper/mediadescriptor.hxx
+++ b/include/comphelper/mediadescriptor.hxx
@@ -289,6 +289,18 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public
SequenceAsHashMap
be created as new item. FALSE otherwise.
*/
COMPHELPER_DLLPRIVATE sal_Bool impl_addInputStream( sal_Bool bLockFile
);
+
+/** @short some URL parts can make trouble for opening streams (e.g.
jumpmarks.)
+An URL should be normalized before its used.
+
+@param sURL
+the original URL (e.g. including a jumpmark)
+
+@return [string]
+the normalized URL (e.g. without jumpmark)
+ */
+COMPHELPER_DLLPRIVATE OUString impl_normalizeURL(const OUString sURL);
+
};
} // namespace comphelper
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 2fe263e..dbac961 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -994,7 +994,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet rSet)
Re: opengl canvas landed in master last week
On Mon, 2013-10-14 at 19:20 +0200, Thorsten Behrens wrote: come suse hackweek, I finally managed to land $subject in master (thanks to Cloph, Caolan and Stephan for cleaning up after me btw). Wow - this is awesome :-) Thanks so much Thorsten ! sounds like a really fun hack-week too, ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/InstallModuleTarget.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 1f78e02a2a9205f2c8f8132395ed1d60da3e0058 Author: David Tardon dtar...@redhat.com Date: Tue Oct 15 15:38:33 2013 +0200 fdo#70487 fix l10n of install sets Change-Id: I97b821e1e039b3ca529ebac7efb63648e5d353a3 diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 2f34826..9cfc0c4 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -100,6 +100,9 @@ endef gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf +$(dir $(call gb_ScpMergeTarget_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: .desktop files
On Mon, 2013-10-14 at 07:31 +0200, Jean-Baptiste Faure wrote:
Hi,
I would like to better understand how .desktop files work. They are in
.../sysui/desktop/menus.
If I read for example writer.desktop I see that the second exec command
(at the end of the file) use the hard coded name libreoffice when the
first one use ${UNIXBASISROOTNAME}. Is it intentional ?
caolanm-bjoern: There are multiple Exec lines in the .desktop files now
after b7423ceee1a6b1c5595fbbef6f0ca4417feeddf6
Are the duplicates intentional/necessary (I'm not up to date on
the .desktop format). And if they are, presumably they should follow the
same replaceable naming scheme of UNIXBASISROOTNAME
Indeed, even after installation of LO (upstream, build at home) I do not have
any
libreoffice command on my system (Ubuntu 13.04)
Did you use --enable-epm --with-package-format to generate the rpms.
If so then there should have been a libreoffice4.2-freedesktop-menus
rpms and that should have
installed /usr/share/applications/libreoffice4-2.writer.desktop etc
including a /usr/bin/libreoffice4.1 binary. So maybe you have it, except
its a versioned (of the alternative devel-version) name in the stock
builds.
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/mediadescriptor.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 706c5a54f662ea58e3b3a64f189eb5120191152a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 15:52:57 2013 +0200
-Werror,-Wunused-variable
...I assume the whole point of 319b160320a045b1a5b302dafbc2220ee1d4d3c3
CMIS
file picker: it really does not like ID Mark was to actually use the
result of
impl_normalizeURL.
Change-Id: Id94c7785183d96f2a2c3f08caa72af045a1212ba
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index b5cd5b6..095df58 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -485,7 +485,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool
bLockFile )
// Parse URL! Only the main part has to be used further. E.g. a
jumpmark can make trouble
OUString sNormalizedURL = impl_normalizeURL( sURL );
-return impl_openStreamWithURL( removeFragment(sURL), bLockFile );
+return impl_openStreamWithURL( removeFragment(sNormalizedURL),
bLockFile );
}
catch(const css::uno::Exception ex)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Changing the object created by imported docx
Hi Noel, Noel Grandin schrieb: On 2013-10-15 10:11, Miklos Vajna wrote: Writer bitmaps are only allowed to be rotated in 90º steps But that is a faked rotation. The picture is (silently!) changed from linked to embedded. The rotation is not done by using a transformation but by generating a new picture. , but in Word they can be rotated to any angle. When importing a document containing a 45º bitmap the rotation is lost, and it keeps lost when the document is saved back. The problem is not the rotation of the image (more exactly of the internal draw:frame element) itself. You can rotate Writer-kind images already be applying a transformation via macro. But the missing part is to make the surrounding text consider the rotated image. And in addition, there are bugs: (1) The area of the bounding box, which is not covered by content is drawn wrongly. You see this bug already, when using negative crop values. (2) Cropping does not work sufficient on rotated images. Perhaps we should extend the Writer code and the OO document spec to cope with arbitrary rotations? That would be the wrong way. We would keep different kind of images. The better way is, to enhance the Draw-kind images to have all features of the Writer-kind images and then drop the Writer-kind images. Will take a little longer, what with needing to get the spec change ratified, but it seems like it might be a safer change, long-term, IMO. There is no need for a change in spec. The element draw:frame, which is used in Draw and Writer as well, has already an attribute draw:transform. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38879] Add git history/log parser for tinderbox
https://bugs.freedesktop.org/show_bug.cgi?id=38879 --- Comment #7 from Norbert Thiebaud nthieb...@gmail.com --- (In reply to comment #6) So tinderbox server could git pull every 15 minutes/whatever the minimum display-interval is, and store the time and the corresponding git-hash of the branches. No, that does not work. The tinderbox script save the sha of the tips and the timestamp of when they _fetched_ but you cannot rely on the timestamp of the commits themselves as they are routinely not in chronological order. the commit timestamp is dated from when you created the commit... commit appears on HEAD when they are pushed... there can be a significant amount of time between the two event... drastic differences for feature branch that get integrated Just take a look at bcc239b405478040fda46d1bf1d4f3e38506d1a3 2013-07-29 and the next commit is 41d2036bee3279928903cdada115d3e3cd022a06 2012-12-18 The tb script that spam people does not rely on dates.. but on a git log analysis between the last good commit sha and the current broken one. This of course is only relevant for 'progressive' tinderbox if/when we move to tb3, the spamming will be the job of the server since the tb client will not have a reliable 'last successful build' point -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8import/data/fdo36868.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |9 +
sw/source/filter/ww8/ww8par3.cxx |9 ++---
3 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 74904ca6b083f16074e1c5b60729890fc972ad42
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 15 15:17:09 2013 +0200
fdo#36868 WW8 import: allow outline numbering and list style in the same ...
.. paragraph style
The original problem (from a user's point of view) was that the second
level of the numbering started from 1.1 instead of 2.1 in the bugdoc.
This was fixed by using outline numbering for level 2 as well, but this
is problematic in many cases: we want to have outline numbering exactly
when outline numbering is enabled for the given paragraph style.
So revert the change in SwWW8ImplReader::SetStylesList() and fix it
differently: SwWW8ImplReader::RegisterNumFmtOnStyle() explicitly ignores
list style if outline numbering is available with no good reason. Both
the WW8 format and Writer core allows to have outline numbering and a
list style at the same time, so set list style even when outline
numbering is available. This fixes the original issue, too -- without
introducing nasty fake outline numbering usage.
Also add a testcase for the original issue.
(regression from e3d5c3e0746916c4056389dd8c2daa6c451c8f6e)
Change-Id: Id7d2d67a96a858aee3230110cb518fea51d19d38
diff --git a/sw/qa/extras/ww8import/data/fdo36868.doc
b/sw/qa/extras/ww8import/data/fdo36868.doc
new file mode 100644
index 000..382c6b2
Binary files /dev/null and b/sw/qa/extras/ww8import/data/fdo36868.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index c61c9ed..79fc470 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -35,6 +35,7 @@ public:
void testN816593();
void testPageBorder();
void testN823651();
+void testFdo36868();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -62,6 +63,7 @@ void Test::run()
{n816593.doc, Test::testN816593},
{page-border.doc, Test::testPageBorder},
{n823651.doc, Test::testN823651},
+{fdo36868.doc, Test::testFdo36868},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -285,6 +287,13 @@ void Test::testN823651()
CPPUNIT_ASSERT_EQUAL(7.5f, getPropertyfloat(getParagraphOfText(1,
xText), CharHeight));
}
+void Test::testFdo36868()
+{
+OUString aText =
parseDump(/root/page/body/txt[3]/Special[@nType='POR_NUMBER'], rText);
+// This was 1.1.
+CPPUNIT_ASSERT_EQUAL(OUString(2.1), aText);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index e7b0b40..80195fa 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1741,8 +1741,6 @@ void SwWW8ImplReader::SetStylesList(sal_uInt16 nStyle,
sal_uInt16 nActLFO,
{
rStyleInf.nLFOIndex = nActLFO;
rStyleInf.nListLevel = nActLevel;
-if (nActLevel 0) // it must be an outline list
-rStyleInf.nOutlineLevel = nActLevel;
if (
(USHRT_MAX nActLFO)
@@ -1791,12 +1789,9 @@ void SwWW8ImplReader::RegisterNumFmtOnStyle(sal_uInt16
nStyle)
{
if( MAXLEVEL rStyleInf.nOutlineLevel )
rStyleInf.pOutlineNumrule = pNmRule;
-else
-{
-rStyleInf.pFmt-SetFmtAttr(
+rStyleInf.pFmt-SetFmtAttr(
SwNumRuleItem( pNmRule-GetName() ) );
-rStyleInf.bHasStyNumRule = true;
-}
+rStyleInf.bHasStyNumRule = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui | 162 1 file changed, 81 insertions(+), 81 deletions(-) New commits: commit 36f4a7956551a49b1ca184189da7feef1ad98cc3 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 15 15:14:47 2013 +0100 fix warning about missing images in startcenter persumably the intent is to show these ones Change-Id: I3110b7efb7acdf689825f78989aba4010abbcc59 diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 4e9c5e8..d58a03b 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -2,20 +2,91 @@ interface !-- interface-requires LibreOffice 1.0 -- !-- interface-requires gtk+ 3.0 -- + object class=GtkImage id=calc_all_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/ods_16_8.png/property + /object + object class=GtkImage id=calc_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/ods_16_8.png/property + /object + object class=GtkImage id=database_all_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odb_16_8.png/property + /object + object class=GtkImage id=database_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odb_16_8.png/property + /object + object class=GtkImage id=draw_all_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odg_16_8.png/property + /object + object class=GtkImage id=draw_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odg_16_8.png/property + /object + object class=GtkImage id=impress_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odp_16_8.png/property + /object + object class=GtkImage id=impress_all_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=tooltip_text translatable=yesNew Presentation/property +property name=pixbufres/odp_16_8.png/property + /object + object class=GtkImage id=math_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odf_16_8.png/property + /object + object class=GtkImage id=math_all_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufres/odf_16_8.png/property + /object + object class=GtkImage id=open_image5 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufcmd/sc_open.png/property + /object + object class=GtkImage id=open_image6 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufcmd/sc_open.png/property + /object + object class=GtkImage id=open_image10 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufcmd/sc_open.png/property + /object object class=GtkImage id=open_image7 property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufframework/res/folder_16.png/property +property name=pixbufcmd/sc_open.png/property + /object + object class=GtkImage id=open_image +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixbufcmd/sc_open.png/property /object object class=GtkImage id=open_image8 property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufframework/res/folder_16.png/property +property name=pixbufcmd/sc_open.png/property /object object class=GtkImage id=open_image9 property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufframework/res/folder_16.png/property +property name=pixbufcmd/sc_open.png/property /object object class=GtkBox id=StartCenter property name=can_focusFalse/property @@ -1037,111 +1108,40 @@ /packing /child /object - object class=GtkImage id=calc_all_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufres/ods_16_8.png/property - /object - object class=GtkImage id=calc_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufres/ods_16_8.png/property - /object - object class=GtkImage id=database_all_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufres/odb_16_8.png/property - /object - object class=GtkImage id=database_image -property name=visibleTrue/property -property
Re: .desktop files
On Tue, Oct 15, 2013 at 02:47:21PM +0100, Caolán McNamara wrote: Are the duplicates intentional/necessary (I'm not up to date on the .desktop format). And if they are, presumably they should follow the same replaceable naming scheme of UNIXBASISROOTNAME Yes to both, I guess (see my other mail for the details). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/basebmp
include/basebmp/polypolygonrenderer.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 064da28833203545eb5554982008c7af346b2488 Author: tsahi glik tsahi.g...@cloudon.com Date: Fri Aug 30 11:49:55 2013 -0700 fix polygon rendering with clip area of one line only Change-Id: I7f1b2c45109ed8011b76013ccb488cdfd12c7868 Reviewed-on: https://gerrit.libreoffice.org/5709 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/include/basebmp/polypolygonrenderer.hxx b/include/basebmp/polypolygonrenderer.hxx index 09bd18a..1fc9292 100644 --- a/include/basebmp/polypolygonrenderer.hxx +++ b/include/basebmp/polypolygonrenderer.hxx @@ -154,7 +154,7 @@ namespace basebmp const sal_Int32 nMinY( basegfx::fround(aPolyBounds.getMinY()) ); const sal_Int32 nMaxY( std::min( -nClipY2-1, +nClipY2, basegfx::fround(aPolyBounds.getMaxY(; if( nMinY nMaxY ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/basebmp
include/basebmp/polypolygonrenderer.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a6a1d65834163761376dcd7f3843d6682cbd37c Author: Tor Lillqvist t...@collabora.com Date: Tue Oct 15 17:33:48 2013 +0300 Revert fix polygon rendering with clip area of one line only Sorry, but this breaks the basebmp unit test. This reverts commit 064da28833203545eb5554982008c7af346b2488. diff --git a/include/basebmp/polypolygonrenderer.hxx b/include/basebmp/polypolygonrenderer.hxx index 1fc9292..09bd18a 100644 --- a/include/basebmp/polypolygonrenderer.hxx +++ b/include/basebmp/polypolygonrenderer.hxx @@ -154,7 +154,7 @@ namespace basebmp const sal_Int32 nMinY( basegfx::fround(aPolyBounds.getMinY()) ); const sal_Int32 nMaxY( std::min( -nClipY2, +nClipY2-1, basegfx::fround(aPolyBounds.getMaxY(; if( nMinY nMaxY ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc
sd/inc/sderror.hxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit 47794c41b1bb2fc31c7cf4e4b420a8f418670ec4
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Oct 15 23:36:49 2013 +0900
Drop unused inline function
Change-Id: I1b59a22cd461f9a6cfc371de4c3a1595c8d8f339
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx
index b462316..0f752d0 100644
--- a/sd/inc/sderror.hxx
+++ b/sd/inc/sderror.hxx
@@ -46,11 +46,6 @@ inline bool IsWarning( sal_uLong nErr )
return 0 != ( nErr ERRCODE_WARNING_MASK nErr );
}
-inline bool IsError( sal_uLong nErr )
-{
-return nErr 0 == ( ERRCODE_WARNING_MASK nErr );
-}
-
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - 4 commits - chart2/inc chart2/source
chart2/inc/DataSeriesState.hxx |5 +-
chart2/source/view/inc/AbstractShapeFactory.hxx |5 +-
chart2/source/view/inc/DummyXShape.hxx | 43 ++--
chart2/source/view/inc/OpenglShapeFactory.hxx |5 +-
chart2/source/view/inc/ShapeFactory.hxx |5 +-
chart2/source/view/main/DummyXShape.cxx | 41 ++
chart2/source/view/main/OpenglShapeFactory.cxx | 10 +++--
chart2/source/view/main/ShapeFactory.cxx|5 +-
8 files changed, 103 insertions(+), 16 deletions(-)
New commits:
commit d51c42d65a74dabda783a577a46e04c85b757304
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 15 16:50:57 2013 +0200
implement XMultiPropertySet
Change-Id: I91878c0883f0de03341eee65f2925ec3beb71889
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index fde04f6..9de599d 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -10,11 +10,12 @@
#ifndef CHART2_DUMMY_XSHAPE_HXX
#define CHART2_DUMMY_XSHAPE_HXX
-#include cppuhelper/implbase5.hxx
+#include cppuhelper/implbase6.hxx
#include com/sun/star/drawing/XShape.hpp
#include com/sun/star/drawing/XShapes.hpp
#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/beans/XMultiPropertySet.hpp
#include com/sun/star/container/XNamed.hpp
#include com/sun/star/container/XChild.hpp
#include com/sun/star/lang/XServiceInfo.hpp
@@ -36,9 +37,10 @@ class DummyChart;
struct OpenglContext;
-class DummyXShape : public cppu::WeakImplHelper5
+class DummyXShape : public cppu::WeakImplHelper6
::com::sun::star::drawing::XShape,
com::sun::star::beans::XPropertySet,
+com::sun::star::beans::XMultiPropertySet,
com::sun::star::container::XNamed,
com::sun::star::container::XChild,
com::sun::star::lang::XServiceInfo
@@ -67,6 +69,25 @@ public:
virtual void SAL_CALL addVetoableChangeListener( const OUString
PropertyName, const ::com::sun::star::uno::Reference
::com::sun::star::beans::XVetoableChangeListener aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeVetoableChangeListener( const OUString
PropertyName, const ::com::sun::star::uno::Reference
::com::sun::star::beans::XVetoableChangeListener aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+// XMultiPropertySet
+virtual void SAL_CALL setPropertyValues( const
::com::sun::star::uno::Sequence OUString aPropertyNames,
+const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Any
aValues )
+throw (::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
+::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+
+virtual ::com::sun::star::uno::Sequence ::com::sun::star::uno::Any
SAL_CALL getPropertyValues(
+const ::com::sun::star::uno::Sequence OUString aPropertyNames )
+throw (::com::sun::star::uno::RuntimeException);
+
+virtual void SAL_CALL addPropertiesChangeListener( const
::com::sun::star::uno::Sequence OUString aPropertyNames, const
::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertiesChangeListener xListener ) throw
(::com::sun::star::uno::RuntimeException);
+
+virtual void SAL_CALL removePropertiesChangeListener( const
::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertiesChangeListener xListener ) throw
(::com::sun::star::uno::RuntimeException);
+
+virtual void SAL_CALL firePropertiesChangeEvent( const
::com::sun::star::uno::Sequence OUString aPropertyNames,
+const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertiesChangeListener xListener )
+throw (::com::sun::star::uno::RuntimeException);
+
+
// XChild
virtual ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface SAL_CALL getParent( )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface Parent )
throw(::com::sun::star::lang::NoSupportException,
::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 807216b..26184f8 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -100,6 +100,34 @@ void DummyXShape::removeVetoableChangeListener( const
OUString, const uno::Refe
{
}
+void DummyXShape::setPropertyValues( const uno::Sequence OUString ,
+
[Libreoffice-commits] core.git: Branch 'feature/android-single-dso' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/minimizer/configurationaccess.cxx | 30 +--
sdext/source/minimizer/informationdialog.cxx | 78 +-
sdext/source/minimizer/optimizerdialog.cxx | 26 +--
sdext/source/minimizer/optimizerdialogcontrols.cxx | 158 ++---
4 files changed, 146 insertions(+), 146 deletions(-)
New commits:
commit 8ab1c6103d5cbc414531c78c3cbaa93bfd99149f
Author: Eike Rathke er...@redhat.com
Date: Tue Oct 15 16:59:36 2013 +0200
could not convert from âconst char*â to ârtl::OUStringâ
Since 3eb84bcb4580af50c2ded9f48749384b8455258e which apparently Clang
has no problem with.
Change-Id: I21af4e20dd116705e53d73a968fde478bff142bb
diff --git a/sdext/source/minimizer/configurationaccess.cxx
b/sdext/source/minimizer/configurationaccess.cxx
index 527aff2..267ff6d 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const
Reference XNameRepla
if ( rSettings.is() )
{
OUString pNames[] = {
-Name,
-JPEGCompression,
-JPEGQuality,
-RemoveCropArea,
-ImageResolution,
-EmbedLinkedGraphics,
-OLEOptimization,
-OLEOptimizationType,
-DeleteUnusedMasterPages,
-DeleteHiddenSlides,
-DeleteNotesPages,
-SaveAs,
-// SaveAsURL,
-// FilterName,
-OpenNewDocument };
+OUString(Name),
+OUString(JPEGCompression),
+OUString(JPEGQuality),
+OUString(RemoveCropArea),
+OUString(ImageResolution),
+OUString(EmbedLinkedGraphics),
+OUString(OLEOptimization),
+OUString(OLEOptimizationType),
+OUString(DeleteUnusedMasterPages),
+OUString(DeleteHiddenSlides),
+OUString(DeleteNotesPages),
+OUString(SaveAs),
+// OUString(SaveAsURL),
+// OUString(FilterName),
+OUString(OpenNewDocument) };
Any pValues[] = {
Any( maName ),
diff --git a/sdext/source/minimizer/informationdialog.cxx
b/sdext/source/minimizer/informationdialog.cxx
index dabf17b..28ab1ce 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -62,14 +62,14 @@ OUString InsertFixedText( InformationDialog
rInformationDialog, const OUString
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32
nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
{
OUString pNames[] = {
-Height,
-Label,
-MultiLine,
-PositionX,
-PositionY,
-Step,
-TabIndex,
-Width };
+OUString(Height),
+OUString(Label),
+OUString(MultiLine),
+OUString(PositionX),
+OUString(PositionY),
+OUString(Step),
+OUString(TabIndex),
+OUString(Width) };
Any pValues[] = {
Any( nHeight ),
@@ -101,13 +101,13 @@ OUString InsertImage(
sal_Bool bScale )
{
OUString pNames[] = {
-Border,
-Height,
-ImageURL,
-PositionX,
-PositionY,
-ScaleImage,
-Width };
+OUString(Border),
+OUString(Height),
+OUString(ImageURL),
+OUString(PositionX),
+OUString(PositionY),
+OUString(ScaleImage),
+OUString(Width) };
Any pValues[] = {
Any( sal_Int16( 0 ) ),
@@ -131,14 +131,14 @@ OUString InsertCheckBox( InformationDialog
rInformationDialog, const OUString
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight,
sal_Int16 nTabIndex )
{
OUString pNames[] = {
-Enabled,
-Height,
-Label,
-PositionX,
-PositionY,
-Step,
-TabIndex,
-Width };
+OUString(Enabled),
+OUString(Height),
+OUString(Label),
+OUString(PositionX),
+OUString(PositionY),
+OUString(Step),
+OUString(TabIndex),
+OUString(Width) };
Any pValues[] = {
Any( sal_True ),
@@ -165,15 +165,15 @@ OUString InsertButton( InformationDialog
rInformationDialog, const OUString rC
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight,
sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID )
{
OUString pNames[] = {
-Enabled,
-Height,
-Label,
-PositionX,
-PositionY,
-PushButtonType,
-Step,
-TabIndex,
-Width };
+OUString(Enabled),
+OUString(Height),
+OUString(Label),
+OUString(PositionX),
+OUString(PositionY),
+OUString(PushButtonType),
+OUString(Step),
+OUString(TabIndex),
+OUString(Width) };
Any pValues[] = {
Any(
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8import/data/list-nolevel.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 10 ++
sw/source/filter/ww8/ww8par3.cxx |2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 1f6435d986fff97095c5619a908ea67906405e3c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 15 16:29:35 2013 +0200
WW8 import: fix handling of sprmPIlfo when sprmPIlvl is missing
Commit 542a0d7260e4767d8aff839eb593e748a82ced48 (#100044# Cleanup for
optimization defines-enums, 2002-08-14) added the problematic else
without mentioning the reason, so I assume it's safe to just revert that
part.
Change-Id: Id90fbdfb1116be458a76c9653fec0633edc34fac
diff --git a/sw/qa/extras/ww8import/data/list-nolevel.doc
b/sw/qa/extras/ww8import/data/list-nolevel.doc
new file mode 100755
index 000..04e3499
Binary files /dev/null and b/sw/qa/extras/ww8import/data/list-nolevel.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 79fc470..345f0dc 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -36,6 +36,7 @@ public:
void testPageBorder();
void testN823651();
void testFdo36868();
+void testListNolevel();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -64,6 +65,7 @@ void Test::run()
{page-border.doc, Test::testPageBorder},
{n823651.doc, Test::testN823651},
{fdo36868.doc, Test::testFdo36868},
+{list-nolevel.doc, Test::testListNolevel},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -294,6 +296,14 @@ void Test::testFdo36868()
CPPUNIT_ASSERT_EQUAL(OUString(2.1), aText);
}
+void Test::testListNolevel()
+{
+// Similar to fdo#36868, numbering portions had wrong values.
+OUString aText =
parseDump(/root/page/body/txt[1]/Special[@nType='POR_NUMBER'], rText);
+// POR_NUMBER was completely missing.
+CPPUNIT_ASSERT_EQUAL(OUString(1.), aText);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 80195fa..2888fa3 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2065,7 +2065,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const
sal_uInt8* pData,
{
if (WW8ListManager::nMaxLevel == nListLevel)
nListLevel = 0;
-else if (WW8ListManager::nMaxLevel nListLevel)
+if (WW8ListManager::nMaxLevel nListLevel)
{
RegisterNumFmt(nLFOPosition, nListLevel);
nLFOPosition = USHRT_MAX;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/source
chart2/source/view/inc/DummyXShape.hxx |5 -
chart2/source/view/main/DummyXShape.cxx | 29 ++---
2 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit f79bd63e3de597d07b64894b9124d773c1e10590
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 15 17:06:31 2013 +0200
make it possible to avoid XShape/XShapes in the backend
Change-Id: I9aa4b71d12bb6720e2197dc1de6f06c61f27d6ee
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 9de599d..ef117ab 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -46,6 +46,7 @@ class DummyXShape : public cppu::WeakImplHelper6
com::sun::star::lang::XServiceInfo
{
public:
+DummyXShape();
// XNamed
virtual OUString SAL_CALL getName( )
throw(::com::sun::star::uno::RuntimeException);
@@ -105,6 +106,7 @@ private:
com::sun::star::awt::Size maSize;
com::sun::star::uno::Reference com::sun::star::uno::XInterface mxParent;
+DummyXShape* mpParent;
};
@@ -141,7 +143,8 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
throw(::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
private:
-std::vectorcom::sun::star::uno::Reference
com::sun::star::drawing::XShape maShapes;
+std::vectorcom::sun::star::uno::Reference
com::sun::star::drawing::XShape maUNOShapes;
+std::vectorDummyXShape* maShapes;
};
}
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 26184f8..2e208f2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -18,6 +18,11 @@ namespace chart {
namespace dummy {
+DummyXShape::DummyXShape():
+mpParent(NULL)
+{
+}
+
OUString DummyXShape::getName()
throw(uno::RuntimeException)
{
@@ -217,15 +222,25 @@ void DummyXShapes::release()
void DummyXShapes::add( const uno::Reference drawing::XShape xShape )
throw(uno::RuntimeException)
{
-maShapes.push_back(xShape);
+DummyXShape* pChild = dynamic_castDummyXShape*(xShape.get());
+assert(pChild);
+maUNOShapes.push_back(xShape);
+pChild-setParent(static_cast ::cppu::OWeakObject* ( this ));
+maShapes.push_back(pChild);
}
void DummyXShapes::remove( const uno::Reference drawing::XShape xShape )
throw(uno::RuntimeException)
{
-std::vector uno::Referencedrawing::XShape ::iterator itr =
std::find(maShapes.begin(), maShapes.end(), xShape);
-if(itr != maShapes.end())
-maShapes.erase(itr);
+std::vector uno::Referencedrawing::XShape ::iterator itr =
std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape);
+
+DummyXShape* pChild = dynamic_castDummyXShape*((*itr).get());
+std::vector DummyXShape* ::iterator itrShape =
std::find(maShapes.begin(), maShapes.end(), pChild);
+if(itrShape != maShapes.end())
+maShapes.erase(itrShape);
+
+if(itr != maUNOShapes.end())
+maUNOShapes.erase(itr);
}
uno::Type DummyXShapes::getElementType()
@@ -237,13 +252,13 @@ uno::Type DummyXShapes::getElementType()
sal_Bool DummyXShapes::hasElements()
throw(uno::RuntimeException)
{
-return !maShapes.empty();
+return !maUNOShapes.empty();
}
sal_Int32 DummyXShapes::getCount()
throw(uno::RuntimeException)
{
-return maShapes.size();
+return maUNOShapes.size();
}
uno::Any DummyXShapes::getByIndex(sal_Int32 nIndex)
@@ -251,7 +266,7 @@ uno::Any DummyXShapes::getByIndex(sal_Int32 nIndex)
uno::RuntimeException)
{
uno::Any aShape;
-aShape = maShapes[nIndex];
+aShape = maUNOShapes[nIndex];
return aShape;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo
instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt |1 + instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt |1 + instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |1 + instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |1 + instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt |1 + instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt |1 + 6 files changed, 6 insertions(+) New commits: commit 51b71f0a9ca0c7504849ccea8dae9c9896d2eeb1 Author: Andras Timar andras.ti...@collabora.com Date: Sat Sep 21 23:09:45 2013 +0200 fdo#58144 - disable the ARP 'Remove' button on Windows XP Windows installer on Windows XP cannot display messages, when the installer database is encoded in UTF-8 and support for CTL languages is not installed. This patch is a workaround, it disables the 'Remove' button in Control Panel's Add or Remove Programs applet, so the user has to choose 'Change', and has to uninstall LibreOffice with the Wizard, which does not exhibit the problem. Initially this bug was not expected, when we changed the enconding from legacy codepages to UTF-8 - I would say irreversibly. Then the severity of the bug was underestimated, because usually uninstallation needs no user interaction, so it does not matter, if the text is unreadable. However, in some circumstances uninstallation needs to reboot the computer, and the user needs to understand the question, whether to reboot now or later. Change-Id: I7d6b4e82cbe4142d23c29313e43a90fa43944b2f Reviewed-on: https://gerrit.libreoffice.org/6111 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt index 997515a..aaf07ca 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt @@ -5,5 +5,6 @@ setAllUsersProfile2K51 ALLUSERSPROFILE [%ALLUSERSPROFILE] SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users setUserProfileNT 51 USERPROFILE [%USERPROFILE] SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION] +SetARPNoRemove 51 ARPNOREMOVE 1 NewProductFound19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt index 3d29abe..b30ebc2 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt @@ -53,6 +53,7 @@ RMCCPSearch Not CCP_SUCCESS And CCP_TEST250 SameProductFound SAMEPRODUCTS120 ScheduleReboot ISSCHEDULEREBOOT3125 SetARPInstallLocation 990 +SetARPNoRemove VersionNT 600 995 SetODBCFolders 550 StartServices VersionNT 2800 StopServices VersionNT 950 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index dd128b2..7727f77 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -6,6 +6,7 @@ setAllUsersProfile2K51 ALLUSERSPROFILE [%ALLUSERSPROFILE] SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users setUserProfileNT 51 USERPROFILE [%USERPROFILE] SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION] +SetARPNoRemove 51 ARPNOREMOVE 1 NewProductFound19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 SetLanguageSelected51 LANG_SELECTED 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 3da59dc..c92b882 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -54,6 +54,7 @@ RMCCPSearch Not CCP_SUCCESS And CCP_TEST250 SameProductFound SAMEPRODUCTS120 ScheduleReboot ISSCHEDULEREBOOT3125 SetARPInstallLocation 990 +SetARPNoRemove VersionNT 600 995 SetODBCFolders 550 StartServices VersionNT 2800 StopServices VersionNT 950 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/CustomAc.idt
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 265c7d62364ab2382491367f66fc14b95681a5a7
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 15 17:20:00 2013 +0200
sw: enable (most of) CppunitTest_sw_ooxmlimport/export on Mac
This used to be problematic due to the flashing windows, but it was
stated recently that we already have those anyway due to e.g. gengal. It
turns out all our DOCX filter tests pass just fine on Mac, except one
checksum test -- make *that* an exception instead.
Change-Id: Id5e620a33b9b05f154e4072a8a49f335837079ea
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0f8486d..5230635 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -124,7 +124,7 @@ public:
void testCharHighlight();
CPPUNIT_TEST_SUITE(Test);
-#if !defined(MACOSX) !defined(WNT)
+#if !defined(WNT)
CPPUNIT_TEST(run);
#endif
CPPUNIT_TEST_SUITE_END();
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2239540..1f7e831 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -141,7 +141,7 @@ public:
void testFdo43093();
CPPUNIT_TEST_SUITE(Test);
-#if !defined(MACOSX) !defined(WNT)
+#if !defined(WNT)
CPPUNIT_TEST(run);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -808,6 +808,7 @@ void Test::testN775899()
void Test::testN777345()
{
+#if !defined(MACOSX)
// The problem was that v:imagedata inside v:rect was ignored.
uno::Referencedocument::XEmbeddedObjectSupplier2 xSupplier(getShape(1),
uno::UNO_QUERY);
uno::Referencegraphic::XGraphic xGraphic =
xSupplier-getReplacementGraphic();
@@ -815,6 +816,7 @@ void Test::testN777345()
// If this changes later, feel free to update it, but make sure it's not
// the checksum of a white/transparent placeholder rectangle.
CPPUNIT_ASSERT_EQUAL(sal_uLong(2529763117U), aGraphic.GetChecksum());
+#endif
}
void Test::testN777337()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/templatedlg.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit 7c75d9ef462958d43bfcf252b24b9084a95af87b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 15 16:26:30 2013 +0100
unused class
Change-Id: I820c9c79113007df096c4efe9e8fc30b93e2b7ae
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 4b00ec3..1da6adb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -147,16 +147,6 @@ static bool cmpSelectionItems (const ThumbnailViewItem
*pItem1, const ThumbnailV
return pItem1-mnId pItem2-mnId;
}
-class TemplateManagerPage : public TabPage
-{
-private:
-FixedText maFixedText;
-
-public:
-TemplateManagerPage( Window* pParent );
-~TemplateManagerPage( ) { };
-};
-
SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
: ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
maTabControl(this,SfxResId(TAB_CONTROL)),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - sfx2/source
sfx2/source/appl/fileobj.cxx | 31 +--
1 file changed, 25 insertions(+), 6 deletions(-)
New commits:
commit 9e958f2f44a63886e44b265c2120020cb0289a1b
Author: Eike Rathke er...@redhat.com
Date: Fri Oct 11 01:08:01 2013 +0200
resolved fdo#69948 honor a detected FilterName
TypeDetection::queryTypeByDescriptor() adds the FilterName property to
the MediaDescriptor, use that if present.
Strangely enough the sequence returned by XNameAccess::getByName(sType)
of the type detection contains an empty PreferredFilter value so that is
useless in this scenario.
(cherry picked from commit 823278dd095d754d0f673ef140c36c9fa7ebeffd)
Conflicts:
sfx2/source/appl/fileobj.cxx
Backported.
Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a
Reviewed-on: https://gerrit.libreoffice.org/6208
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 4c8e5c2a5cf67661ebf33be5c5c2700a4c389f7c)
Reviewed-on: https://gerrit.libreoffice.org/6215
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 385b8b0..abda2a5 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -397,13 +397,32 @@ String impl_getFilter( const String _rURL )
::rtl::OUString sType = xTypeDetection-queryTypeByDescriptor(
aDescrList, sal_True );
if ( !sType.isEmpty() )
{
-css::uno::Reference css::container::XNameAccess xTypeCont(
xTypeDetection,
-
css::uno::UNO_QUERY );
-if ( xTypeCont.is() )
+// Honor a selected/detected filter.
+for (sal_Int32 i=0; i aDescrList.getLength(); ++i)
{
-::comphelper::SequenceAsHashMap lTypeProps(
xTypeCont-getByName( sType ) );
-sFilter = lTypeProps.getUnpackedValueOrDefault(
-::rtl::OUString(PreferredFilter), ::rtl::OUString()
);
+if (aDescrList[i].Name == FilterName)
+{
+OUString aFilterName;
+if (aDescrList[i].Value = aFilterName)
+{
+sFilter = aFilterName;
+break;
+}
+}
+}
+if (!sFilter.Len())
+{
+css::uno::Reference css::container::XNameAccess
xTypeCont( xTypeDetection,
+css::uno::UNO_QUERY );
+if ( xTypeCont.is() )
+{
+/* XXX: for fdo#69948 scenario the sequence returned by
+ * getByName() contains an empty PreferredFilter
+ * property value (since? expected?) */
+::comphelper::SequenceAsHashMap lTypeProps(
xTypeCont-getByName( sType ) );
+sFilter = lTypeProps.getUnpackedValueOrDefault(
+::rtl::OUString(PreferredFilter),
::rtl::OUString() );
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: move external builds into subfolder (fdo#70393)
Hi Bjoern, On Tuesday, 2013-10-15 13:40:21 +0200, Bjoern Michaelsen wrote: is there any violent opposition to: https://bugs.freedesktop.org/show_bug.cgi?id=70393 No opposition, just please move the current content, i.e. external/*.mk, out of the way to have it one level deeper (is it all Windows related? then have windows/ subdir or some such), as is it would be quite confusing to have *.mk files there that are completely unrelated to all the external modules below then. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpN6JcFu_eKm.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - codemaker/source
codemaker/source/cppumaker/cpputype.cxx | 52 +---
1 file changed, 28 insertions(+), 24 deletions(-)
New commits:
commit 911486c4624bdf45f3fb13ef705017475c6554b9
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 1 14:33:56 2013 +0200
rhbz#1014010: Missing dependencies in isBootstrapType list
...the list has been fixed now by copying its elements into an ENTRIES file
and
running unoidl-write udkapi/ @ENTITIES TEMP unoidl-read TEMP
/dev/null and
adding any reported unknown entities until it succeeds.
However, the updated list lead to deadlock when css.reflection.ParamInfo
UnoType
resolves css.reflection.XIdlClass UnoType resolves css.reflection.XIdlMethod
UnoType resolves css.reflection.ParamInfo UnoType, so broke the circle by no
longer resolving the interface methods' return and parameter types in
InterfaceType::dumpMethodsCppuDecl (which is why those type infos are only
generated on demand anyway; looks like this had been a careless thinko in
the
generation of comprehensive type info that had remained unnoticed all the
time).
(cherry picked from commit 254f59f623f58c320175a06a2c93bcee7868b623)
Conflicts:
codemaker/source/cppumaker/cpputype.cxx
Change-Id: I50ef2fde16242298e055c6fa5971e70fad1a2b68
Reviewed-on: https://gerrit.libreoffice.org/6106
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 395b860fe19b786a096a2533a09d0c45c11ed8b4)
Reviewed-on: https://gerrit.libreoffice.org/6221
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 09de49c..eb6a92b 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -72,17 +72,25 @@ rtl::OString translateSimpleUnoType(rtl::OString const
unoType, bool cppuUnoTy
bool isBootstrapType(rtl::OString const name) {
static char const * const names[] = {
+com/sun/star/beans/Property,
com/sun/star/beans/PropertyAttribute,
+com/sun/star/beans/PropertyChangeEvent,
+com/sun/star/beans/PropertyState,
com/sun/star/beans/PropertyValue,
com/sun/star/beans/XFastPropertySet,
com/sun/star/beans/XMultiPropertySet,
+com/sun/star/beans/XPropertiesChangeListener,
com/sun/star/beans/XPropertyAccess,
+com/sun/star/beans/XPropertyChangeListener,
com/sun/star/beans/XPropertySet,
+com/sun/star/beans/XPropertySetInfo,
com/sun/star/beans/XPropertySetOption,
+com/sun/star/beans/XVetoableChangeListener,
com/sun/star/bridge/UnoUrlResolver,
com/sun/star/bridge/XUnoUrlResolver,
com/sun/star/connection/SocketPermission,
com/sun/star/container/XElementAccess,
+com/sun/star/container/XEnumeration,
com/sun/star/container/XEnumerationAccess,
com/sun/star/container/XHierarchicalNameAccess,
com/sun/star/container/XNameAccess,
@@ -92,6 +100,7 @@ bool isBootstrapType(rtl::OString const name) {
com/sun/star/io/FilePermission,
com/sun/star/io/IOException,
com/sun/star/lang/DisposedException,
+com/sun/star/lang/EventObject,
com/sun/star/lang/WrappedTargetRuntimeException,
com/sun/star/lang/XComponent,
com/sun/star/lang/XEventListener,
@@ -103,11 +112,19 @@ bool isBootstrapType(rtl::OString const name) {
com/sun/star/lang/XSingleServiceFactory,
com/sun/star/lang/XTypeProvider,
com/sun/star/loader/XImplementationLoader,
+com/sun/star/reflection/FieldAccessMode,
+com/sun/star/reflection/MethodMode,
+com/sun/star/reflection/ParamInfo,
+com/sun/star/reflection/ParamMode,
+com/sun/star/reflection/TypeDescriptionSearchDepth,
com/sun/star/reflection/XArrayTypeDescription,
com/sun/star/reflection/XCompoundTypeDescription,
com/sun/star/reflection/XEnumTypeDescription,
+com/sun/star/reflection/XIdlArray,
com/sun/star/reflection/XIdlClass,
+com/sun/star/reflection/XIdlField,
com/sun/star/reflection/XIdlField2,
+com/sun/star/reflection/XIdlMethod,
com/sun/star/reflection/XIdlReflection,
com/sun/star/reflection/XIndirectTypeDescription,
com/sun/star/reflection/XInterfaceAttributeTypeDescription,
@@ -119,18 +136,28 @@ bool isBootstrapType(rtl::OString const name) {
com/sun/star/reflection/XMethodParameter,
com/sun/star/reflection/XStructTypeDescription,
com/sun/star/reflection/XTypeDescription,
+com/sun/star/reflection/XTypeDescriptionEnumeration,
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/templatedlg.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 1b0f568853a04158d69e49edbc77a0f3464e5fa1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 15 16:34:46 2013 +0100
silence Non-Layout Enabled Page is visible warning
Change-Id: Ib5de02d774e2d47ad0dbc36444a50e03b539
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 1da6adb..22271ba 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -165,10 +165,15 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
mbIsSynced(false),
maRepositories()
{
+maTabPage.Hide();
maTabControl.SetTabPage( FILTER_DOCS, maTabPage );
+maTabPage.Hide();
maTabControl.SetTabPage( FILTER_SHEETS, maTabPage );
+maTabPage.Hide();
maTabControl.SetTabPage( FILTER_PRESENTATIONS, maTabPage );
+maTabPage.Hide();
maTabControl.SetTabPage( FILTER_DRAWS, maTabPage );
+maTabPage.Show();
// Create popup menus
mpActionMenu = new PopupMenu;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic
vcl/generic/fontmanager/fontmanager.cxx | 33
1 file changed, 33 insertions(+)
New commits:
commit 22e58528fed41b15d242eb9e85dc25c51ec01e4d
Author: Caolán McNamara caol...@redhat.com
Date: Sat Oct 5 10:32:12 2013 +0100
CID#736943 clamp no of ttc entries to physical max
Change-Id: Ic63defe9c14c6ee2b86bd5b7730a570238ca3981
(cherry picked from commit 225539ab08043b6937fdd67d9ae308ebd4104646)
Reviewed-on: https://gerrit.libreoffice.org/6150
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index d3adb50..418f480 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1175,6 +1175,39 @@ bool PrintFontManager::analyzeFontFile( int nDirID,
const OString rFontFile, ::
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, ttc: %s contains %d fonts\n,
aFullPath.getStr(), nLength );
#endif
+
+sal_uInt64 fileSize;
+
+OUString aURL;
+if
(!osl::File::getFileURLFromSystemPath(OStringToOUString(aFullPath,
osl_getThreadTextEncoding()),
+aURL))
+{
+fileSize = 0;
+}
+else
+{
+osl::File aFile(aURL);
+if (aFile.open(osl_File_OpenFlag_Read |
osl_File_OpenFlag_NoLock) != osl::File::E_None)
+fileSize = 0;
+else
+{
+osl::DirectoryItem aItem;
+osl::DirectoryItem::get( aURL, aItem );
+osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize
);
+aItem.getFileStatus( aFileStatus );
+fileSize = aFileStatus.getFileSize();
+}
+}
+
+//Feel free to calc the exact max possible number of fonts a file
+//could contain given its physical size. But this will clamp it to
+//a sane starting point
+//http://processingjs.nihongoresources.com/the_smallest_font/
+//https://github.com/grzegorzrolek/null-ttf
+int nMaxFontsPossible = fileSize / 528;
+
+nLength = std::min(nLength, nMaxFontsPossible);
+
for( int i = 0; i nLength; i++ )
{
TrueTypeFontFile* pFont = new TrueTypeFontFile();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: hanging indent
Hi Russel, On Mon, Oct 14, 2013 at 04:20:07AM +, Russell Schmitt russjennschmi...@juno.com wrote: Would like to assist in restoring the ability to save hanging indent in Impress, but would appreciate info on how to begin. Thank you Just curious, is there a bugreport where this regression is described? Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/generic
vcl/generic/fontmanager/fontmanager.cxx | 33
1 file changed, 33 insertions(+)
New commits:
commit c3e4ad052f7fceda20441809e48573dc6a1589ae
Author: Caolán McNamara caol...@redhat.com
Date: Sat Oct 5 10:32:12 2013 +0100
CID#736943 clamp no of ttc entries to physical max
Change-Id: Ic63defe9c14c6ee2b86bd5b7730a570238ca3981
(cherry picked from commit 225539ab08043b6937fdd67d9ae308ebd4104646)
Reviewed-on: https://gerrit.libreoffice.org/6149
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index aa84fc7..a915d7d 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1192,6 +1192,39 @@ bool PrintFontManager::analyzeFontFile( int nDirID,
const OString rFontFile, ::
#if OSL_DEBUG_LEVEL 1
fprintf( stderr, ttc: %s contains %d fonts\n,
aFullPath.getStr(), nLength );
#endif
+
+sal_uInt64 fileSize;
+
+OUString aURL;
+if
(!osl::File::getFileURLFromSystemPath(OStringToOUString(aFullPath,
osl_getThreadTextEncoding()),
+aURL))
+{
+fileSize = 0;
+}
+else
+{
+osl::File aFile(aURL);
+if (aFile.open(osl_File_OpenFlag_Read |
osl_File_OpenFlag_NoLock) != osl::File::E_None)
+fileSize = 0;
+else
+{
+osl::DirectoryItem aItem;
+osl::DirectoryItem::get( aURL, aItem );
+osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize
);
+aItem.getFileStatus( aFileStatus );
+fileSize = aFileStatus.getFileSize();
+}
+}
+
+//Feel free to calc the exact max possible number of fonts a file
+//could contain given its physical size. But this will clamp it to
+//a sane starting point
+//http://processingjs.nihongoresources.com/the_smallest_font/
+//https://github.com/grzegorzrolek/null-ttf
+int nMaxFontsPossible = fileSize / 528;
+
+nLength = std::min(nLength, nMaxFontsPossible);
+
for( int i = 0; i nLength; i++ )
{
TrueTypeFontFile* pFont = new TrueTypeFontFile();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Test failure
On Wed, Oct 09, 2013 at 04:56:18PM +0200, Stephan Bergmann sberg...@redhat.com wrote: ...not to mention gengal flashing windows at least on Mac OS X during a plain make. As a start, http://cgit.freedesktop.org/libreoffice/core/commit/?id=265c7d62364ab2382491367f66fc14b95681a5a7 enables all (except one) DOCX filter tests on Mac, if I hear no problems, I'll continue with enabling other formats as well (as my time / limited Mac access allows that). Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/hicontrast officecfg/registry sdext/source sd/source
dev/null |binary icon-themes/galaxy/sd/res/minimize_presi_80.png |binary icon-themes/hicontrast/cmd/lc_presentationminimizer.png |binary icon-themes/hicontrast/cmd/sc_presentationminimizer.png |binary icon-themes/hicontrast/sd/res/minimize_presi_80.png |binary officecfg/registry/data/org/openoffice/Office/Addons.xcu | 80 +- officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu | 4 officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs | 3 sd/source/ui/app/res_bmp.src | 8 + sd/source/ui/inc/res_bmp.hrc | 1 sdext/source/minimizer/optimizerdialog.cxx| 9 - 11 files changed, 25 insertions(+), 80 deletions(-) New commits: commit cc2a405915e82c4b332dd25457f76704dc536d7f Author: David Ostrovsky da...@ostrovsky.org Date: Tue Oct 15 17:37:59 2013 +0200 fdo#61950 De-extensionize presentation minimizer: post clean Change-Id: I7d21f1d67b13fcd83792503e8c72ccf16fbda1ec Reviewed-on: https://gerrit.libreoffice.org/6247 Reviewed-by: David Ostrovsky david.ostrov...@gmx.de Tested-by: David Ostrovsky david.ostrov...@gmx.de diff --git a/icon-themes/galaxy/minimizer/minimizepresi_80.png b/icon-themes/galaxy/sd/res/minimize_presi_80.png similarity index 100% rename from icon-themes/galaxy/minimizer/minimizepresi_80.png rename to icon-themes/galaxy/sd/res/minimize_presi_80.png diff --git a/icon-themes/hicontrast/minimizer/opt_26.png b/icon-themes/hicontrast/cmd/lc_presentationminimizer.png similarity index 100% rename from icon-themes/hicontrast/minimizer/opt_26.png rename to icon-themes/hicontrast/cmd/lc_presentationminimizer.png diff --git a/icon-themes/hicontrast/minimizer/opt_16.png b/icon-themes/hicontrast/cmd/sc_presentationminimizer.png similarity index 100% rename from icon-themes/hicontrast/minimizer/opt_16.png rename to icon-themes/hicontrast/cmd/sc_presentationminimizer.png diff --git a/icon-themes/hicontrast/minimizer/minimizepresi_80.png b/icon-themes/hicontrast/sd/res/minimize_presi_80.png similarity index 100% rename from icon-themes/hicontrast/minimizer/minimizepresi_80.png rename to icon-themes/hicontrast/sd/res/minimize_presi_80.png diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index b0caea2..cecba99 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -8,8 +8,8 @@ * -- oor:component-data xmlns:install=http://openoffice.org/2004/installation; xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; oor:name=Addons oor:package=org.openoffice.Office - node oor:name=AddonUI -node oor:name=OfficeToolBar install:module=librelogo + node oor:name=AddonUI install:module=librelogo +node oor:name=OfficeToolBar node oor:name=LibreLogo.OfficeToolBar oor:op=replace node oor:name=m01 oor:op=replace prop oor:name=Context oor:type=xs:string @@ -159,47 +159,8 @@ /node /node /node -node oor:name=OfficeMenuBarMerging - node oor:name=PresentationMinimizer oor:op=replace install:module=impress -node oor:name=Command1 oor:op=replace - prop oor:name=MergePoint -value.uno:ToolsMenu\.uno:AVMediaPlayer/value - /prop - prop oor:name=MergeCommand -valueAddAfter/value - /prop - prop oor:name=MergeFallback -valueAddPath/value - /prop - prop oor:name=MergeContext -valuecom.sun.star.presentation.PresentationDocument/value - /prop - node oor:name=MenuItems -node oor:name=PresentationMinimizerExecute1 oor:op=replace - prop oor:name=URL oor:type=xs:string -valueprivate:separator/value - /prop -/node -node oor:name=PresentationMinimizerExecute2 oor:op=replace - prop oor:name=URL oor:type=xs:string - valuevnd.com.sun.star.comp.PresentationMinimizer:execute/value - /prop -prop oor:name=Title oor:type=xs:string - value xml:lang=en-US~Minimize Presentation.../value -/prop -prop oor:name=Target oor:type=xs:string - value_self/value -/prop - prop oor:name=Context oor:type=xs:string -valuecom.sun.star.presentation.PresentationDocument/value - /prop -/node - /node -/node - /node -/node node
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basic/qa sal/qa sal/rtl
basic/qa/cppunit/test_scanner.cxx |4 +++-
sal/qa/rtl/math/test-rtl-math.cxx | 12
sal/rtl/math.cxx |6 ++
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit d8b9d9e84ef2e18bda11d51f6c9eb1fe4f1fb791
Author: Eike Rathke er...@redhat.com
Date: Mon Oct 14 14:55:23 2013 +0200
resolved fdo#70319 exponent must be followed by at least one digit
(cherry picked from commit f20feba4c43c34fd2ee05b4658b0de0248c08eb9)
work around crappy SbiScanner::NextSym(), fdo#70319
just to make test not fail that was wrong anyway
(cherry picked from commit 472ad8ba7ef99982025b37aba562f2135ca8a999)
Change-Id: Icdd22fa0f1efcdd18cfea7cb48e1cbf2cf8d3533
Reviewed-on: https://gerrit.libreoffice.org/6241
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index 9c8d388..acf740fb 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -647,6 +647,8 @@ namespace
CPPUNIT_ASSERT(symbols[1].text == cr);
CPPUNIT_ASSERT(errors == 0);
+/* FIXME: SbiScanner::NextSym() is total crap, the result of scanning
+ * 12e++3 should be something different than this.. */
symbols = getSymbols(source12, errors);
CPPUNIT_ASSERT(symbols.size() == 4);
CPPUNIT_ASSERT(symbols[0].number == 12);
@@ -655,7 +657,7 @@ namespace
CPPUNIT_ASSERT(symbols[2].number == 3);
CPPUNIT_ASSERT(symbols[2].type == SbxINTEGER);
CPPUNIT_ASSERT(symbols[3].text == cr);
-CPPUNIT_ASSERT(errors == 0);
+CPPUNIT_ASSERT(errors == 1);
symbols = getSymbols(source13, errors);
CPPUNIT_ASSERT(symbols.size() == 2);
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index c156c37..3ebdb15 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -72,9 +72,21 @@ public:
CPPUNIT_ASSERT_EQUAL(0.0, res);
}
+void test_stringToDouble_exponent_without_digit() {
+rtl_math_ConversionStatus status;
+sal_Int32 end;
+double res = rtl::math::stringToDouble(
+rtl::OUString(1e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(1.0, res);
+}
+
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(test_stringToDouble_good);
CPPUNIT_TEST(test_stringToDouble_bad);
+CPPUNIT_TEST(test_stringToDouble_exponent_without_digit);
CPPUNIT_TEST_SUITE_END();
};
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 590ea0e..f66039a 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -799,6 +799,7 @@ inline double stringToDouble(CharT const * pBegin, CharT
const * pEnd,
// Exponent
if (p != p0 p != pEnd (*p == CharT('E') || *p == CharT('e')))
{
+CharT const * const pExponent = p;
++p;
bool bExpSign;
if (p != pEnd *p == CharT('-'))
@@ -812,6 +813,7 @@ inline double stringToDouble(CharT const * pBegin, CharT
const * pEnd,
if (p != pEnd *p == CharT('+'))
++p;
}
+CharT const * const pFirstExpDigit = p;
if ( fVal == 0.0 )
{ // no matter what follows, zero stays zero, but carry on the
// offset
@@ -857,6 +859,10 @@ inline double stringToDouble(CharT const * pBegin, CharT
const * pEnd,
else
fVal = rtl::math::pow10Exp( fVal, nExp ); // normal
}
+else if (p == pFirstExpDigit)
+{ // no digits in exponent, reset end of scan
+p = pExponent;
+}
}
}
else if (p - p0 == 2 p != pEnd p[0] == CharT('#')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/inc svx/source
svx/inc/svx/fillctrl.hxx |2 --
svx/source/tbxctrls/fillctrl.cxx | 13 -
2 files changed, 15 deletions(-)
New commits:
commit 2fc5d2946561258b012b80443cac025d851afda8
Author: Armin Le Grand a...@apache.org
Date: Tue Oct 15 15:51:03 2013 +
i122738 corrected update of FillStyle/FillAttribute UI elements
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index caf0ee9..daa2b20 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -58,7 +58,6 @@ private:
SvxFillAttrBox* pFillAttrLB;
sal_BoolbUpdate;
-sal_BoolbIgnoreStatusUpdate;
sal_uInt16 eLastXFS;
public:
@@ -71,7 +70,6 @@ public:
const SfxPoolItem* pState );
voidUpdate( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
-voidIgnoreStatusUpdate( sal_Bool bSet );
};
//
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 2bb0e2c..1e00fe0 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -74,7 +74,6 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16
nSlotId, sal_uInt16 nId
pFillTypeLB ( NULL ),
pFillAttrLB ( NULL ),
bUpdate ( sal_False ),
-bIgnoreStatusUpdate( sal_False ),
eLastXFS( XFILL_NONE )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:FillColor )));
@@ -107,9 +106,6 @@ void SvxFillToolBoxControl::StateChanged(
{
bool bEnableControls = sal_False;
-if ( bIgnoreStatusUpdate )
-return;
-
if( eState == SFX_ITEM_DISABLED )
{
if( nSID == SID_ATTR_FILL_STYLE )
@@ -229,13 +225,6 @@ void SvxFillToolBoxControl::StateChanged(
//
-void SvxFillToolBoxControl::IgnoreStatusUpdate( sal_Bool bSet )
-{
-bIgnoreStatusUpdate = bSet;
-}
-
-//
-
void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{
if ( pStyleItem pState bUpdate )
@@ -686,10 +675,8 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox
)
aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
FillStyle ));
aXFillStyleItem.QueryValue( a );
aArgs[0].Value = a;
-( (SvxFillToolBoxControl*)GetData() )-IgnoreStatusUpdate( sal_True );
((SvxFillToolBoxControl*)GetData())-Dispatch(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( .uno:FillStyle )),
aArgs );
-( (SvxFillToolBoxControl*)GetData() )-IgnoreStatusUpdate( sal_False );
switch( eXFS )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configure.ac distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf distro-configs/OxygenOfficeWin32.conf distro-configs/README extensio
configure.ac | 63 +++
distro-configs/LibreOfficeMacOSX.conf|1
distro-configs/LibreOfficeWin32.conf |1
distro-configs/OxygenOfficeWin32.conf|1
distro-configs/README|7 +++
extensions/source/update/feed/updatefeed.cxx | 13 -
instsetoo_native/Module_instsetoo_native.mk |2
sdext/source/minimizer/fileopendialog.cxx| 31 +++--
8 files changed, 36 insertions(+), 83 deletions(-)
New commits:
commit a83b3b5d45ba516883e80eefd7c5f6785b8a567c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 18:24:14 2013 +0200
Minimizer: *.mini was saved w/o .odp etc. extension (and clean up)
Change-Id: I4626794f7816ae455a392cdc0acbac42c866fff4
diff --git a/sdext/source/minimizer/fileopendialog.cxx
b/sdext/source/minimizer/fileopendialog.cxx
index e7f42d4..d0b2761 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -46,8 +46,6 @@
#include com/sun/star/view/XControlAccess.hpp
#include com/sun/star/ucb/InteractiveAugmentedIOException.hpp
-#include rtl/ustrbuf.hxx
-
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -140,29 +138,14 @@ FileOpenDialog::FileOpenDialog( const Reference
XComponentContext rxContext
}
if ( aExtensions.getLength() )
{
-OUString aExtension = aExtensions[0];
-
-const char filter[] = *.;
-// the filter title must be formed in the same it is
currently done
-// in the internal implementation: UIName (.extension)
-OUStringBuffer aUIName;
-// the filter must be in the form *.extension
-OUStringBuffer aFilter;
-
-// form the title: UIName (.extension)
-aUIName.append( aIter-maUIName );
-aUIName.appendAscii( RTL_CONSTASCII_STRINGPARAM( (. ));
-aUIName.append( aExtension );
-aUIName.append( sal_Unicode( ')' ) );
-// form the filter: (*.extension)
-aFilter.appendAscii( RTL_CONSTASCII_STRINGPARAM( filter )
);
-aFilter.append( aExtensions[0] );
-
-mxFilePicker-appendFilter( aUIName.makeStringAndClear(),
- aFilter.makeStringAndClear()
);
-
+// The filter title must be formed in the same way it is
+// currently done in the internal implementation:
+OUString aTitle(
+aIter-maUIName + (. + aExtensions[0] + ));
+OUString aFilter(*. + aExtensions[0]);
+mxFilePicker-appendFilter(aTitle, aFilter);
if ( aIter-maFlags 0x100 )
-mxFilePicker-setCurrentFilter( aIter-maUIName );
+mxFilePicker-setCurrentFilter(aTitle);
}
}
}
commit 4fa1fa931e9d5d8300eb185cfcbf08dcf95787e1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 17:54:41 2013 +0200
Use OUString::replaceAll
Change-Id: Ide87f07a97a51d924947f7959016164b98ab43f9
diff --git a/extensions/source/update/feed/updatefeed.cxx
b/extensions/source/update/feed/updatefeed.cxx
index e18afa1..2274ad5 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -352,18 +352,7 @@ UpdateInformationProvider::UpdateInformationProvider(
OUString aUserAgent( ${$BRAND_BASE_DIR/ LIBO_ETC_FOLDER /
SAL_CONFIGFILE(version) :UpdateUserAgent} );
rtl::Bootstrap::expandMacros( aUserAgent );
-
-for (sal_Int32 i = 0;;) {
-i = aUserAgent.indexOfAsciiL(
-RTL_CONSTASCII_STRINGPARAM(PRODUCT), i);
-if (i == -1) {
-break;
-}
-aUserAgent = aUserAgent.replaceAt(
-i, RTL_CONSTASCII_LENGTH(PRODUCT), product);
-i += product.getLength();
-}
-
+aUserAgent = aUserAgent.replaceAll(PRODUCT, product);
SAL_INFO(extensions.update, UpdateUserAgent: aUserAgent);
m_aRequestHeaderList[0].First = Accept-Language;
commit 8fc7e560db11f424362c8effdeb61eb8d1526256
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 17:10:01 2013 +0200
Make building installation sets depend on --with-package-format=...
...instead of inconsitently having it depend on --enable-epm for some
platforms
and having it always enabled on Windows. Only Android and iOS are
presumably
still special and build any installation sets in their specific modules and
outside instsetoo_native.
One consequence is that for a non-Windows --enable-online-update
--without-package-format build,
ATTENTION master tinderbox uploaders (was: How are installation sets being built?)
On 10/11/2013 10:48 AM, Stephan Bergmann wrote: So, if there are no complaints coming, I'll change the meaning of --with-package-format so that only if --with-package-format=... is explicitly specified are installation sets (of the specified kinds) generated. Done with http://cgit.freedesktop.org/libreoffice/core/commit/?id=8fc7e560db11f424362c8effdeb61eb8d1526256 Make building installation sets depend on --with-package-format=... TDF release builds should not be affected negatively, as for those cases where https://wiki.documentfoundation.org/Development/ReleaseBuilds does not explicitly mention a --with-package-format=..., the relevant distro-configs/*.conf does now. But some of the tinderboxes that upload master dailies might suddenly stop to do so if they do not specify --with-package-format=... (either directly or indirectly via --with-distro=...). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - filter/source
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 56 ++
filter/source/graphicfilter/idxf/dxf2mtf.hxx |2
filter/source/graphicfilter/idxf/dxfblkrd.cxx | 16 +++
filter/source/graphicfilter/idxf/dxfblkrd.hxx |8 +--
filter/source/graphicfilter/idxf/dxfentrd.cxx | 56 +++---
filter/source/graphicfilter/idxf/dxfentrd.hxx | 28 ++---
filter/source/graphicfilter/idxf/dxfreprd.cxx |4 -
filter/source/graphicfilter/idxf/dxftblrd.cxx | 44 ++--
filter/source/graphicfilter/idxf/dxftblrd.hxx | 22 +-
9 files changed, 110 insertions(+), 126 deletions(-)
New commits:
commit 5b98ed53008ee715b992a99afd8db5cfd10781b6
Author: Michael Stahl mst...@redhat.com
Date: Sat Oct 5 23:12:40 2013 +0200
fdo#64400: DXF import filter: fix OUString handling
The DXF import filter stores all strings read from the file in
char[DXF_MAX_STRING_LEN+1] arrays, and then calls OUString constructor
with that which then asserts because the string is actually shorter than
the size of the array... avoid that by converting from char* to OString.
Actually this also fixes the actual bug: the weird lines in the exported
PDF were tiny Text elements from the document, repeated.
(cherry picked from commit 96852a89da058084b2acf5ff706d9679b127b29a)
Conflicts:
filter/source/graphicfilter/idxf/dxf2mtf.cxx
filter/source/graphicfilter/idxf/dxfblkrd.hxx
filter/source/graphicfilter/idxf/dxfentrd.hxx
filter/source/graphicfilter/idxf/dxftblrd.hxx
Change-Id: I93c52788f88fe5d21968d450d029ed5db101d88b
Reviewed-on: https://gerrit.libreoffice.org/6152
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit ac48e8c589233962bc68644b30bb184c3b0ee321)
Reviewed-on: https://gerrit.libreoffice.org/6217
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index c22e0a4..e4e9f17 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -52,9 +52,10 @@ long DXF2GDIMetaFile::GetEntityColor(const DXFBasicEntity
rE)
nColor=rE.nColor;
if (nColor==256) {
-if (rE.sLayer[0]=='0' rE.sLayer[1]==0) nColor=nParentLayerColor;
-else {
-pLayer=pDXF-aTables.SearchLayer(rE.sLayer);
+if (rE.m_sLayer.getLength() 2) {
+nColor=nParentLayerColor;
+} else {
+pLayer=pDXF-aTables.SearchLayer(rE.m_sLayer);
if (pLayer!=NULL) nColor=pLayer-nColor;
else nColor=nParentLayerColor;
}
@@ -63,12 +64,12 @@ long DXF2GDIMetaFile::GetEntityColor(const DXFBasicEntity
rE)
return nColor;
}
-DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
+DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(OString const rLineType)
{
const DXFLType * pLT;
DXFLineInfo aDXFLineInfo;
-pLT=pDXF-aTables.SearchLType(sLineType);
+pLT = pDXF-aTables.SearchLType(rLineType);
if (pLT==NULL || pLT-nDashCount == 0) {
aDXFLineInfo.eStyle = LINE_SOLID;
}
@@ -125,18 +126,23 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const
DXFBasicEntity rE)
aDXFLineInfo.fDotLen = 0;
aDXFLineInfo.fDistance = 0;
-if (strcmp(rE.sLineType,BYLAYER)==0) {
-if (rE.sLayer[0]=='0' rE.sLayer[1]==0)
aDXFLineInfo=aParentLayerDXFLineInfo;
-else {
-pLayer=pDXF-aTables.SearchLayer(rE.sLayer);
-if (pLayer!=NULL)
aDXFLineInfo=LTypeToDXFLineInfo(pLayer-sLineType);
+if (rE.m_sLineType == BYLAYER) {
+if (rE.m_sLayer.getLength() 2) {
+aDXFLineInfo=aParentLayerDXFLineInfo;
+} else {
+pLayer=pDXF-aTables.SearchLayer(rE.m_sLayer);
+if (pLayer!=NULL) {
+aDXFLineInfo = LTypeToDXFLineInfo(pLayer-m_sLineType);
+}
else aDXFLineInfo=aParentLayerDXFLineInfo;
}
}
-else if (strcmp(rE.sLineType,BYBLOCK)==0) {
+else if (rE.m_sLineType == BYBLOCK) {
aDXFLineInfo=aBlockDXFLineInfo;
}
-else aDXFLineInfo=LTypeToDXFLineInfo(rE.sLineType);
+else {
+aDXFLineInfo = LTypeToDXFLineInfo(rE.m_sLineType);
+}
return aDXFLineInfo;
}
@@ -415,7 +421,6 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity
rE, const DXFTransfor
double fA;
sal_uInt16 nHeight;
short nAng;
-rtl::OString aStr( rE.sText );
DXFTransform aT(
DXFTransform(rE.fXScale,rE.fHeight,1.0,rE.fRotAngle,rE.aP0), rTransform );
aT.TransDir(DXFVector(0,1,0),aV);
nHeight=(sal_uInt16)(aV.Abs()+0.5);
@@ -424,7 +429,8 @@ void DXF2GDIMetaFile::DrawTextEntity(const
Research on Open Source - Volunteers needed
Hello, my name is Igor Steinmacher and I am PhD student from Brazil and a Research Scholar at University of California, Irvine. I am conducting a research aiming at finding how to support new contributors during their first steps in the project. My final goal is to verify what kind of tooling is appropriate to support the newcomers overcoming their difficulties when they are willing to contribute to the project. The first step of my research is to find out what are the main obstacles and difficulties faced by these newcomers. My goal is to hear from the community itself, interviewing new contributors and core members. By having the information regarding the main problems, I will start figuring out which mechanisms can be applied to provide the support. I will keep the anonymity of interviewers and I have the commitment to publish/return the results of my research to the community. I need your help answering my interview. We will conduct the interviews via textual chat, and we can schedule it at the time that fits better for you. Please send me a private email if you are interested in supporting my research. I also request your help reaching out contributors so that I can gather the best information. The data will help gain insights about newcomer issues, and allow us to propose initiatives to alleviate the problems faced by newcomers, as a tentative to retain them. To volunteer you must be 18 years or older, be English speaking, and have experience in software development. Feel free to contact me in case you have any doubt or question regarding my research or the interview process. -- Igor Fabio Steinmacher Visiting Scholar in Dept of Informatics at UCI (http://www.informatics.uci .edu/) Faculty in Dept. of Computing at Universidade Tecnológica Federal do Paraná ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34555] Make cropping handles function available for all LibO applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 Jorendc jore...@libreoffice.org changed: What|Removed |Added CC||romano.signore...@gmail.com --- Comment #33 from Jorendc jore...@libreoffice.org --- *** Bug 70482 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38879] Add git history/log parser for tinderbox
https://bugs.freedesktop.org/show_bug.cgi?id=38879 --- Comment #8 from Lionel Elie Mamane lio...@mamane.lu --- (In reply to comment #7) The tinderbox script save the sha of the tips and the timestamp of when they _fetched_ but you cannot rely on the timestamp of the commits themselves as they are routinely not in chronological order. the commit timestamp is dated from when you created the commit... commit appears on HEAD when they are pushed... there can be a significant amount of time between the two event... drastic differences for feature branch that get integrated Just take a look at bcc239b405478040fda46d1bf1d4f3e38506d1a3 2013-07-29 and the next commit is 41d2036bee3279928903cdada115d3e3cd022a06 2012-12-18 That's because you look at AuthorDate, and not at CommitDate. CommitDate is usually in order. Theoretically, they could not be, but that's only if the clock on the machine doing the rebase / merge / ... is wrong. $ git log --pretty=fuller 41d2036bee3279928903cdada115d3e3cd022a06 commit 41d2036bee3279928903cdada115d3e3cd022a06 Author: Herbert Dürr h...@apache.org AuthorDate: Tue Dec 18 15:25:42 2012 + Commit: Caolán McNamara caol...@redhat.com CommitDate: Mon Jul 29 11:28:04 2013 +0100 Resolves: #i121406# support the OSX=10.7 fullscreen mode based on OSX Spaces commit bcc239b405478040fda46d1bf1d4f3e38506d1a3 Author: Caolán McNamara caol...@redhat.com AuthorDate: Mon Jul 29 11:17:11 2013 +0100 Commit: Gerrit Code Review ger...@vm2.documentfoundation.org CommitDate: Mon Jul 29 10:17:42 2013 + Updated core Project: help 60eaec58845c8f697c2d7ab5bb671273b0ff4155 -- 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: include/touch sw/source vcl/ios
include/touch/touch.h|4 -
sw/source/ui/uiview/viewport.cxx | 106 +--
vcl/ios/iosinst.cxx |8 +-
3 files changed, 33 insertions(+), 85 deletions(-)
New commits:
commit 79d83741eb0d60d741415de8b8f01b3ef8510ae2
Author: p...@cloudon.com p...@cloudon.com
Date: Tue Oct 15 20:21:17 2013 +0200
New iOS client code
does not work yet - needs fix by tor after refactoring of ios-bootstrap.h
Change-Id: I0728306beb734511bd3f16e2e4922fd726bb37da
diff --git a/include/touch/touch.h b/include/touch/touch.h
index 1f0d7ef..1d93e65 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -58,9 +58,9 @@ void touch_lo_pan(int deltaX, int deltaY);
void touch_lo_zoom(int x, int y, float scale);
void touch_lo_keyboard_input(int c);
-typedef enum { DOWN, MOVE, UP} LOMouseButtonState;
+typedef enum { DOWN, MOVE, UP} MLOMouseButtonState;
-void touch_lo_mouse_drag(int x, int y, LOMouseButtonState state);
+void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
#ifdef __cplusplus
}
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 9a0125e..a5fb8de 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1262,95 +1262,43 @@ sal_Bool SwView::HandleWheelCommands( const
CommandEvent rCEvt )
}
else if( COMMAND_WHEEL_ZOOM_SCALE == pWData-GetMode() )
{
-// COMMAND_WHEEL_ZOOM_SCALE is de facto used only for Android and iOS,
I think
-
// mobile touch zoom (pinch) section
-// last location in pixels is defaulted to an illegal location
-// (coordinates are always positive)
-static Point lastLocationInPixels(0,0);
-static const double NEW_ZOOM_START= -.66;
-static double initialZoom = NEW_ZOOM_START;
-static int rememberedZoom = 0;
-
-// the target should remain the same in logic, regardless of eventual
zoom
-const Point targetInLogic =
GetEditWin().PixelToLogic(rCEvt.GetMousePosPixel());
-double scale = double(pWData-GetDelta()) /
double(MOBILE_ZOOM_SCALE_MULTIPLIER);
-
-if( scale==0 )
-{
-// scale 0, means end of gesture, and zoom resets
-rememberedZoom=0;
-}
-else
-{
-int preZoomByVCL = m_pWrtShell-GetViewOptions()-GetZoom();
-bool isFirst = rememberedZoom != preZoomByVCL;
-
-if( isFirst )
-{
-// If this is the start of a new zoom action, we take the
value from VCL.
-// Otherwise, we remeber the zoom from the previous action.
-// This way we can be more accurate than VCL
-initialZoom =(double) preZoomByVCL;
-}
+// remember the center location to reach in logic
-// each zooming event is scaling the initial zoom
-int zoomTarget = int(initialZoom * scale);
+Size winSize = GetViewFrame()-GetWindow().GetOutputSizePixel();
+Point centerInPixels(winSize.getWidth() / 2, winSize.getHeight() / 2);
+const Point preZoomTargetCenterInLogic =
GetEditWin().PixelToLogic(centerInPixels);
-// thresholding the zoom
-zoomTarget = std::max( MOBILE_MAX_ZOOM_OUT, std::min(
MOBILE_MAX_ZOOM_IN, zoomTarget ) );
-long deltaX = 0, deltaY = 0;
+double scale = double(pWData-GetDelta()) /
double(MOBILE_ZOOM_SCALE_MULTIPLIER);
-// no point zooming if the target zoom is the same as the current
zoom
-if( zoomTarget != preZoomByVCL )
-{
+int preZoomByVCL = m_pWrtShell-GetViewOptions()-GetZoom();
-SetZoom( SVX_ZOOM_PERCENT, zoomTarget );
+// each zooming event is scaling the initial zoom
+int zoomTarget = int(preZoomByVCL * scale);
-// getting the VCL post zoom
-rememberedZoom = m_pWrtShell-GetViewOptions()-GetZoom();
-}
-else
-{
-rememberedZoom = preZoomByVCL;
-}
+// thresholding the zoom
+zoomTarget = std::max( MOBILE_MAX_ZOOM_OUT, std::min(
MOBILE_MAX_ZOOM_IN, zoomTarget ) );
-// if there was no zoom
-if( rememberedZoom == preZoomByVCL )
-{
-if( !isFirst )
-{
-// If this is not the first location of the zoom, there is
a valid last location.
-// Therefore, scroll the center of the gesture.
-// Explanation: without a zoom transpiring, the view will
not change.
-// Therefore, we do a simple scrolll from screen center to
screen center
-deltaX = rCEvt.GetMousePosPixel().X() -
lastLocationInPixels.X();
-deltaY = rCEvt.GetMousePosPixel().Y() -
lastLocationInPixels.Y();
-}
-}
[Bug 47958] gross cut/paste signal emission nonsense
https://bugs.freedesktop.org/show_bug.cgi?id=47958 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added Whiteboard|EasyHack,DifficultyInterest |EasyHack |ing,SkillCpp,TopicCleanup |DifficultyInteresting |target:4.2.0|SkillCpp TopicCleanup ||target:4.2.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 3 commits - formula/source include/formula sc/qa sc/source
formula/source/core/api/vectortoken.cxx | 11 +-
include/formula/vectortoken.hxx | 28 -
sc/qa/unit/ucalc.hxx|2
sc/qa/unit/ucalc_formula.cxx| 74 ++
sc/source/core/data/formulacell.cxx |4
sc/source/core/tool/formulagroup.cxx| 160
6 files changed, 230 insertions(+), 49 deletions(-)
New commits:
commit cec617679b765611a17cd95a08f6e7029de989f7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 15 16:07:08 2013 -0400
Right a new test case for fetching vector ref array.
This currently fails rightly.
Change-Id: Ic4d8d3d720b2ee879f963d1871dd8779461f352f
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 2c30f43..27bdaff 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -84,6 +84,7 @@ public:
void testRangeList();
void testInput();
+void testFetchVectorRefArray();
void testFormulaHashAndTag();
void testFormulaRefData();
void testFormulaCompiler();
@@ -288,6 +289,7 @@ public:
CPPUNIT_TEST(testSharedStringPool);
CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
+CPPUNIT_TEST(testFetchVectorRefArray);
CPPUNIT_TEST(testFormulaHashAndTag);
CPPUNIT_TEST(testFormulaRefData);
CPPUNIT_TEST(testFormulaCompiler);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index e85c01c55..ba73d11 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -16,15 +16,89 @@
#include refdata.hxx
#include scopetools.hxx
#include formulacell.hxx
+#include formulagroup.hxx
#include inputopt.hxx
#include scmod.hxx
#include docsh.hxx
#include docfunc.hxx
+#include formula/vectortoken.hxx
+
#include boost/scoped_ptr.hpp
using namespace formula;
+void Test::testFetchVectorRefArray()
+{
+m_pDoc-InsertTab(0, Test);
+
+// All numeric cells in Column A.
+m_pDoc-SetValue(ScAddress(0,0,0), 1);
+m_pDoc-SetValue(ScAddress(0,1,0), 2);
+m_pDoc-SetValue(ScAddress(0,2,0), 3);
+m_pDoc-SetValue(ScAddress(0,3,0), 4);
+
+sc::FormulaGroupContext aCxt;
+formula::VectorRefArray aArray = m_pDoc-FetchVectorRefArray(aCxt,
ScAddress(0,0,0), 4);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array is expected to be numeric cells only.,
!aArray.mpStringArray);
+CPPUNIT_ASSERT_EQUAL(1.0, aArray.mpNumericArray[0]);
+CPPUNIT_ASSERT_EQUAL(2.0, aArray.mpNumericArray[1]);
+CPPUNIT_ASSERT_EQUAL(3.0, aArray.mpNumericArray[2]);
+CPPUNIT_ASSERT_EQUAL(4.0, aArray.mpNumericArray[3]);
+
+aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(0,0,0), 5);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array is expected to be numeric cells only.,
!aArray.mpStringArray);
+CPPUNIT_ASSERT_EQUAL(1.0, aArray.mpNumericArray[0]);
+CPPUNIT_ASSERT_EQUAL(2.0, aArray.mpNumericArray[1]);
+CPPUNIT_ASSERT_EQUAL(3.0, aArray.mpNumericArray[2]);
+CPPUNIT_ASSERT_EQUAL(4.0, aArray.mpNumericArray[3]);
+CPPUNIT_ASSERT_MESSAGE(Empty cell should be represented by a NaN.,
rtl::math::isNan(aArray.mpNumericArray[4]));
+
+// All string cells in Column B. Note that the fetched string arrays are
+// only to be compared case-insensitively. Right now, we use upper cased
+// strings to achieve case-insensitive-ness, but that may change. So,
+// don't count on that.
+m_pDoc-SetString(ScAddress(1,0,0), Andy);
+m_pDoc-SetString(ScAddress(1,1,0), Bruce);
+m_pDoc-SetString(ScAddress(1,2,0), Charlie);
+m_pDoc-SetString(ScAddress(1,3,0), David);
+aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(1,0,0), 5);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array is expected to be string cells only.,
!aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[0]).equalsIgnoreAsciiCaseAscii(Andy));
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[1]).equalsIgnoreAsciiCaseAscii(Bruce));
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[2]).equalsIgnoreAsciiCaseAscii(Charlie));
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[3]).equalsIgnoreAsciiCaseAscii(David));
+CPPUNIT_ASSERT_MESSAGE(Empty cell should be represented by a NULL
pointer., !aArray.mpStringArray[4]);
+
+// Mixture of numeric, string, and empty cells in Column C.
+m_pDoc-SetString(ScAddress(2,0,0), Header);
+m_pDoc-SetValue(ScAddress(2,1,0), 11);
+m_pDoc-SetValue(ScAddress(2,2,0), 12);
+m_pDoc-SetValue(ScAddress(2,3,0), 13);
+m_pDoc-SetString(ScAddress(2,5,0), =SUM(C2:C4));
+m_pDoc-CalcAll();
+
+
[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 7 commits - include/sax sax/CppunitTest_sax_parser.mk sax/Module_sax.mk sax/qa sax/source
include/sax/fastattribs.hxx |5
sax/CppunitTest_sax_parser.mk| 43 +++
sax/Module_sax.mk|9 -
sax/qa/cppunit/parser.cxx| 108 +++
sax/source/fastparser/fastparser.cxx | 198 ++-
sax/source/fastparser/fastparser.hxx | 44 ---
sax/source/tools/fastattribs.cxx | 73 ++--
7 files changed, 324 insertions(+), 156 deletions(-)
New commits:
commit d574f3781717add908985d74d2f568effaea2d5a
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Oct 15 17:28:35 2013 +0200
sax: add unittest for fastparser
Adapt FastSaxParser so that it does not require XFastDocumentHandler.
Change-Id: I7af49752dfbb4b55b8dde094fe6b762bd179be78
diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk
new file mode 100644
index 000..ed2176d
--- /dev/null
+++ b/sax/CppunitTest_sax_parser.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sax_parser))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sax_parser, \
+sax/qa/cppunit/parser \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sax_parser, \
+ comphelper \
+ cppu \
+ sal \
+ test \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sax_parser,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sax_parser))
+
+$(eval $(call gb_CppunitTest_use_components,sax_parser,\
+ configmgr/source/configmgr \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ oox/util/oox \
+ sax/source/fastparser/fastsax \
+ sfx2/util/sfx \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sax_parser))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
index 17c98c0..4352282 100644
--- a/sax/Module_sax.mk
+++ b/sax/Module_sax.mk
@@ -10,14 +10,15 @@
$(eval $(call gb_Module_Module,sax))
$(eval $(call gb_Module_add_targets,sax,\
-Library_expwrap \
-Library_fastsax \
-Library_sax \
+ Library_expwrap \
+ Library_fastsax \
+ Library_sax \
StaticLibrary_sax_shared \
))
$(eval $(call gb_Module_add_check_targets,sax,\
-CppunitTest_sax \
+ CppunitTest_sax \
+ CppunitTest_sax_parser \
))
# vim: set noet sw=4 ts=4:
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
new file mode 100644
index 000..861c53f
--- /dev/null
+++ b/sax/qa/cppunit/parser.cxx
@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include sal/config.h
+
+#include com/sun/star/io/Pipe.hpp
+#include com/sun/star/xml/sax/SAXParseException.hpp
+#include com/sun/star/xml/sax/XFastParser.hpp
+#include com/sun/star/xml/sax/XFastTokenHandler.hpp
+
+#include test/bootstrapfixture.hxx
+#include comphelper/componentcontext.hxx
+
+using namespace css;
+using namespace css::xml::sax;
+
+namespace {
+
+class ParserTest: public test::BootstrapFixture
+{
+InputSource maInput;
+uno::Reference XFastParser mxParser;
+uno::Reference XFastTokenHandler mxTokenHandler;
+uno::Reference XFastDocumentHandler mxDocumentHandler;
+
+public:
+virtual void setUp();
+virtual void tearDown();
+
+void parse();
+
+CPPUNIT_TEST_SUITE(ParserTest);
+CPPUNIT_TEST(parse);
+CPPUNIT_TEST_SUITE_END();
+
+private:
+uno::Reference io::XInputStream createStream(OString sInput);
+};
+
+void ParserTest::setUp()
+{
+test::BootstrapFixture::setUp();
+mxParser.set( comphelper::ComponentContext(m_xContext).createComponent(
+com.sun.star.xml.sax.FastParser), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE(No FastParser!, mxParser.is());
+mxTokenHandler.set(
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/qa
Rebased ref, commits from common ancestor:
commit 5bc9718a4585cf70dc7d01fadb757d8d854beb84
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 15 16:07:08 2013 -0400
Write a new test case for fetching vector ref array.
This currently fails rightly.
Change-Id: Ic4d8d3d720b2ee879f963d1871dd8779461f352f
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 2c30f43..27bdaff 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -84,6 +84,7 @@ public:
void testRangeList();
void testInput();
+void testFetchVectorRefArray();
void testFormulaHashAndTag();
void testFormulaRefData();
void testFormulaCompiler();
@@ -288,6 +289,7 @@ public:
CPPUNIT_TEST(testSharedStringPool);
CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
+CPPUNIT_TEST(testFetchVectorRefArray);
CPPUNIT_TEST(testFormulaHashAndTag);
CPPUNIT_TEST(testFormulaRefData);
CPPUNIT_TEST(testFormulaCompiler);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index e85c01c55..ba73d11 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -16,15 +16,89 @@
#include refdata.hxx
#include scopetools.hxx
#include formulacell.hxx
+#include formulagroup.hxx
#include inputopt.hxx
#include scmod.hxx
#include docsh.hxx
#include docfunc.hxx
+#include formula/vectortoken.hxx
+
#include boost/scoped_ptr.hpp
using namespace formula;
+void Test::testFetchVectorRefArray()
+{
+m_pDoc-InsertTab(0, Test);
+
+// All numeric cells in Column A.
+m_pDoc-SetValue(ScAddress(0,0,0), 1);
+m_pDoc-SetValue(ScAddress(0,1,0), 2);
+m_pDoc-SetValue(ScAddress(0,2,0), 3);
+m_pDoc-SetValue(ScAddress(0,3,0), 4);
+
+sc::FormulaGroupContext aCxt;
+formula::VectorRefArray aArray = m_pDoc-FetchVectorRefArray(aCxt,
ScAddress(0,0,0), 4);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array is expected to be numeric cells only.,
!aArray.mpStringArray);
+CPPUNIT_ASSERT_EQUAL(1.0, aArray.mpNumericArray[0]);
+CPPUNIT_ASSERT_EQUAL(2.0, aArray.mpNumericArray[1]);
+CPPUNIT_ASSERT_EQUAL(3.0, aArray.mpNumericArray[2]);
+CPPUNIT_ASSERT_EQUAL(4.0, aArray.mpNumericArray[3]);
+
+aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(0,0,0), 5);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array is expected to be numeric cells only.,
!aArray.mpStringArray);
+CPPUNIT_ASSERT_EQUAL(1.0, aArray.mpNumericArray[0]);
+CPPUNIT_ASSERT_EQUAL(2.0, aArray.mpNumericArray[1]);
+CPPUNIT_ASSERT_EQUAL(3.0, aArray.mpNumericArray[2]);
+CPPUNIT_ASSERT_EQUAL(4.0, aArray.mpNumericArray[3]);
+CPPUNIT_ASSERT_MESSAGE(Empty cell should be represented by a NaN.,
rtl::math::isNan(aArray.mpNumericArray[4]));
+
+// All string cells in Column B. Note that the fetched string arrays are
+// only to be compared case-insensitively. Right now, we use upper cased
+// strings to achieve case-insensitive-ness, but that may change. So,
+// don't count on that.
+m_pDoc-SetString(ScAddress(1,0,0), Andy);
+m_pDoc-SetString(ScAddress(1,1,0), Bruce);
+m_pDoc-SetString(ScAddress(1,2,0), Charlie);
+m_pDoc-SetString(ScAddress(1,3,0), David);
+aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(1,0,0), 5);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array is expected to be string cells only.,
!aArray.mpNumericArray);
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[0]).equalsIgnoreAsciiCaseAscii(Andy));
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[1]).equalsIgnoreAsciiCaseAscii(Bruce));
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[2]).equalsIgnoreAsciiCaseAscii(Charlie));
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[3]).equalsIgnoreAsciiCaseAscii(David));
+CPPUNIT_ASSERT_MESSAGE(Empty cell should be represented by a NULL
pointer., !aArray.mpStringArray[4]);
+
+// Mixture of numeric, string, and empty cells in Column C.
+m_pDoc-SetString(ScAddress(2,0,0), Header);
+m_pDoc-SetValue(ScAddress(2,1,0), 11);
+m_pDoc-SetValue(ScAddress(2,2,0), 12);
+m_pDoc-SetValue(ScAddress(2,3,0), 13);
+m_pDoc-SetString(ScAddress(2,5,0), =SUM(C2:C4));
+m_pDoc-CalcAll();
+
+aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(2,0,0), 7);
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
+CPPUNIT_ASSERT_MESSAGE(Array should have both numeric and string
arrays., aArray.mpNumericArray aArray.mpStringArray);
+CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - formula/source include/formula
formula/source/core/api/vectortoken.cxx |2 ++
include/formula/vectortoken.hxx |1 +
2 files changed, 3 insertions(+)
New commits:
commit 6ba3d3ec90bfd5841a9b383c6400bc71c424f645
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 15 16:37:14 2013 -0400
New constructor that takes both numeric and string arrays.
Change-Id: I9c48f340a0349e5f1ba772fcd783924c79b07616
diff --git a/formula/source/core/api/vectortoken.cxx
b/formula/source/core/api/vectortoken.cxx
index 55ab18e..961eda6 100644
--- a/formula/source/core/api/vectortoken.cxx
+++ b/formula/source/core/api/vectortoken.cxx
@@ -14,6 +14,8 @@ namespace formula {
VectorRefArray::VectorRefArray() : mpNumericArray(NULL), mpStringArray(NULL) {}
VectorRefArray::VectorRefArray( const double* pArray ) :
mpNumericArray(pArray), mpStringArray(NULL) {}
VectorRefArray::VectorRefArray( rtl_uString** pArray ) : mpNumericArray(NULL),
mpStringArray(pArray) {}
+VectorRefArray::VectorRefArray( const double* pNumArray, rtl_uString**
pStrArray ) :
+mpNumericArray(pNumArray), mpStringArray(pStrArray) {}
bool VectorRefArray::isValid() const
{
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 3b1db68..0d3cbf7 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -40,6 +40,7 @@ struct FORMULA_DLLPUBLIC VectorRefArray
VectorRefArray();
VectorRefArray( const double* pArray );
VectorRefArray( rtl_uString** pArray );
+VectorRefArray( const double* pNumArray, rtl_uString** pStrArray );
bool isValid() const;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configmgr/source extensions/source include/rtl unoidl/source
configmgr/source/access.cxx | 10 +
configmgr/source/components.cxx | 16 --
configmgr/source/data.cxx| 11 -
extensions/source/update/check/download.cxx |6 -
extensions/source/update/check/updatecheckconfig.cxx |7 -
extensions/source/update/check/updatehdl.cxx | 46 ++--
extensions/source/update/check/updatehdl.hxx |1
include/rtl/string.hxx | 47 ++--
include/rtl/ustring.hxx | 109 ++-
unoidl/source/sourceprovider-parser.y|7 -
unoidl/source/unoidl-read.cxx|3
unoidl/source/unoidl-write.cxx |3
12 files changed, 156 insertions(+), 110 deletions(-)
New commits:
commit d9da04ddc1d72eea1a691652117d37319570fa31
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 22:52:13 2013 +0200
Some string clean-up
Change-Id: Ic046150605c599746ed3235c04bcbc981e18e589
diff --git a/extensions/source/update/check/download.cxx
b/extensions/source/update/check/download.cxx
index 093ef02..4809cf4 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -201,17 +201,17 @@ Download::getProxyForURL(const OUString rURL, OString
rHost, sal_Int32 rPort)
sal_Int32 nProxyType = aValue.get sal_Int32 ();
if( 0 != nProxyType ) // type 0 means direct connection to the internet
{
-if( rURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(http:)) )
+if( rURL.startsWith(http:) )
{
rHost = getStringValue(xNameAccess, ooInetHTTPProxyName);
rPort = getInt32Value(xNameAccess, ooInetHTTPProxyPort);
}
-else if( rURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(https:)) )
+else if( rURL.startsWith(https:) )
{
rHost = getStringValue(xNameAccess, ooInetHTTPSProxyName);
rPort = getInt32Value(xNameAccess, ooInetHTTPSProxyPort);
}
-else if( rURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(ftp:)) )
+else if( rURL.startsWith(ftp:) )
{
rHost = getStringValue(xNameAccess, ooInetFTPProxyName);
rPort = getInt32Value(xNameAccess, ooInetFTPProxyPort);
diff --git a/extensions/source/update/check/updatecheckconfig.cxx
b/extensions/source/update/check/updatecheckconfig.cxx
index d739bdc..198414a 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -592,16 +592,13 @@ UpdateCheckConfig::commitChanges()
for( sal_Int32 i=0; inChanges; ++i )
{
aChangesSet[i].Accessor = aString;
-
-// FIXME: use non IgnoreAsciiCase version as soon as it
becomes available
-if( aString.endsWithIgnoreAsciiCaseAsciiL(AUTOCHECK_ENABLED
'], sizeof(AUTOCHECK_ENABLED)+1) )
+if( aString.endsWith(AUTOCHECK_ENABLED ']) )
{
sal_Bool bEnabled = sal_False;
aChangesSet[i].Element = bEnabled;
m_rListener-autoCheckStatusChanged(sal_True == bEnabled);
}
-// FIXME: use non IgnoreAsciiCase version as soon as it
becomes available
-else if( aString.endsWithIgnoreAsciiCaseAsciiL(CHECK_INTERVAL
'], sizeof(CHECK_INTERVAL)+1) )
+else if( aString.endsWith(CHECK_INTERVAL ']) )
{
m_rListener-autoCheckIntervalChanged();
}
diff --git a/extensions/source/update/check/updatehdl.cxx
b/extensions/source/update/check/updatehdl.cxx
index 86fc8ff..57ff85f 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -611,20 +611,6 @@ void UpdateHandler::updateState( UpdateState eState )
}
//
-void UpdateHandler::searchAndReplaceAll( OUString rText,
- const OUString rWhat,
- const OUString rWith ) const
-{
-sal_Int32 nIndex = rText.indexOf( rWhat );
-
-while ( nIndex != -1 )
-{
-rText = rText.replaceAt( nIndex, rWhat.getLength(), rWith );
-nIndex = rText.indexOf( rWhat, nIndex );
-}
-}
-
-//
OUString UpdateHandler::loadString( const uno::Reference
resource::XResourceBundle xBundle,
sal_Int32 nResourceId ) const
{
@@ -646,14 +632,11 @@ OUString UpdateHandler::loadString( const uno::Reference
resource::XResourceBun
OUString UpdateHandler::substVariables( const OUString rSource ) const
{
-OUString sString( rSource );
-
-searchAndReplaceAll( sString, %NEXTVERSION, msNextVersion );
-
[Libreoffice-commits] core.git: 10 commits - configure.ac ios/.gitignore ios/lo.xcconfig ios/lo.xcconfig.in ios/MobileLibreOffice ios/shared
configure.ac |6 ++--
ios/.gitignore|9 ++
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |4 ++
ios/lo.xcconfig |8 -
ios/lo.xcconfig.in| 12
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 14
+-
ios/shared/ios_sharedlo/objective_c/gestures/MLOGestureEngine.m |2 -
ios/shared/ios_sharedlo/objective_c/render/MLORenderManager.m |4 ++
8 files changed, 40 insertions(+), 19 deletions(-)
New commits:
commit 4afeb5c4adbb6907ca9d6cbcc2036ea2bc83f4a8
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 16 00:15:51 2013 +0300
Adapt to recent changes in solver/instdir/workdir structure
Change-Id: I1286feafa1a11fe30aa4f8383c094661aa10db92
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 846a923..19fbb87 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1491,7 +1491,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript =
dest_lib=lib_link\ndest_resource=resource_link\nsrc=$OUTDIR\nsrc2=$INSTDIR\nproduct_ver=`sed
-ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib
$dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in
$src/lib/*.a; do\nln $file $dest_lib/${file##*/}\ndone\n\n# Resources
#\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $src/bin/offapi.rdb
$dest_resource\ncp $src/bin/udkapi.rdb $dest_resource\ncp
$src/bin/oovbaapi.rdb$dest_resource\ncp $src/xml/services.rdb
$dest_resource\ncp $src/xml/ure/services.rdb$dest_resource/ure\n\n# copy
\registry\ files\nmkdir -p $dest_resource/registry/modules
$dest_resource/registry/res\ncp $src/xml/*.xcd $dest_resource/registry\nmv
$dest_resource/registry/fcfg_langpack_en-US.xcd $dest_resource/registry/res\ncp
-R $src/xml/registry/* $dest_resource/registry\n\n# copy .res files\n# progr
am/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n# we could set
STAR_RESOURCE_PATH instead. sigh...\nmkdir -p
$dest_resource/program/resource\ncp $src/bin/*en-US.res
$dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p
$dest_resource/share/config\ncp -R $src2/share/config/soffice.cfg
$dest_resource/share/config\n\n# \registry\\nmkdir -p
$dest_resource/share/registry/res\ncp $src/xml/*.xcd
$dest_resource/share/registry\nmv
$dest_resource/share/registry/fcfg_langpack_en-US.xcd
$dest_resource/share/registry/res\ncp -R $src/xml/registry/*
$dest_resource/share/registry\n\n# Set up rc, the \inifile\. See
getIniFileName_Impl().\nfile=$dest_resource/rc\necho '[Bootstrap]'
$file\necho
'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' $file\necho
'HOME=$APP_DATA_DIR/tmp'$file\n\n# Set up
fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all thes
e?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'
$file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR'
$file\necho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/registry
module:${BRAND_BASE_DIR}/registry/modules res:${BRAND_BASE_DIR}/registry'
$file\n\nfile=$dest_resource/unorc\necho '[Bootstrap]' $file\n\n# bootstraprc
must be in $BRAND_BASE_DIR/program\nmkdir -p
$dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho
'[Bootstrap]'
$file\necho 'InstallMode=installmode'
$file\necho \ProductKey=LibreOffice $product_ver\
$file\necho
'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'
$file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho
'[Version]' $file\necho 'AllLanguages=en-U
S'$file\necho 'BuildVersion=' $file\necho \buildid=$buildid\
$file\necho 'ProductMajor=360' $file\necho 'ProductMinor=1'
$file\n ;
+ shellScript = set
-x\ndest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne
's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib
$dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in
$OUTDIR/lib/*.a; do\nln $file
[Libreoffice-commits] core.git: 2 commits - ios/MobileLibreOffice
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 66
+++---
1 file changed, 21 insertions(+), 45 deletions(-)
New commits:
commit a359bc887aaab85106c3822fc147936ab3391029
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 16 00:49:49 2013 +0300
Adapt library names and paths to current build system
For many 3rd-party libraries we have for some time already kept the
archives only in their build directories, under workdir's
UnpackedTarball. Also, we now use upstream names for them which often
contain a verison number.
Change-Id: I51888de287e2c352a890bd4ae1dfdf0c6dc77158
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 5c39b8b..018f9ab 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -115,7 +115,7 @@
68B9A227180BDB7F00FFEA35 /* libexplo.a in Frameworks */ = {isa
= PBXBuildFile; fileRef = 68B9A126180BDB7E00FFEA35 /* libexplo.a */; };
68B9A228180BDB7F00FFEA35 /* libexpwraplo.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A127180BDB7E00FFEA35 /* libexpwraplo.a */; };
68B9A229180BDB7F00FFEA35 /* libexslt.a in Frameworks */ = {isa
= PBXBuildFile; fileRef = 68B9A128180BDB7E00FFEA35 /* libexslt.a */; };
- 68B9A22A180BDB7F00FFEA35 /* libexttextcat.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A129180BDB7E00FFEA35 /* libexttextcat.a */;
};
+ 68B9A22A180BDB7F00FFEA35 /* libexttextcat-2.0.a in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 68B9A129180BDB7E00FFEA35 /*
libexttextcat-2.0.a */; };
68B9A22B180BDB7F00FFEA35 /* libfastsaxlo.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A12A180BDB7E00FFEA35 /* libfastsaxlo.a */; };
68B9A22C180BDB7F00FFEA35 /* libfileacc.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A12B180BDB7E00FFEA35 /* libfileacc.a */; };
68B9A22D180BDB7F00FFEA35 /* libfilelo.a in Frameworks */ = {isa
= PBXBuildFile; fileRef = 68B9A12C180BDB7E00FFEA35 /* libfilelo.a */; };
@@ -138,7 +138,7 @@
68B9A23E180BDB7F00FFEA35 /* libgraphicfilterlo.a in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 68B9A13D180BDB7E00FFEA35 /*
libgraphicfilterlo.a */; };
68B9A23F180BDB7F00FFEA35 /* libguesslanglo.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A13E180BDB7E00FFEA35 /* libguesslanglo.a */;
};
68B9A240180BDB7F00FFEA35 /* libhatchwindowfactorylo.a in
Frameworks */ = {isa = PBXBuildFile; fileRef = 68B9A13F180BDB7E00FFEA35 /*
libhatchwindowfactorylo.a */; };
- 68B9A241180BDB7F00FFEA35 /* libhunspell.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A140180BDB7E00FFEA35 /* libhunspell.a */; };
+ 68B9A241180BDB7F00FFEA35 /* libhunspell-1.3.a in Frameworks */
= {isa = PBXBuildFile; fileRef = 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a
*/; };
68B9A242180BDB7F00FFEA35 /* libhwplo.a in Frameworks */ = {isa
= PBXBuildFile; fileRef = 68B9A141180BDB7E00FFEA35 /* libhwplo.a */; };
68B9A243180BDB7F00FFEA35 /* libhyphen.a in Frameworks */ = {isa
= PBXBuildFile; fileRef = 68B9A142180BDB7E00FFEA35 /* libhyphen.a */; };
68B9A244180BDB7F00FFEA35 /* libhyphenlo.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A143180BDB7E00FFEA35 /* libhyphenlo.a */; };
@@ -184,15 +184,15 @@
68B9A26C180BDB7F00FFEA35 /* libmtfrendererlo.a in Frameworks */
= {isa = PBXBuildFile; fileRef = 68B9A16B180BDB7E00FFEA35 /* libmtfrendererlo.a
*/; };
68B9A26D180BDB7F00FFEA35 /* libmwaw-0.1.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A16C180BDB7E00FFEA35 /* libmwaw-0.1.a */; };
68B9A26E180BDB7F00FFEA35 /* libmysqllo.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A16D180BDB7E00FFEA35 /* libmysqllo.a */; };
- 68B9A26F180BDB7F00FFEA35 /* libmythes.a in Frameworks */ = {isa
= PBXBuildFile; fileRef = 68B9A16E180BDB7E00FFEA35 /* libmythes.a */; };
+ 68B9A26F180BDB7F00FFEA35 /* libmythes-1.2.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A16E180BDB7E00FFEA35 /* libmythes-1.2.a */;
};
68B9A270180BDB7F00FFEA35 /* libnamingservicelo.a in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 68B9A16F180BDB7E00FFEA35 /*
libnamingservicelo.a */; };
68B9A271180BDB7F00FFEA35 /* libodfflatxmllo.a in Frameworks */
= {isa = PBXBuildFile; fileRef = 68B9A170180BDB7E00FFEA35 /* libodfflatxmllo.a
*/; };
68B9A272180BDB7F00FFEA35 /* libodfgen-0.0.a in Frameworks */ =
{isa = PBXBuildFile; fileRef = 68B9A171180BDB7E00FFEA35 /* libodfgen-0.0.a */;
};
68B9A273180BDB7F00FFEA35 /* liboffacclo.a in Frameworks */ =
{isa =
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/options/optsave.cxx | 35 ---
1 file changed, 16 insertions(+), 19 deletions(-)
New commits:
commit a17e221225915c140c7840904cb9b46d75731edc
Author: Ariel Constenla-Haile arie...@apache.org
Date: Tue Oct 15 21:17:30 2013 +
i122759 - Pass the Sequence by reference
Despite it's name, rProperties, the Sequence is not a reference in the
function signature.
Besides, some small improvements:
- remove the unused code related to the Flags
- instead of compareToAscii, use equalsAsciiL, which is optimized for
performance
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a67b864..99d58e6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -655,32 +655,29 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *,
pBox )
/* -05.04.01 13:10
---*/
-OUString lcl_ExtracUIName(const SequencePropertyValue rProperties)
+OUString lcl_ExtracUIName(const SequencePropertyValue rProperties)
{
-OUString sRet;
-sal_Int32 nFlags;
-const PropertyValue* pProperties = rProperties.getConstArray();
-for(int nProp = 0; nProp rProperties.getLength(); nProp++)
+OUString sName;
+const PropertyValue* pPropVal = rProperties.getConstArray();
+const PropertyValue* const pEnd = pPropVal + rProperties.getLength();
+for( ; pPropVal != pEnd; pPropVal++ )
{
-if(!pProperties[nProp].Name.compareToAscii(UIName))
+const OUString rName = pPropVal-Name;
+if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UIName ) ) )
{
-if ( pProperties[nProp].Value = sRet )
-break;
+OUString sUIName;
+if ( ( pPropVal-Value = sUIName ) sUIName.getLength() )
+return sUIName;
}
-else if(!pProperties[nProp].Name.compareToAscii(Flags))
+else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( Name ) ) )
{
-if ( pProperties[nProp].Value = nFlags )
-{
-nFlags = 0x100;
-}
-}
-else if(!pProperties[nProp].Name.compareToAscii(Name))
-{
-if ( !sRet.getLength() )
-pProperties[nProp].Value = sRet;
+pPropVal-Value = sName;
}
}
-return sRet;
+
+OSL_ENSURE( false, Filter without UIName! );
+
+return sName;
}
/* -05.04.01 13:37
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/MobileLibreOffice
ios/MobileLibreOffice/.gitignore |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0aca32e4c0dd01d1e034b8b48e37370c405fbf6f Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 16 01:12:42 2013 +0300 Ignore the lib_link and resource_link dirs Change-Id: Ib30199e3f193f9b98e9f0e2ec0d76953abf39a14 diff --git a/ios/MobileLibreOffice/.gitignore b/ios/MobileLibreOffice/.gitignore new file mode 100644 index 000..85f0b5d --- /dev/null +++ b/ios/MobileLibreOffice/.gitignore @@ -0,0 +1,2 @@ +/lib_link +/resource_link ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - 2 commits - chart2/source
chart2/source/view/inc/DummyXShape.hxx | 236
chart2/source/view/main/DummyXShape.cxx| 20 +
chart2/source/view/main/OpenglShapeFactory.cxx | 283 +++--
3 files changed, 426 insertions(+), 113 deletions(-)
New commits:
commit eaba48d9d542c9e598856d8dbb1b70761860c99f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Oct 16 00:36:23 2013 +0200
make the shapes explicit in the backend
Change-Id: Idf92176c66cefde3022cec2990c9711a1b49a111
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index ef117ab..0e5c4f7 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -14,7 +14,6 @@
#include com/sun/star/drawing/XShape.hpp
#include com/sun/star/drawing/XShapes.hpp
-#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/beans/XMultiPropertySet.hpp
#include com/sun/star/container/XNamed.hpp
#include com/sun/star/container/XChild.hpp
@@ -24,10 +23,41 @@
#include com/sun/star/uno/Type.h
#include com/sun/star/uno/Any.h
#include com/sun/star/lang/IndexOutOfBoundsException.hpp
+#include com/sun/star/beans/XPropertySet.hpp
+#include com/sun/star/drawing/CircleKind.hpp
+#include com/sun/star/drawing/DoubleSequence.hpp
+#include com/sun/star/drawing/FlagSequence.hpp
+#include com/sun/star/drawing/FillStyle.hpp
+#include com/sun/star/drawing/LineStyle.hpp
+#include com/sun/star/drawing/NormalsKind.hpp
+#include com/sun/star/drawing/PointSequence.hpp
+#include com/sun/star/drawing/PolygonKind.hpp
+#include com/sun/star/drawing/PolyPolygonBezierCoords.hpp
+#include com/sun/star/drawing/ProjectionMode.hpp
+#include com/sun/star/drawing/ShadeMode.hpp
+#include com/sun/star/drawing/TextFitToSizeType.hpp
+#include com/sun/star/drawing/TextHorizontalAdjust.hpp
+#include com/sun/star/drawing/TextureProjectionMode.hpp
+#include com/sun/star/drawing/TextVerticalAdjust.hpp
+#include com/sun/star/text/XText.hpp
+#include com/sun/star/uno/Any.hxx
+#include com/sun/star/drawing/PolyPolygonShape3D.hpp
+#include com/sun/star/drawing/Direction3D.hpp
+#include com/sun/star/drawing/Position3D.hpp
+#include com/sun/star/graphic/XGraphic.hpp
+#include com/sun/star/drawing/HomogenMatrix.hpp
+#include com/sun/star/drawing/PointSequenceSequence.hpp
+
+#include PropertyMapper.hxx
+#include VLineProperties.hxx
+#include Stripe.hxx
#include rtl/ustring.hxx
#include vector
+#include map
+
+using namespace com::sun::star;
namespace chart {
@@ -105,20 +135,193 @@ private:
com::sun::star::awt::Point maPosition;
com::sun::star::awt::Size maSize;
+std::mapOUString, uno::Any maProperties;
+
com::sun::star::uno::Reference com::sun::star::uno::XInterface mxParent;
DummyXShape* mpParent;
};
-class DummyChart : public DummyXShape
+class DummyCube : public DummyXShape
{
public:
-virtual DummyChart* getRootShape();
+DummyCube(const drawing::Position3D rPos, const drawing::Direction3D
rSize,
+sal_Int32 nRotateZAngleHundredthDegree, const uno::Reference
beans::XPropertySet xPropSet,
+const tPropertyNameMap rPropertyNaemMap, bool bRounded );
-OpenglContext* getGlContext() { return mpContext; }
+private:
+sal_Int32 mnRotateZAngleHundredthDegree;
+bool mbRounded;
+};
+class DummyCylinder : public DummyXShape
+{
+public:
+DummyCylinder(const drawing::Position3D, const drawing::Direction3D
rSize,
+sal_Int32 nRotateZAngleHundredthDegree );
private:
-OpenglContext* mpContext;
+sal_Int32 mnRotateZAngleHundredthDegree;
+bool mbRounded;
+};
+
+class DummyPyramid : public DummyXShape
+{
+public:
+DummyPyramid(const drawing::Position3D rPosition, const
drawing::Direction3D rSize,
+double fTopHeight, bool bRotateZ, uno::Reference
beans::XPropertySet xPropSet,
+const tPropertyNameMap rPropertyNameMap );
+
+private:
+double mfTopHeight;
+bool bRotateZ;
+};
+
+class DummyCone : public DummyXShape
+{
+public:
+DummyCone(const drawing::Position3D rPosition, const
drawing::Direction3D rSize,
+double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree);
+
+private:
+sal_Int32 mnRotateZAngleHundredthDegree;
+double mfTopHeight;
+};
+
+class DummyPieSegment2D : public DummyXShape
+{
+public:
+DummyPieSegment2D(double fUnitCircleStartAngleDegree, double
fUnitCircleWidthAngleDegree,
+double fUnitCircleInnerRadius, double fUnitCircleOuterRadius,
+const drawing::Direction3D rOffset, const drawing::HomogenMatrix
rUnitCircleToScene);
+
+private:
+double mfUnitCircleStartAngleDegree;
+double mfUnitCircleWidthAngleDegree;
+double mfUnitCircleInnerRadius;
+double mfUnitCircleOuterRadius;
+
+drawing::Direction3D maOffset;
+drawing::HomogenMatrix maUnitCircleToScene;
+};
+
+class DummyPieSegment : public DummyXShape
+{
+public:
+DummyPieSegment(double
[Libreoffice-commits] core.git: 3 commits - ios/MobileLibreOffice ios/shared
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
| 16 +-
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
|8 ++---
ios/shared/ios_sharedlo/objective_c/gestures/MLOKeyboardManager.m
|7
ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
|2 +
4 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit 5b0577885a686199a5dc1ff4d1b0e6bd87665f8e
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 16 01:39:49 2013 +0300
No mlo_select_all(), probably left out accidentally from Ptyl's commit
Change-Id: I1859f6c05f371fccdd39f903d663d5a452866876
diff --git
a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
index 79ccd4d..c9a75c4 100644
---
a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
+++
b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
@@ -33,9 +33,11 @@
-(void)loSelectAll:(id) sender{
+#if 0 // No mlo_select_all() anywhere !?
NSLog(@Calling mlo_select_all());
mlo_select_all();
NSLog(@mlo_select_all() returned. reshowing contextualMenu);
+#endif
[_selectionViewController showPostSelectAll];
}
commit de547ccddec1e59879b66f34e5a977dca08cec75
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 16 01:35:36 2013 +0300
Use libc++ here, too, as we now do for the LO code
Also quotes added by Xcode around library names that contain
nonalphanumerics.
Change-Id: Ie5b34b2da0ec5600e9ca1aba1e17efd7e3e087de
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 018f9ab..64aa6db 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -441,7 +441,7 @@
68B9A126180BDB7E00FFEA35 /* libexplo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libexplo.a; path =
lib_link/libexplo.a; sourceTree = group; };
68B9A127180BDB7E00FFEA35 /* libexpwraplo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libexpwraplo.a; path =
lib_link/libexpwraplo.a; sourceTree = group; };
68B9A128180BDB7E00FFEA35 /* libexslt.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libexslt.a; path =
lib_link/libexslt.a; sourceTree = group; };
- 68B9A129180BDB7E00FFEA35 /* libexttextcat-2.0.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libexttextcat-2.0.a;
path = lib_link/libexttextcat-2.0.a; sourceTree = group; };
+ 68B9A129180BDB7E00FFEA35 /* libexttextcat-2.0.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libexttextcat-2.0.a;
path = lib_link/libexttextcat-2.0.a; sourceTree = group; };
68B9A12A180BDB7E00FFEA35 /* libfastsaxlo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libfastsaxlo.a; path =
lib_link/libfastsaxlo.a; sourceTree = group; };
68B9A12B180BDB7E00FFEA35 /* libfileacc.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libfileacc.a; path =
lib_link/libfileacc.a; sourceTree = group; };
68B9A12C180BDB7E00FFEA35 /* libfilelo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libfilelo.a; path =
lib_link/libfilelo.a; sourceTree = group; };
@@ -464,7 +464,7 @@
68B9A13D180BDB7E00FFEA35 /* libgraphicfilterlo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libgraphicfilterlo.a;
path = lib_link/libgraphicfilterlo.a; sourceTree = group; };
68B9A13E180BDB7E00FFEA35 /* libguesslanglo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libguesslanglo.a; path
= lib_link/libguesslanglo.a; sourceTree = group; };
68B9A13F180BDB7E00FFEA35 /* libhatchwindowfactorylo.a */ = {isa
= PBXFileReference; lastKnownFileType = archive.ar; name =
libhatchwindowfactorylo.a; path = lib_link/libhatchwindowfactorylo.a;
sourceTree = group; };
- 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libhunspell-1.3.a;
path = lib_link/libhunspell-1.3.a; sourceTree = group; };
+ 68B9A140180BDB7E00FFEA35 /* libhunspell-1.3.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libhunspell-1.3.a;
path = lib_link/libhunspell-1.3.a; sourceTree = group; };
68B9A141180BDB7E00FFEA35 /* libhwplo.a */ = {isa =
PBXFileReference; lastKnownFileType = archive.ar; name = libhwplo.a; path =
lib_link/libhwplo.a;
[Libreoffice-commits] core.git: ios/MobileLibreOffice
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |2 --
1 file changed, 2 deletions(-)
New commits:
commit 0d9c32a8dfcdfc732ed5e04b001b1155b49dfa52
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 16 01:43:39 2013 +0300
No registry directly at top app level any more
Change-Id: Idc81f4913a96938f1fdd2644cc9e34a07554bb21
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 64aa6db..c5a6cf3 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
681D78BC180C12D300D52D5E /* oovbaapi.rdb in Resources */ = {isa
= PBXBuildFile; fileRef = 681D78B1180C12D300D52D5E /* oovbaapi.rdb */; };
681D78BD180C12D300D52D5E /* program in Resources */ = {isa =
PBXBuildFile; fileRef = 681D78B2180C12D300D52D5E /* program */; };
681D78BE180C12D300D52D5E /* rc in Resources */ = {isa =
PBXBuildFile; fileRef = 681D78B3180C12D300D52D5E /* rc */; };
- 681D78BF180C12D300D52D5E /* registry in Resources */ = {isa =
PBXBuildFile; fileRef = 681D78B4180C12D300D52D5E /* registry */; };
681D78C0180C12D300D52D5E /* services.rdb in Resources */ = {isa
= PBXBuildFile; fileRef = 681D78B5180C12D300D52D5E /* services.rdb */; };
681D78C1180C12D300D52D5E /* share in Resources */ = {isa =
PBXBuildFile; fileRef = 681D78B6180C12D300D52D5E /* share */; };
681D78C2180C12D300D52D5E /* udkapi.rdb in Resources */ = {isa =
PBXBuildFile; fileRef = 681D78B7180C12D300D52D5E /* udkapi.rdb */; };
@@ -1447,7 +1446,6 @@
681D78BC180C12D300D52D5E /* oovbaapi.rdb in
Resources */,
681D78BD180C12D300D52D5E /* program in
Resources */,
681D78BE180C12D300D52D5E /* rc in Resources */,
- 681D78BF180C12D300D52D5E /* registry in
Resources */,
681D78C0180C12D300D52D5E /* services.rdb in
Resources */,
681D78C1180C12D300D52D5E /* share in Resources
*/,
681D78C2180C12D300D52D5E /* udkapi.rdb in
Resources */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/MobileLibreOffice
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1204d2ff819300c17770d4cc84d2b63372963f65
Author: Tor Lillqvist t...@collabora.com
Date: Wed Oct 16 01:57:45 2013 +0300
Adapt to changed directory structure in fundamentalrc
With this change, the MobileLibreOffice app builds and runs for me.
Change-Id: I8c7ce3fdedced5eb82ed18e21873e773733d612f
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index c5a6cf3..d29c166 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1469,7 +1469,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = set
-x\ndest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne
's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib
$dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in
$OUTDIR/lib/*.a $INSTDIR/program/*.a $WORKDIR/LinkTarget/StaticLibrary/*.a
$WORKDIR/UnpackedTarball/*/.libs/*.a $WORKDIR/UnpackedTarball/*/src/.libs/*.a
$WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$WORKDIR/UnpackedTarball/openssl/*.a; do\nln $file
$dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n#
copy rdb files\ncp $OUTDIR/bin/offapi.rdb $dest_resource\ncp
$OUTDIR/bin/udkapi.rdb $dest_resource\ncp $OUTDIR/bin/oovbaapi.rdb
$dest_resource\ncp $INSTDIR/program/services/services.rdb
$dest_resource\ncp $INSTDIR/ure/share/misc/services.rdb
$dest_resource/ure\n\n# copy .res files\n# program/resource is hardcoded in
tools/source/r
c/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir
-p $dest_resource/program/resource\ncp $INSTDIR/program/resource/*en-US.res
$dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p
$dest_resource/share/config\ncp -R $INSTDIR/share/config/soffice.cfg
$dest_resource/share/config\n\n# \registry\\ncp -R
$INSTDIR/share/registry $dest_resource/share\n\n# Set up rc, the
\inifile\. See getIniFileName_Impl().\nfile=$dest_resource/rc\necho
'[Bootstrap]'$file\necho
'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' $file\necho
'HOME=$APP_DATA_DIR/tmp'$file\n\n# Set up
fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all
these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'
$file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR'
$file\necho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND
_BASE_DIR}/registry module:${BRAND_BASE_DIR}/registry/modules
res:${BRAND_BASE_DIR}/registry' $file\n\nfile=$dest_resource/unorc\necho
'[Bootstrap]' $file\n\n# bootstraprc must be in
$BRAND_BASE_DIR/program\nmkdir -p
$dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho
'[Bootstrap]'
$file\necho 'InstallMode=installmode'
$file\necho \ProductKey=LibreOffice $product_ver\
$file\necho
'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'
$file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho
'[Version]' $file\necho 'AllLanguages=en-US'$file\necho
'BuildVersion=' $file\necho \buildid=$buildid\ $file\necho
'ProductMajor=360' $file\necho 'ProductMinor=1'$file\n
;
+ shellScript = set
-x\ndest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne
's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib
$dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in
$OUTDIR/lib/*.a $INSTDIR/program/*.a $WORKDIR/LinkTarget/StaticLibrary/*.a
$WORKDIR/UnpackedTarball/*/.libs/*.a $WORKDIR/UnpackedTarball/*/src/.libs/*.a
$WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$WORKDIR/UnpackedTarball/openssl/*.a; do\nln $file
$dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n#
copy rdb files\ncp $OUTDIR/bin/offapi.rdb $dest_resource\ncp
$OUTDIR/bin/udkapi.rdb $dest_resource\ncp $OUTDIR/bin/oovbaapi.rdb
$dest_resource\ncp $INSTDIR/program/services/services.rdb
$dest_resource\ncp $INSTDIR/ure/share/misc/services.rdb
$dest_resource/ure\n\n# copy .res files\n# program/resource is hardcoded in
tools/source/r
c/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead.
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - readlicense_oo/docs
readlicense_oo/docs/readme/readme.xrm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6f9694374143ce181353b44df1d9da78d7dd7cc1 Author: Ariel Constenla-Haile arie...@apache.org Date: Wed Oct 16 00:04:54 2013 + i123481 - Paragraph should have a language to mark it localizable diff --git a/readlicense_oo/docs/readme/readme.xrm b/readlicense_oo/docs/readme/readme.xrm index 2757068..d2f34e8 100644 --- a/readlicense_oo/docs/readme/readme.xrm +++ b/readlicense_oo/docs/readme/readme.xrm @@ -301,8 +301,8 @@ /div div id=ModifiedSourceCode - h2 id=sdffd23r3cefwefew xml:lang=en-USUsed / Modified Source Code/h2 -p id=sdffd23red32efewFor detailed information about used and/or modified source code, see the NOTICE file which is part of the installation./p + h2 id=ModifiedSourceCodeHeading xml:lang=en-USUsed / Modified Source Code/h2 +p id=ModifiedSourceCodePara xml:lang=en-USFor detailed information about used and/or modified source code, see the NOTICE file which is part of the installation./p /div /body /html ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/inc sc/source
sc/inc/formulacell.hxx|1
sc/inc/formularesult.hxx | 21
sc/source/core/data/column2.cxx | 85 +++---
sc/source/core/data/formulacell.cxx | 11
sc/source/core/tool/formularesult.cxx | 47 ++
5 files changed, 138 insertions(+), 27 deletions(-)
New commits:
commit 87fe06a25dd22a3244f9741a079ce0e734acb6c8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 15 20:42:00 2013 -0400
Re-do fetching of vector ref array to support number / string mixture.
For now it only works when the range starts with string cell. With this,
the test now passes.
Change-Id: I6f79415ce11233648cdb20c8075f500b8c3d2f76
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index ea80b15..9d27558 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -253,6 +253,7 @@ public:
sal_uInt16 GetRawError(); // don't interpret, just return code or
result error
bool GetErrorOrValue( sal_uInt16 rErr, double rVal );
bool GetErrorOrString( sal_uInt16 rErr, svl::SharedString rStr );
+sc::FormulaResultValue GetResult();
sal_uInt8 GetMatrixFlag() const;
ScTokenArray* GetCode();
const ScTokenArray* GetCode() const;
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 8a7b365..3708c8a 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -23,6 +23,26 @@
#include token.hxx
#include scdllapi.h
+namespace sc {
+
+struct FormulaResultValue
+{
+enum Type { Invalid, Value, String, Error };
+
+Type meType;
+
+double mfValue;
+svl::SharedString maString;
+sal_uInt16 mnError;
+
+FormulaResultValue();
+FormulaResultValue( double fValue );
+FormulaResultValue(const svl::SharedString rStr );
+FormulaResultValue( sal_uInt16 nErr );
+};
+
+}
+
/** Store a variable formula cell result, balancing between runtime performance
and memory consumption. */
class ScFormulaResult
@@ -136,6 +156,7 @@ public:
bool GetErrorOrDouble( sal_uInt16 rErr, double rVal ) const;
bool GetErrorOrString( sal_uInt16 rErr, svl::SharedString rStr ) const;
+sc::FormulaResultValue GetResult() const;
/** Get error code if set or GetCellResultType() is formula::svError or
svUnknown,
else 0. */
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index a0ee046..8fbfd1b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2178,12 +2178,16 @@ bool appendDouble(
return false;
}
-bool appendStrings(
-ScDocument* pDoc, sc::FormulaGroupContext::StrArrayType rArray,
-size_t nLen, sc::CellStoreType::iterator it, const
sc::CellStoreType::iterator itEnd)
+formula::VectorRefArray appendBlocks(
+ScDocument* pDoc, sc::FormulaGroupContext rCxt, size_t nPos,
+size_t nLenRequested, sc::CellStoreType::iterator it, const
sc::CellStoreType::iterator itEnd )
{
-size_t nLenRemain = nLen;
+sc::FormulaGroupContext::StrArrayType rStrArray = rCxt.maStrArrays.back();
+sc::FormulaGroupContext::NumArrayType* pNumArray = NULL;
svl::SharedStringPool rPool = pDoc-GetSharedStringPool();
+size_t nLenRemain = nLenRequested - nPos;
+double fNan;
+rtl::math::setNan(fNan);
for (; it != itEnd; ++it)
{
@@ -2194,8 +2198,8 @@ bool appendStrings(
sc::string_block::iterator itData, itDataEnd;
getBlockIteratorssc::string_block(it, nLenRemain, itData,
itDataEnd);
-for (; itData != itDataEnd; ++itData)
-rArray.push_back(itData-getDataIgnoreCase());
+for (; itData != itDataEnd; ++itData, ++nPos)
+rStrArray[nPos] = itData-getDataIgnoreCase();
}
break;
case sc::element_type_edittext:
@@ -2203,10 +2207,10 @@ bool appendStrings(
sc::edittext_block::iterator itData, itDataEnd;
getBlockIteratorssc::edittext_block(it, nLenRemain, itData,
itDataEnd);
-for (; itData != itDataEnd; ++itData)
+for (; itData != itDataEnd; ++itData, ++nPos)
{
OUString aStr = ScEditUtil::GetString(**itData, pDoc);
-rArray.push_back(rPool.intern(aStr).getDataIgnoreCase());
+rStrArray[nPos] = rPool.intern(aStr).getDataIgnoreCase();
}
}
break;
@@ -2215,51 +2219,81 @@ bool appendStrings(
sc::formula_block::iterator itData, itDataEnd;
getBlockIteratorssc::formula_block(it, nLenRemain, itData,
itDataEnd);
-sal_uInt16 nErr;
-svl::SharedString aStr;
-for (; itData != itDataEnd; ++itData)
+for (; itData != itDataEnd; ++itData, ++nPos)
{
ScFormulaCell rFC =
[Libreoffice-commits] core.git: 2 commits - cui/source include/svx sw/source
cui/source/inc/backgrnd.hxx |6 ++
cui/source/inc/page.hxx |5 +
cui/source/inc/paragrph.hxx | 10 ++
cui/source/inc/tabstpge.hxx |4
include/svx/srchdlg.hxx | 16
sw/source/filter/html/css1atr.cxx |8
sw/source/filter/html/htmlatr.cxx |6 ++
7 files changed, 7 insertions(+), 48 deletions(-)
New commits:
commit d6f18c09496318adf78ab32dfa1e1edf74521c5f
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Oct 16 03:28:19 2013 +0200
remove some stuff
Change-Id: I766c01c3ea4c03f4c76ef70fd16037d8196242a1
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index be0e8d3..45a1659 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -26,9 +26,6 @@
#include svx/dlgctrl.hxx
#include editeng/brushitem.hxx
-//
-// forwards:
-
class BackgroundPreviewImpl;
class SvxOpenGraphicDialog;
struct SvxBackgroundTable_Impl;
@@ -37,8 +34,9 @@ struct SvxBackgroundPage_Impl;
class SvxBrushItem;
class XFillStyleItem;
class XFillGradientItem;
+
/** class SvxBackgroundTabPage
-{k:\svx\prototyp\dialog\backgrnd.bmp}
+
[Description]
With this TabPage a Brush (e. g. for a frame's background color)
can be set.
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index d07a6b9..421b5e1 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -19,7 +19,6 @@
#ifndef _SVX_PAGE_HXX
#define _SVX_PAGE_HXX
-
#include sfx2/tabdlg.hxx
#include vcl/field.hxx
#include vcl/fixed.hxx
@@ -33,9 +32,7 @@
#include svx/flagsdef.hxx
// class SvxPageDescPage -
-
-/* {k:\svx\prototyp\dialog\page.bmp}
-
+/*
[Description]
TabPage for page settings (size, margins, ...)
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 8d27bc4..1fda0cf 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -28,14 +28,10 @@
#include vcl/lstbox.hxx
#include svx/flagsdef.hxx
-// forward ---
-
class SvxLineSpacingItem;
// class SvxStdParagraphTabPage --
-
-/* {k:\svx\prototyp\dialog\parastd.bmp}
-
+/*
[Description]
With this TabPage standard attributes of a paragraph can be set
(indention, distance, alignment, line spacing).
@@ -175,9 +171,7 @@ public:
};
// class SvxExtParagraphTabPage --
-
-/* {k:\svx\prototyp\dialog\paraext.bmp}
-
+/*
[Description]
With this TabPage special attributes of a paragraph can be set
(hyphenation, pagebreak, orphan, widow, ...).
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index c19f085..3879bd3 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -29,14 +29,10 @@
#include editeng/tstpitem.hxx
#include svx/flagsdef.hxx
-// forward ---
-
class TabWin_Impl;
// class SvxTabulatorTabPage -
/*
-{k:\svx\prototyp\dialog\tabstop.bmp}
-
[Description]
In this TabPage tabulators are managed.
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 3488998..77a7c21 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -43,10 +43,6 @@ class SvxSearchController;
struct SearchDlg_Impl;
-#ifndef NO_SVX_SEARCH
-
-// struct SearchAttrItem -
-
struct SearchAttrItem
{
sal_uInt16 nSlot;
@@ -80,7 +76,6 @@ public:
void Remove(size_t nPos, size_t nLen = 1);
};
-#ifndef SV_NODIALOG
// class SvxSearchDialogWrapper --
@@ -98,10 +93,7 @@ public:
};
// class SvxSearchDialog -
-
/*
-{k:\svx\prototyp\dialog\svx/srchdlg.hxx}
-
[Description]
In this modeless dialog the attributes for a search are configured
and a search is started from it. Several search types
@@ -263,14 +255,6 @@ inline sal_Bool SvxSearchDialog::HasReplaceAttributes()
const
return ( m_pReplaceAttrText-IsEnabled() bLen );
}
-
-//
-
-
-#endif // SV_NODIALOG
-#endif // NO_SVX_SEARCH
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d4ae0d8d30e10f7e194a06c540cac1f33a4fe0ba
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Oct 15 11:47:11 2013 +0200
HTML: always export CSS option for font size
This removes some kind of a hack. Before this commit the CSS
option was only exported if the size didn't fit any HTML size
option. Maybe size could be dropped in the future.
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 suokunl...@gmail.com changed: What|Removed |Added Depends on||55018 --- Comment #94 from suokunl...@gmail.com --- Adding Bug 55018, FILESAVE and FILEOPEN: Joined cells in table cause table distortion after save to doc and docx and reopen in LO. This is an old bug, first reported in Sep 2012, and still reproducable in 4.1.2.3. In my opinion, table distortion = data loss. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx| 90
sc/source/core/data/column2.cxx |9 ++--
2 files changed, 78 insertions(+), 21 deletions(-)
New commits:
commit 62f8229ee3a05f82757d8bcae2f5c0f239955637
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 15 22:27:57 2013 -0400
Add helper functions for unit test add new test that currently fails.
Change-Id: I503fc26ccc0f117c626e78a8a1dd07ff32a06432
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ba73d11..034e0e3 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -28,6 +28,44 @@
using namespace formula;
+namespace {
+
+bool isEmpty( const formula::VectorRefArray rArray, size_t nPos )
+{
+if (rArray.mpStringArray)
+{
+if (rArray.mpStringArray[nPos])
+return false;
+}
+
+if (rArray.mpNumericArray)
+return rtl::math::isNan(rArray.mpNumericArray[nPos]);
+else
+return true;
+}
+
+bool equals( const formula::VectorRefArray rArray, size_t nPos, double fVal )
+{
+if (rArray.mpStringArray rArray.mpStringArray[nPos])
+// This is a string cell.
+return false;
+
+if (rArray.mpNumericArray rArray.mpNumericArray[nPos] == fVal)
+return true;
+
+return false;
+}
+
+bool equals( const formula::VectorRefArray rArray, size_t nPos, const
OUString rVal )
+{
+if (!rArray.mpStringArray)
+return false;
+
+return OUString(rArray.mpStringArray[nPos]).equalsIgnoreAsciiCase(rVal);
+}
+
+}
+
void Test::testFetchVectorRefArray()
{
m_pDoc-InsertTab(0, Test);
@@ -54,7 +92,7 @@ void Test::testFetchVectorRefArray()
CPPUNIT_ASSERT_EQUAL(2.0, aArray.mpNumericArray[1]);
CPPUNIT_ASSERT_EQUAL(3.0, aArray.mpNumericArray[2]);
CPPUNIT_ASSERT_EQUAL(4.0, aArray.mpNumericArray[3]);
-CPPUNIT_ASSERT_MESSAGE(Empty cell should be represented by a NaN.,
rtl::math::isNan(aArray.mpNumericArray[4]));
+CPPUNIT_ASSERT_MESSAGE(This should be empty., isEmpty(aArray, 4));
// All string cells in Column B. Note that the fetched string arrays are
// only to be compared case-insensitively. Right now, we use upper cased
@@ -67,11 +105,11 @@ void Test::testFetchVectorRefArray()
aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(1,0,0), 5);
CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
CPPUNIT_ASSERT_MESSAGE(Array is expected to be string cells only.,
!aArray.mpNumericArray);
-CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[0]).equalsIgnoreAsciiCaseAscii(Andy));
-CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[1]).equalsIgnoreAsciiCaseAscii(Bruce));
-CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[2]).equalsIgnoreAsciiCaseAscii(Charlie));
-CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[3]).equalsIgnoreAsciiCaseAscii(David));
-CPPUNIT_ASSERT_MESSAGE(Empty cell should be represented by a NULL
pointer., !aArray.mpStringArray[4]);
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 0,
Andy));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 1,
Bruce));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 2,
Charlie));
+CPPUNIT_ASSERT_MESSAGE(Unexpected string cell., equals(aArray, 3,
David));
+CPPUNIT_ASSERT_MESSAGE(This should be empty., isEmpty(aArray, 4));
// Mixture of numeric, string, and empty cells in Column C.
m_pDoc-SetString(ScAddress(2,0,0), Header);
@@ -84,17 +122,35 @@ void Test::testFetchVectorRefArray()
aArray = m_pDoc-FetchVectorRefArray(aCxt, ScAddress(2,0,0), 7);
CPPUNIT_ASSERT_MESSAGE(Failed to fetch vector ref array.,
aArray.isValid());
CPPUNIT_ASSERT_MESSAGE(Array should have both numeric and string
arrays., aArray.mpNumericArray aArray.mpStringArray);
-CPPUNIT_ASSERT_MESSAGE(Failed on case in-sensitive equality test.,
OUString(aArray.mpStringArray[0]).equalsIgnoreAsciiCaseAscii(Header));
-CPPUNIT_ASSERT_MESSAGE(String value should be NULL for numeric cell.,
aArray.mpStringArray[1] == NULL);
-CPPUNIT_ASSERT_MESSAGE(String value should be NULL for numeric cell.,
aArray.mpStringArray[2] == NULL);
-CPPUNIT_ASSERT_MESSAGE(String value should be NULL for numeric cell.,
aArray.mpStringArray[3] == NULL);
-CPPUNIT_ASSERT_EQUAL(11.0, aArray.mpNumericArray[1]);
-CPPUNIT_ASSERT_EQUAL(12.0, aArray.mpNumericArray[2]);
-CPPUNIT_ASSERT_EQUAL(13.0, aArray.mpNumericArray[3]);
-CPPUNIT_ASSERT_MESSAGE(This cell should be empty.,
aArray.mpStringArray[4] == NULL rtl::math::isNan(aArray.mpNumericArray[4]));
-CPPUNIT_ASSERT_MESSAGE(String value should be NULL for numeric cell.,
aArray.mpStringArray[5] == NULL);
-CPPUNIT_ASSERT_EQUAL(36.0,
[Libreoffice-commits] core.git: 3 commits - basctl/source cui/source extras/source filter/source fpicker/test include/comphelper include/vcl mysqlc/source sd/inc sd/source svtools/source sw/source vcl
basctl/source/basicide/bastype3.hxx |6
cui/source/dialogs/hlinettp.cxx |3 +-
extras/source/palettes/standard.soc |2 -
filter/source/graphicfilter/eos2met/eos2met.cxx |2 -
fpicker/test/svdem.cxx |2 -
include/comphelper/ihwrapnofilter.hxx | 10 --
include/vcl/svapp.hxx |3 --
mysqlc/source/mysqlc_propertyids.hxx|4 --
sd/inc/sdpage.hxx |2 -
sd/source/filter/eppt/epptso.cxx|2 -
sd/source/ui/inc/PresentationViewShell.hxx |2 -
sd/source/ui/view/OutlinerIterator.cxx |2 -
sd/source/ui/view/drawview.cxx |2 -
sd/source/ui/view/drviews3.cxx |2 -
sd/source/ui/view/drviewsa.cxx |4 --
sd/source/ui/view/drviewsf.cxx |2 -
sd/source/ui/view/drviewsg.cxx |3 --
sd/source/ui/view/drviewsh.cxx |2 -
sd/source/ui/view/presvish.cxx |2 -
sd/source/ui/view/unmodpg.cxx |4 --
svtools/source/config/test/test.cxx |2 -
sw/source/filter/html/htmlsect.cxx |2 -
vcl/aqua/source/gdi/salgdicommon.cxx|4 --
vcl/inc/xconnection.hxx |2 -
vcl/source/gdi/bmpfast.cxx | 24
xmlhelp/source/cxxhelp/test/abidebug.hxx|3 --
xmloff/source/transform/EventOASISTContext.cxx |6
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx |3 --
xmlsecurity/inc/xmlsecurity/documentsignaturehelper.hxx |3 --
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx |4 --
30 files changed, 4 insertions(+), 110 deletions(-)
New commits:
commit e7841b62456fcb5743f4ab60a4e967883260c7db
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Oct 16 06:17:09 2013 +0200
fdo#45777: handling of whitespaces in hyperlinks
Remove leading and trailing whitespaces in the hyperlink dialog, because
the resulting links would be unusable.
Change-Id: Icf617daf51508a37494536e02fb298fb3cf746c5
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 6809ed6..47c6e0d 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -181,7 +181,8 @@ void SvxHyperlinkInternetTp::GetCurentItemData ( OUString
rStrURL, OUString aS
OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
{
-OUString aStrURL(maCbbTarget.GetText());
+// erase leading and trailing whitespaces
+OUString aStrURL( maCbbTarget.GetText().trim() );
INetURLObject aURL(aStrURL);
commit aa2d011acdcf332693f2a32a8eb3b9d73c958be7
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Oct 16 05:41:55 2013 +0200
fdo#45970: pale green is not green at all
Was like Cyan 10 before. Now it's like Green 10...
Change-Id: I7ec9b884b53fb0ab2a5a0c3d09cb8b2789037234
diff --git a/extras/source/palettes/standard.soc
b/extras/source/palettes/standard.soc
index 40d559a4..36ad9da 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -177,7 +177,7 @@
draw:color draw:name=Violet draw:color=#ff/
draw:color draw:name=Bordeaux draw:color=#993366/
draw:color draw:name=Pale yellow draw:color=#cc/
- draw:color draw:name=Pale green draw:color=#cc/
+ draw:color draw:name=Pale green draw:color=#ccffcc/
draw:color draw:name=Dark violet draw:color=#660066/
draw:color draw:name=Salmon draw:color=#ff8080/
draw:color draw:name=Sea blue draw:color=#0066cc/
commit 67aec439153b8a374d418cfe653b601f8d1b514a
Author: Thomas Arnhold tho...@arnhold.org
Date: Wed Oct 16 04:12:49 2013 +0200
cleanup
Change-Id: I7bfd221f89718ba8634417c93a26b3a199178694
diff --git a/basctl/source/basicide/bastype3.hxx
b/basctl/source/basicide/bastype3.hxx
index 5d51783..ca2da15 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -20,13 +20,9 @@
#define BASCTL_BASTYPE3_HXX
#include svheader.hxx
-
#include svtools/svmedit.hxx
-
#include iderid.hxx
-#ifndef NO_SPECIALEDIT
-
namespace basctl
{
@@ -54,8 +50,6 @@ public:
} // namespace basctl
-#endif // NO_SPECIALEDIT
-
#endif // BASCTL_BASTYPE3_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 76ec162..e48c370 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -238,9 +238,7 @@ public:
METWriter() :
LibreOffice Gerrit News 2013-10-15
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#57659: fix exif processing in https://gerrit.libreoffice.org/6245 from Julien Nabet + Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2 in https://gerrit.libreoffice.org/6244 from Julien Nabet + fdo#7 add support for COVARIANCE.P and COVARIANCE.S functions in https://gerrit.libreoffice.org/6135 from Winfried Donkers + Save Image-Crop information in docx in https://gerrit.libreoffice.org/6240 from pallavi jadhav * Merged changes on master for project core changed in the last 25 hours: + Change sal_Bool to bool in viewfunc.cxx (Calc) in https://gerrit.libreoffice.org/6203 from Laurent BP + String to OUString in viewfunc (Calc) in https://gerrit.libreoffice.org/6202 from Laurent BP + fdo#38838 use OUString instead of String in https://gerrit.libreoffice.org/6237 from Christina Roßmanith + don't include unused tools/string.hxx in https://gerrit.libreoffice.org/6236 from Christina Roßmanith + don't include unused tools/string.hxx in https://gerrit.libreoffice.org/6206 from Christina Roßmanith + fdo#38838 use OUString instead of String in https://gerrit.libreoffice.org/6195 from Christina Roßmanith + fdo#61950 De-extensionize presentation minimizer in https://gerrit.libreoffice.org/6143 from David Ostrovsky * Abandoned changes on master for project core changed in the last 25 hours: + String to OUString in column.hxx in https://gerrit.libreoffice.org/6205 from Laurent BP + fdo#69407 Putting no fill frame color instead of transparent by default in https://gerrit.libreoffice.org/5996 from matthieu gay + fdo#60071: Don't export SDNUM and SDVAL options to HTML in https://gerrit.libreoffice.org/6194 from Thomas Arnhold * Open changes needing tweaks, but being untouched for more than a week: + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Remove obsolete MIME associatons on MAC OS in https://gerrit.libreoffice.org/6103 from Samuel Mehrbrodt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fix polygon rendering with clip area of one line only in https://gerrit.libreoffice.org/5709 from Tsahi Glik @ CloudOn + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement : Synerzip
Hi All, For the record, All contributions past and present made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Synerzip are available under the terms the MPL / LGPLv3+. Thanks Regards, *Tushar Bende* -- This e-mail, including any attached files, may contain confidential and privileged information for the sole use of the intended recipient. Any review, use, distribution, or disclosure by others is strictly prohibited. If you are not the intended recipient (or authorized to receive information for the intended recipient), please contact the sender by reply e-mail and delete all copies of this message. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/doctok/Dff.cxx |8 +++-
writerfilter/source/doctok/Dff.hxx |1 -
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 3e770e3294ee70864329a79f8aaf3834c487d412
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 08:36:47 2013 +0200
-Werror,-Wunused-private-field
Change-Id: I0b203dd65f659533dd3db9f25a1d42569473df31
diff --git a/writerfilter/source/doctok/Dff.cxx
b/writerfilter/source/doctok/Dff.cxx
index 026e92f..aaf7763 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -325,21 +325,19 @@ Sprm::Kind DffRecord::getKind()
DffBlock::DffBlock(WW8Stream rStream, sal_uInt32 nOffset,
sal_uInt32 nCount, sal_uInt32 nPadding)
-: WW8StructBase(rStream, nOffset, nCount), bInitialized(false),
- mnPadding(nPadding)
+: WW8StructBase(rStream, nOffset, nCount), mnPadding(nPadding)
{
}
DffBlock::DffBlock(WW8StructBase * pParent, sal_uInt32 nOffset,
sal_uInt32 nCount, sal_uInt32 nPadding)
-: WW8StructBase(pParent, nOffset, nCount), bInitialized(false),
- mnPadding(nPadding)
+: WW8StructBase(pParent, nOffset, nCount), mnPadding(nPadding)
{
}
DffBlock::DffBlock(const DffBlock rSrc)
: WW8StructBase(rSrc), writerfilter::ReferenceProperties(rSrc),
- bInitialized(false), mnPadding(rSrc.mnPadding)
+ mnPadding(rSrc.mnPadding)
{
}
diff --git a/writerfilter/source/doctok/Dff.hxx
b/writerfilter/source/doctok/Dff.hxx
index 7225367..87daaef 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -98,7 +98,6 @@ typedef vectorDffRecord::Pointer_t Records_t;
class DffBlock : public WW8StructBase,
public writerfilter::ReferenceProperties
{
-bool bInitialized;
sal_uInt32 mnPadding;
Records_t mRecords;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/doctok/Dff.cxx |4 ++--
writerfilter/source/doctok/Dff.hxx |3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 5d04fd117ab2519edd78a852f41d1be1e45da290
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 08:45:00 2013 +0200
Remove unused member
Change-Id: I435f2781be620fa910a40a49fde19ecc81a70974
diff --git a/writerfilter/source/doctok/Dff.cxx
b/writerfilter/source/doctok/Dff.cxx
index aaf7763..202bbd1 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -30,13 +30,13 @@ typedef boost::shared_ptrWW8Value WW8ValueSharedPointer_t;
DffRecord::DffRecord(WW8Stream rStream, sal_uInt32 nOffset,
sal_uInt32 nCount)
-: WW8StructBase(rStream, nOffset, nCount), bInitialized(false)
+: WW8StructBase(rStream, nOffset, nCount)
{
}
DffRecord::DffRecord(WW8StructBase * pParent, sal_uInt32 nOffset,
sal_uInt32 nCount)
-: WW8StructBase(pParent, nOffset, nCount), bInitialized(false)
+: WW8StructBase(pParent, nOffset, nCount)
{
}
diff --git a/writerfilter/source/doctok/Dff.hxx
b/writerfilter/source/doctok/Dff.hxx
index db39229..3cb66e9 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -34,7 +34,6 @@ class DffBlock;
class DffRecord : public WW8StructBase, public
writerfilter::ReferenceProperties,
public Sprm
{
-bool bInitialized;
public:
typedef boost::shared_ptrDffRecord Pointer_t;
commit 3a3a41fba54979253029f35b98aefbc7fa68f1c3
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 15 08:38:48 2013 +0200
Remove unnecessary friend declaration
Change-Id: I7bd0fb541f16e39400b40742e92b501be086c887
diff --git a/writerfilter/source/doctok/Dff.hxx
b/writerfilter/source/doctok/Dff.hxx
index 87daaef..db39229 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -89,8 +89,6 @@ public:
virtual string getName() const;
virtual Kind getKind();
-
-friend class DffBlock;
};
typedef vectorDffRecord::Pointer_t Records_t;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
