[Libreoffice-commits] core.git: sw/source
sw/source/core/bastyp/calc.cxx |4 1 file changed, 4 deletions(-) New commits: commit e64adf61eb36e6999cced57a35b7cdd8d014abf3 Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 22 08:59:26 2014 +0300 I see no reason why stdlib.h would be needed on OS X Change-Id: I5a4f53874db43917c7522d03f0607078194c02a1 diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 4e3c139..837d87e 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(MACOSX) -#include stdlib.h -#endif - #include calc.hxx #include cctype #include cfloat ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for dev-tools on 2014-04-22
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: + An implementation of easyhack bug #38841. in https://gerrit.libreoffice.org/9114 from John Smith * Merged changes on master for project dev-tools changed in the last 25 hours: None * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-04-22
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ Finish cleaning up ASCII art in the sw module
in https://gerrit.libreoffice.org/9117 from Chris Laplante
about module sw
+ fdo#77725 LO not able to open/save file when exported multiple times.
in https://gerrit.libreoffice.org/9112 from Ravindra Vidhate
about module sw
End of freshness
+ fdo#77739 UI trendline: limit max values of Degree and Period
in https://gerrit.libreoffice.org/9116 from Laurent BP
about module chart2
+ Related: fdo#77720 Writer crashes when running Mail Merge Wizard
in https://gerrit.libreoffice.org/9111 from Julien Nabet
about module sw
+ cppcheck: Iterator it used after element has been erased
in https://gerrit.libreoffice.org/9110 from Julien Nabet
about module sw
* Merged changes on master for project core changed in the last 25 hours:
+ fdo#47800 Fixing manifest files in cs autotext libraries
in https://gerrit.libreoffice.org/9109 from Michal Horák
* Abandoned changes on master for project core changed in the last 25 hours:
None
* Open changes needing tweaks, but being untouched for more than a week:
+ move inettype.{hc}xx from svl to tools
in https://gerrit.libreoffice.org/8926 from Christina Roßmanith
+ fdo#43157 : Remove OSL_THIS_FILE
in https://gerrit.libreoffice.org/8886 from Michaël Lefèvre
+ fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF
in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
+ new method INetURLObject::getData() for data urls
in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
in https://gerrit.libreoffice.org/8160 from Andras Timar
+ Lots of changes to Tango icons
in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate Paste Special entries in Calc.
in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ WIP: fdo#33980 Preserve selection across all slide sorters.
in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ Positional Tab additions
in https://gerrit.libreoffice.org/5387 from Adam CloudOn
Best,
Your friendly LibreOffice Gerrit Digest Mailer
Note: The bot generating this message can be found and improved here:
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice fuzz-testing
Hi, In theory, I agree with you that it would be nicer if the entire thing would have been written in a single language. In practice, however : The fuzzer was already written, and in perl: Morten Welinder (of gnumeric fame) wrote a perl XML fuzzer - which you can find here: http://git.gnome.org/browse/gnumeric/tree/test/fuzzxml. So I took that. (the bug report references that code). The code to make libreoffice open and close documents was already there, in 'dev-tools/test-bugzilla-filestest-bugzilla-files.py'. So I took that, and only took out the parts I didnt need (file validation, etc). Now I know neither python nor perl; but i can do some unix shell scripting. So the fact that made it an 'EasyHack' for me was, that the hard parts were already written and I 'only' had to glue the stuff together using Unix shell scripting. Sadly, re-coding it in either perl or python in its entirety is beyond my current skill set; so if that would turn out to be a requirement then im afraid i have to abandon the easyhack bug and let others step in. We may want to continue this discuss this point on list or in the gerrit review though; its a valid point. Regards, John Smith. On Mon, Apr 21, 2014 at 10:58 PM, Keith Curtis keit...@gmail.com wrote: It looks interesting. The only thing I noticed is that it is written in both Perl and Python. I'm no Python expert yet, but I've done some, and never written Perl. I think it would be nice if small tools like this were all in one language, to lessen the requirements for someone to be able to contribute. The number of people who know Python is 100x greater than the number of people who know both Perl and Python. What do you think? -Keith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/blink.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf8946d10226272e8a0e6f1b1043b54d4b63db8d Author: Julien Nabet serval2...@yahoo.fr Date: Mon Apr 21 10:24:48 2014 +0200 cppcheck: Iterator it used after element has been erased Change-Id: Id0a0b026cd25f210df4bd821c2ca28edf3dee693 Reviewed-on: https://gerrit.libreoffice.org/9110 Tested-by: David Tardon dtar...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 0555322..70b994b 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SwBlink, Blinker) -GetCurrShell()-InvalidateWindows( aRefresh ); } else // Portions without a shell can be removed from the list -aList.erase( it ); +it = aList.erase(it); } } else // If the list is empty, the timer can be stopped ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/Library_svxcore.mk svx/Library_svx.mk svx/source sw/Library_sw.mk sw/source
svx/Library_svx.mk|4 -
svx/Library_svxcore.mk|3 -
svx/source/form/fmobjfac.cxx |5 +
sw/Library_sw.mk |2
sw/source/core/bastyp/calc.cxx|6 ++
sw/source/core/doc/docfld.cxx | 81 --
sw/source/core/edit/edfld.cxx | 10 +++
sw/source/core/fields/docufld.cxx | 10 ++-
sw/source/core/uibase/app/apphdl.cxx | 22 +---
sw/source/core/uibase/fldui/fldmgr.cxx|6 ++
sw/source/core/uibase/uiview/view2.cxx| 12
sw/source/core/uibase/uno/unodispatch.cxx |9 +++
sw/source/core/uibase/utlui/initui.cxx|4 +
sw/source/core/unocore/unofield.cxx | 16 +
sw/source/filter/ww8/ww8par5.cxx | 12
15 files changed, 181 insertions(+), 21 deletions(-)
New commits:
commit e15223582710e9e2e31fad2f557df6ee99501fd0
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 09:26:33 2014 +0300
More hacking on --disable-database-connectivity
Work in progress, still lots of undefineds when attempting to link
TiledLibreOffice.
Change-Id: I80fa330768d9f9fa9ef65e3693f1d777c0713210
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2f0e9a4..3f9ded6 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -247,12 +247,11 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/unogallery/unogalthemeprovider \
))
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/fmcomp/dbaobjectex \
svx/source/form/databaselocationinput \
svx/source/form/dbcharsethelper \
-svx/source/form/filtnav \
+$(call gb_Helper_optional,DBCONNECTIVITY,svx/source/form/filtnav) \
svx/source/form/fmobjfac \
svx/source/form/fmPropBrw \
svx/source/form/fmsrccfg \
@@ -260,7 +259,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/form/tabwin \
svx/source/form/tbxform \
))
-endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,svx,\
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 2b2d194..ccb48ed 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -390,8 +390,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/xoutdev/xtablend \
))
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/fmcomp/dbaexchange \
svx/source/fmcomp/fmgridcl \
@@ -445,7 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/form/typemap \
svx/source/form/xfm_addcondition \
))
-endif
$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 8c00e5e..f1bad87 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include tools/diagnose_ex.h
#include svx/svdobj.hxx
#include svx/fmtools.hxx
@@ -79,8 +81,9 @@ FmFormObjFactory::FmFormObjFactory()
FmPropBrwMgr::RegisterChildWindow();
NavigatorFrameManager::RegisterChildWindow();
DataNavigatorManager::RegisterChildWindow();
+#if HAVE_FEATURE_DBCONNECTIVITY
FmFilterNavigatorWinMgr::RegisterChildWindow();
-
+#endif
// Interface fuer die Formshell registrieren
FmFormShell::RegisterInterface(0);
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1f7d55a..6bb809d 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -256,7 +256,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/fields/authfld \
sw/source/core/fields/cellfml \
sw/source/core/fields/chpfld \
-sw/source/core/fields/dbfld \
sw/source/core/fields/ddefld \
sw/source/core/fields/ddetbl \
sw/source/core/fields/docufld \
@@ -744,6 +743,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,sw,\
+sw/source/core/fields/dbfld \
sw/source/core/uibase/dbui/dbmgr \
sw/source/core/uibase/dbui/dbtree \
sw/source/core/uibase/dbui/dbui \
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 837d87e..4c3a68e 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include calc.hxx
#include cctype
#include cfloat
@@ -513,6 +515,7 @@ SwCalcExp* SwCalc::VarLook( const OUString rStr,
sal_uInt16 ins )
if( !ins )
{
+#if HAVE_FEATURE_DBCONNECTIVITY
SwDBMgr *pMgr = rDoc.GetNewDBMgr();
OUString sDBName(GetDBName( sTmpName ));
@@
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx |6 +++---
sw/inc/editsh.hxx |2 +-
sw/inc/swabstdlg.hxx |2 +-
sw/source/core/bastyp/calc.cxx |4 ++--
sw/source/core/doc/docfld.cxx | 24
sw/source/core/doc/docnew.cxx |4 ++--
sw/source/core/edit/edfld.cxx |6 +++---
sw/source/core/fields/dbfld.cxx|8
sw/source/core/fields/docufld.cxx |2 +-
sw/source/core/uibase/app/applab.cxx |4 ++--
sw/source/core/uibase/dbui/dbmgr.cxx | 18 +-
sw/source/core/uibase/dbui/dbtree.cxx |2 +-
sw/source/core/uibase/fldui/fldmgr.cxx |4 ++--
sw/source/core/uibase/fldui/xfldui.cxx |4 ++--
sw/source/core/uibase/inc/label.hxx|4 ++--
sw/source/core/uibase/shells/textsh2.cxx |6 +++---
sw/source/core/uibase/uiview/view2.cxx | 12 ++--
sw/source/core/uibase/uno/unodispatch.cxx |6 +++---
sw/source/core/uibase/uno/unomailmerge.cxx |2 +-
sw/source/ui/dbui/mailmergewizard.cxx |2 +-
sw/source/ui/dbui/mmpreparemergepage.cxx |2 +-
sw/source/ui/dialog/swdlgfact.cxx |4 ++--
sw/source/ui/dialog/swdlgfact.hxx |2 +-
sw/source/ui/envelp/envlop1.cxx| 10 +-
sw/source/ui/envelp/label1.cxx | 18 +-
sw/source/ui/envelp/mailmrge.cxx |8
sw/source/ui/envelp/swuilabimp.hxx |6 +++---
27 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit 043bbbf1988e8a5b719e0fa4cab9c576dc2deeec
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 10:05:49 2014 +0300
There is nothing new with SwNewDBMgr any more
Change-Id: Icbf3d5663a358bf31b58ab8086ffe9160c26bf8f
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ac3556d..cfff535 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -315,7 +315,7 @@ class SW_DLLPUBLIC SwDoc :
SwDocUpdtFld*mpUpdtFlds; // Struct for updating fields
SwFldTypes *mpFldTypes;
-SwDBMgr *mpNewDBMgr; /** Pointer to the new DBMgr for
+SwDBMgr *mpDBMgr;/** Pointer to the DBMgr for
evaluation of DB-fields. */
VirtualDevice *mpVirDev; // can be used for formatting
@@ -1144,8 +1144,8 @@ public:
const Point* pPt = 0 ) const;
// Database and DB-Manager
-void SetNewDBMgr( SwDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; }
-SwDBMgr* GetNewDBMgr() const { return mpNewDBMgr; }
+void SetDBMgr( SwDBMgr* pNewMgr ) { mpDBMgr = pNewMgr; }
+SwDBMgr* GetDBMgr() const { return mpDBMgr; }
void ChangeDBFields( const std::vectorOUString rOldNames,
const OUString rNewName );
void SetInitDBFields(sal_Bool b);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 09721b3..70c18cb 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -393,7 +393,7 @@ public:
void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
/// For evaluation of DB fields (new DB-manager).
-SwDBMgr* GetNewDBMgr() const;
+SwDBMgr* GetDBMgr() const;
SwFieldType* InsertFldType(const SwFieldType );
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 3d17742..4a3c4b7 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -353,7 +353,7 @@ public:
virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const
SfxItemSet rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0;
virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const
SfxItemSet rSet,
- SwDBMgr* pNewDBMgr, bool
bLabel) = 0;
+ SwDBMgr* pDBMgr, bool
bLabel) = 0;
virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 4c3a68e..1237428 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -516,7 +516,7 @@ SwCalcExp* SwCalc::VarLook( const OUString rStr,
sal_uInt16 ins )
if( !ins )
{
#if HAVE_FEATURE_DBCONNECTIVITY
-SwDBMgr *pMgr = rDoc.GetNewDBMgr();
+SwDBMgr *pMgr = rDoc.GetDBMgr();
OUString sDBName(GetDBName( sTmpName ));
OUString sSourceName(sDBName.getToken(0, DB_DELIM));
@@ -580,7 +580,7 @@ SwCalcExp* SwCalc::VarLook( const OUString rStr,
sal_uInt16 ins )
SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
{
#if HAVE_FEATURE_DBCONNECTIVITY
-SwDBMgr *pMgr = rDoc.GetNewDBMgr();
+SwDBMgr *pMgr = rDoc.GetDBMgr();
OUString sDBName(GetDBName( sTmpName ));
OUString sSourceName(sDBName.getToken(0, DB_DELIM));
OUString
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo55381.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
writerfilter/source/dmapper/DomainMapper.cxx | 12
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 19 ---
4 files changed, 33 insertions(+), 7 deletions(-)
New commits:
commit c04cf57bdb99f9aa961a739f5ab62e3ece83449f
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Mon Apr 21 19:10:37 2014 +0200
handle properly page breaks even if a page contains only a frame (fdo#55381)
The test document has 4 pages which only contain frames, first 3 pages
(sections) have p block with framePr and another p with just sectPr,
and the second paragraph would be removed, thus there would be no nodes on
which
to actually set the page style and they would be set on nodes for the
previous
page, overwriting its page style. The last page does not have its own p
at all, so it needs to be faked.
The changes in finishParagraph() are because of e.g. the comments-nested.odt
sw test, which there causes exception because of unknown property
ParaStyleName
(comments do not use those it seems) and the code is skipped over (which
is probably a bug on its own, but it's unrelated to this change otherwise).
Change-Id: I9d37f992407a9b649c710d2a031ec4447fb11771
Reviewed-on: https://gerrit.libreoffice.org/9115
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlimport/data/fdo55381.docx
b/sw/qa/extras/ooxmlimport/data/fdo55381.docx
new file mode 100644
index 000..ffeae1f
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo55381.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1c8665b..6c2f3a7 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1645,6 +1645,15 @@ DECLARE_OOXMLIMPORT_TEST(testStrictLockedcanvas,
strict-lockedcanvas.docx)
getShape(1);
}
+DECLARE_OOXMLIMPORT_TEST(testFdo55381, fdo55381.docx)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(4), xCursor-getPage());
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index dbb16d0..c7625e3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3643,6 +3643,18 @@ void DomainMapper::lcl_endSectionGroup()
{
m_pImpl-CheckUnregisteredFrameConversion();
m_pImpl-ExecuteFrameConversion();
+if(m_pImpl-GetIsFirstParagraphInSection())
+{
+// This section has no paragraph at all (e.g. they are all actually in
a frame).
+// If this section has a page break, there would be nothing to apply
to the page
+// style, so force a dummy paragraph.
+lcl_startParagraphGroup();
+lcl_startCharacterGroup();
+sal_uInt8 sBreak[] = { 0xd };
+lcl_text(sBreak, 1);
+lcl_endCharacterGroup();
+lcl_endParagraphGroup();
+}
PropertyMapPtr pContext = m_pImpl-GetTopContextOfType(CONTEXT_SECTION);
SectionPropertyMap* pSectionContext = dynamic_cast SectionPropertyMap* (
pContext.get() );
OSL_ENSURE(pSectionContext, SectionContext unavailable!);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7fe53ae8..6591673 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1140,12 +1140,6 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
uno::Reference text::XTextRange xParaEnd( xCur,
uno::UNO_QUERY );
CheckParaRedline( xParaEnd );
-m_bIsFirstParaInSection = false;
-m_bIsLastParaInSection = false;
-m_bParaChanged = false;
-
-// Reset the frame properties for the next paragraph
-pParaContext-ResetFrameProperties();
}
if( !bKeepLastParagraphProperties )
rAppendContext.pLastParagraphProperties = pToBeSavedProperties;
@@ -1154,11 +1148,22 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
{
OSL_FAIL( IllegalArgumentException in
DomainMapper_Impl::finishParagraph );
}
-catch(const uno::Exception)
+catch(const uno::Exception e)
{
+SAL_WARN( writerfilter, finishParagraph() exception:
[Libreoffice-commits] core.git: 19 commits - dbaccess/source lotuswordpro/source sc/source sw/source vcl/source
dbaccess/source/ui/misc/TableCopyHelper.cxx| 14 ++-
dbaccess/source/ui/tabledesign/TEditControl.cxx|4 +--
lotuswordpro/source/filter/explode.cxx |2 -
sc/source/filter/inc/scflt.hxx | 20 -
sc/source/filter/starcalc/scflt.cxx| 16 +++--
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |9 ---
sc/source/filter/xml/XMLColumnRowGroupExport.cxx |5 +++-
sc/source/filter/xml/XMLDetectiveContext.hxx |9 +--
sc/source/filter/xml/XMLExportIterator.cxx |2 +
sc/source/filter/xml/XMLStylesExportHelper.cxx | 11 ++---
sc/source/filter/xml/XMLStylesImportHelper.cxx |2 +
sc/source/filter/xml/xmldpimp.cxx |3 ++
sc/source/filter/xml/xmlfilti.cxx |2 +
sc/source/ui/drawfunc/fuconuno.cxx |2 +
sw/source/filter/ww8/ww8par.cxx|3 +-
vcl/source/fontsubset/cff.cxx | 16 ++---
16 files changed, 75 insertions(+), 45 deletions(-)
New commits:
commit 9b0a75c7b15efe8942c88c5492db80f2b047d053
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 21 21:12:11 2014 +0100
coverity#708068 Uninitialized scalar field
Change-Id: Ia458cb74a0db51e5468645d1c386fd06d6c386b7
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx
b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index a8c0831..99019dd 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -242,6 +242,8 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport
rTempImport)
pPrevStyleName(NULL),
pCurrency(NULL),
pPrevCurrency(NULL),
+nCellType(0),
+nPrevCellType(0),
bPrevRangeAdded(true)
{
}
commit 02c8ec2fb27d8abd0905d7548530b9439b890191
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 21 21:08:38 2014 +0100
coverity#708066 Uninitialized scalar field
Change-Id: I1ba5f9abf0f20373b4f719ea7ecd404d2fd2efa9
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 2771195..1566505 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -690,9 +690,10 @@ void ScRowFormatRanges::Sort()
ScMyFormatRange::ScMyFormatRange()
-: nStyleNameIndex(-1),
-nValidationIndex(-1),
-bIsAutoStyle(true)
+: nStyleNameIndex(-1)
+, nValidationIndex(-1)
+, nNumberFormat(0)
+, bIsAutoStyle(true)
{
}
commit b08c87db567b471f79621e6929942deee6936984
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 21 21:06:56 2014 +0100
coverity#708065 Uninitialized scalar field
Change-Id: Iee7260e15ea0f25a2b415a803138d88c6be6e401
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 6ed4add..2771195 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -48,6 +48,10 @@ ScMyValidation::ScMyValidation()
sImputTitle(),
sFormula1(),
sFormula2(),
+aAlertStyle(sheet::ValidationAlertStyle_STOP),
+aValidationType(sheet::ValidationType_ANY),
+aOperator(sheet::ConditionOperator_NONE),
+nShowList(0),
bShowErrorMessage(false),
bShowImputMessage(false),
bIgnoreBlanks(false)
commit 74680add8abb48cfd1536e7eced622bf8c27485d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 21 21:03:17 2014 +0100
coverity#708063 Uninitialized scalar field
Change-Id: Ic643d3c5131d88a732d8b72d75e40b4a8a188e9e
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx
b/sc/source/filter/xml/XMLExportIterator.cxx
index 729ca41..efb9da3 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -605,6 +605,8 @@
ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport rTempXMLExport
pDetectiveObj(NULL),
pDetectiveOp(NULL),
rExport(rTempXMLExport),
+nCellCol(0),
+nCellRow(0),
nCurrentTable(SCTAB_MAX)
{
}
commit acf018e6c2f2e49005962724670fe346dc55161c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 21 21:01:58 2014 +0100
coverity#708061 Uninitialized scalar field
Change-Id: Ifa499fb78c17a967312521b75542158b56dcff66
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx
b/sc/source/filter/xml/XMLDetectiveContext.hxx
index fa73b09..0232204 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -48,8 +48,13 @@ struct ScMyImpDetectiveOp
ScDetOpType eOpType;
sal_Int32 nIndex;
-inline ScMyImpDetectiveOp() : nIndex( -1 ) {}
-booloperator(const
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/doc/guisaveas.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 0e689d0d31c93012a375fa86f1ce9e91128db8e5 Author: LuboÅ¡ LuÅák l.lu...@collabora.com Date: Sun Apr 20 14:29:27 2014 +0200 adjust output file extension when exporting (bnc#870581) If foo.odt is open, 'foo.odt' is the file name passed to the file dialog for File-Export to PDF (simply because it's the document name). If automatic file extension is enabled, the file dialog will fix this to the PDF file type, but if disabled, the default filename will remain foo.odt, possibly overwriting the source file if the user confirms without checking. (cherry picked from commit cadf6cc31ffa000d1fe8e42cc3e6cd427e0104bd) Signed-off-by: Andras Timar andras.ti...@collabora.com Change-Id: I46504630b5f4e489d5a0cedf0b2b358305763722 diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 9a8d84b..446d9d5 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -991,6 +991,9 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, OUString(UIName), OUString() ); pFileDlg-SetCurrentFilter( aFilterUIName ); +aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( +OUString(Type), +OUString() ); } // it is no export, bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format else if ( bSetStandardName || GetStorable()-hasLocation() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - distro-configs/CPLinux.conf
distro-configs/CPLinux.conf | 47 1 file changed, 47 insertions(+) New commits: commit 4f08915db31487f9dbe9024f343ad50da5b941a0 Author: Andras Timar andras.ti...@collabora.com Date: Tue Apr 22 01:02:09 2014 -0700 LibreOffice from Collabora Linux config Change-Id: I17aa247e83a7b4ac87b44fc111f605b5fcc9d533 diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf new file mode 100644 index 000..f312342 --- /dev/null +++ b/distro-configs/CPLinux.conf @@ -0,0 +1,47 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--with-system-dicts +--with-myspell-dicts +--with-system-zlib +--without-system-poppler +--without-system-openssl +--without-system-mesa-headers +--without-system-libpng +--without-system-libxml +--without-system-jpeg +--without-system-jars +--without-system-postgresql +--without-junit +--with-help +--without-helppack-integration +--with-linker-hash-style=both +--with-fonts +--with-external-thes-dir=/usr/share/mythes +--with-external-hyph-dir=/usr/share/hyphen +--with-external-dict-dir=/usr/share/hunspell +--enable-dbus +--enable-extension-integration +--enable-opengl +--disable-odk +--enable-lockdown +--enable-kde +--enable-gstreamer-0-10 +--enable-evolution2 +--enable-gnome-vfs +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-ext-languagetool +--enable-epm +--enable-python=internal +--disable-online-update +--disable-gio +--disable-randr-link +--disable-kde4 +--with-package-format=deb rpm +--enable-release-build +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/dapiuno.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit b2e6ac535eb923336a99f9ebfcd4b50fce1790a0
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 10:03:48 2014 +0200
Do not unconditionally throw NoSuchElementException
...this fixes 1a9463277006e8e5a8c0b82bbf5d5ab2d5ea15ac coverity#704274
Logically dead code and JunitTest_sc_unoapi.
Change-Id: I20fc5262d6198fca1c7dfc970a7f8664c325aa91
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 4aebc8a..567439f 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -3230,27 +3230,23 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const
OUString aName )
{
SolarMutexGuard aGuard;
ReferenceXNameAccess xMembers = GetMembers();
-Any aRet;
if (xMembers.is())
{
ReferenceXIndexAccess xMembersIndex(new ScNameToIndexAccess(
xMembers ));
sal_Int32 nCount = xMembersIndex-getCount();
-sal_Bool bFound(false);
sal_Int32 nItem = 0;
-while (nItem nCount !bFound )
+while (nItem nCount)
{
ReferenceXNamed xMember(xMembersIndex-getByIndex(nItem),
UNO_QUERY);
if (xMember.is() (aName == xMember-getName()))
{
-aRet = Any( Reference XPropertySet ( GetObjectByIndex_Impl(
nItem ) ) );
-break;
+return Any( Reference XPropertySet ( GetObjectByIndex_Impl(
nItem ) ) );
}
++nItem;
}
-if (!bFound)
-throw NoSuchElementException();
+throw NoSuchElementException();
}
-return aRet;
+return Any();
}
SequenceOUString SAL_CALL ScDataPilotItemsObj::getElementNames()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf
distro-configs/CPWin32-MPL.conf |2 +- distro-configs/CPWin32.conf |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f847b9ac0ee0d40935ab0d9bcf178180b52c7ca1 Author: Andras Timar andras.ti...@collabora.com Date: Tue Apr 22 01:06:01 2014 -0700 distro-configs: fix language list (ca-valencia, sr-Latn) Change-Id: Ib092039f62c1e0843f9a50feb44019ff0905b2ae diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf index 778d598..eccad60 100644 --- a/distro-configs/CPWin32-MPL.conf +++ b/distro-configs/CPWin32-MPL.conf @@ -27,5 +27,5 @@ --enable-win-mozab-driver --enable-ia2 --with-package-format=msi ---with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sh sk sl sr sv ta te tr uk vi zh-CN zh-TW +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW --enable-windows-build-signing diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf index b326211..be48eea 100644 --- a/distro-configs/CPWin32.conf +++ b/distro-configs/CPWin32.conf @@ -21,5 +21,5 @@ --enable-win-mozab-driver --enable-ia2 --with-package-format=msi ---with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sh sk sl sr sv ta te tr uk vi zh-CN zh-TW +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW --enable-windows-build-signing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87812e16c51d91e37bdf50aa30ceacc6807f Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 22 09:36:14 2014 +0100 Updated core Project: help 373b6920afc9b78dc1af8859f20ac3b7a03eae17 diff --git a/helpcontent2 b/helpcontent2 index 4a202ac..373b692 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4a202ac51e3cfda0dc2e52392e394bf51f185f38 +Subproject commit 373b6920afc9b78dc1af8859f20ac3b7a03eae17 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/shared/autopi/01170500.xhp |5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 373b6920afc9b78dc1af8859f20ac3b7a03eae17 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 22 09:36:14 2014 +0100 update help ids for field assign type page .ui conversion Change-Id: Id57c657f7c810f3a32f509bef35dcb54bb677989 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 3b3c16e..7c64e53 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5552,7 +5552,6 @@ extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204, extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650, extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649, extensions_PushButton_RID_PAGE_ADMININVOKATION_PB_INVOKE_ADMIN_DIALOG,860639745, -extensions_PushButton_RID_PAGE_FIELDMAPPING_PB_INVOKE_FIELDS_DIALOG,860672514, extensions_PushButton_RID_PAGE_FINAL_PB_BROWSE,860688899, extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETOLEFT,859673090, extensions_PushButton_RID_PAGE_GROUPRADIOSELECTION_PB_MOVETORIGHT,859673089, @@ -5571,7 +5570,6 @@ extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_NO,859718148, extensions_RadioButton_RID_PAGE_OPTION_DBFIELD_RB_STOREINFIELD_YES,859718147, extensions_TabPage_RID_PAGE_ADMININVOKATION,860635136, extensions_TabPage_RID_PAGE_DEFAULTFIELDSELECTION,859684864, -extensions_TabPage_RID_PAGE_FIELDMAPPING,860667904, extensions_TabPage_RID_PAGE_FINAL,860684288, extensions_TabPage_RID_PAGE_FORM_DATASOURCE_STATUS,859815936, extensions_TabPage_RID_PAGE_GROUPRADIOSELECTION,859668480, diff --git a/source/text/shared/autopi/01170500.xhp b/source/text/shared/autopi/01170500.xhp index 5ff0f1c..046b43d 100644 --- a/source/text/shared/autopi/01170500.xhp +++ b/source/text/shared/autopi/01170500.xhp @@ -32,14 +32,15 @@ /meta body section id=feldzuordnung +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/fieldassignpage/FieldAssignPage id=bm_id3152593 localize=false/ paragraph role=heading id=hd_id3147588 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/autopi/01170500.xhp name=Field AssignmentField Assignment/link/paragraph paragraph role=paragraph id=par_id3143284 xml-lang=en-US l10n=U oldref=2ahelp hid=Opens a dialog that allows you to specify the field assignment./ahelp/paragraph /section section id=howtoget embed href=text/shared/00/0401.xhp#addressimport5/ /section -bookmark xml-lang=en-US branch=hid/extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG id=bm_id3152594 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/sabpilot/ui/fieldassignpage/assign id=bm_id3152594 localize=false/ paragraph role=heading id=hd_id3152372 xml-lang=en-US level=2 l10n=U oldref=3Field Assignment/paragraph -paragraph role=paragraph id=par_id3149549 xml-lang=en-US l10n=U oldref=4ahelp hid=extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOGOpens the link href=text/shared/01/01110101.xhp name=Templates: Address Book AssignmentTemplates: Address Book Assignment/link dialog./ahelp/paragraph +paragraph role=paragraph id=par_id3149549 xml-lang=en-US l10n=U oldref=4ahelp hid=modules/sabpilot/ui/fieldassignpage/assignOpens the link href=text/shared/01/01110101.xhp name=Templates: Address Book AssignmentTemplates: Address Book Assignment/link dialog./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source extensions/uiconfig extensions/UIConfig_sabpilot.mk
extensions/UIConfig_sabpilot.mk|1
extensions/source/abpilot/abpresid.hrc |3
extensions/source/abpilot/abspilot.src | 34 --
extensions/source/abpilot/fieldmappingpage.cxx | 34 ++
extensions/source/abpilot/fieldmappingpage.hxx |5 -
extensions/uiconfig/sabpilot/ui/fieldassignpage.ui | 65 +
extensions/uiconfig/sabpilot/ui/selecttypepage.ui |2
7 files changed, 76 insertions(+), 68 deletions(-)
New commits:
commit e139290ca19b5cf00d1408925d918dbfddebe330
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 09:29:42 2014 +0100
convert field assign address book page to .ui
Change-Id: I4d97bd75df0c75af6b643e67350a1af738bd7538
diff --git a/extensions/UIConfig_sabpilot.mk b/extensions/UIConfig_sabpilot.mk
index e90fc7e..18683e4 100644
--- a/extensions/UIConfig_sabpilot.mk
+++ b/extensions/UIConfig_sabpilot.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,modules/sabpilot))
$(eval $(call gb_UIConfig_add_uifiles,modules/sabpilot,\
+ extensions/uiconfig/sabpilot/ui/fieldassignpage \
extensions/uiconfig/sabpilot/ui/selecttypepage \
))
diff --git a/extensions/source/abpilot/abpresid.hrc
b/extensions/source/abpilot/abpresid.hrc
index 15db79d..028dff9 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -47,7 +47,6 @@
#define RID_PAGE_ADMININVOKATION( RID_PAGE_START + 1 )
#define RID_PAGE_TABLESELECTION_AB ( RID_PAGE_START + 2 )
-#define RID_PAGE_FIELDMAPPING ( RID_PAGE_START + 3 )
#define RID_PAGE_FINAL ( RID_PAGE_START + 4 )
// please adjust RID_PAGE_END (below) when adding new tab pages
@@ -140,7 +139,6 @@
#define FT_NAME_EXPL 4
#define FT_ERROR 5
#define FL_TOOMUCHTABLES 6
-#define FT_FIELDASSIGMENTEXPL7
#define FT_ASSIGNEDFIELDS8
#define FT_FINISH_EXPL 9
#define FT_DUPLICATENAME10
@@ -151,7 +149,6 @@
#define PB_INVOKE_ADMIN_DIALOG 1
-#define PB_INVOKE_FIELDS_DIALOG 2
#define PB_BROWSE 3
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 7531f12..ddc17c3 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -122,40 +122,6 @@ TabPage RID_PAGE_TABLESELECTION_AB
};
};
-
-TabPage RID_PAGE_FIELDMAPPING
-{
-HelpID = extensions:TabPage:RID_PAGE_FIELDMAPPING;
-SVLook = TRUE ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-
-FixedText FT_FIELDASSIGMENTEXPL
-{
-Pos = MAP_APPFONT ( BORDER_X, 9 ) ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 72 ) ;
-WordBreak = TRUE;
-
-Text [ en-US ] = To incorporate the address data in your templates,
%PRODUCTNAME has to know which fields contain which data.\n\nFor instance, you
could have stored the e-mail addresses in a field named \email\, or
\E-mail\ or \EM\ - or something completely different.\n\nClick the button
below to open another dialog where you can enter the settings for your data
source.;
-};
-
-PushButton PB_INVOKE_FIELDS_DIALOG
-{
-HelpID =
extensions:PushButton:RID_PAGE_FIELDMAPPING:PB_INVOKE_FIELDS_DIALOG;
-Pos = MAP_APPFONT ( ( WINDOW_SIZE_X - BUTTON_SIZE_X ) / 2, 84 ) ;
-Size= MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
-
-Text [ en-US ] = Field Assignment;
-};
-
-FixedText FT_ASSIGNEDFIELDS
-{
-Pos = MAP_APPFONT ( BORDER_X, WINDOW_SIZE_Y - HEADER_SIZE_Y - 7 -
32 ) ;
-Size= MAP_APPFONT ( WINDOW_SIZE_X - 2 * BORDER_X, 32 ) ;
-WordBreak = TRUE;
-};
-};
-
-
TabPage RID_PAGE_FINAL
{
HelpID = extensions:TabPage:RID_PAGE_FINAL;
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx
b/extensions/source/abpilot/fieldmappingpage.cxx
index 5ebdc9d..c30bf82 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -26,41 +26,21 @@
namespace abp
{
-
-
-
//= FieldMappingPage
-
-
FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent )
-:AddressBookSourcePage( _pParent, ModuleRes( RID_PAGE_FIELDMAPPING ) )
-,m_aExplanation ( this, ModuleRes( FT_FIELDASSIGMENTEXPL ) )
-,m_aInvokeDialog( this, ModuleRes( PB_INVOKE_FIELDS_DIALOG ) )
-,m_aHint( this, ModuleRes( FT_ASSIGNEDFIELDS ) )
+: AddressBookSourcePage(_pParent, FieldAssignPage,
+modules/sabpilot/ui/fieldassignpage.ui)
{
-FreeResource();
-
-m_aInvokeDialog.SetClickHdl( LINK( this, FieldMappingPage,
OnInvokeDialog ) );
+get(m_pInvokeDialog, assign);
+get(m_pHint, hint);
-// check the size of the InvokeDialog button - some languages are very
... gossipy here
-
[Libreoffice-commits] dev-tools.git: scripts/annotate.pl scripts/esc-bug-stats.pl
scripts/annotate.pl |3 ++-
scripts/esc-bug-stats.pl |2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit d1e5102ab1950b95bb37f3995f687b5fc50a4d1e
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Apr 22 10:43:58 2014 +0100
cleanup annotations, expand bugzilla black-list
diff --git a/scripts/annotate.pl b/scripts/annotate.pl
index 70e0016..fc07b36 100755
--- a/scripts/annotate.pl
+++ b/scripts/annotate.pl
@@ -113,6 +113,7 @@ sub dump_breakdown($)
$stem =~ s/^merged as.*$/merged as:/;
$stem =~ s/^prefer.*$/prefer:/;
$stem =~ s/^reject.*$/reject:/;
+ $stem =~ s/^ignore.*$/ignore:/; # don't breakdown reasons anymore.
$frequency{$stem} = 0 if (!defined $frequency{$stem});
$frequency{$stem}++;
$annotated++;
@@ -135,7 +136,7 @@ sub dump_breakdown($)
print $frequency{$stem}\t$stem\n;
}
print contiguous annotations: $contiguous - contiguous\n;
-print contiguous tolerating $in_start_limit_max missing:
$contiguous_limit\n;
+#print contiguous tolerating $in_start_limit_max missing:
$contiguous_limit\n;
}
sub sanity_check_revs($$)
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 69a9dfb..487bf1b 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -42,6 +42,8 @@ my %sadly_non_libreoffice = (
'Peter Hutterer' = 1,
'Guillaume Desmottes' = 1,
'Bryce Harrington' = 1,
+'Paolo Zanoni' = 1,
+'David Faure' = 1,
);
# use me for testing XML pretty printing etc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/Library_frm.mk forms/source sw/Library_sw.mk sw/source
forms/Library_frm.mk | 11 ---
forms/source/component/Filter.cxx | 17 -
forms/source/component/Filter.hxx |4
forms/source/component/Grid.cxx |6 ++
forms/source/component/ListBox.cxx| 16 ++--
forms/source/misc/services.cxx|6 ++
forms/source/runtime/formoperations.cxx |3 +++
sw/Library_sw.mk |2 +-
sw/source/core/doc/docfld.cxx |7 ++-
sw/source/core/doc/docnew.cxx |6 ++
sw/source/core/uibase/app/applab.cxx | 12 +++-
sw/source/core/uibase/inc/uivwimp.hxx |6 ++
sw/source/core/uibase/uiview/uivwimp.cxx |7 ++-
sw/source/core/uibase/uiview/view0.cxx|8 ++--
sw/source/core/uibase/uiview/viewstat.cxx |6 ++
15 files changed, 105 insertions(+), 12 deletions(-)
New commits:
commit f12237c4c6239428b00dd4885a25bbc3b4f14368
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 13:03:06 2014 +0300
More hacking on --disable-database-connectivity
Change-Id: Iefa6b104c60464e5a0d793bd676d8ea7ff2727c1
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index d130431..93acb2d 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -62,12 +62,10 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/component/Columns \
forms/source/component/ComboBox \
forms/source/component/Currency \
-forms/source/component/DatabaseForm \
forms/source/component/Date \
forms/source/component/EditBase \
forms/source/component/Edit \
forms/source/component/entrylisthelper \
-forms/source/component/errorbroadcaster \
forms/source/component/EventThread \
forms/source/component/File \
forms/source/component/Filter \
@@ -123,7 +121,6 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/richtext/richtextviewport \
forms/source/richtext/rtattributehandler \
forms/source/richtext/specialdispatchers \
-forms/source/runtime/formoperations \
forms/source/solar/component/navbarcontrol \
forms/source/solar/control/navtoolbar \
forms/source/xforms/binding \
@@ -154,4 +151,12 @@ $(eval $(call gb_Library_add_exception_objects,frm,\
forms/source/xforms/xpathlib/xpathlib \
))
+$(eval $(call gb_Library_add_exception_objects,frm,\
+$(call gb_Helper_optional,DBCONNECTIVITY, \
+forms/source/component/DatabaseForm \
+forms/source/component/errorbroadcaster \
+forms/source/runtime/formoperations \
+) \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/forms/source/component/Filter.cxx
b/forms/source/component/Filter.cxx
index 976c82f..603178f 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -98,7 +98,9 @@ namespace frm
:UnoControl()
,m_aTextListeners( *this )
,m_xContext( _rxORB )
+#if HAVE_FEATURE_DBCONNECTIVITY
,m_aParser( _rxORB )
+#endif
,m_nControlClass( FormComponentType::TEXTFIELD )
,m_bFilterList( sal_False )
,m_bMultiLine( sal_False )
@@ -109,6 +111,7 @@ namespace frm
sal_Bool OFilterControl::ensureInitialized( )
{
+#if HAVE_FEATURE_DBCONNECTIVITY
if ( !m_xField.is() )
{
OSL_FAIL( OFilterControl::ensureInitialized: improperly
initialized: no field! );
@@ -139,7 +142,7 @@ namespace frm
// no fallback anymore
return sal_False;
}
-
+#endif
return sal_True;
}
@@ -291,6 +294,9 @@ namespace frm
void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent rEvent )
throw(RuntimeException, std::exception)
{
+#if !HAVE_FEATURE_DBCONNECTIVITY
+(void) rEvent;
+#else
OUStringBuffer aText;
switch (m_nControlClass)
{
@@ -377,11 +383,13 @@ namespace frm
while( aIt.hasMoreElements() )
((XTextListener *)aIt.next())-textChanged( aEvt );
}
+#endif
}
void OFilterControl::implInitFilterList()
{
+#if HAVE_FEATURE_DBCONNECTIVITY
if ( !ensureInitialized( ) )
// already asserted in ensureInitialized
return;
@@ -487,6 +495,7 @@ namespace frm
{
DBG_UNHANDLED_EXCEPTION();
}
+#endif
}
// XFocusListener
@@ -506,6 +515,7 @@ namespace frm
sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException,
std::exception)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
if ( !ensureInitialized( ) )
// already asserted in ensureInitialized
return sal_True;
@@ -550,6 +560,7 @@ namespace frm
while( aIt.hasMoreElements() )
static_cast XTextListener* ( aIt.next() )-textChanged( aEvt
);
}
+#endif
return sal_True;
}
@@ -820,6 +831,9 @@ namespace frm
void
[Libreoffice-commits] core.git: include/oox oox/source sw/qa sw/source writerfilter/source
include/oox/drawingml/shape.hxx | 16 ++
oox/source/drawingml/shape.cxx| 19 +++
oox/source/shape/WpsContext.cxx | 35 +-
oox/source/token/tokens.txt |1
sw/qa/extras/ooxmlexport/data/LinkedTextBoxes.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 +
sw/source/filter/ww8/docxsdrexport.cxx| 75 +++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 103 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |2
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3
10 files changed, 250 insertions(+), 14 deletions(-)
New commits:
commit 255194801e9eb8e3aaede56837450af35f8313e0
Author: umeshkadam umesh.ka...@synerzip.com
Date: Fri Apr 18 13:12:53 2014 +0530
fod#77122 DOCX filter: link between textboxes is not being preserved
Added support for linked textboxes for docx interoperability.
Reviewed on:
https://gerrit.libreoffice.org/9092
Change-Id: I7db4f5a1783afff53c64908d182788b262f5e863
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index a7232fa..926f223 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -63,6 +63,15 @@ struct ChartShapeInfo
explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes(
bEmbedShapes ) {}
};
+/// Attributes for a linked textbox.
+struct LinkedTxbxAttr
+{
+sal_Int32 id;
+sal_Int32 seq;
+LinkedTxbxAttr(): id(0),seq(0){};
+~LinkedTxbxAttr(){};
+};
+
class OOX_DLLPUBLIC Shape
: public boost::enable_shared_from_this Shape
{
@@ -176,6 +185,11 @@ public:
voidsetDiagramDoms(const
com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue
rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
com::sun::star::uno::Sequence com::sun::star::uno::Sequence
com::sun::star::uno::Any resolveRelationshipsOfTypeFromOfficeDoc(
core::XmlFilterBase rFilter, const OUString sFragment, const OUString sType
);
+voidsetLinkedTxbxAttributes(const LinkedTxbxAttr rhs){
maLinkedTxbxAttr = rhs; };
+voidsetTxbxHasLinkedTxtBox( const bool rhs){
mbHasLinkedTxbx = rhs; };
+const LinkedTxbxAttr getLinkedTxbxAttributes() { return
maLinkedTxbxAttr; };
+boolisLinkedTxbx() { return mbHasLinkedTxbx; };
+
protected:
::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape
@@ -279,6 +293,8 @@ private:
// to propagate it
when applying reference shape
bool mbLockedCanvas; /// Is this shape part of a locked canvas?
bool mbWps; /// Is this a wps shape?
+LinkedTxbxAttr maLinkedTxbxAttr;
+boolmbHasLinkedTxbx; // this text box has
linked text box ?
com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue
maDiagramDoms;
};
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f7150db..1d0d452 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -139,6 +139,8 @@ Shape::Shape( const ShapePtr pSourceShape )
, mbHiddenMasterShape( pSourceShape-mbHiddenMasterShape )
, mbLockedCanvas( pSourceShape-mbLockedCanvas )
, mbWps( pSourceShape-mbWps )
+, maLinkedTxbxAttr()
+, mbHasLinkedTxbx(false)
, maDiagramDoms( pSourceShape-maDiagramDoms )
{}
@@ -677,6 +679,23 @@ Reference XShape Shape::createAndInsert(
aGrabBag[length].Value =
uno::makeAny(mpCustomShapePropertiesPtr-getShapePresetTypeName());
propertySet-setPropertyValue(FrameInteropGrabBag,uno::makeAny(aGrabBag));
}
+//If the text box has links then save the link information so
that
+//it can be accessed in DomainMapper_Impl.cxx while chaining
the text frames.
+if (this-isLinkedTxbx())
+{
+uno::Referencebeans::XPropertySet propertySet (mxShape,
uno::UNO_QUERY);
+uno::Sequencebeans::PropertyValue aGrabBag;
+propertySet-getPropertyValue(FrameInteropGrabBag) =
aGrabBag;
+sal_Int32 length = aGrabBag.getLength();
+aGrabBag.realloc( length + 3 );
+aGrabBag[length].Name = TxbxHasLink;
+aGrabBag[length].Value =
uno::makeAny(this-isLinkedTxbx());
+aGrabBag[length + 1 ].Name = Txbx-Id;
+aGrabBag[length + 1 ].Value =
uno::makeAny(this-getLinkedTxbxAttributes().id);
+aGrabBag[length + 2 ].Name = Txbx-Seq;
+aGrabBag[length + 2 ].Value =
uno::makeAny(this-getLinkedTxbxAttributes().seq);
+
[Libreoffice-commits] core.git: 16 commits - include/svx include/tools scaddins/source sc/source starmath/inc svtools/source svx/source
include/svx/svdtrans.hxx | 14 ++-
include/tools/bigint.hxx | 98 +++---
sc/source/filter/xml/XMLTrackedChangesContext.cxx |3
sc/source/ui/view/viewdata.cxx| 21
scaddins/source/analysis/analysishelper.cxx |5 -
starmath/inc/node.hxx | 12 +-
svtools/source/misc/imap3.cxx |8 +
svtools/source/misc/svtaccessiblefactory.cxx |1
svtools/source/svrtf/parrtf.cxx |6 -
svtools/source/svrtf/svparser.cxx | 13 ++
svx/source/table/tableundo.hxx| 12 ++
11 files changed, 132 insertions(+), 61 deletions(-)
New commits:
commit 0060649399eb130848a79b224ddc39a81721249b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 10:59:25 2014 +0100
coverity#708389 Uninitialized scalar field
Change-Id: If4b05a34b77cc0b6366880ad65132e801b297a62
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 2b5779c..85c7978 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -67,7 +67,17 @@ private:
::sal_Int32 mnRowSpan;
::sal_Int32 mnColSpan;
-Data() : mpProperties(NULL), mpOutlinerParaObject(NULL), mfValue(0) {};
+Data()
+: mpProperties(NULL)
+, mpOutlinerParaObject(NULL)
+, mnCellContentType(CellContentType_EMPTY)
+, mfValue(0)
+, mnError(0)
+, mbMerged(false)
+, mnRowSpan(0)
+, mnColSpan(0)
+{
+}
};
void setDataToCell( const Data rData );
commit d52b0640f413521a782673834f1142bcf3053e70
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 10:56:50 2014 +0100
coverity#708340 Uninitialized scalar field
Change-Id: I1ad1777492f94e7a4162382d9d68e0032aaee460
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 3cd736c..fa6319f 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -280,7 +280,19 @@ private:
SVX_DLLPRIVATE void Undirty();
SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty)
((SdrFormatter*)this)-Undirty(); }
public:
-SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=false;
eDstMU=eDst; bDstFU=false; bDirty=true; }
+SdrFormatter(MapUnit eSrc, MapUnit eDst)
+: nMul_(0)
+, nDiv_(0)
+, nKomma_(0)
+, bSrcFU(false)
+, bDstFU(false)
+, bDirty(true)
+, eSrcMU(eSrc)
+, eDstMU(eDst)
+, eSrcFU(FUNIT_NONE)
+, eDstFU(FUNIT_NONE)
+{
+}
SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=false;
eDstFU=eDst; bDstFU=true; bDirty=true; }
SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=true;
eDstMU=eDst; bDstFU=false; bDirty=true; }
SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=true;
eDstFU=eDst; bDstFU=true; bDirty=true; }
commit 10382948e636072cd31900f8ae8c74f29887633a
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 10:54:20 2014 +0100
coverity#708335 Uninitialized scalar field
Change-Id: I14ce77fe16acdf6491ce49cdbe7550ef303f0ff9
diff --git a/svtools/source/svrtf/svparser.cxx
b/svtools/source/svrtf/svparser.cxx
index 0ecdca4..670b5b1 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -40,8 +40,17 @@ struct SvParser_Impl
rtl_TextToUnicodeConverter hConv;
rtl_TextToUnicodeContext hContext;
-SvParser_Impl() :
-nTokenValue(0), nToken(0), nSaveToken(0), hConv( 0 ), hContext(
(rtl_TextToUnicodeContext)1 )
+SvParser_Impl()
+: nFilePos(0)
+, nlLineNr(0)
+, nlLinePos(0)
+, nTokenValue(0)
+, bTokenHasValue(false)
+, nToken(0)
+, nNextCh(0)
+, nSaveToken(0)
+, hConv( 0 )
+, hContext( (rtl_TextToUnicodeContext)1 )
{
}
commit bbe00527f0529ce8b2295df4a914a954e090c2d2
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 10:52:41 2014 +0100
coverity#708334 Uninitialized scalar field
Change-Id: I01e8a8b18d07e035a57fbc731b4666c98148c102
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 62ddfeb..7a09a7b 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -35,8 +35,10 @@ const int MAX_TOKEN_LEN = 128;
SvRTFParser::SvRTFParser( SvStream rIn, sal_uInt8 nStackSize )
: SvParser( rIn, nStackSize ),
-eUNICodeSet( RTL_TEXTENCODING_MS_1252 ),// default ist ANSI-CodeSet
-nUCharOverread( 1 )
+, nOpenBrakets(0)
+, eCodeSet(RTL_TEXTENCODING_MS_1252)
+, eUNICodeSet(RTL_TEXTENCODING_MS_1252)// default ist ANSI-CodeSet
+, nUCharOverread(1)
{
// default ist ANSI-CodeSet
SetSrcEncoding(
[Libreoffice-commits] core.git: svtools/source
svtools/source/svrtf/parrtf.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aa555c725b9529d5ddb61ae75b65942b4c35b47a Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 22 11:43:00 2014 +0100 stray comma Change-Id: I7771fbb76fe83ba605cb6b86824396c2b1414253 diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index 7a09a7b..0818d24 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -34,7 +34,7 @@ const int MAX_TOKEN_LEN = 128; #define RTF_ISALPHA( c ) comphelper::string::isalphaAscii(c) SvRTFParser::SvRTFParser( SvStream rIn, sal_uInt8 nStackSize ) -: SvParser( rIn, nStackSize ), +: SvParser( rIn, nStackSize ) , nOpenBrakets(0) , eCodeSet(RTL_TEXTENCODING_MS_1252) , eUNICodeSet(RTL_TEXTENCODING_MS_1252)// default ist ANSI-CodeSet ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/boost sw/source
external/boost/UnpackedTarball_boost.mk
|2
external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
| 11 --
external/boost/boost.property_tree.Wtype-limits.warnings.patch.1
| 41 ++
sw/source/core/unocore/unostyle.cxx
| 12 +-
4 files changed, 48 insertions(+), 18 deletions(-)
New commits:
commit d286ffc3adb5386651e177cbc23512436d89d35f
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 22 12:22:11 2014 +0200
fix the getProperty case more thoroughly (related: fdo#77340)
Change-Id: I0cb042474c58b38a3e9a9073a262041b0ef185c7
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index d5ac430..e368108 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1931,7 +1931,7 @@ static void lcl_SetStyleProperty(const
SfxItemPropertySimpleEntry rEntry,
{
if (MID_PAGEDESC_PAGEDESCNAME != nMemberId)
break;
-// Sonderbehandlung RES_PAGEDESC
+// special handling for RES_PAGEDESC
if(aValue.getValueType() != ::getCppuType((const OUString*)0))
throw lang::IllegalArgumentException();
SfxItemSet rStyleSet = rBase.GetItemSet();
@@ -2387,10 +2387,11 @@ static uno::Any lcl_GetStyleProperty(const
SfxItemPropertySimpleEntry rEntry,
}
case RES_PAGEDESC :
{
-// Sonderbehandlung RES_PAGEDESC
+if (MID_PAGEDESC_PAGEDESCNAME != nMemberId)
+break;
+// special handling for RES_PAGEDESC
const SfxPoolItem* pItem;
-if (MID_PAGEDESC_PAGEDESCNAME == nMemberId
-SFX_ITEM_SET ==
rBase.GetItemSet().GetItemState(RES_PAGEDESC, true, pItem))
+if (SFX_ITEM_SET ==
rBase.GetItemSet().GetItemState(RES_PAGEDESC, true, pItem))
{
const SwPageDesc* pDesc = ((const
SwFmtPageDesc*)pItem)-GetPageDesc();
if(pDesc)
@@ -2400,9 +2401,8 @@ static uno::Any lcl_GetStyleProperty(const
SfxItemPropertySimpleEntry rEntry,
aRet = aString;
}
-bDone = true;
}
-
+bDone = true;
break;
}
case FN_UNO_IS_AUTO_UPDATE:
commit 0fbc3a87f78663d9ace98221024f581d5e0c86d9
Author: Adam Co rattles2...@gmail.com
Date: Sun Apr 20 14:35:30 2014 +0300
Boost Patch - Change '*b' to a variable, to remove GCC 4.7.3 -Wtype-limits
Change-Id: Ic7bac90c9b77490c47e5ddd2005453290374b7b2
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index 5be550ee..29c478c 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -54,7 +54,7 @@ boost_patches += boost.preprocessor.Wundef.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9892
boost_patches += boost.property_tree.Wshadow.warnings.patch.1
# https://svn.boost.org/trac/boost/ticket/9893
-boost_patches +=
boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
+boost_patches += boost.property_tree.Wtype-limits.warnings.patch.1
# https://svn.boost.org/trac/boost/ticket/9894
boost_patches += boost.ptr_container.Wshadow.warnings.patch
# https://svn.boost.org/trac/boost/ticket/9895
diff --git
a/external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
b/external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
deleted file mode 100644
index 4ad7b9b..000
---
a/external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
boost/property_tree/detail/json_parser_write.hpp
-+++ boost/property_tree/detail/json_parser_write.hpp
-@@ -33,7 +33,7 @@
- // We escape everything outside ASCII, because this code can't
- // handle high unicode characters.
- if (*b == 0x20 || *b == 0x21 || (*b = 0x23 *b = 0x2E) ||
--(*b = 0x30 *b = 0x5B) || (*b = 0x5D *b = 0xFF))
-+(*b = 0x30 *b = 0x5B) || (*b = 0x5D
static_casttypename std::basic_stringCh::traits_type::int_type(*b) = 0xFF))
- result += *b;
- else if (*b == Ch('\b')) result += Ch('\\'), result += Ch('b');
- else if (*b == Ch('\f')) result += Ch('\\'), result += Ch('f');
diff --git a/external/boost/boost.property_tree.Wtype-limits.warnings.patch.1
b/external/boost/boost.property_tree.Wtype-limits.warnings.patch.1
new file mode 100644
index 000..e4c7ede
--- /dev/null
+++
License statement
Hi, All of mine past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Regards, John Smith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/table/tableundo.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 16e917643f4855125f5a872586b9841a677bb35b Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 22 11:52:35 2014 +0100 fix namespace Change-Id: I4bd345e54d9d5a5901cd6e7aa409135b4dabecef diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 85c7978..1f7e24d 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -70,7 +70,7 @@ private: Data() : mpProperties(NULL) , mpOutlinerParaObject(NULL) -, mnCellContentType(CellContentType_EMPTY) +, mnCellContentType(css::table::CellContentType_EMPTY) , mfValue(0) , mnError(0) , mbMerged(false) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - download.lst svx/source
download.lst |2 +-
svx/source/table/svdotable.cxx | 10 +-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 88c3b4bbf005299203370efecbc09dd9d9d26a72
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 12:05:48 2014 +0100
table not resizing when rows/columns added to it
I happened across a presentation whose table didn't resize when extra rows
and
columns were added to it. It worked on a higher resolution machine, but not
on
a 1024x768 one
Change-Id: I98a7a04bee0b0175174e6376e9ebc046b9eff2dc
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 5e22fba..369b5a2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -248,6 +248,8 @@ private:
static bool lastLayoutFitWidth;
static bool lastLayoutFitHeight;
static WritingMode lastLayoutMode;
+static sal_Int32 lastRowCount;
+static sal_Int32 lastColCount;
};
SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = NULL;
@@ -255,6 +257,8 @@ Rectangle SdrTableObjImpl::lastLayoutRectangle;
bool SdrTableObjImpl::lastLayoutFitWidth;
bool SdrTableObjImpl::lastLayoutFitHeight;
WritingMode SdrTableObjImpl::lastLayoutMode;
+sal_Int32 SdrTableObjImpl::lastRowCount;
+sal_Int32 SdrTableObjImpl::lastColCount;
SdrTableObjImpl::SdrTableObjImpl()
: mpTableObj( 0 )
@@ -694,13 +698,17 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
WritingMode writingMode = mpTableObj-GetWritingMode();
if( lastLayoutTable != this || lastLayoutRectangle != rArea
|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
-|| lastLayoutMode != writingMode )
+|| lastLayoutMode != writingMode
+|| lastRowCount != getRowCount()
+|| lastColCount != getColumnCount() )
{
lastLayoutTable = this;
lastLayoutRectangle = rArea;
lastLayoutFitWidth = bFitWidth;
lastLayoutFitHeight = bFitHeight;
lastLayoutMode = writingMode;
+lastRowCount = getRowCount();
+lastColCount = getColumnCount();
TableModelNotifyGuard aGuard( mxTable.get() );
mpLayouter-LayoutTable( rArea, bFitWidth, bFitHeight );
}
commit 432d735a1d4dbfd1558b95cc18edab1e677c7f71
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 10:16:21 2014 +0100
update narrow liberation-fonts-ttf to 1.07.4
Change-Id: Ie58abbb5b0b4aec574367bf1b8f7a9d8012450ae
diff --git a/download.lst b/download.lst
index b3b48fa..2a16e7e 100644
--- a/download.lst
+++ b/download.lst
@@ -59,7 +59,7 @@ export FONT_CALADEA_TARBALL :=
368f114c078f94214a308a74c7e991bc-crosextrafonts-2
export FONT_CARLITO_TARBALL :=
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
export FONT_DEJAVU_TARBALL :=
a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip
export FONT_GENTIUM_TARBALL :=
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
-export FONT_LIBERATION_NARROW_TARBALL :=
b3174b11c2b6a341f5c99b31088bd67b-liberation-fonts-ttf-1.07.3.tar.gz
+export FONT_LIBERATION_NARROW_TARBALL :=
134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
export FONT_LIBERATION_TARBALL :=
5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
export FONT_LINLIBERTINEG_TARBALL :=
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
export FONT_OPENSANS_TARBALL :=
7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Äbout cpplint
On 04/20/2014 11:03 AM, julien2412 wrote:
I gave a try to cpplint
(http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py) with
some changes so it scan subdirectories.
Except pure formatting warnings, it reports things like this:
1) ./drawinglayer/source/primitive2d/polygonprimitive2d.cxx:274: Consider
using rand_r(...) instead of rand(...) for improved thread safety.
[runtime/threadsafe_fn]
(other functions quoted in the py script:
asctime_r, ctime_r, getgrgid_r, getgrnam_r, getlogin_r, getpwnam_r,
getpwuid_r, gmtime_r, localtime_r, strtok_r, ttyname_r)
If this use of rand() is really about the function from stdlib.h (and
not some other function that happens to have the same name; didn't
check), one problem with the advice is that rand_r is Posix (and
deprecated, at that) but not ISO C.
2) ./fpicker/source/win32/filepicker/comptr.hxx:100: Unary operator is
dangerous. Do not use it. [runtime/operator] [4]
Yeah, that one looks scary indeed.
3) ./crashrep/source/unx/main.cxx:64: For a static/global string constant,
use a C style string instead: static char g_strProductKey[].
[runtime/string]
Looks like a false positive, as
static string g_strProductKey;
is not used to hold a statically known string constant.
4) ./sd/source/ui/remotecontrol/Transmitter.cxx:10: Streams are highly
discouraged. [readability/streams]
Beats me what's wrong with
#include iostream
in general.
5) ./sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h:488: Are you
taking an address of a cast? This is dangerous: could be a temp var. Take
the address before doing the cast, rather than after [runtime/casting]
Looks like cpplint is confused here, as
( (const struct sockaddr_in *)( SA ) )-sin_addr
clearly needs to cast before taking the adr of pointed-to member.
6) ./include/comphelper/sequenceashashmap.hxx:81: Single-argument
constructors should be marked explicit. [runtime/explicit]
There can be no hard-and-fast rule for that. While some ctors probably
miss an explicit, others deliberately are not explicit.
7) ./oox/source/helper/binaryoutputstream.cxx:122: Do not use
variable-length arrays. Use an appropriately named ('k' followed by
CamelCase) compile-time constant for the size. [runtime/arrays]
While the advice to not use variable-length arrays is generally sound,
the suggestion is of course nonsense here (though using OUStringBuffer
or std::vectorsal_Unicode could arguably be an improvement).
There are other different types of warnings about headers/include guards but
would you have some opinion about these first?
Looks like a rather poor signal/noise ratio to me.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/font-override.rtf | 28 ++
sw/qa/extras/rtfimport/rtfimport.cxx |6 +
writerfilter/source/rtftok/rtfsprm.cxx|9
writerfilter/source/rtftok/rtfsprm.hxx|1
writerfilter/source/rtftok/rtfvalue.cxx |4 +++
5 files changed, 48 insertions(+)
New commits:
commit 8e8f9388c323ad3c32cef3f91609ad19386b7d56
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 22 12:53:24 2014 +0200
Related: fdo#77600 RTF import: RTFValue::equals: compare attribute content
Previously only the number of nested sprms / attributes was compared.
With this, the font of the bugdoc is correctly Arial, not Times.
Change-Id: I351de414b6734336b31c1334dbd2349072f16002
diff --git a/sw/qa/extras/rtfimport/data/font-override.rtf
b/sw/qa/extras/rtfimport/data/font-override.rtf
new file mode 100644
index 000..a41d2ab
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/font-override.rtf
@@ -0,0 +1,28 @@
+{\rtf1\ansi\deff4\adeflang1025
+{\fonttbl
+{\f0\froman\fprq2\fcharset0 Times New Roman;}
+{\f1\froman\fprq2\fcharset2 Symbol;}
+{\f2\fswiss\fprq2\fcharset0 Arial;}
+{\f3\froman\fprq2\fcharset0 Liberation Serif
+{\*\falt Times New Roman}
+;}
+{\f4\froman\fprq2\fcharset0 Times New Roman;}
+{\f5\fswiss\fprq2\fcharset0 Liberation Sans
+{\*\falt Arial}
+;}
+{\f6\froman\fprq2\fcharset0 Tahoma;}
+{\f7\froman\fprq2\fcharset0 Arial;}
+{\f8\fnil\fprq2\fcharset0 Droid Sans Fallback;}
+{\f9\fnil\fprq2\fcharset0 Lucida Sans;}
+{\f10\fswiss\fprq0\fcharset1 Lucida Sans;}
+{\f11\fnil\fprq2\fcharset0 Arial;}
+}
+{\colortbl;\red0\green0\blue0;\red5\green99\blue193;\red128\green128\blue128;\red0\green0\blue10;}
+{\stylesheet
+{\s0\snext0\ql\widctlpar\ltrpar
+\cf0\kerning1\dbch\af12\langfe1033\dbch\af12\afs20\alang1025\fs24\loch\f4\lang1033
Normal;}
+}
+\pard\plain\s0
+{\af11\f7
+This should be Arial.}
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 1e3ad95..5445002 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1663,6 +1663,12 @@ DECLARE_RTFIMPORT_TEST(testFdo75735, fdo75735.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty
uno::Sequencestyle::TabStop (getParagraph(2), ParaTabStops).getLength());
}
+DECLARE_RTFIMPORT_TEST(testFontOverride, font-override.rtf)
+{
+// This was Times New Roman.
+CPPUNIT_ASSERT_EQUAL(OUString(Arial),
getPropertyOUString(getRun(getParagraph(1), 1), CharFontName));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index e69f6ed..c6349cb 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -156,6 +156,15 @@ void RTFSprms::deduplicate(RTFSprms rReference)
}
}
+bool RTFSprms::equals(RTFValue rOther)
+{
+RTFSprms::Iterator_t i = m_pSprms-begin();
+while (i != m_pSprms-end())
+if (!i-second-equals(rOther))
+return false;
+return true;
+}
+
void RTFSprms::ensureCopyBeforeWrite()
{
if (m_pSprms-m_nRefCount 1)
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx
b/writerfilter/source/rtftok/rtfsprm.hxx
index 9f811bd..f6c9f5b 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -90,6 +90,7 @@ public:
return m_pSprms-end();
}
void clear();
+bool equals(RTFValue rOther);
private:
void ensureCopyBeforeWrite();
boost::intrusive_ptrRTFSprmsImpl m_pSprms;
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx
b/writerfilter/source/rtftok/rtfvalue.cxx
index 3ff04d7..430b049 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -227,8 +227,12 @@ bool RTFValue::equals(RTFValue rOther)
return false;
if (m_pAttributes-size() != rOther.m_pAttributes-size())
return false;
+else if (!m_pAttributes-equals(rOther))
+return false;
if (m_pSprms-size() != rOther.m_pSprms-size())
return false;
+else if (!m_pSprms-equals(rOther))
+return false;
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
0 files changed New commits: commit aba9d4ba8bed2ea1ee4cf1da0984da62521bdeed Author: Thomas Arnhold tho...@arnhold.org Date: Tue Apr 22 13:13:43 2014 +0200 remove one more zero byte hrc Change-Id: Ic97a7b07bd408bd8c629b4f93296fa6a43e83bb8 diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.hrc deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-4' - include/vcl vcl/generic vcl/inc vcl/null vcl/unx
include/vcl/printerinfomanager.hxx |4 ++--
vcl/generic/print/printerjob.cxx |2 +-
vcl/inc/cupsmgr.hxx|2 +-
vcl/null/printerinfomanager.cxx|2 +-
vcl/unx/generic/printer/cupsmgr.cxx|4 ++--
vcl/unx/generic/printer/printerinfomanager.cxx |2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 8c0d051a0e719fe51fdc5cab1b01afbf721e5e75
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 9 23:09:12 2014 +0100
every even numbered print job is reported as failed
because of.
bool bSuccess;
...
bSuccess = ...endSpool(...);
in PspSalPrinter::StartJob
was...
endSpool return value is effectively success flag, not job ID
(cherry picked from commit e6323214830895d1c76ec44ee53990bf577fbda2)
Change-Id: I5b96eeff80ca29f0f8f24ee6da7a2ca76cbb05ce
Reviewed-on: https://gerrit.libreoffice.org/9093
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 5a7d3debc2dcd483a691afcb6fd6ece6c73beeaf)
Reviewed-on: https://gerrit.libreoffice.org/9118
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/include/vcl/printerinfomanager.hxx
b/include/vcl/printerinfomanager.hxx
index 96e7846..7e3ccd6 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -211,8 +211,8 @@ public:
// close the FILE* returned by startSpool and does the actual spooling
// set bBanner to false will attempt to suppress banner printing
// set bBanner to true will rely on the system default
-// returns a numerical job id
-virtual int endSpool( const OUString rPrinterName, const OUString
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner );
+// returns true on success
+virtual bool endSpool( const OUString rPrinterName, const OUString
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner );
// for spadmin: whether adding or removing a printer is possible
virtual bool addOrRemovePossible() const;
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 7c1b359..f611c26 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -530,7 +530,7 @@ PrinterJob::EndJob ()
else
{
PrinterInfoManager rPrinterInfoManager = PrinterInfoManager::get();
-if (0 == rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName,
+if (!rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName,
maJobTitle, pDestFILE, m_aDocumentJobData, true ))
{
bSuccess = sal_False;
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 8c659fe..a8c06bb 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -78,7 +78,7 @@ public:
const char* authenticateUser( const char* );
virtual FILE* startSpool( const OUString rPrinterName, bool bQuickCommand
);
-virtual int endSpool( const OUString rPrinterName, const OUString
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner );
+virtual bool endSpool( const OUString rPrinterName, const OUString
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner );
virtual void setupJobContextData( JobData rData );
/// changes the info about a named printer
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index a480856..4845ec3 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -147,7 +147,7 @@ FILE* PrinterInfoManager::startSpool( const OUString /*
rPrintername */, bool /
return NULL;
}
-int PrinterInfoManager::endSpool( const OUString /*rPrintername*/, const
OUString /*rJobTitle*/, FILE* /* pFile */, const JobData
/*rDocumentJobData*/, bool /*bBanner*/ )
+bool PrinterInfoManager::endSpool( const OUString /*rPrintername*/, const
OUString /*rJobTitle*/, FILE* /* pFile */, const JobData
/*rDocumentJobData*/, bool /*bBanner*/ )
{
return true;
}
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 069df7d..ecf44e7 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -640,7 +640,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const
JobData rJob, bool bBanner
}
}
-int CUPSManager::endSpool( const OUString rPrintername, const OUString
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner )
+bool CUPSManager::endSpool( const OUString rPrintername, const OUString
rJobTitle, FILE* pFile, const JobData rDocumentJobData, bool bBanner )
{
OSL_TRACE( endSpool: %s, %s, copy count = %d,
OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8
).getStr(),
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/ios
vcl/headless/svpframe.cxx | 12 ++-
vcl/inc/headless/svpframe.hxx | 10 +-
vcl/inc/ios/iosinst.hxx | 15
vcl/ios/iosinst.cxx | 149 --
4 files changed, 19 insertions(+), 167 deletions(-)
New commits:
commit 848ff96d0b3ecca7d9d3c00924aa88bfa5d7d5d5
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 14:37:13 2014 +0300
With tiled rendering for iOS there is no need for a frame buffer
The resulting dropping of the basebmp code reduces app size by 0.7 MB.
Change-Id: Id263873ed5c4bb2435d929a1319fedeedb6daa14
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 8c21445..932abba 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -32,6 +32,8 @@ using namespace basegfx;
SvpSalFrame* SvpSalFrame::s_pFocusFrame = NULL;
+#ifndef IOS
+
namespace {
/// Decouple SalFrame lifetime from damagetracker lifetime
struct DamageTracker : public basebmp::IBitmapDeviceDamageTracker
@@ -61,6 +63,8 @@ void SvpSalFrame::enableDamageTracker( bool bOn )
m_bDamageTracking = bOn;
}
+#endif
+
SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
SalFrame* pParent,
sal_uLong nSalFrameStyle,
@@ -71,8 +75,10 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
m_pParent( static_castSvpSalFrame*(pParent) ),
m_nStyle( nSalFrameStyle ),
m_bVisible( false ),
-m_bDamageTracking( false ),
m_bTopDown( bTopDown ),
+#ifndef IOS
+m_bDamageTracking( false ),
+#endif
m_nScanlineFormat( nScanlineFormat ),
m_nMinWidth( 0 ),
m_nMinHeight( 0 ),
@@ -281,6 +287,7 @@ void SvpSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight, sal_u
if( m_nMinHeight 0 maGeometry.nHeight (unsigned
int)m_nMinHeight )
maGeometry.nHeight = m_nMinHeight;
}
+#ifndef IOS
B2IVector aFrameSize( maGeometry.nWidth, maGeometry.nHeight );
if( ! m_aFrame.get() || m_aFrame-getSize() != aFrameSize )
{
@@ -296,13 +303,12 @@ void SvpSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight, sal_u
for( std::list SvpSalGraphics* ::iterator it = m_aGraphics.begin();
it != m_aGraphics.end(); ++it )
{
-#ifndef IOS
(*it)-setDevice( m_aFrame );
-#endif
}
}
if( m_bVisible )
m_pInstance-PostEvent( this, NULL, SALEVENT_RESIZE );
+#endif
}
void SvpSalFrame::GetClientSize( long rWidth, long rHeight )
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 6a14adf..1aec3aa 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -43,8 +43,11 @@ class SvpSalFrame : public SalFrame
std::list SvpSalFrame*m_aChildren; // List of child
frames
sal_uLong m_nStyle;
boolm_bVisible;
-boolm_bDamageTracking;
boolm_bTopDown;
+#ifndef IOS
+basebmp::BitmapDeviceSharedPtr m_aFrame;
+boolm_bDamageTracking;
+#endif
basebmp::Format m_nScanlineFormat;
longm_nMinWidth;
longm_nMinHeight;
@@ -53,7 +56,6 @@ class SvpSalFrame : public SalFrame
SystemEnvData m_aSystemChildData;
-basebmp::BitmapDeviceSharedPtr m_aFrame;
std::list SvpSalGraphics* m_aGraphics;
static SvpSalFrame* s_pFocusFrame;
@@ -71,7 +73,7 @@ public:
void PostPaint(bool bImmediate) const;
void AllocateFrame();
-#if defined IOS || defined ANDROID
+#if defined ANDROID
const basebmp::BitmapDeviceSharedPtr getDevice() const { return m_aFrame;
}
#endif
@@ -125,9 +127,11 @@ public:
virtual voidUnionClipRegion( long nX, long nY, long
nWidth, long nHeight ) SAL_OVERRIDE;
virtual voidEndSetClipRegion() SAL_OVERRIDE;
+#ifndef IOS
// If enabled we can get damage notifications for regions immediately
rendered to ...
virtual voidenableDamageTracker( bool bOn = true );
virtual voiddamaged( const basegfx::B2IBox /* rDamageRect
*/) {}
+#endif
/*TODO: functional implementation */
virtual voidSetScreenNumber( unsigned int nScreen )
SAL_OVERRIDE { (void)nScreen; }
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index a91b6fc..e165f13 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_VCL_INC_IOS_IOSINST_HXX
#define INCLUDED_VCL_INC_IOS_IOSINST_HXX
-#include pthread.h
-
#include premac.h
#include CoreGraphics/CoreGraphics.h
#include postmac.h
@@ -47,17 +45,7 @@ public:
SalFrame *getFocusFrame() const;
-void damaged( IosSalFrame
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions/prj extensions/source postprocess/packcomponents scp2/source sd/source
extensions/prj/build.lst |1
extensions/prj/d.lst |2
extensions/source/mozbootstrap/MMozillaBootstrap.cxx | 233 ++
extensions/source/mozbootstrap/MMozillaBootstrap.hxx | 97 +++
extensions/source/mozbootstrap/MNSFolders.cxx | 147 +++
extensions/source/mozbootstrap/MNSFolders.hxx | 39 +++
extensions/source/mozbootstrap/MNSINIParser.cxx | 133 ++
extensions/source/mozbootstrap/MNSINIParser.hxx | 79 ++
extensions/source/mozbootstrap/MNSProfileDiscover.cxx | 221 +
extensions/source/mozbootstrap/MNSProfileDiscover.hxx | 98 +++
extensions/source/mozbootstrap/makefile.mk| 76 +
extensions/source/mozbootstrap/mozbootstrap.component | 27 ++
postprocess/packcomponents/makefile.mk|4
scp2/source/ooo/file_library_ooo.scp |9
scp2/source/ooo/module_hidden_ooo.scp |3
sd/source/ui/app/sdxfer.cxx | 11
16 files changed, 1179 insertions(+), 1 deletion(-)
New commits:
commit a91b5943b2c971ff1e69f5c2da45b8a647562676
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 22 11:45:25 2014 +
i63399 add to clipboard as URL only when no fill and no line style, just a
simple URL
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 97302f6..d2fdde9 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -256,7 +256,16 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
{
const SvxURLField* pURL = (SvxURLField*) pData;
-mpBookmark = new INetBookmark( pURL-GetURL(),
pURL-GetRepresentation() );
+// #63399# This special code identifies TextFrames
which have just an URL
+// as content and directly add this to the clipboard,
probably to avoid adding
+// an unnecessary DrawObject to the target where paste
may take place. This is
+// wanted only for SdrObjects with no fill and no
line, else it is necessary to
+// use the whole SdrObect. Test here for
Line/FillStyle and take shortcut only
+// when both are unused
+if(!pObj-HasFillStyle() !pObj-HasLineStyle())
+{
+mpBookmark = new INetBookmark( pURL-GetURL(),
pURL-GetRepresentation() );
+}
}
}
}
commit 7496ed4f9a07d2f09894279158f47e9f29e2b4e2
Author: Jürgen Schmidt j...@apache.org
Date: Tue Apr 22 09:23:51 2014 +
#124701# bring back moz bootstrap to find profile
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index aea..8a815ee 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -22,6 +22,7 @@ ex extensions\source\config\ldap nmake -
all ex_ldap ex_inc N
ex extensions\source\update\feed nmake - all ex_updchkfeed
ex_inc NULL
ex extensions\source\update\check nmake - all ex_updchk
ex_inc NULL
ex extensions\source\update\ui nmake - all ex_updchkui
ex_inc NULL
+ex extensions\source\mozbootstrap nmake - all
ex_mozbootstrap ex_inc NULL
ex extensions\util nmake - all ex_util
ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib
ex_oooimprovecore NULL
# Fails at the moment
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index e4e2e21..9c01f3a 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -12,6 +12,7 @@ mkdir: %_DEST%\bin%_EXT%\so
..\%__SRC%\lib\ldapbe2.uno.so %_DEST%\lib%_EXT%\ldapbe2.uno.so
..\%__SRC%\lib\updchk.uno.so %_DEST%\lib%_EXT%\updchk.uno.so
..\%__SRC%\lib\updatefeed.uno.so %_DEST%\lib%_EXT%\updatefeed.uno.so
+..\%__SRC%\lib\mozbootstrap.uno.so %_DEST%\lib%_EXT%\mozbootstrap.uno.so
..\%__SRC%\bin\oleautobridge2.uno.dll
%_DEST%\bin%_EXT%\odf4ms\oleautobridge.uno.dll
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
@@ -50,3 +51,4 @@ mkdir:
%_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Logging
..\%__SRC%\misc\updchk.component %_DEST%\xml%_EXT%\updchk.component
..\%__SRC%\misc\updchk.uno.component %_DEST%\xml%_EXT%\updchk.uno.component
..\%__SRC%\misc\xmx.component %_DEST%\xml%_EXT%\xmx.component
+..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
diff --git a/extensions/source/mozbootstrap/MMozillaBootstrap.cxx
b/extensions/source/mozbootstrap/MMozillaBootstrap.cxx
new file mode 100644
index 000..410c55d
--- /dev/null
+++ b/extensions/source/mozbootstrap/MMozillaBootstrap.cxx
@@ -0,0 +1,233 @@
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9b7e3511b334ca905503ba69b52b4cc541963a91
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 14:35:47 2014 +0200
-Werror,-Wparentheses-equality
Change-Id: I65f41ace03071fdb420736e373684b592ddf5fab
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 434e9b0..2d433bb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2287,14 +2287,14 @@ void DomainMapper_Impl::ChainTextFrames()
if ( nTxbxId1 == nTxbxId2 )
{
//who connects whom ??
-if ( ( nTxbxSeq1 == ( nTxbxSeq2 + 1 ) ) )
+if ( nTxbxSeq1 == ( nTxbxSeq2 + 1 ) )
{
xPropertySet2-setPropertyValue(sChainNextName,
uno::makeAny(sName1));
xPropertySet1-setPropertyValue(sChainPrevName,
uno::makeAny(sName2));
bIsTxbxChained = true ;
break ; //there cannot be more than one previous/next
frames
}
-else if( (nTxbxSeq2 == ( nTxbxSeq1 + 1 ) ))
+else if ( nTxbxSeq2 == ( nTxbxSeq1 + 1 ) )
{
xPropertySet1-setPropertyValue(sChainNextName,
uno::makeAny(sName2));
xPropertySet2-setPropertyValue(sChainPrevName,
uno::makeAny(sName1));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 28fc951233a58fb4d8515ed4380140aaee0afd32
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 14:38:33 2014 +0200
loplugin:passstringbyref
Change-Id: Iee0ad3898e109add96daac693633c0921c3d7c97
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2d433bb..bb30218 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2230,7 +2230,7 @@ void DomainMapper_Impl::SetNumberFormat( const OUString
rCommand,
}
}
-static uno::Any lcl_getGrabBagValue( const
uno::Sequencebeans::PropertyValue grabBag, OUString name )
+tatic uno::Any lcl_getGrabBagValue( const uno::Sequencebeans::PropertyValue
grabBag, OUString const name )
{
for (int i = 0; i grabBag.getLength(); ++i)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b2e4ea31ec0ff8505629a94c2ee85a6e7ba19245
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 14:40:04 2014 +0200
Accidentally removed s
Change-Id: I1b693f767fd7fc1170cd396ee037243fa5a1fffa
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bb30218..9c88008 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2230,7 +2230,7 @@ void DomainMapper_Impl::SetNumberFormat( const OUString
rCommand,
}
}
-tatic uno::Any lcl_getGrabBagValue( const uno::Sequencebeans::PropertyValue
grabBag, OUString const name )
+static uno::Any lcl_getGrabBagValue( const
uno::Sequencebeans::PropertyValue grabBag, OUString const name )
{
for (int i = 0; i grabBag.getLength(); ++i)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/DocumentSettingManager.hxx | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit a2ec06ab9aef65ddea6c56019de6db0b7229b9dc Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 22 14:44:13 2014 +0200 loplugin:saloverride Change-Id: I638c6afdfbc4af7d2431e4b6c6a9324094b7a0d3 diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx index 10a2a5a..a60a919 100644 --- a/sw/source/core/inc/DocumentSettingManager.hxx +++ b/sw/source/core/inc/DocumentSettingManager.hxx @@ -91,21 +91,21 @@ class DocumentSettingManager : public: DocumentSettingManager(SwDoc rDoc); -~DocumentSettingManager(); +virtual ~DocumentSettingManager(); // IDocumentSettingAccess -virtual bool get(/*[in]*/ DocumentSettingId id) const; -virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value); -virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const; -virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters rForbiddenCharacters ); -virtual rtl::ReferenceSvxForbiddenCharactersTable getForbiddenCharacterTable(); -virtual const rtl::ReferenceSvxForbiddenCharactersTable getForbiddenCharacterTable() const; -virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const; -virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ); -virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const; -virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ); -virtual SwCharCompressType getCharacterCompressionType() const; -virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ); +virtual bool get(/*[in]*/ DocumentSettingId id) const SAL_OVERRIDE; +virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) SAL_OVERRIDE; +virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const SAL_OVERRIDE; +virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters rForbiddenCharacters ) SAL_OVERRIDE; +virtual rtl::ReferenceSvxForbiddenCharactersTable getForbiddenCharacterTable() SAL_OVERRIDE; +virtual const rtl::ReferenceSvxForbiddenCharactersTable getForbiddenCharacterTable() const SAL_OVERRIDE; +virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; +virtual void setLinkUpdateMode( /*[in]*/ sal_uInt16 nMode ) SAL_OVERRIDE; +virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const SAL_OVERRIDE; +virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags eMode ) SAL_OVERRIDE; +virtual SwCharCompressType getCharacterCompressionType() const SAL_OVERRIDE; +virtual void setCharacterCompressionType( /*[in]*/SwCharCompressType nType ) SAL_OVERRIDE; // Replace all compatability options with those from rSource. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/DocumentDeviceManager.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c6b74f24494a0426067dfcb54b7b8fb0e01c821 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 22 14:58:31 2014 +0200 Keep MSVC happy Change-Id: I29f17634de46febbd50331af20a726b394c0087d diff --git a/sw/source/core/inc/DocumentDeviceManager.hxx b/sw/source/core/inc/DocumentDeviceManager.hxx index 5681a98..d9cf106 100644 --- a/sw/source/core/inc/DocumentDeviceManager.hxx +++ b/sw/source/core/inc/DocumentDeviceManager.hxx @@ -61,7 +61,7 @@ public: void setPrintData(/*[in]*/ const SwPrintData rPrtData ) SAL_OVERRIDE; -virtual ~DocumentDeviceManager() SAL_OVERRIDE; +virtual ~DocumentDeviceManager(); private: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/rtfexport/data/fdo77600.rtf| 25 +
sw/qa/extras/rtfexport/rtfexport.cxx|6 ++
sw/source/filter/ww8/rtfattributeoutput.cxx |9 +
sw/source/filter/ww8/rtfattributeoutput.hxx |2 ++
4 files changed, 42 insertions(+)
New commits:
commit 55c832d86e6cb06e9d6423ce5e6245189bc80da1
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 22 14:49:41 2014 +0200
fdo#77600 RTF export: always close URL's before the end of run
In case the URL text has multiple portions, then MSWordExportBase
generates multiple URL's anyway, and this helps to avoid loosing some
direct formatting of the remaining portions of the paragraph.
Change-Id: Ifd72741de610ce69b9ae0978aa8f9a532a3aeed2
diff --git a/sw/qa/extras/rtfexport/data/fdo77600.rtf
b/sw/qa/extras/rtfexport/data/fdo77600.rtf
new file mode 100644
index 000..5c6a488
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo77600.rtf
@@ -0,0 +1,25 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2
+Times New Roman;}
+{\f1\fbidi \fswiss\fcharset238\fprq2
+Arial;}
+}
+\pard\plain \ltrpar
+\ql
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6446855
\rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
+{\rtlch\fcs1 \af1 \ltrch\fcs0
+\f1\fs20\insrsid6446855 Before }
+{\field\fldedit
+{\*\fldinst
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1260577 HYPERLINK
http://www.microsoft.com/en-us/news/press/2013/jul13/07-11onemicrosoft.aspx; }
+}
+{\fldrslt
+{\rtlch\fcs1 \af1 \ltrch\fcs0
+\cs61\f1\fs20\ul\cf17\insrsid6446855\charrsid4592903 href}
+}
+}
+\sectd \ltrsect\psz1\linex0\endnhere\sectdefaultcl\sectrsid6897289\sftnbj
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\fs20\insrsid6446855 after.}
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6446855
+\par }
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index a0ffe5d..c395ec9 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -619,6 +619,12 @@ DECLARE_RTFEXPORT_TEST(testLineNumbering,
linenumbering.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), getPropertysal_Int32(xPropertySet,
Interval));
}
+DECLARE_RTFEXPORT_TEST(testFdo77600, fdo77600.rtf)
+{
+// This was 'Liberation Serif'.
+CPPUNIT_ASSERT_EQUAL(OUString(Arial),
getPropertyOUString(getRun(getParagraph(1), 3), CharFontName));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 0185a01..862b128 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -413,6 +413,8 @@ void RtfAttributeOutput::StartRun( const SwRedlineData*
pRedlineData, bool bSing
void RtfAttributeOutput::EndRun()
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+if (m_bInURL)
+EndURL();
m_aRun-append(SAL_NEWLINE_STRING);
m_aRun.appendAndClear(m_aRunText);
if (!m_bSingleEmptyRun m_bInRun)
@@ -493,6 +495,7 @@ bool RtfAttributeOutput::StartURL( const OUString rUrl,
const OUString rTarget
m_aStyles.append(});
m_bHadFieldResult = false;
+m_bInURL = true;
return true;
}
@@ -500,6 +503,11 @@ bool RtfAttributeOutput::EndURL()
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+if (m_bInURL)
+m_bInURL = false;
+else
+return true;
+
// close the fldrslt group
if (m_bHadFieldResult)
m_aRunText-append('}');
@@ -3361,6 +3369,7 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport
rExport )
m_aCells(),
m_bSingleEmptyRun(false),
m_bInRun(false),
+m_bInURL(false),
m_pFlyFrameSize(0),
m_pPrevPageDesc(0)
{
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 0d00506..fbb191a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -586,6 +586,8 @@ private:
bool m_bInRun;
+bool m_bInURL;
+
/// Maps ID's to postit fields, used in atrfstart/end and atnref.
std::mapsal_uInt16, const SwPostItField* m_aPostitFields;
___
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-6' - sw/source
sw/source/core/fields/reffld.cxx | 73 ++-
1 file changed, 34 insertions(+), 39 deletions(-)
New commits:
commit 96c60b814c487a23aa7d1ae8db4407304a50b097
Author: Michael Stahl mst...@redhat.com
Date: Thu Apr 17 15:25:23 2014 +0200
fdo#77342: sw: fix copy/paste of footnote cross references
The fix for sequence fields broke the footnote references some more;
simplify it by handling the footnotes in the same way as the sequence
fields, and not remapping GetExp fields for which the corresponding
SetExp field / footnote is missing.
Also, don't do any remapping when the target is a clipboard document, to
prevent modifying the source document.
(regression from bb665affbd8870652ade3951d626d76e99143f67)
(cherry picked from commit cbfcb837fb06a14daf5281ae13fc1886328cee6f)
Conflicts:
sw/source/core/fields/reffld.cxx
Change-Id: If1be1e1d9742182a4085bbbff53e26a8fa8665b8
Reviewed-on: https://gerrit.libreoffice.org/9084
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 4786291566320aaf21fe4c9a7fb52269ddba4f3c)
Reviewed-on: https://gerrit.libreoffice.org/9087
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index ba0e4bb..fee6d0e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1014,6 +1014,17 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc,
bool bField )
{
GetNoteIdsFromDoc( rDestDoc, aIds );
GetNoteIdsFromDoc( rDoc, aDstIds );
+
+for (std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt !=
aDstIds.end(); ++pIt)
+AddId( GetFirstUnusedId(aIds), *pIt );
+
+// Change the footnotes/endnotes in the source doc to the new ID
+for (sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i nCnt; ++i)
+{
+SwTxtFtn *const pFtnIdx = rDoc.GetFtnIdxs()[i];
+sal_uInt16 const n = pFtnIdx-GetSeqRefNo();
+pFtnIdx-SetSeqNo(sequencedIds[n]);
+}
}
bInit = true;
}
@@ -1051,54 +1062,38 @@ void _RefIdsMap::Check( SwDoc rDoc, SwDoc rDestDoc,
SwGetRefField rFld,
{
Init( rDoc, rDestDoc, bField);
-sal_uInt16 nSeqNo = rFld.GetSeqNo();
+sal_uInt16 const nSeqNo = rFld.GetSeqNo();
-// Check if the number is used in both documents
-// Note: For fields, aIds contains both the ids of SetExp from rDestDoc
-// and the targets of the already remapped ones from rDoc.
-// It is possible that aDstIds contains numbers that aIds does not contain!
-// For example, copying a selection to clipboard that does not contain
-// the first SwSetExpField will result in id 0 missing, then pasting that
-// into empty document gives a mapping 1-0 ... N-N-1 (fdo#63553).
-if (aIds.count(nSeqNo) || aDstIds.count(nSeqNo))
+// check if it needs to be remapped
+// if sequencedIds doesn't contain the number, it means there is no
+// SetExp field / footnote in the source document: do not modify
+// the number, which works well for copy from/paste to same document
+// (and if it is not the same document, there's no correct result anyway)
+if (sequencedIds.count(nSeqNo))
{
-// Number already taken, so need a new one.
-if( sequencedIds.count(nSeqNo) )
-rFld.SetSeqNo( sequencedIds[nSeqNo] );
-else
-{
-assert(!bField || !aDstIds.count(nSeqNo)); // postcond of Init
-
-sal_uInt16 n = GetFirstUnusedId( aIds );
-
-// die neue SeqNo eintragen, damit die belegt ist
-AddId( n, nSeqNo );
-rFld.SetSeqNo( n );
-
-// und noch die Fuss-/EndNote auf die neue Id umsetzen
-if( !bField )
-{
-SwTxtFtn* pFtnIdx;
-for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().size(); i
nCnt; ++i )
-if( nSeqNo == (pFtnIdx = rDoc.GetFtnIdxs()[ i
])-GetSeqRefNo() )
-{
-pFtnIdx-SetSeqNo( n );
-break;
-}
-}
-}
-}
-else
-{
-AddId( nSeqNo, nSeqNo ); // this requires that nSeqNo is unused in
both!
+rFld.SetSeqNo( sequencedIds[nSeqNo] );
}
}
-
+/// 1. if _both_ SetExp + GetExp / Footnote + GetExp field are copied,
+///enusure that both get a new unused matching number
+/// 2. if only SetExp / Footnote is copied, it gets a new unused number
+/// 3. if only GetExp field is copied, for the case of copy from / paste to
+///same document it's desirable to keep the same number;
+///for other cases of copy/paste or master documents it's not obvious
+///what is most desirable
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/util.cxx | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
New commits:
commit ab9813eaea32b3456a37a283b74ee7be39c69a0c
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 15:06:58 2014 +0200
Don't litter pCustomShapeTypeTranslationHashMap with dangling keys
...that are char* into temporary OString at the GetOOXMLPresetGeometry call
site
in oox/source/export/shapes.cxx.
Change-Id: Ifd6533f9bd869b740a6b483f4a1f6e4860007b9c
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 807061f..3eb2309 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1302,8 +1302,6 @@ static CustomShapeTypeTranslationHashMap*
pCustomShapeTypeTranslationHashMap = N
const char* GetOOXMLPresetGeometry( const char* sShapeType )
{
-const char* sPresetGeo;
-
if( pCustomShapeTypeTranslationHashMap == NULL )
{
pCustomShapeTypeTranslationHashMap = new
CustomShapeTypeTranslationHashMap ();
@@ -1312,13 +1310,9 @@ const char* GetOOXMLPresetGeometry( const char*
sShapeType )
(*pCustomShapeTypeTranslationHashMap)[
pCustomShapeTypeTranslationTable[ i ].sOOo ] =
pCustomShapeTypeTranslationTable[ i ].sMSO;
}
}
-
-sPresetGeo = (*pCustomShapeTypeTranslationHashMap)[ sShapeType ];
-
-if( sPresetGeo == NULL )
-sPresetGeo = rect;
-
-return sPresetGeo;
+CustomShapeTypeTranslationHashMap::iterator i(
+pCustomShapeTypeTranslationHashMap-find(sShapeType));
+return i == pCustomShapeTypeTranslationHashMap-end() ? rect : i-second;
}
typedef boost::unordered_map const char*, MSO_SPT, rtl::CStringHash,
rtl::CStringEqual DMLToVMLTranslationHashMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/util.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 60db3dae6cdacff0519e3f37186592baafb9e6b0 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 22 15:18:57 2014 +0200 Use already found result Change-Id: Ifafba6f4f93b357239ddadd5ca16ac62bd6e289b diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 3eb2309..5aad6fe 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -1329,10 +1329,8 @@ MSO_SPT GETVMLShapeType(const OString aType) (*pDMLToVMLMap)[pDMLToVMLTable[i].sDML] = pDMLToVMLTable[i].nVML; } -if (pDMLToVMLMap-find(pDML) == pDMLToVMLMap-end()) -return mso_sptNil; - -return (*pDMLToVMLMap)[pDML]; +DMLToVMLTranslationHashMap::iterator i(pDMLToVMLMap-find(pDML)); +return i == pDMLToVMLMap-end() ? mso_sptNil : i-second; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-1'
Tag 'cp-4.2-1' created by Andras Timar andras.ti...@collabora.com at 2014-04-22 14:20 -0700 cp-4.2-1 Changes since libreoffice-4-2-branch-point-12: --- 0 files changed --- ___ 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-6' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 16f5d0504c3385a746c8936318d55082ce30998d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 11 11:10:14 2014 +0100
check that stacks are not empty before top()
Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc
(cherry picked from commit a1ea3838adee634ccf725bc5f2be7805c6294a16)
Reviewed-on: https://gerrit.libreoffice.org/8933
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 1a8d06881ee7ba679da8b7cc37b53a20a04ee3e8)
Reviewed-on: https://gerrit.libreoffice.org/9127
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b0cde8d..21416e2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1242,6 +1242,9 @@ void DomainMapper_Impl::appendTextContent(
const uno::Sequence beans::PropertyValue xPropertyValues
)
{
+SAL_WARN_IF(m_aTextAppendStack.empty(), writerfilter.dmapper, no text
append stack);
+if (m_aTextAppendStack.empty())
+return;
uno::Reference text::XTextAppendAndConvert xTextAppendAndConvert(
m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY );
OSL_ENSURE( xTextAppendAndConvert.is(), trying to append a text content
without XTextAppendAndConvert );
if(xTextAppendAndConvert.is() ! getTableManager( ).isIgnore())
@@ -1291,7 +1294,9 @@ void DomainMapper_Impl::appendOLE( const OUString
rStreamName, OLEHandlerPtr pO
// gives a better ( visually ) result
xOLEProperties-setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
PROP_ANCHOR_TYPE ), uno::makeAny( text::TextContentAnchorType_AS_CHARACTER )
);
// remove ( if valid ) associated shape ( used for graphic replacement
)
-m_aAnchoredStack.top( ).bToRemove = true;
+SAL_WARN_IF(m_aAnchoredStack.empty(), writerfilter.dmapper, no
anchor stack);
+if (!m_aAnchoredStack.empty())
+m_aAnchoredStack.top( ).bToRemove = true;
RemoveLastParagraph();
m_aTextAppendStack.pop();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-1'
Tag 'cp-4.2-1' created by Andras Timar andras.ti...@collabora.com at 2014-04-22 14:20 -0700 cp-4.2-1 Changes since libreoffice-4-2-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-1'
Tag 'cp-4.2-1' created by Andras Timar andras.ti...@collabora.com at 2014-04-22 14:20 -0700 cp-4.2-1 Changes since cp-4.2-branch-point-306: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.2-1'
Tag 'cp-4.2-1' created by Andras Timar andras.ti...@collabora.com at 2014-04-22 14:20 -0700 cp-4.2-1 Changes since libreoffice-4-2-branch-point-18: --- 0 files changed --- ___ 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-6' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
New commits:
commit af8d6c6e58d18758c2544fc71c076ae537285c48
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Apr 9 10:47:25 2014 +0200
fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude
case
This is still not perfect, but at least we now don't do the opposite of
what was asked.
Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11
(cherry picked from commit c2af50eb6df396c957890a6b912b8f3185893551)
(cherry picked from commit 9b1108fb4107d1a009acf468a1771214928516c4)
Reviewed-on: https://gerrit.libreoffice.org/9128
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index cb0a37b..36e6499 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -115,6 +115,16 @@ const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001;
const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002;
const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003;
+enum EmfPlusCombineMode
+{
+EmfPlusCombineModeReplace = 0x,
+EmfPlusCombineModeIntersect = 0x0001,
+EmfPlusCombineModeUnion = 0x0002,
+EmfPlusCombineModeXOR = 0x0003,
+EmfPlusCombineModeExclude = 0x0004,
+EmfPlusCombineModeComplement = 0x0005
+};
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -2185,7 +2195,19 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon clipPoly
(path.GetPolygon (*this));
clipPoly.transform (rState.mapModeTransform);
-updateClipping (clipPoly, rFactoryParms,
combineMode == 1);
+switch (combineMode)
+{
+case EmfPlusCombineModeReplace:
+case EmfPlusCombineModeIntersect:
+case EmfPlusCombineModeUnion: // Is this,
EmfPlusCombineModeXOR and EmfPlusCombineModeComplement correct?
+case EmfPlusCombineModeXOR:
+case EmfPlusCombineModeComplement:
+updateClipping (clipPoly, rFactoryParms,
combineMode == 1);
+break;
+case EmfPlusCombineModeExclude:
+// Not doing anything is better then including
exactly what we wanted to exclude.
+break;
+}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/flat/EConnection.cxx |2 +-
connectivity/source/inc/flat/EConnection.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fc0f5f654848f5a44f5f95a862916d57594fd045
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 15:38:55 2014 +0200
Revert coverity#1202903 Uncaught exception
This reverts commit 3716833635926fa59372a8274decfebd4dc498e9,
DeploymentException is a RuntimeException.
diff --git a/connectivity/source/drivers/flat/EConnection.cxx
b/connectivity/source/drivers/flat/EConnection.cxx
index 5f55159..03bb821 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -60,7 +60,7 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection,
com.sun.star.sdbc.drivers.flat.Connecti
void OFlatConnection::construct(const OUString url,const Sequence
PropertyValue info)
-throw(css::sdbc::SQLException, css::uno::RuntimeException,
css::uno::DeploymentException)
+throw(css::sdbc::SQLException, css::uno::RuntimeException)
{
osl_atomic_increment( m_refCount );
diff --git a/connectivity/source/inc/flat/EConnection.hxx
b/connectivity/source/inc/flat/EConnection.hxx
index ad1fb1c..1d3854f 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -40,7 +40,7 @@ namespace connectivity
OFlatConnection(ODriver*_pDriver);
virtual ~OFlatConnection();
-virtual void construct(const OUString _rUrl,const
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
_rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException,
css::uno::DeploymentException) SAL_OVERRIDE;
+virtual void construct(const OUString _rUrl,const
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
_rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException)
SAL_OVERRIDE;
// own methods
inline bool isHeaderLine() const { return
m_bHeaderLine; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-4' - sd/qa xmloff/source
sd/qa/unit/data/odp/fdo77027.odp |binary
sd/qa/unit/import-tests.cxx | 37 +
xmloff/source/draw/ximpshap.cxx |2 +-
3 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit e04b47ef73247607aa05d1c875557f0cce896df7
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 15 23:34:37 2014 +0200
fdo#77027: ODF import: fix wrong version in check for embedded objects
SvXMLImport::LO_4x does not mean 4.0+ any more.
(regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)
(cherry picked from commit 25a2eab22798373b8197f1e594568207eb7c5039)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a
Reviewed-on: https://gerrit.libreoffice.org/9064
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 192963c3c1959389cb78e80bbc3e22e49fabcc73)
Reviewed-on: https://gerrit.libreoffice.org/9067
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/sd/qa/unit/data/odp/fdo77027.odp b/sd/qa/unit/data/odp/fdo77027.odp
new file mode 100644
index 000..4d834d4
Binary files /dev/null and b/sd/qa/unit/data/odp/fdo77027.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 991f5fe..7fddb39 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -18,6 +18,10 @@
#include svx/svdotext.hxx
#include svx/svdoashp.hxx
+#include svx/svdogrp.hxx
+#include svx/svdomedia.hxx
+#include svx/svdoole2.hxx
+#include svx/xflclit.hxx
#include animations/animationnodehelper.hxx
#include com/sun/star/drawing/XDrawPage.hpp
@@ -43,6 +47,7 @@ class SdFiltersTest : public SdModelTestBase
public:
void testDocumentLayout();
void testSmoketest();
+void testFdo77027();
void testN759180();
void testN778859();
void testFdo64512();
@@ -53,6 +58,7 @@ public:
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
CPPUNIT_TEST(testSmoketest);
+CPPUNIT_TEST(testFdo77027);
CPPUNIT_TEST(testN759180);
CPPUNIT_TEST(testN778859);
CPPUNIT_TEST(testFdo64512);
@@ -243,6 +249,37 @@ void SdFiltersTest::testN778859()
}
}
+// FIXME copypasta
+std::ostream operator(std::ostream rStrm, const Color rColor)
+{
+rStrm Color: R: rColor.GetRed() G: rColor.GetGreen()
B: rColor.GetBlue();
+return rStrm;
+}
+
+void SdFiltersTest::testFdo77027()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/odp/fdo77027.odp));
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+{
+SdrOle2Obj *const pObj = dynamic_castSdrOle2Obj*(pPage-GetObj(0));
+CPPUNIT_ASSERT(pObj);
+
+// check that the fill style/color was actually imported
+const XFillStyleItem rStyleItem = dynamic_castconst XFillStyleItem(
+pObj-GetMergedItem(XATTR_FILLSTYLE));
+CPPUNIT_ASSERT_EQUAL(XFILL_SOLID, rStyleItem.GetValue());
+const XFillColorItem rColorItem = dynamic_castconst XFillColorItem(
+pObj-GetMergedItem(XATTR_FILLCOLOR));
+CPPUNIT_ASSERT_EQUAL(Color(0xff6600), rColorItem.GetColorValue());
+}
+
+xDocShRef-DoClose();
+}
+
void SdFiltersTest::testFdo64512()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/fdo64512.odp));
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index bb3a49f..ae94d31 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2677,7 +2677,7 @@ void SdXMLObjectShapeContext::StartElement( const
::com::sun::star::uno::Referen
void SdXMLObjectShapeContext::EndElement()
{
if (GetImport().isGeneratorVersionOlderThan(
-SvXMLImport::OOo_34x, SvXMLImport::LO_4x))
+SvXMLImport::OOo_34x, SvXMLImport::LO_41x)) // LO 4.0
{
// #i118485#
// If it's an old file from us written before OOo3.4, we need to
correct
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38841] Fuzz XML file filters
https://bugs.freedesktop.org/show_bug.cgi?id=38841 John Smith lbalba...@gmail.com changed: What|Removed |Added Assignee|lbalba...@gmail.com |libreoffice-b...@lists.free ||desktop.org --- Comment #6 from John Smith lbalba...@gmail.com --- Abandoned the patch; resetting assignee to default. -- 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: sal/textenc
sal/textenc/tables.cxx |8 1 file changed, 8 insertions(+) New commits: commit 247cec2c119464dca7775c1a556cc2bfd59e0f8c Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 22 16:55:13 2014 +0300 Bypass EUC and ISO-2022 encoding tables for iOS It is questionable whether they are needed for any document format. Saves 0.4 MB of app executable size. If it turns out that some document format that support is needed for actually does need these tables, will have to revert this then. An alternative, but more complex, way to save executable size would be to put this, and other, conversion data into a data file instead. Change-Id: I017e8f15626023af1344964be54c09fe2d937acc diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index 90b40ce..0d5eaf0 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -171,11 +171,19 @@ extern C SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * aImplGBT12345TextEncodingData, /* GBT_12345 */ aImplGBKTextEncodingData, /* GBK */ aImplBIG5TextEncodingData, /* BIG5 */ +#ifndef IOS aImplEUCJPTextEncodingData, /* EUC_JP */ aImplEUCCNTextEncodingData, /* EUC_CN */ aImplEucTwTextEncodingData, /* EUC_TW */ aImplIso2022JpTextEncodingData, /* ISO_2022_JP */ aImplIso2022CnTextEncodingData, /* ISO_2022_CN */ +#else +NULL, /* EUC_JP */ +NULL, /* EUC_CN */ +NULL, /* EUC_TW */ +NULL, /* ISO_2022_JP */ +NULL, /* ISO_2022_CN */ +#endif aImplKOI8RTextEncodingData, /* KOI8_R */ aImplUTF7TextEncodingData, /* UTF7 */ NULL, /* UTF8, see above */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/Transmitter.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit f515609c725b754d687c0f98ef61e9b6c9ac9a4a Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Apr 22 14:59:45 2014 +0100 Kill unneeded include. Added in b042a78d9847753d95560749dab2159d9cfbd7ae , but doesn't actually appear to be used for anything (possibly an accidental debug-output leftover?). Change-Id: If062c40da7164284a8d6538fc8cf8cb0e4719436 diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx index 212299e..cc7b8ec 100644 --- a/sd/source/ui/remotecontrol/Transmitter.cxx +++ b/sd/source/ui/remotecontrol/Transmitter.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include Transmitter.hxx -#include iostream using namespace std; using namespace osl; // Sockets etc. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/print.cxx |8
vcl/source/outdev/font.cxx |7 +++
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit efbc6ba6af3db201e610abb93ceab61818b98d28
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Wed Apr 23 00:17:49 2014 +1000
Fix regression introduced in f4e8bca336 when fixing fdo#74702
I misread the original code and in OutputDevice::InitFont().
Antialiasing should NOT be done for Printer fonts, and SHOULD be done
by VirtualDevice and Window fonts. Unfortunately, I made Printer fonts
do anti-aliasing and VirtualDevice and Window fonts did not...
Change-Id: Ic38451da4ffdfa2e7a5412355f659bde03eae08f
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 5659709..b3daa80 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -33,7 +33,6 @@
#include vcl/gdimtf.hxx
#include vcl/metaact.hxx
#include vcl/print.hxx
-#include vcl/settings.hxx
#include salinst.hxx
#include salvd.hxx
@@ -1822,13 +1821,6 @@ void Printer::InitFont() const
if ( mbInitFont )
{
-// decide if antialiasing is appropriate
-bool bNonAntialiased = (GetAntialiasing() ANTIALIASING_DISABLE_TEXT)
!= 0;
-const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
-bNonAntialiased |= ((rStyleSettings.GetDisplayOptions()
DISPLAY_OPTION_AA_DISABLE) != 0);
-bNonAntialiased |=
(int(rStyleSettings.GetAntialiasingMinPixelHeight())
mpFontEntry-maFontSelData.mnHeight);
-mpFontEntry-maFontSelData.mbNonAntialiased = bNonAntialiased;
-
// select font in the device layers
mpFontEntry-mnSetFontFlags = mpGraphics-SetFont(
(mpFontEntry-maFontSelData), 0 );
mbInitFont = false;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 225dac3..ceea7a9 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1162,6 +1162,13 @@ void OutputDevice::InitFont() const
if ( mbInitFont )
{
+// decide if antialiasing is appropriate
+bool bNonAntialiased = (GetAntialiasing() ANTIALIASING_DISABLE_TEXT)
!= 0;
+const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
+bNonAntialiased |= ((rStyleSettings.GetDisplayOptions()
DISPLAY_OPTION_AA_DISABLE) != 0);
+bNonAntialiased |=
(int(rStyleSettings.GetAntialiasingMinPixelHeight())
mpFontEntry-maFontSelData.mnHeight);
+mpFontEntry-maFontSelData.mbNonAntialiased = bNonAntialiased;
+
// select font in the device layers
mpFontEntry-mnSetFontFlags = mpGraphics-SetFont(
(mpFontEntry-maFontSelData), 0 );
mbInitFont = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] US Hackfest July 26-27
On Tue, Apr 22, 2014 at 4:57 AM, klaus-jürgen weghorn ol o...@sophia-louise.de wrote: So you need a banner like the other ones for this? png (2000dpi) https://owncloud.documentfoundation.org/public.php?service=filest=9baf4044085fce6c0b673bb9074d7e0b svg: https://owncloud.documentfoundation.org/public.php?service=filest=6cddcd82a7a9ff92e17590ecc05de233 Nice! --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/test/tests.cxx | 74 +-
1 file changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 16b81b0dbf70876440b3b980b6f8c707126d1740
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 17:21:42 2014 +0200
Fix order of CPPUNIT_ASSERT_EQUAL arguments
Change-Id: Ib341ed33e98c31e296bb5ee6bff5789cf2459113
diff --git a/sdext/source/pdfimport/test/tests.cxx
b/sdext/source/pdfimport/test/tests.cxx
index 8bef030..aa11ea6 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -84,16 +84,16 @@ namespace
virtual ~TestSink()
{
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Width, m_aPageSize.Width, 79400, 0.0001);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Height , m_aPageSize.Height, 59500, 0.001 );
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Width, 79400, m_aPageSize.Width, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( A4 page size (in 100th of
points): Height, 59500, m_aPageSize.Height, 0.001 );
CPPUNIT_ASSERT_MESSAGE( endPage() called, m_bPageEnded );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, m_nNumPages,
(sal_Int32) 1 );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Num pages equal one, (sal_Int32)
1, m_nNumPages );
CPPUNIT_ASSERT_MESSAGE( Correct hyperlink bounding box,
rtl::math::approxEqual(m_aHyperlinkBounds.X1,34.7 )
rtl::math::approxEqual(m_aHyperlinkBounds.Y1,386.0)
rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7)
rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( Correct hyperlink URI, m_aURI,
OUString(http://download.openoffice.org/;) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( Correct hyperlink URI,
OUString(http://download.openoffice.org/;), m_aURI );
const char* sText = \n \nThis is a testtext\nNew paragraph,\nnew
line\n
Hyperlink, this is\n?\nThis is more text\noutline
mode\n?\nNew paragraph\n;
@@ -103,7 +103,7 @@ namespace
OUSTRING_TO_OSTRING_CVTFLAGS );
CPPUNIT_ASSERT_EQUAL_MESSAGE( Imported text is \This is a
testtext New paragraph, new line
Hyperlink, this is * This is more text
outline mode * New paragraph\,
-OString(sText), aTmp );
+aTmp, OString(sText) );
CPPUNIT_ASSERT_MESSAGE( red circle seen in input,
m_bRedCircleSeen );
CPPUNIT_ASSERT_MESSAGE( green stroke seen in input,
m_bGreenStrokeSeen );
@@ -161,7 +161,7 @@ namespace
GraphicsContext rContext( getCurrentContext() );
if( dashes.getLength() )
comphelper::sequenceToContainer(rContext.DashArray,dashes);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( line dashing start offset,
start, 0.0, 0.1 );
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( line dashing start offset,
0.0, start, 0.1 );
}
virtual void setFlatness( double nFlatness ) SAL_OVERRIDE
@@ -226,10 +226,10 @@ namespace
if( rContext.DashArray.empty() )
{
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
rContext.LineColor.Alpha, 1.0, 0.0001);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
rContext.LineColor.Blue, 0.0, 0.0001);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
rContext.LineColor.Green, 1.0, 0.0001);
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
rContext.LineColor.Red, 0.0, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
1.0, rContext.LineColor.Alpha, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
0.0, rContext.LineColor.Blue, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
1.0, rContext.LineColor.Green, 0.0001);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is green,
0.0, rContext.LineColor.Red, 0.0001);
CPPUNIT_ASSERT_MESSAGE( Line width is 0,
rtl::math::approxEqual(rContext.LineWidth, 28.3) );
@@ -249,13 +249,13 @@ namespace
rContext.DashArray[1] ==
rContext.DashArray[2]
rContext.DashArray[2] ==
rContext.DashArray[3] );
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( Line color is black,
rContext.LineColor.Alpha, 1.0,
[Libreoffice-commits] core.git: bin/ios-mapfile-statistics
bin/ios-mapfile-statistics | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit 613699ebaf97e77c77e7bf2e90100be56299b550
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 18:24:56 2014 +0300
Script to postprocess linker map files for iOS a bit
Show the total size of code and data linked in from each library.
Change-Id: Ibd6e0e15259f338addc30f2d821c794d65676637
diff --git a/bin/ios-mapfile-statistics b/bin/ios-mapfile-statistics
new file mode 100755
index 000..0ae2753
--- /dev/null
+++ b/bin/ios-mapfile-statistics
@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my $state = 0;
+my %libofnumber;
+my %sizeoflib;
+
+while () {
+ if ($state == 0 m!^# Object files:!) {
+$state = 1;
+ } elsif ($state == 1 m!^\[ *([0-9]+)\] .*/([-_a-z0-9]+\.a)\(.*!i) {
+$libofnumber{$1} = $2;
+ } elsif ($state == 1 m!^# Sections:!) {
+$state = 2;
+ } elsif ($state == 2 m!^# Address\s+Size\s+File\s+Name!) {
+$state = 3;
+ } elsif ($state == 3 m!^0x[0-9A-F]+\s+(0x[0-9A-F]+)\s+\[ *([0-9]+)\]
(.*)!) {
+if (defined($libofnumber{$2})) {
+ $sizeoflib{$libofnumber{$2}} += hex($1);
+}
+ }
+}
+
+foreach (sort keys(%sizeoflib)) {
+ print $_, : , $sizeoflib{$_}, \n;
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] US Hackfest July 26-27
Hi Em 22-04-2014 11:39, Robinson Tryon escreveu: On Tue, Apr 22, 2014 at 4:57 AM, klaus-jürgen weghorn ol o...@sophia-louise.de wrote: So you need a banner like the other ones for this? png (2000dpi) https://owncloud.documentfoundation.org/public.php?service=filest=9baf4044085fce6c0b673bb9074d7e0b svg: https://owncloud.documentfoundation.org/public.php?service=filest=6cddcd82a7a9ff92e17590ecc05de233 Nice! --R Guys... Since LibreOffice has less visibility in US than elsewhere, I think the name LibreOffice should somehow be visually connected to the Hackfest logo... e.g. Boston 2014 \n LibreOffice Hackfest... Just my BRL 0,02 -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-6' - sc/source
sc/source/core/data/column3.cxx | 100 +-
sc/source/ui/docshell/docsh8.cxx | 112 ++-
2 files changed, 162 insertions(+), 50 deletions(-)
New commits:
commit 4532676ce2fd8224b869f2157677b35bc99acc0e
Author: Eike Rathke er...@redhat.com
Date: Mon Mar 31 19:28:31 2014 +0200
re-enabled user-defined numeric fields for dBase export
Since commit f59e350d1733125055f1144f8b3b1b0a46f6d1ca it was impossible
to define a numeric field with a precision of less than 2 decimals, even
if all values were integers. It was also impossible to define a field
width larger than needed for any values in that column. Furthermore, the
integer part was shortened if the overall column's values resulted in
more precision than defined, but the overall length did not reach the
predefined length.
This does not change the behavior of the original intention of
f59e350d1733125055f1144f8b3b1b0a46f6d1ca to give the precision of number
formats precedence over precision defined in the column header, which is
debatable though because conflicts may silently change the field
definition.
(cherry picked from commit e65141e93a540fc9fb4343ee65a5a7da7e3b1769)
Plus comment translation.
Conflicts:
sc/source/core/data/column3.cxx
sc/source/ui/docshell/docsh8.cxx
Backported.
Change-Id: I234c4bceaa1a6aadbd259cb8d9b6cb6f16bf91c2
Reviewed-on: https://gerrit.libreoffice.org/8809
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 19d01c838c779d3326c65a798aa39cfc51bcd15e)
Reviewed-on: https://gerrit.libreoffice.org/9125
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 4bd6a5a..3630be3 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1906,15 +1906,19 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
sal_uInt16 nPrecision, SCROW nRowStart, SCROW nRowEnd ) const
{
xub_StrLen nStringLen = 0;
-nPrecision = pDocument-GetDocOptions().GetStdPrecision();
-if ( nPrecision == SvNumberFormatter::UNLIMITED_PRECISION )
-// In case of unlimited precision, use 2 instead.
-nPrecision = 2;
+nPrecision = 0;
if ( !maItems.empty() )
{
OUString aString;
+String aSep;
SvNumberFormatter* pNumFmt = pDocument-GetFormatTable();
+sal_uInt16 nMaxGeneralPrecision =
pDocument-GetDocOptions().GetStdPrecision();
+// Limit the decimals passed to doubleToUString().
+// Also, the dBaseIII maximum precision is 15.
+if (nMaxGeneralPrecision 15)
+nMaxGeneralPrecision = 15;
+bool bHaveSigned = false;
SCSIZE nIndex;
SCROW nRow;
Search( nRowStart, nIndex );
@@ -1926,16 +1930,33 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
if ( eType == CELLTYPE_VALUE || (eType == CELLTYPE_FORMULA
aCell.mpFormula-IsValue()) )
{
-sal_uLong nFormat = (sal_uLong) ((SfxUInt32Item*) GetAttr(
-nRow, ATTR_VALUE_FORMAT ))-GetValue();
-ScCellFormat::GetInputString(aCell, nFormat, aString,
*pNumFmt, pDocument);
-xub_StrLen nLen = aString.getLength();
-if ( nLen )
+do
{
-if ( nFormat )
+sal_uInt16 nCellPrecision = nMaxGeneralPrecision;
+if (eType == CELLTYPE_FORMULA)
{
+// Limit unformatted formula cell precision to
precision
+// encountered so far, if any, otherwise we'd end up
with 15 just
+// because of =1/3 ... If no precision yet then
arbitrarily limit
+// to a maximum of 4 unless a maximum general
precision is set.
+if (nPrecision)
+nCellPrecision = nPrecision;
+else
+nCellPrecision = (nMaxGeneralPrecision = 15) ? 4
: nMaxGeneralPrecision;
+}
+
+double fVal = aCell.getValue();
+if (!bHaveSigned fVal 0.0)
+bHaveSigned = true;
+
+sal_uInt16 nPrec;
+sal_uLong nFormat = (sal_uLong) ((SfxUInt32Item*) GetAttr(
+nRow, ATTR_VALUE_FORMAT ))-GetValue();
+if (nFormat % SV_COUNTRY_LANGUAGE_OFFSET)
+{
+aSep = pNumFmt-GetFormatDecimalSep(nFormat);
+ScCellFormat::GetInputString(aCell, nFormat,
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 73 +-
1 file changed, 69 insertions(+), 4 deletions(-)
New commits:
commit f61cdf6fa8c3ceb5435fadbe469fa55883c8b31f
Author: Vort vv...@yandex.ru
Date: Tue Apr 22 10:59:37 2014 +0300
fdo#71217 PDF Import: Fix importing of JPEG images
Change-Id: Ic0902a3f9340d2d05be05d13d98f168879b4c3e3
Reviewed-on: https://gerrit.libreoffice.org/9120
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index cf601b9..c5b9aa1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -143,20 +143,85 @@ void writeBinaryBuffer( const OutputBuffer rBuffer )
fflush(g_binary_out);
}
+bool ExtractJpegData(Stream* str, OutputBuffer outBuf)
+{
+int bytesToMarker = 0;
+int bytesToLen = -1;
+bool collectBytes = false;
+int startOfScan = 0;
+int b2 = -1;
+int b1 = -1;
+for (; ; )
+{
+b2 = b1;
+b1 = str-getChar();
+
+if (b1 == -1)
+return false;
+
+if (collectBytes)
+{
+outBuf.push_back((Output_t)b1);
+
+bytesToMarker--;
+bytesToLen--;
+}
+
+if (bytesToMarker == 0)
+{
+if (startOfScan == 1)
+{
+bytesToMarker = -1;
+startOfScan = 2;
+}
+else if (b2 == 0xFF)
+{
+if (b1 == 0xD8)
+{
+collectBytes = true;
+bytesToMarker = 2;
+
+outBuf.push_back((Output_t)0xFF);
+outBuf.push_back((Output_t)0xD8);
+}
+else
+{
+bytesToLen = 2;
+}
+if (b1 == 0xDA)
+{
+startOfScan = 1;
+}
+}
+else if (collectBytes)
+{
+return false;
+}
+}
+
+if (bytesToLen == 0)
+{
+bytesToMarker = b2 * 256 + b1;
+}
+
+if (startOfScan == 2)
+if ((b2 == 0xFF) (b1 == 0xD9))
+return true;
+}
+}
+
void writeJpeg_( OutputBuffer o_rOutputBuf, Stream* str, bool bWithLinefeed )
{
// dump JPEG file as-is
#if POPPLER_CHECK_VERSION(0, 17, 3)
-str = str-getBaseStream();
+str = str-getNextStream();
#else
str = ((DCTStream *)str)-getRawStream();
#endif
str-reset();
-int c;
o_rOutputBuf.clear();
-while((c=str-getChar()) != EOF)
-o_rOutputBuf.push_back(static_castchar(c));
+ExtractJpegData(str, o_rOutputBuf);
printf( JPEG %d, (int)o_rOutputBuf.size() );
if( bWithLinefeed )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: About cpplint
Thank you Stephan for your feedback, so let's drop it. Julien -- View this message in context: http://nabble.documentfoundation.org/About-cpplint-tp4105821p4106051.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] US Hackfest July 26-27
On Tue, Apr 22, 2014 at 12:40:10PM -0300, Olivier Hallot wrote: Guys... Since LibreOffice has less visibility in US than elsewhere, I think the name LibreOffice should somehow be visually connected to the Hackfest logo... e.g. Boston 2014 \n LibreOffice Hackfest... Just my BRL 0,02 IMHO no need to overload the logo with that. Just use e.g. the flyers: https://wiki.documentfoundation.org/File:HackfestGranCanaria2014Flyer.odg which feature LibreOffice quite prominently. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/wrapper/wrapper.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit ef141bb147fde7915c17b336cfbc3e7ef6e72ce3
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 18:21:53 2014 +0200
Do not drop existing LD_LIBRARY_PATH
Change-Id: I5b3599596dc40d1f88c075257c466b56ed73e795
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index d024071..ddba8b3 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -59,8 +59,8 @@
#include boost/scoped_ptr.hpp
#include boost/unordered_map.hpp
#include string.h
-#ifdef WNT
#include stdlib.h
+#ifdef WNT
#include ctype.h
#endif
@@ -1042,6 +1042,13 @@ bool xpdf_ImportFromFile( const OUString
rURL,
OUStringBuffer aEnvBuf( aStr.getLength() + 20 );
aEnvBuf.appendAscii( LD_LIBRARY_PATH= );
aEnvBuf.append( aSysPath );
+char const * path = getenv(LD_LIBRARY_PATH);
+if (path != 0 path[0] != 0)
+{
+aEnvBuf.append(':');
+aEnvBuf.append(
+OUString(path, strlen(path), RTL_TEXTENCODING_ISO_8859_1));
+}
aStr = aEnvBuf.makeStringAndClear();
ppEnv = aStr.pData;
nEnv = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/CTRunData.hxx |8
1 file changed, 8 insertions(+)
New commits:
commit 26c10caf5c0a1f6f4e90465d71a5d90352630263
Author: Douglas Mencken dougmenc...@gmail.com
Date: Tue Apr 22 12:15:47 2014 -0400
CTRunData fix for exporting SPI stuff on OSX 10.6
Change-Id: I7ba23f0b03438cc8a71581cc503aedf46aad45f8
Reviewed-on: https://gerrit.libreoffice.org/9130
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index 043d404..0aafeef 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -12,6 +12,14 @@
#include premac.h
#if defined(MACOSX) MACOSX_SDK_VERSION 1080
#include ApplicationServices/ApplicationServices.h
+#if MAC_OS_X_VERSION_MAX_ALLOWED 1060
+// The following symbols are SPI (System Programming Interface) in 10.5
+extern C {
+void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]);
+const CGSize* CTRunGetAdvancesPtr(CTRunRef run);
+extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
+}
+#endif
#else
#include CoreGraphics/CoreGraphics.h
#include CoreText/CoreText.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/rtfexport/data/fdo77600.rtf| 25 +
sw/qa/extras/rtfexport/rtfexport.cxx|6 ++
sw/source/filter/ww8/rtfattributeoutput.cxx |9 +
sw/source/filter/ww8/rtfattributeoutput.hxx |2 ++
4 files changed, 42 insertions(+)
New commits:
commit f0a169c8c7173d469ff628b3bd32ff0020a269e2
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 22 14:49:41 2014 +0200
fdo#77600 RTF export: always close URL's before the end of run
In case the URL text has multiple portions, then MSWordExportBase
generates multiple URL's anyway, and this helps to avoid loosing some
direct formatting of the remaining portions of the paragraph.
(cherry picked from commit 55c832d86e6cb06e9d6423ce5e6245189bc80da1)
Conflicts:
sw/source/filter/ww8/rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.hxx
Change-Id: Ifd72741de610ce69b9ae0978aa8f9a532a3aeed2
Reviewed-on: https://gerrit.libreoffice.org/9124
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfexport/data/fdo77600.rtf
b/sw/qa/extras/rtfexport/data/fdo77600.rtf
new file mode 100644
index 000..5c6a488
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo77600.rtf
@@ -0,0 +1,25 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2
+Times New Roman;}
+{\f1\fbidi \fswiss\fcharset238\fprq2
+Arial;}
+}
+\pard\plain \ltrpar
+\ql
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6446855
\rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0
\fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033
+{\rtlch\fcs1 \af1 \ltrch\fcs0
+\f1\fs20\insrsid6446855 Before }
+{\field\fldedit
+{\*\fldinst
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1260577 HYPERLINK
http://www.microsoft.com/en-us/news/press/2013/jul13/07-11onemicrosoft.aspx; }
+}
+{\fldrslt
+{\rtlch\fcs1 \af1 \ltrch\fcs0
+\cs61\f1\fs20\ul\cf17\insrsid6446855\charrsid4592903 href}
+}
+}
+\sectd \ltrsect\psz1\linex0\endnhere\sectdefaultcl\sectrsid6897289\sftnbj
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\fs20\insrsid6446855 after.}
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6446855
+\par }
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 225ab3a..d58e200 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -586,6 +586,12 @@ DECLARE_RTFEXPORT_TEST(testFdo74709, fdo74709.rtf)
CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(360)),
getPropertysal_Int32(xCell, RightBorderDistance));
}
+DECLARE_RTFEXPORT_TEST(testFdo77600, fdo77600.rtf)
+{
+// This was 'Liberation Serif'.
+CPPUNIT_ASSERT_EQUAL(OUString(Arial),
getPropertyOUString(getRun(getParagraph(1), 3), CharFontName));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3415be7..3cf3b69 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -413,6 +413,8 @@ void RtfAttributeOutput::StartRun( const SwRedlineData*
pRedlineData, bool bSing
void RtfAttributeOutput::EndRun()
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+if (m_bInURL)
+EndURL();
m_aRun-append(SAL_NEWLINE_STRING);
m_aRun.appendAndClear(m_aRunText);
if (!m_bSingleEmptyRun m_bInRun)
@@ -493,6 +495,7 @@ bool RtfAttributeOutput::StartURL( const OUString rUrl,
const OUString rTarget
m_aStyles.append(});
m_bHadFieldResult = false;
+m_bInURL = true;
return true;
}
@@ -500,6 +503,11 @@ bool RtfAttributeOutput::EndURL()
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+if (m_bInURL)
+m_bInURL = false;
+else
+return true;
+
// close the fldrslt group
if (m_bHadFieldResult)
m_aRunText-append('}');
@@ -3242,6 +3250,7 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport
rExport )
m_bSingleEmptyRun(false),
m_bInRun(false),
m_nPostitFieldsMaxId(0),
+m_bInURL(false),
m_pFlyFrameSize(0),
m_pPrevPageDesc(0)
{
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 60de3e4..b5b19a9 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -575,6 +575,8 @@ private:
unsigned int m_nPostitFieldsMaxId;
+bool m_bInURL;
+
/// When exporting fly frames, this holds the real size of the frame.
const Size* m_pFlyFrameSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac i18npool/Library_i18npool.mk
config_host.mk.in|1 +
configure.ac | 21 -
i18npool/Library_i18npool.mk |8 +++-
3 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 0c0fbc3f8b09017c490ae77794aad3e7417b9c23
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 19:35:11 2014 +0300
Add a new configure switch --with-locales for restricting the included
locales
For now only effective in the DISABLE_DYNLOADING case, where it limits
the locales compiled in to the i18npool library. Maybe should use this
same option to also limit what collation tables etc are compiled in?
Not expected to be used for desktop OSes, but can be useful for mobile
platforms where every megabyte counts.
Change-Id: If672b4cd19f44f8c7e119378faf40930a51969b7
diff --git a/config_host.mk.in b/config_host.mk.in
index 0b4595d..6b68d93 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -604,6 +604,7 @@ export WITH_KRB5=@WITH_KRB5@
export WITH_LANG=@WITH_LANG@
export WITH_LANG_LIST=@WITH_LANG_LIST@
export WITH_LINKER_HASH_STYLE=@WITH_LINKER_HASH_STYLE@
+export WITH_LOCALES=@WITH_LOCALES@
export WITH_MOZAB4WIN=@WITH_MOZAB4WIN@
export WITH_MYSPELL_DICTS=@WITH_MYSPELL_DICTS@
export WITH_POOR_HELP_LOCALIZATIONS=@WITH_POOR_HELP_LOCALIZATIONS@
diff --git a/configure.ac b/configure.ac
index bfc00bd..07c7d13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1948,7 +1948,7 @@ AC_ARG_WITH(windows-sdk,
AC_ARG_WITH(lang,
AS_HELP_STRING([--with-lang],
-[Use this option to build LibreOffice with additional language support.
+[Use this option to build LibreOffice with additional UI language
support.
English (US) is always included by default.
Separate multiple languages with space.
For all languages, use --with-lang=ALL.])
@@ -1957,6 +1957,20 @@ AC_ARG_WITH(lang,
],
,)
+AC_ARG_WITH(locales,
+AS_HELP_STRING([--with-locales],
+[Use this option to limit the locale information built in.
+ By default all the locales available is included.
+ This option is completely unrelated to --with-lang.
+ Separate multiple locales with space.
+ For the default, all locales, don't use this switch at all.
+ Specifying just the language part of a locale means all matching
+ locales will be included.])
+[
+ Usage: --with-locales=en es pt fr zh kr ja
+],
+,)
+
# Kerberos and GSSAPI used only by PostgreSQL as of LibO 3.5
AC_ARG_WITH(krb5,
AS_HELP_STRING([--with-krb5],
@@ -12185,6 +12199,11 @@ if test -d $SRC_ROOT/translations/source; then
fi
AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
+if test -n $with_locales; then
+WITH_LOCALES=$with_locales
+fi
+AC_SUBST(WITH_LOCALES)
+
dnl git submodule update --reference
dnl ===
if test -n ${GIT_REFERENCE_SRC}; then
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index c095fa8..b66a298 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -120,8 +120,14 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(call gb_CxxObject_get_target,i18npool/source/localedata/localedata): $(call
gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_static.hxx
+ifeq ($(WITH_LOCALES),)
+i18npool_locale_pattern=%
+else
+i18npool_locale_pattern=$(WITH_LOCALES) $(addsuffix _%,$(WITH_LOCALES))
+endif
+
$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_static.hxx
: $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl
- $(PERL) $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl
$(patsubst $(SRCDIR)/i18npool/source/localedata/data/%.xml,%,$(shell echo
$(SRCDIR)/i18npool/source/localedata/data/*.xml)) $@
+ $(PERL) $(SRCDIR)/i18npool/source/localedata/genstaticheader.pl
$(filter $(i18npool_locale_pattern),$(patsubst
$(SRCDIR)/i18npool/source/localedata/data/%.xml,%,$(shell echo
$(SRCDIR)/i18npool/source/localedata/data/*.xml))) $@
$(call gb_CxxObject_get_target,i18npool/source/localedata/localedata) : \
INCLUDE += -I$(call gb_CustomTarget_get_workdir,i18npool/localedata)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice fuzz-testing
On Tue, Apr 22, 2014 at 5:33 PM, Keith Curtis keit...@gmail.com wrote: I don't think it is worth abandoning just because it is in separate languages. Maybe. However, I did run into something else that is worth abandoning it for. Im have been using the pseudonym of 'John Smith, lbalba...@gmail.com' for quite a few years now, for various reasons. Not disclosing my real name could potentially mean future problems for the LibreOffice project. One place where issues could occur, is where contributors need to digitally make/mail a legally binding statement that all of their contributions may be licensed under the MPL/GPL. Dont get me wrong: I have no issue whatsoever with the MPL/GPL licenses, but being unwilling to put my real name under that statement may mean trouble for the project. Because I mean the project no harm, not even imaginary, I decided to abandon the code. In all fairness: I was offered the chance of only making my real name known to the legal department, and keeping my pseudonym in all other cases. But I guess im to paranoid for even that. Anyway, im currently re-evaluating my need for a pseudonym, and may decide to contribute to the project using my real name sometime in the future. Regards, John Smith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - basegfx/source include/basegfx unusedcode.easy
basegfx/source/polygon/b2dpolygontools.cxx | 44
basegfx/source/polygon/b2dpolypolygontools.cxx | 18 -
basegfx/source/polygon/b3dpolygontools.cxx | 26 --
basegfx/source/tools/canvastools.cxx| 14 ---
include/basegfx/numeric/ftools.hxx | 11 --
include/basegfx/polygon/b2dpolygontools.hxx |4 --
include/basegfx/polygon/b2dpolypolygontools.hxx |5 --
include/basegfx/polygon/b3dpolygontools.hxx |4 --
include/basegfx/tools/canvastools.hxx |4 --
unusedcode.easy |4 --
10 files changed, 134 deletions(-)
New commits:
commit ff05b6b10094de3e27f9d200c0ccdbb2f6cc76c5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 22 19:07:02 2014 +0200
Remove unused basegfx::tools::equal
Change-Id: I2fb3121c711dfdd1e2081681864a6f4753960a81
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index 0e6b2b9..709a2f1 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3133,50 +3133,6 @@ namespace basegfx
return aRetval;
}
-
-// comparators with tolerance for 2D Polygons
-
-bool equal(const B2DPolygon rCandidateA, const B2DPolygon
rCandidateB, const double rfSmallValue)
-{
-const sal_uInt32 nPointCount(rCandidateA.count());
-
-if(nPointCount != rCandidateB.count())
-return false;
-
-const bool bClosed(rCandidateA.isClosed());
-
-if(bClosed != rCandidateB.isClosed())
-return false;
-
-const bool
bAreControlPointsUsed(rCandidateA.areControlPointsUsed());
-
-if(bAreControlPointsUsed != rCandidateB.areControlPointsUsed())
-return false;
-
-for(sal_uInt32 a(0); a nPointCount; a++)
-{
-const B2DPoint aPoint(rCandidateA.getB2DPoint(a));
-
-if(!aPoint.equal(rCandidateB.getB2DPoint(a), rfSmallValue))
-return false;
-
-if(bAreControlPointsUsed)
-{
-const basegfx::B2DPoint
aPrev(rCandidateA.getPrevControlPoint(a));
-
-if(!aPrev.equal(rCandidateB.getPrevControlPoint(a),
rfSmallValue))
-return false;
-
-const basegfx::B2DPoint
aNext(rCandidateA.getNextControlPoint(a));
-
-if(!aNext.equal(rCandidateB.getNextControlPoint(a),
rfSmallValue))
-return false;
-}
-}
-
-return true;
-}
-
// snap points of horizontal or vertical edges to discrete values
B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon
rCandidate)
{
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx
b/basegfx/source/polygon/b3dpolygontools.cxx
index 4dd7734..f3e42700c 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -734,32 +734,6 @@ namespace basegfx
return false;
}
-
-// comparators with tolerance for 3D Polygons
-
-bool equal(const B3DPolygon rCandidateA, const B3DPolygon
rCandidateB, const double rfSmallValue)
-{
-const sal_uInt32 nPointCount(rCandidateA.count());
-
-if(nPointCount != rCandidateB.count())
-return false;
-
-const bool bClosed(rCandidateA.isClosed());
-
-if(bClosed != rCandidateB.isClosed())
-return false;
-
-for(sal_uInt32 a(0); a nPointCount; a++)
-{
-const B3DPoint aPoint(rCandidateA.getB3DPoint(a));
-
-if(!aPoint.equal(rCandidateB.getB3DPoint(a), rfSmallValue))
-return false;
-}
-
-return true;
-}
-
// snap points of horizontal or vertical edges to discrete values
B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon
rCandidate)
{
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx
b/include/basegfx/polygon/b2dpolygontools.hxx
index 8fadce0..04f20d2d 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -422,10 +422,6 @@ namespace basegfx
*/
BASEGFX_DLLPUBLIC B2DPolygon createWaveline(const B2DPolygon
rCandidate, double fWaveWidth, double fWaveHeight);
-
-// comparators with tolerance for 2D Polygons
-BASEGFX_DLLPUBLIC bool equal(const B2DPolygon rCandidateA, const
B2DPolygon rCandidateB, const double rfSmallValue);
-
/** snap some polygon coordinates to discrete coordinates
This method allows to snap some polygon points to discrete
(integer) values
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo71785.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
sw/source/filter/ww8/docxtablestyleexport.cxx | 20 ++--
3 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit d6e66af53ccbb6e15925a14c9283a8ada92ebc5f
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Nov 29 18:02:54 2013 +0530
fdo#71785: File hangs LibreOffice on Save
Problem Description: While saving the file LO shows the error
This file could not be save.
The root cause was memory leak.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6850
(cherry picked from commit 0f6240fa92c443f66441545438821c02b3412486)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Iacc185780c14760056a7d690eb113d4dde1de034
diff --git a/sw/qa/extras/ooxmlexport/data/fdo71785.docx
b/sw/qa/extras/ooxmlexport/data/fdo71785.docx
new file mode 100644
index 000..e155e83
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71785.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b8b104b..7095ea2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2042,6 +2042,12 @@ DECLARE_OOXMLEXPORT_TEST(testExtraSectionBreak,
1_page.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
}
+
+DECLARE_OOXMLEXPORT_TEST(testFdo71785, fdo71785.docx)
+{
+// crashtest
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index af96d5f..663898e4 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -342,7 +342,8 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
m_pSerializer-startElementNS(XML_w, XML_rPr, FSEND);
-uno::Sequencebeans::PropertyValue aRFonts, aLang, aColor;
+uno::Sequencebeans::PropertyValue aRFonts, aLang, aColor,
aSpacingSequence;
+bool bSequenceFlag = false ;
OUString aB, aBCs, aI, aSz, aSzCs, aCaps, aSmallCaps, aSpacing;
for (sal_Int32 i = 0; i rRPr.getLength(); ++i)
{
@@ -367,7 +368,16 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
else if (rRPr[i].Name == smallCaps)
aSmallCaps = rRPr[i].Value.getOUString();
else if (rRPr[i].Name == spacing)
-aSpacing = rRPr[i].Value.getOUString();
+{
+if (rRPr[i].Value.hasOUString())
+{
+aSpacing = rRPr[i].Value.getOUString();
+}
+else {
+aSpacingSequence = rRPr[i].Value.get
uno::Sequencebeans::PropertyValue () ;
+bSequenceFlag = true ; // set the uno::Sequence flag.
+}
+}
}
tableStyleRRFonts(aRFonts);
tableStyleRLang(aLang);
@@ -377,6 +387,12 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
handleBoolean(aCaps, XML_caps);
handleBoolean(aSmallCaps, XML_smallCaps);
tableStyleRColor(aColor);
+if(bSequenceFlag)
+{
+ m_pSerializer-singleElementNS(XML_w, XML_spacing,
+FSNS(XML_w,
XML_val),OUStringToOString(aSpacingSequence[0].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr(),
+ FSEND);
+}
if (!aSpacing.isEmpty())
m_pSerializer-singleElementNS(XML_w, XML_spacing,
FSNS(XML_w, XML_val), OUStringToOString(aSpacing,
RTL_TEXTENCODING_UTF8).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo71785.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
sw/source/filter/ww8/docxtablestyleexport.cxx | 20 ++--
3 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit 67702f2451f3132c93339c3471228c716c2ba02d
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Nov 29 18:02:54 2013 +0530
fdo#71785: File hangs LibreOffice on Save
Problem Description: While saving the file LO shows the error
This file could not be save.
The root cause was memory leak.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6850
(cherry picked from commit 0f6240fa92c443f66441545438821c02b3412486)
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: Iacc185780c14760056a7d690eb113d4dde1de034
diff --git a/sw/qa/extras/ooxmlexport/data/fdo71785.docx
b/sw/qa/extras/ooxmlexport/data/fdo71785.docx
new file mode 100644
index 000..e155e83
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71785.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b8b104b..7095ea2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2042,6 +2042,12 @@ DECLARE_OOXMLEXPORT_TEST(testExtraSectionBreak,
1_page.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
}
+
+DECLARE_OOXMLEXPORT_TEST(testFdo71785, fdo71785.docx)
+{
+// crashtest
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index af96d5f..663898e4 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -342,7 +342,8 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
m_pSerializer-startElementNS(XML_w, XML_rPr, FSEND);
-uno::Sequencebeans::PropertyValue aRFonts, aLang, aColor;
+uno::Sequencebeans::PropertyValue aRFonts, aLang, aColor,
aSpacingSequence;
+bool bSequenceFlag = false ;
OUString aB, aBCs, aI, aSz, aSzCs, aCaps, aSmallCaps, aSpacing;
for (sal_Int32 i = 0; i rRPr.getLength(); ++i)
{
@@ -367,7 +368,16 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
else if (rRPr[i].Name == smallCaps)
aSmallCaps = rRPr[i].Value.getOUString();
else if (rRPr[i].Name == spacing)
-aSpacing = rRPr[i].Value.getOUString();
+{
+if (rRPr[i].Value.hasOUString())
+{
+aSpacing = rRPr[i].Value.getOUString();
+}
+else {
+aSpacingSequence = rRPr[i].Value.get
uno::Sequencebeans::PropertyValue () ;
+bSequenceFlag = true ; // set the uno::Sequence flag.
+}
+}
}
tableStyleRRFonts(aRFonts);
tableStyleRLang(aLang);
@@ -377,6 +387,12 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
handleBoolean(aCaps, XML_caps);
handleBoolean(aSmallCaps, XML_smallCaps);
tableStyleRColor(aColor);
+if(bSequenceFlag)
+{
+ m_pSerializer-singleElementNS(XML_w, XML_spacing,
+FSNS(XML_w,
XML_val),OUStringToOString(aSpacingSequence[0].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr(),
+ FSEND);
+}
if (!aSpacing.isEmpty())
m_pSerializer-singleElementNS(XML_w, XML_spacing,
FSNS(XML_w, XML_val), OUStringToOString(aSpacing,
RTL_TEXTENCODING_UTF8).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC student looking for Thorsten, Fridrich and Cedric
I am supposed to email the LibreOffice admins Thorsten, Fridrich and Cedric regarding GSoC. However since those are only first names and I dont know them yet Im having trouble finding their adresses. Could someone send them to me? Thanks, Valentin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSoC student looking for Thorsten, Fridrich and Cedric
On Tue, Apr 22, 2014 at 10:44 AM, V vak...@gmail.com wrote: I am supposed to email the LibreOffice admins Thorsten, Fridrich and Cedric regarding GSoC. However since those are only first names and I dont know them yet Im having trouble finding their adresses. Could someone send them to me? Hi Valentin, You may find a list of all of the LibreOffice devs here: https://wiki.documentfoundation.org/Development/Developers Here are the specific addresses for those three: t...@documentfoundation.org fridr...@libreoffice.org cbosdon...@suse.com Best, --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSoC student looking for Thorsten, Fridrich and Cedric
Hi Valentin, Emails Id's you need : Fridrich Strba : fridr...@libreoffice.org Thorsten : t...@documentfoundation.org Cedric : cbosdon...@suse.com Greetins Anurag Kanungo On Tue, Apr 22, 2014 at 11:14 PM, V vak...@gmail.com wrote: I am supposed to email the LibreOffice admins Thorsten, Fridrich and Cedric regarding GSoC. However since those are only first names and I dont know them yet Im having trouble finding their adresses. Could someone send them to me? Thanks, Valentin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - editeng/source
editeng/source/editeng/impedit3.cxx | 69 +++-
1 file changed, 68 insertions(+), 1 deletion(-)
New commits:
commit f7358fa957ae2211e59b62cb6f9c4c7805580219
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 22 15:36:34 2014 +
i71056 also create TabSpace's fill characters if used
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 300ebb2..27ffd7f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3558,7 +3558,74 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
String aText;
aText.Fill( (sal_uInt16)nChars,
pTextPortion-GetExtraValue() );
-pOutDev-DrawStretchText( aTmpPos,
pTextPortion-GetSize().Width(), aText );
+
+if(bStripOnly)
+{
+// #71056# when converting to
primitives, visualized TAB spaces need to be
+// visualized. Add tab#ed text here.
Alternatively a primitive especially
+// representing this space and the
single fill character would be possible, too.
+// For now, use what we have (the
DrawingText callback)
+const lang::Locale
aLocale(GetLocale(EditPaM(pPortion-GetNode(),nIndex + 1)));
+
+// get Overline color (from ((const
SvxOverlineItem*)GetItem())-GetColor() in
+// consequence, but also already set
at pOutDev)
+const Color
aOverlineColor(pOutDev-GetOverlineColor());
+
+// get TextLine color (from ((const
SvxUnderlineItem*)GetItem())-GetColor() in
+// consequence, but also already set
at pOutDev)
+const Color
aTextLineColor(pOutDev-GetTextLineColor());
+
+// get AllWidth and together with
nCharWidth create DXArray using per character
+// difference
+const sal_Int32
nAllWidth(pTextPortion-GetSize().Width());
+const double
fSingleCharDiff((double(nAllWidth) / double(nChars)) - double(nCharWidth));
+sal_Int32* pTmpDXArray = 0;
+
+if(fSingleCharDiff 1.0)
+{
+// if more than one unit per
character, create DXArray to create
+// something adequate to
StretchText
+const double fAdvance(nCharWidth +
fSingleCharDiff);
+const sal_uInt32
nCount(static_cast sal_uInt32 (nChars));
+pTmpDXArray = new
sal_Int32[nCount];
+double fPos(0.0);
+
+for(sal_uInt32 a(0); a nCount;
a++)
+{
+fPos += fAdvance;
+pTmpDXArray[a] =
basegfx::fround(fPos);
+}
+}
+
+// StripPortions() data callback
+GetEditEnginePtr()-DrawingText(
+aTmpPos,
+aText,
+0,
+nChars,
+pTmpDXArray,
+aTmpFont,
+n,
+nIndex,
+pTextPortion-GetRightToLeft(),
+0,
+0,
+false,
+false,
+false, // support for EOL/EOP TEXT
comments
+aLocale,
+aOverlineColor,
+aTextLineColor);
+
+if(pTmpDXArray)
+{
+delete pTmpDXArray;
+
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - sc/inc sc/source
sc/inc/column.hxx |1
sc/inc/document.hxx|1
sc/inc/table.hxx |1
sc/source/core/data/column4.cxx| 104 +
sc/source/core/data/document10.cxx |9 +++
sc/source/core/data/table7.cxx |9 +++
sc/source/ui/docshell/dbdocfun.cxx |9 ++-
7 files changed, 133 insertions(+), 1 deletion(-)
New commits:
commit ed7b45b436b62abc3a56f977399d8da431a23b74
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Apr 22 15:28:49 2014 -0400
Update script types of all cells in sort range ahead of time.
To ensure that there is no SC_SCRIPTTYPE_UNKNOWN in the sort range,
the presence of which would slow down during AdjustRowHeight().
This only adds a tiny overhead (0.3 second) and cuts the duration of
AdjustRowHeight() from 15 seconds to 5 seconds.
Change-Id: I145e901225ef1136f53c6f682ffed3902099859c
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 94795d3..02ec925 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -499,6 +499,7 @@ public:
sc::CellStoreType::iterator itr);
void SetScriptType( SCROW nRow, sal_uInt8 nType );
+void UpdateScriptTypes( SCROW nRow1, SCROW nRow2 );
size_t GetFormulaHash( SCROW nRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 582d086..df8d0bb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2062,6 +2062,7 @@ public:
sal_uInt8 GetScriptType( const ScAddress rPos ) const;
void SetScriptType( const ScAddress rPos, sal_uInt8 nType );
+void UpdateScriptTypes( const ScAddress rPos, SCCOL nColSize, SCROW
nRowSize );
size_t GetFormulaHash( const ScAddress rPos ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 34059f7..6715448 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -864,6 +864,7 @@ public:
sal_uInt8 GetScriptType( SCCOL nCol, SCROW nRow ) const;
void SetScriptType( SCCOL nCol, SCROW nRow, sal_uInt8 nType );
+void UpdateScriptTypes( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
);
sal_uInt8 GetRangeScriptType( sc::ColumnBlockPosition rBlockPos, SCCOL
nCol, SCROW nRow1, SCROW nRow2 );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 2698f0b..cad94e5 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -25,6 +25,9 @@
#include conditio.hxx
#include formulagroup.hxx
#include tokenarray.hxx
+#include globalnames.hxx
+#include scitems.hxx
+#include cellform.hxx
#include svl/sharedstringpool.hxx
@@ -721,4 +724,105 @@ void ScColumn::PostprocessRangeNameUpdate(
sc::CompileFormulaContext rCompileCx
std::for_each(aGroups.begin(), aGroups.end(), aFunc);
}
+namespace {
+
+class ScriptTypeUpdater
+{
+ScColumn mrCol;
+sc::CellTextAttrStoreType mrTextAttrs;
+sc::CellTextAttrStoreType::iterator miPosAttr;
+ScConditionalFormatList* mpCFList;
+SvNumberFormatter* mpFormatter;
+ScAddress maPos;
+bool mbUpdated;
+
+private:
+void updateScriptType( size_t nRow, ScRefCellValue rCell )
+{
+sc::CellTextAttrStoreType::position_type aAttrPos =
mrTextAttrs.position(miPosAttr, nRow);
+miPosAttr = aAttrPos.first;
+
+if (aAttrPos.first-type != sc::element_type_celltextattr)
+return;
+
+sc::CellTextAttr rAttr =
sc::celltextattr_block::at(*aAttrPos.first-data, aAttrPos.second);
+if (rAttr.mnScriptType != SC_SCRIPTTYPE_UNKNOWN)
+// Script type already deteremined. Skip it.
+return;
+
+const ScPatternAttr* pPat = mrCol.GetPattern(nRow);
+if (!pPat)
+// In theory this should never return NULL. But let's be safe.
+return;
+
+const SfxItemSet* pCondSet = NULL;
+if (mpCFList)
+{
+maPos.SetRow(nRow);
+const ScCondFormatItem rItem =
+static_castconst
ScCondFormatItem(pPat-GetItem(ATTR_CONDITIONAL));
+const std::vectorsal_uInt32 rData = rItem.GetCondFormatData();
+pCondSet = mrCol.GetDoc().GetCondResult(rCell, maPos, *mpCFList,
rData);
+}
+
+OUString aStr;
+Color* pColor;
+sal_uLong nFormat = pPat-GetNumberFormat(mpFormatter, pCondSet);
+ScCellFormat::GetString(rCell, nFormat, aStr, pColor, *mpFormatter,
mrCol.GetDoc());
+
+rAttr.mnScriptType = mrCol.GetDoc().GetStringScriptType(aStr);
+mbUpdated = true;
+}
+
+public:
+ScriptTypeUpdater( ScColumn rCol ) :
+mrCol(rCol),
+mrTextAttrs(rCol.GetCellAttrStore()),
+miPosAttr(mrTextAttrs.begin()),
+mpCFList(rCol.GetDoc().GetCondFormList(rCol.GetTab())),
+mpFormatter(rCol.GetDoc().GetFormatTable()),
+maPos(rCol.GetCol(), 0, rCol.GetTab()),
+mbUpdated(false)
+{}
+
+void operator() ( size_t nRow, double fVal )
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/tools vcl/source
include/tools/gen.hxx|2 ++
vcl/source/filter/wmf/winwmf.cxx |8
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 10e38e72f4f940bf7bbf9865d76c17a731c3200b
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Apr 18 20:57:27 2014 +0200
fdo#77088 WMF - replace 32-bit min/max assumption with const
Added RECT_MIN and RECT_MAX which represent the minimum and
maximum value a Rectangle object can hold. In WMF we used a 32-bit
assumption what the min and max value could be (0x7fff,
0x8000) which causes problems on 64-bit systems.
Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313
(cherry picked from commit fa632a57b7fcbc0a790fc6615174f25b7f640713)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 3986058..bba8bae 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -355,6 +355,8 @@ inline std::basic_ostreamcharT, traits operator (
// Rectangle
#define RECT_EMPTY ((short)-32767)
+#define RECT_MAXLONG_MAX
+#define RECT_MINLONG_MIN
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
{
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index f3cfaf2..1ae9047 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1272,10 +1272,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
{
sal_Bool bRet = sal_True;
-rPlaceableBound.Left() = (sal_Int32)0x7fff;
-rPlaceableBound.Top()= (sal_Int32)0x7fff;
-rPlaceableBound.Right() = (sal_Int32)0x8000;
-rPlaceableBound.Bottom() = (sal_Int32)0x8000;
+rPlaceableBound.Left() = RECT_MAX;
+rPlaceableBound.Top()= RECT_MAX;
+rPlaceableBound.Right() = RECT_MIN;
+rPlaceableBound.Bottom() = RECT_MIN;
sal_uInt32 nPos = pStm-Tell();
sal_uInt32 nEnd = pStm-Seek( STREAM_SEEK_TO_END );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - include/tools vcl/source
include/tools/gen.hxx|2 ++
vcl/source/filter/wmf/winwmf.cxx |8
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit a88fda247ac70828d1304261db56cfeab6d1ccd1
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Apr 18 20:57:27 2014 +0200
fdo#77088 WMF - replace 32-bit min/max assumption with const
Added RECT_MIN and RECT_MAX which represent the minimum and
maximum value a Rectangle object can hold. In WMF we used a 32-bit
assumption what the min and max value could be (0x7fff,
0x8000) which causes problems on 64-bit systems.
Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 3986058..bba8bae 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -355,6 +355,8 @@ inline std::basic_ostreamcharT, traits operator (
// Rectangle
#define RECT_EMPTY ((short)-32767)
+#define RECT_MAXLONG_MAX
+#define RECT_MINLONG_MIN
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
{
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index f3cfaf2..1ae9047 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1272,10 +1272,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
{
sal_Bool bRet = sal_True;
-rPlaceableBound.Left() = (sal_Int32)0x7fff;
-rPlaceableBound.Top()= (sal_Int32)0x7fff;
-rPlaceableBound.Right() = (sal_Int32)0x8000;
-rPlaceableBound.Bottom() = (sal_Int32)0x8000;
+rPlaceableBound.Left() = RECT_MAX;
+rPlaceableBound.Top()= RECT_MAX;
+rPlaceableBound.Right() = RECT_MIN;
+rPlaceableBound.Bottom() = RECT_MIN;
sal_uInt32 nPos = pStm-Tell();
sal_uInt32 nEnd = pStm-Seek( STREAM_SEEK_TO_END );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - include/tools vcl/source
include/tools/gen.hxx|2 ++
vcl/source/filter/wmf/winwmf.cxx |8
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 49e5bdc10ca7e1c7fde0353f98cb454c1b22c8e7
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Apr 18 20:57:27 2014 +0200
fdo#77088 WMF - replace 32-bit min/max assumption with const
Added RECT_MIN and RECT_MAX which represent the minimum and
maximum value a Rectangle object can hold. In WMF we used a 32-bit
assumption what the min and max value could be (0x7fff,
0x8000) which causes problems on 64-bit systems.
Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index c1a1e35..e012f2d 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -355,6 +355,8 @@ inline std::basic_ostreamcharT, traits operator (
// Rectangle
#define RECT_EMPTY ((short)-32767)
+#define RECT_MAXLONG_MAX
+#define RECT_MINLONG_MIN
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
{
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 3777c3b..6c5093d 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1271,10 +1271,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
{
sal_Bool bRet = sal_True;
-rPlaceableBound.Left() = (sal_Int32)0x7fff;
-rPlaceableBound.Top()= (sal_Int32)0x7fff;
-rPlaceableBound.Right() = (sal_Int32)0x8000;
-rPlaceableBound.Bottom() = (sal_Int32)0x8000;
+rPlaceableBound.Left() = RECT_MAX;
+rPlaceableBound.Top()= RECT_MAX;
+rPlaceableBound.Right() = RECT_MIN;
+rPlaceableBound.Bottom() = RECT_MIN;
sal_uInt32 nPos = pStm-Tell();
sal_uInt32 nEnd = pStm-Seek( STREAM_SEEK_TO_END );
___
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-6' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90c3940eab1fd2ae9c0f950a8e16df8a8ea48ac8 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Apr 22 21:13:15 2014 +0200 Updated core Project: translations fe78c8f0298a93397552fd62ac5503a32552640e diff --git a/translations b/translations index 994758b..fe78c8f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 994758be26d72b71a9fc930c8cf1f8e1cc7dec00 +Subproject commit fe78c8f0298a93397552fd62ac5503a32552640e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - tools/inc vcl/source
tools/inc/tools/gen.hxx |2 ++
vcl/source/filter/wmf/winwmf.cxx |8
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 1c2e47193e8d811be2023860f61e1af922526610
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Apr 18 20:57:27 2014 +0200
fdo#77088 WMF - replace 32-bit min/max assumption with const
Added RECT_MIN and RECT_MAX which represent the minimum and
maximum value a Rectangle object can hold. In WMF we used a 32-bit
assumption what the min and max value could be (0x7fff,
0x8000) which causes problems on 64-bit systems.
Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 2ddb21f..1c7f766 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -354,6 +354,8 @@ inline std::basic_ostreamcharT, traits operator (
// Rectangle
#define RECT_EMPTY ((short)-32767)
+#define RECT_MAXLONG_MAX
+#define RECT_MINLONG_MIN
class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle
{
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 0178e3d..db4fb75 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -1259,10 +1259,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
{
sal_Bool bRet = sal_True;
-rPlaceableBound.Left() = (sal_Int32)0x7fff;
-rPlaceableBound.Top()= (sal_Int32)0x7fff;
-rPlaceableBound.Right() = (sal_Int32)0x8000;
-rPlaceableBound.Bottom() = (sal_Int32)0x8000;
+rPlaceableBound.Left() = RECT_MAX;
+rPlaceableBound.Top()= RECT_MAX;
+rPlaceableBound.Right() = RECT_MIN;
+rPlaceableBound.Bottom() = RECT_MIN;
sal_uInt32 nPos = pStm-Tell();
sal_uInt32 nEnd = pStm-Seek( STREAM_SEEK_TO_END );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfskipdestination.cxx | 10 +++---
writerfilter/source/rtftok/rtfskipdestination.hxx | 36 +++---
2 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit 2b59ca5c36fb684cae438917f559e97272293e26
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 22 21:48:00 2014 +0200
writerfilter: fix indentation in rtfskipdestination
Change-Id: I56a306baabdfb46da4b46c5e0c0ce2bbd2369e03
diff --git a/writerfilter/source/rtftok/rtfskipdestination.cxx
b/writerfilter/source/rtftok/rtfskipdestination.cxx
index 68081c1..044e26b 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.cxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.cxx
@@ -11,13 +11,15 @@
#include osl/diagnose.h
#include sal/log.hxx
-namespace writerfilter {
-namespace rtftok {
+namespace writerfilter
+{
+namespace rtftok
+{
RTFSkipDestination::RTFSkipDestination(RTFListener rImport)
: m_rImport(rImport),
-m_bParsed(true),
-m_bReset(true)
+ m_bParsed(true),
+ m_bReset(true)
{
}
diff --git a/writerfilter/source/rtftok/rtfskipdestination.hxx
b/writerfilter/source/rtftok/rtfskipdestination.hxx
index 33f0d6a..f70a8c7 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.hxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.hxx
@@ -12,23 +12,25 @@
#include rtflistener.hxx
-namespace writerfilter {
-namespace rtftok {
-/// Skips a destination after a not parsed control word if it was
prefixed with \*
-class RTFSkipDestination
-{
-public:
-RTFSkipDestination(RTFListener rImport);
-virtual ~RTFSkipDestination();
-void setParsed(bool bParsed);
-void setReset(bool bReset);
-private:
-RTFListener m_rImport;
-bool m_bParsed;
-/// If false, the destructor is a noop, required by the \*
symbol itself.
-bool m_bReset;
-};
-} // namespace rtftok
+namespace writerfilter
+{
+namespace rtftok
+{
+/// Skips a destination after a not parsed control word if it was prefixed
with \*
+class RTFSkipDestination
+{
+public:
+RTFSkipDestination(RTFListener rImport);
+virtual ~RTFSkipDestination();
+void setParsed(bool bParsed);
+void setReset(bool bReset);
+private:
+RTFListener m_rImport;
+bool m_bParsed;
+/// If false, the destructor is a noop, required by the \* symbol itself.
+bool m_bReset;
+};
+} // namespace rtftok
} // namespace writerfilter
#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSKIPDESTINATION_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/qa
dbaccess/qa/extras/macros-test.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 139dcea46bf3044697e857a9de0b59a4b943604a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 22 22:07:21 2014 +0200
loplugin:unreffun
Change-Id: Ia7b5ac5ca28d80c353f1ccdce4b69838e584d811
diff --git a/dbaccess/qa/extras/macros-test.cxx
b/dbaccess/qa/extras/macros-test.cxx
index 761f241..7600720 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -23,6 +23,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+#if !defined(MACOSX) !defined(WNT)
class DBAccessTest : public UnoApiTest
{
@@ -32,9 +33,7 @@ public:
void test();
CPPUNIT_TEST_SUITE(DBAccessTest);
-#if !defined(MACOSX) !defined(WNT)
CPPUNIT_TEST(test);
-#endif
CPPUNIT_TEST_SUITE_END();
};
@@ -56,6 +55,8 @@ void DBAccessTest::test()
CPPUNIT_TEST_SUITE_REGISTRATION(DBAccessTest);
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - forms/source sw/source
forms/source/xforms/model.hxx |2 +-
sw/source/core/unocore/unotbl.cxx |5 ++---
sw/source/ui/vba/vbatablehelper.cxx |2 +-
sw/source/ui/vba/vbatablehelper.hxx |2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit f8fd4b70717ee2fc9a3b3f25ebf9e1b6a91a7a25
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 21:08:34 2014 +0100
coverity#704968 Unchecked dynamic_cast
Change-Id: Ifa12e220208d9a67213d1a58ab7e2b67083e2968
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index 57096bc..0d60435 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1612,11 +1612,10 @@ OUString SwXTextTableCursor::getRangeName()
SolarMutexGuard aGuard;
OUString aRet;
SwUnoCrsr* pUnoCrsr = GetCrsr();
-
+SwUnoTableCrsr* pTblCrsr = dynamic_castSwUnoTableCrsr*(pUnoCrsr);
//!! see also SwChartDataSequence::getSourceRangeRepresentation
-if(pUnoCrsr)
+if (pTblCrsr)
{
-SwUnoTableCrsr* pTblCrsr = dynamic_castSwUnoTableCrsr*(pUnoCrsr);
pTblCrsr-MakeBoxSels();
const SwStartNode* pNode =
pTblCrsr-GetPoint()-nNode.GetNode().FindTableBoxStartNode();
const SwTable* pTable = SwTable::FindTable( GetFrmFmt() );
commit 8e7ec95d7c461410477cc9eaed74c7269b50be10
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 21:06:09 2014 +0100
coverity#989725 Uncaught exception
Change-Id: I8904995c474146746623cfda36b8ddb81146070c
diff --git a/sw/source/ui/vba/vbatablehelper.cxx
b/sw/source/ui/vba/vbatablehelper.cxx
index 2a2f1fb..9f659b1 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -230,7 +230,7 @@ sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols rCols,
sal_Int32 nNum ) thro
return nWidth;
}
-void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol,
sal_Int32 nRow, bool bCurRowOnly ) throw (css::uno::RuntimeException)
+void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol,
sal_Int32 nRow, bool bCurRowOnly ) throw (css::uno::RuntimeException,
std::exception)
{
double dAbsWidth = Millimeter::getInHundredthsOfOneMillimeter( _width );
sal_Int32 nTableWidth = getTableWidth( );
diff --git a/sw/source/ui/vba/vbatablehelper.hxx
b/sw/source/ui/vba/vbatablehelper.hxx
index 0c636ad..e5b31fb 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -47,7 +47,7 @@ public:
sal_Int32 getTableWidth( ) throw (css::uno::RuntimeException);
sal_Int32 GetColWidth( sal_Int32 nCol, sal_Int32 nRow = 0, bool
bCurRowOnly = false ) throw (css::uno::RuntimeException);
-void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0,
bool bCurRowOnly = false ) throw (css::uno::RuntimeException);
+void SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 nRow = 0,
bool bCurRowOnly = false ) throw (css::uno::RuntimeException, std::exception);
static SwTable* GetSwTable( const css::uno::Reference
css::text::XTextTable xTextTable ) throw (css::uno::RuntimeException);
static OUString getColumnStr( sal_Int32 nCol );
commit 529215e4230189f9fa0ef68031c98203e09b5729
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 22 21:04:17 2014 +0100
coverity#989724 Uncaught exception
Change-Id: Ia3a74e71b95d263a4d911523d77fd6d8e65adc69
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index a4dc08f..35057e9 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -299,7 +299,7 @@ public:
{ PropertySetBase::addVetoableChangeListener(p1, p2); }
virtual void SAL_CALL removeVetoableChangeListener(const OUString p1,
const css::uno::Referencecss::beans::XVetoableChangeListener p2)
-throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE
+throw( css::beans::UnknownPropertyException,
css::uno::RuntimeException, std::exception ) SAL_OVERRIDE
{ PropertySetBase::removeVetoableChangeListener(p1, p2); }
virtual css::uno::Referencecss::beans::XPropertySetInfo SAL_CALL
getPropertySetInfo()
___
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' - 74/96ed4f9a07d2f09894279158f47e9f29e2b4e2
74/96ed4f9a07d2f09894279158f47e9f29e2b4e2 |1 + 1 file changed, 1 insertion(+) New commits: commit 21663e103c7cc2d9dd56f757cce405e2b19ebc15 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 22 21:18:18 2014 +0100 Notes added by 'git notes add' diff --git a/74/96ed4f9a07d2f09894279158f47e9f29e2b4e2 b/74/96ed4f9a07d2f09894279158f47e9f29e2b4e2 new file mode 100644 index 000..6734489 --- /dev/null +++ b/74/96ed4f9a07d2f09894279158f47e9f29e2b4e2 @@ -0,0 +1 @@ +prefer: 207313157688d79cb0d53e920a03423c81a7bc23 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/examples
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 14d7aa76923bb046e4cca361c72eca817000342f Author: Julien Nabet serval2...@yahoo.fr Date: Tue Apr 22 22:17:45 2014 +0200 cppcheck: multiCondition, remove duplicate Change-Id: I8f819a1ab24ab9fa3a8ef7478f105620deae4aa0 diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx index 31de9de..b320313 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx @@ -167,9 +167,6 @@ OUString SAL_CALL FilterDetect::detect(Sequence PropertyValue aArguments ) else if (aMimeType.equals(application/x-vnd.oasis.opendocument.presentation) || aMimeType.equals(application/vnd.oasis.opendocument.presentation)) sTypeName = devguide_FlatXMLType_Cpp_impress; -else if (aMimeType.equals(application/x-vnd.oasis.opendocument.presentation) || - aMimeType.equals(application/vnd.oasis.opendocument.presentation)) -sTypeName = devguide_FlatXMLType_Cpp_impress; } } return sTypeName; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/CustomTarget_collator.mk i18npool/source solenv/gbuild
i18npool/CustomTarget_collator.mk | 61 +-
i18npool/source/collator/collator_unicode.cxx | 28 +++
solenv/gbuild/Helper.mk | 10
3 files changed, 77 insertions(+), 22 deletions(-)
New commits:
commit 8774a2b1279fcb43eb3cf821cadd3b969078cbcd
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 22 23:09:40 2014 +0300
Let --with-locales prune also built-in collator data
Effective in the DISABLE_DYNLOADING case.
Introduce a new gbuild macro gb_Helper_optional_locale.
Change-Id: I43eb39fa810f71cadb6bc6d5c117ae145629ecb9
diff --git a/i18npool/CustomTarget_collator.mk
b/i18npool/CustomTarget_collator.mk
index 04527bb..9fea159 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -11,26 +11,37 @@ $(eval $(call
gb_CustomTarget_CustomTarget,i18npool/collator))
i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator)
i18npool_COTXTS := \
-ca_charset.txt \
-dz_charset.txt \
-hu_charset.txt \
-ja_charset.txt \
-ja_phonetic_alphanumeric_first.txt \
-ja_phonetic_alphanumeric_last.txt \
-ko_charset.txt \
-ku_alphanumeric.txt \
-ln_charset.txt \
-my_dictionary.txt \
-ne_charset.txt \
-sid_charset.txt \
-zh_charset.txt \
-zh_pinyin.txt \
-zh_radical.txt \
-zh_stroke.txt \
-zh_TW_charset.txt \
-zh_TW_radical.txt \
-zh_TW_stroke.txt \
-zh_zhuyin.txt
+$(call gb_Helper_optional_locale,ca, \
+ca_charset.txt) \
+$(call gb_Helper_optional_locale,dz, \
+dz_charset.txt) \
+$(call gb_Helper_optional_locale,hu, \
+hu_charset.txt) \
+$(call gb_Helper_optional_locale,ja, \
+ja_charset.txt \
+ja_phonetic_alphanumeric_first.txt \
+ja_phonetic_alphanumeric_last.txt) \
+$(call gb_Helper_optional_locale,ko, \
+ko_charset.txt) \
+$(call gb_Helper_optional_locale,ku, \
+ku_alphanumeric.txt) \
+$(call gb_Helper_optional_locale,ln, \
+ln_charset.txt) \
+$(call gb_Helper_optional_locale,my, \
+my_dictionary.txt) \
+$(call gb_Helper_optional_locale,ne, \
+ne_charset.txt) \
+$(call gb_Helper_optional_locale,sid, \
+sid_charset.txt) \
+$(call gb_Helper_optional_locale,zh, \
+zh_charset.txt \
+zh_pinyin.txt \
+zh_radical.txt \
+zh_stroke.txt \
+zh_TW_charset.txt \
+zh_TW_radical.txt \
+zh_TW_stroke.txt \
+zh_zhuyin.txt)
$(call gb_CustomTarget_get_target,i18npool/collator) :
$(SRCDIR)/i18npool/CustomTarget_collator.mk \
$(i18npool_CODIR)/lrl_include.hxx $(foreach txt,$(i18npool_COTXTS), \
@@ -44,10 +55,20 @@ $(i18npool_CODIR)/collator_%.cxx : \
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,gencoll_rule) $ $@ $*)
+define i18npool_echo_one_lang
+ echo '#define LOCAL_RULE_$(1)' $@
+
+endef
+
$(i18npool_CODIR)/lrl_include.hxx : \
$(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo '#define LOCAL_RULE_LANGS $(sort $(foreach
txt,$(i18npool_COTXTS), \
$(firstword $(subst _, ,$(txt)' $@
+ifeq ($(WITH_LOCALES),)
+ echo '#define LOCAL_RULE_ALL' $@
+else
+ $(foreach txt,$(i18npool_COTXTS),$(call i18npool_echo_one_lang,$(subst
.txt,,$(txt
+endif
# vim: set noet sw=4 ts=4:
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index f6fcbe7..5f03e4b 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -154,16 +154,25 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
}
}
#else
-if ( rLocale.Language == ca ) {
+if (false) {
+;
+#if defined LOCAL_RULE_ALL || defined LOCAL_RULE_ca_charset
+} else if ( rLocale.Language == ca ) {
if ( rAlgorithm == charset )
func = get_collator_data_ca_charset;
+#endif
+#if defined LOCAL_RULE_ALL || defined LOCAL_RULE_dz_charset
} else if ( rLocale.Language == dz || rLocale.Language == bo )
{
// 'bo' Tibetan uses the same collation rules as 'dz' Dzongkha
if ( rAlgorithm == charset )
func = get_collator_data_dz_charset;
+#endif
+#if defined LOCAL_RULE_ALL || defined LOCAL_RULE_hu
} else if ( rLocale.Language == hu ) {
if ( rAlgorithm == charset )
func = get_collator_data_hu_charset;
+#endif
+#if defined LOCAL_RULE_ALL || defined LOCAL_RULE_ja_charset
} else if ( rLocale.Language == ja ) {
if ( rAlgorithm == charset )
func =
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-sort-fix' - sc/inc sc/source
sc/inc/document.hxx|2 ++
sc/inc/table.hxx |2 ++
sc/source/core/data/document10.cxx |9 +
sc/source/core/data/table7.cxx | 14 ++
sc/source/ui/docshell/dbdocfun.cxx | 20 ++--
5 files changed, 41 insertions(+), 6 deletions(-)
New commits:
commit 737806755dc57a1fa2b95a29a7a4ed49384fa016
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Apr 22 16:29:14 2014 -0400
Skip adjustment of row height when all rows have the same height.
Change-Id: I490ecade6b909bcf36b848c05e198d58adc90e0a
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index df8d0bb..06f3b54 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1574,6 +1574,8 @@ public:
SC_DLLPUBLIC bool IsManualRowHeight(SCROW nRow, SCTAB nTab) const;
+bool HasUniformRowHeight( SCTAB nTab, SCROW nRow1, SCROW nRow2 ) const;
+
/**
* Write all column row flags to table's flag data, because not all column
* row attributes are stored in the flag data members. This is necessary
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 6715448..a521fa34 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -815,6 +815,8 @@ public:
bool IsManualRowHeight(SCROW nRow) const;
+bool HasUniformRowHeight( SCROW nRow1, SCROW nRow2 ) const;
+
voidSyncColRowFlags();
voidStripHidden( SCCOL rX1, SCROW rY1, SCCOL rX2, SCROW rY2 );
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index abf5297..9513dfb 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -279,4 +279,13 @@ void ScDocument::UpdateScriptTypes( const ScAddress rPos,
SCCOL nColSize, SCROW
pTab-UpdateScriptTypes(rPos.Col(), rPos.Row(), rPos.Col()+nColSize-1,
rPos.Row()+nRowSize-1);
}
+bool ScDocument::HasUniformRowHeight( SCTAB nTab, SCROW nRow1, SCROW nRow2 )
const
+{
+const ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return false;
+
+return pTab-HasUniformRowHeight(nRow1, nRow2);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index eeb4643..385bea1 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -12,6 +12,7 @@
#include document.hxx
#include clipparam.hxx
#include bcaslot.hxx
+#include segmenttree.hxx
bool ScTable::IsMerged( SCCOL nCol, SCROW nRow ) const
{
@@ -110,4 +111,17 @@ void ScTable::UpdateScriptTypes( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nR
aCol[nCol].UpdateScriptTypes(nRow1, nRow2);
}
+bool ScTable::HasUniformRowHeight( SCROW nRow1, SCROW nRow2 ) const
+{
+if (!ValidRow(nRow1) || !ValidRow(nRow2) || nRow1 nRow2)
+return false;
+
+ScFlatUInt16RowSegments::RangeData aData;
+if (!mpRowHeights-getRangeData(nRow1, aData))
+// Search failed.
+return false;
+
+return nRow2 = aData.mnRow2;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 936f601..2be536e 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -490,13 +490,19 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam
rSortParam,
WaitObject aWait( rDocShell.GetActiveDialogParent() );
+SCROW nStartRow = aLocalParam.nRow1 + (aLocalParam.bHasHeader ? 1 : 0);
+
// Calculate the script types for all cells in the sort range beforehand.
// This will speed up the row height adjustment that takes place after the
// sort.
pDoc-UpdateScriptTypes(
-ScAddress(rSortParam.nCol1,rSortParam.nRow1,nTab),
-rSortParam.nCol2-rSortParam.nCol1+1,
-rSortParam.nRow2-rSortParam.nRow1+1);
+ScAddress(aLocalParam.nCol1,nStartRow,nTab),
+aLocalParam.nCol2-aLocalParam.nCol1+1,
+aLocalParam.nRow2-nStartRow+1);
+
+// No point adjusting row heights after the sort when all rows have the
same height.
+bool bUniformRowHeight =
+pDoc-HasUniformRowHeight(nTab, nStartRow, aLocalParam.nRow2);
sal_Bool bRepeatQuery = false; // bestehenden
Filter wiederholen?
ScQueryParam aQueryParam;
@@ -632,8 +638,9 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam
rSortParam,
}
}
-ScRange aDirtyRange( aLocalParam.nCol1, aLocalParam.nRow1, nTab,
-aLocalParam.nCol2, aLocalParam.nRow2, nTab );
+ScRange aDirtyRange(
+aLocalParam.nCol1, nStartRow, nTab,
+aLocalParam.nCol2, aLocalParam.nRow2, nTab);
pDoc-SetDirty( aDirtyRange );
if (bPaint)
@@ -659,7 +666,8 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam
rSortParam,
rDocShell.PostPaint(ScRange(nStartX, nStartY, nTab, nEndX, nEndY,
nTab), nPaint);
}
-rDocShell.AdjustRowHeight( aLocalParam.nRow1,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 666 +--
1 file changed, 296 insertions(+), 370 deletions(-)
New commits:
commit 9ac8872cf211c42acaa034e6f283e6ec10d164c2
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Apr 22 22:37:47 2014 +0200
enhwmf.cxx merge fix
Change-Id: I41e2b8ad7348e274e147317ea04b094c9101c859
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 8df19ac..e529533 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -524,14 +524,14 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
case EMR_SETWINDOWEXTEX :
{ //
#75383#
*pWMF nW nH;
-pOut-SetWinExt( Size( nW, nH ), true);
+pOut-SetWinExt( Size( nW, nH ) );
}
break;
case EMR_SETWINDOWORGEX :
{
*pWMF nX32 nY32;
-pOut-SetWinOrg( Point( nX32, nY32 ), true);
+pOut-SetWinOrg( Point( nX32, nY32 ) );
}
break;
@@ -961,67 +961,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
PolyPolygon aPolyPoly;
if ( cbRgnData )
ImplReadRegion( aPolyPoly, *pWMF, nRecSize );
-pOut-SetClipPath( aPolyPoly, iMode, sal_True );
-}
-break;
-
-case EMR_ALPHABLEND:
-{
-sal_Int32 xDest(0), yDest(0), cxDest(0), cyDest(0);
-
-BLENDFUNCTION aFunc;
-sal_Int32 xSrc(0), ySrc(0), cxSrc(0), cySrc(0);
-XForm xformSrc;
-sal_uInt32 BkColorSrc(0), iUsageSrc(0), offBmiSrc(0);
-sal_uInt32 cbBmiSrc(0), offBitsSrc(0), cbBitsSrc(0);
-
-sal_uInt32 nStart = pWMF-Tell() - 8;
-pWMF-SeekRel( 0x10 );
-
-*pWMF xDest yDest cxDest cyDest aFunc
xSrc ySrc
- xformSrc BkColorSrc iUsageSrc
offBmiSrc cbBmiSrc
- offBitsSrc cbBitsSrc cxSrccySrc ;
-
-sal_uInt32 dwRop = SRCAND|SRCINVERT;
-
-Bitmap aBitmap;
-Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1,
cyDest+1 ) );
-
-if ( (cbBitsSrc (SAL_MAX_UINT32 - 14)) ||
((SAL_MAX_UINT32 - 14) - cbBitsSrc cbBmiSrc) )
-bStatus = sal_False;
-else
-{
-sal_uInt32 nSize = cbBmiSrc + cbBitsSrc + 14;
-if ( nSize = ( nEndPos - nStartPos ) )
-{
-char* pBuf = new char[ nSize ];
-SvMemoryStream aTmp( pBuf, nSize, STREAM_READ |
STREAM_WRITE );
-aTmp.ObjectOwnsMemory( sal_True );
-aTmp (sal_uInt8)'B'
- (sal_uInt8)'M'
- (sal_uInt32)cbBitsSrc
- (sal_uInt16)0
- (sal_uInt16)0
- (sal_uInt32)cbBmiSrc + 14;
-pWMF-Seek( nStart + offBmiSrc );
-pWMF-Read( pBuf + 14, cbBmiSrc );
-pWMF-Seek( nStart + offBitsSrc );
-pWMF-Read( pBuf + 14 + cbBmiSrc, cbBitsSrc );
-aTmp.Seek( 0 );
-ReadDIB(aBitmap, aTmp, true);
-
-// test if it is sensible to crop
-if ( ( cxSrc 0 ) ( cySrc 0 )
-( xSrc = 0 ) ( ySrc = 0 )
-( xSrc + cxSrc =
aBitmap.GetSizePixel().Width() )
-( ySrc + cySrc =
aBitmap.GetSizePixel().Height() ) )
-{
-Rectangle aCropRect( Point( xSrc, ySrc ),
Size( cxSrc, cySrc ) );
-aBitmap.Crop( aCropRect );
-}
-aBmpSaveList.push_back( new BSaveStruct( aBitmap,
aRect, dwRop, pOut-GetFillStyle () ) );
-}
-}
+pOut-SetClipPath( aPolyPoly, iMode, sal_False );
}
break;
@@ -1036,8 +976,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
pWMF-SeekRel( 0x10 );
*pWMF xDest yDest cxDest cyDest dwRop
xSrc ySrc
- xformSrc nColor iUsageSrc offBmiSrc
cbBmiSrc
- offBitsSrc cbBitsSrc;
+
[Libreoffice-commits] core.git: svx/source
svx/source/form/fmshimp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 56f065b29995e7a44f661a158b1f56eb3983742f
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Apr 22 22:40:21 2014 +0200
cppcheck: Fix same expression on both sides of ''
Change-Id: Iddc7ac546cbe105466278a733f5ae17451b9670b
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 47a36a9..732d947 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2538,7 +2538,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest,
FmSearchContext*, pfmscContextIn
// when the cursor is a non-STANDARD RecordMode, set it back
Reference XPropertySet xCursorSet(pfmscContextInfo-xCursor, UNO_QUERY);
Reference XResultSetUpdate xUpdateCursor(pfmscContextInfo-xCursor,
UNO_QUERY);
-if (xUpdateCursor.is() xCursorSet.is() xCursorSet.is())
+if (xUpdateCursor.is() xCursorSet.is())
{
if (::comphelper::getBOOL(xCursorSet-getPropertyValue(FM_PROP_ISNEW)))
xUpdateCursor-moveToCurrentRow();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/config/cjkoptions.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 1893ca5fd5fe66265af43473436b2943b35e1f2b
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Apr 22 22:50:55 2014 +0200
cppcheck: fix variable reassigned before the old value has been used
Change-Id: I866eaf946d4cd8eaa8e4b8799ddac5e0d5dc59bb
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 05a4f5e..cf2500e 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -199,11 +199,9 @@ void SvtCJKOptions_Impl::Load()
if (!bCJKFont)
{
-bool bAutoEnableCJK = false;
-
sal_uInt16 nScriptType =
SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM);
//system locale is CJK
-bAutoEnableCJK = (nScriptType SCRIPTTYPE_ASIAN);
+bool bAutoEnableCJK = (nScriptType SCRIPTTYPE_ASIAN);
if (!bAutoEnableCJK)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Dead code in escherex.cxx (filter module)
Hello,
Taking a look to this part:
4442 if ( nErrCode == ERRCODE_NONE )
4443 {
p_EscherBlibEntry-meBlibType = ( eGraphicType
== GRAPHIC_BITMAP ) ? PNG : EMF;
4445 aStream.Seek( STREAM_SEEK_TO_END );
4446 p_EscherBlibEntry-mnSize = aStream.Tell();
4447 pGraphicAry = (sal_uInt8*)aStream.GetData();
4448
4449 if ( p_EscherBlibEntry-meBlibType == WMF )
// the fileheader is not used
4450 {
4451 p_EscherBlibEntry-mnSize -= 22;
4452 pGraphicAry += 22;
4453 }
4454 }
I wonder if in line 4449 'WMF' should be changed to 'EMF' or the contrary on
line .
See
http://opengrok.libreoffice.org/xref/core/filter/source/msfilter/escherex.cxx#
A research in Opengrok didn't help:
http://opengrok.libreoffice.org/search?q=%22eGraphicType+%3D%3D+GRAPHIC_BITMAP%22project=coredefs=refs=path=hist=
Any idea?
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Dead-code-in-escherex-cxx-filter-module-tp4106079.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 906 +++
vcl/source/filter/wmf/winmtf.cxx | 16
vcl/source/filter/wmf/winwmf.cxx | 36 -
3 files changed, 475 insertions(+), 483 deletions(-)
New commits:
commit 00b3388748aa2dce30fe058534342a5d3f560187
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Apr 22 22:41:31 2014 +0200
enhwmf.cxx merge fix
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index e529533..48de7f0 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -492,541 +492,529 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
}
}
else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
+switch( nRecType )
{
-switch( nRecType )
-{
-case EMR_POLYBEZIERTO :
-
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyBezier, _1,
_2, _3, _4), sal_True);
-break;
-case EMR_POLYBEZIER :
-
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyBezier, _1,
_2, _3, _4), sal_False);
-break;
+case EMR_POLYBEZIERTO :
+
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyBezier, _1,
_2, _3, _4), sal_True);
+break;
+case EMR_POLYBEZIER :
+
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyBezier, _1,
_2, _3, _4), sal_False);
+break;
-case EMR_POLYGON :
-
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolygon, _1, _2,
_3, _4), sal_False);
-break;
+case EMR_POLYGON :
+
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolygon, _1, _2,
_3, _4), sal_False);
+break;
-case EMR_POLYLINETO :
-
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyLine, _1, _2,
_3, _4), sal_True);
-break;
-case EMR_POLYLINE :
-
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyLine, _1, _2,
_3, _4), sal_False);
-break;
+case EMR_POLYLINETO :
+
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyLine, _1, _2,
_3, _4), sal_True);
+break;
+case EMR_POLYLINE :
+
ReadAndDrawPolygonsal_Int32(boost::bind(WinMtfOutput::DrawPolyLine, _1, _2,
_3, _4), sal_False);
+break;
-case EMR_POLYPOLYLINE :
-ReadAndDrawPolyLinesal_Int32();
-break;
+case EMR_POLYPOLYLINE :
+ReadAndDrawPolyLinesal_Int32();
+break;
-case EMR_POLYPOLYGON :
-ReadAndDrawPolyPolygonsal_Int32();
-break;
+case EMR_POLYPOLYGON :
+ReadAndDrawPolyPolygonsal_Int32();
+break;
-case EMR_SETWINDOWEXTEX :
-{ //
#75383#
-*pWMF nW nH;
-pOut-SetWinExt( Size( nW, nH ) );
-}
-break;
+case EMR_SETWINDOWEXTEX :
+{ // #75383#
+*pWMF nW nH;
+pOut-SetWinExt( Size( nW, nH ), true);
+}
+break;
-case EMR_SETWINDOWORGEX :
-{
-*pWMF nX32 nY32;
-pOut-SetWinOrg( Point( nX32, nY32 ) );
-}
-break;
+case EMR_SETWINDOWORGEX :
+{
+*pWMF nX32 nY32;
+pOut-SetWinOrg( Point( nX32, nY32 ), true);
+}
+break;
-case EMR_SCALEWINDOWEXTEX :
-{
-*pWMF nNom1 nDen1 nNom2 nDen2;
-pOut-ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 /
nDen2 );
-}
-break;
+case EMR_SCALEWINDOWEXTEX :
+{
+*pWMF nNom1 nDen1 nNom2 nDen2;
+pOut-ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 /
nDen2 );
+}
+break;
-case EMR_SETVIEWPORTORGEX :
-{
-*pWMF nX32 nY32;
-pOut-SetDevOrg( Point( nX32, nY32 ) );
-}
-break;
+case EMR_SETVIEWPORTORGEX :
+{
+*pWMF nX32 nY32;
+pOut-SetDevOrg( Point( nX32, nY32 ) );
+}
+break;
-case EMR_SCALEVIEWPORTEXTEX :
-{
-*pWMF nNom1 nDen1 nNom2 nDen2;
-pOut-ScaleDevExt( (double)nNom1 /
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 36 +++
vcl/source/filter/wmf/winmtf.cxx | 16 --
vcl/source/filter/wmf/winwmf.cxx | 60 +++
3 files changed, 73 insertions(+), 39 deletions(-)
New commits:
commit e8e9dd4105b80a3ab30da10f511130f73558a87e
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Jan 19 15:12:15 2014 +0100
EMF/WMF: fix rendering of pen styles (dash, dot, dashdot, dashdotdot)
Change-Id: I226bac370601b75f2589f7a7c5e8830746b31e2e
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 5cd9c0b..e487d73 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -730,19 +730,37 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
aLineInfo.SetWidth( aSize.Width() );
sal_Bool bTransparent = sal_False;
-sal_uInt16 nDashCount = 0;
-sal_uInt16 nDotCount = 0;
switch( nStyle 0xFF )
{
case PS_DASHDOTDOT :
-nDotCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 2 );
+aLineInfo.SetDashLen( 150 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 50 );
+break;
case PS_DASHDOT :
-nDashCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 1 );
+aLineInfo.SetDashLen( 150 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 90 );
+break;
case PS_DOT :
-nDotCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 0 );
+aLineInfo.SetDotCount( 1 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 50 );
break;
case PS_DASH :
-nDashCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 0 );
+aLineInfo.SetDashLen( 225 );
+aLineInfo.SetDistance( 100 );
break;
case PS_NULL :
bTransparent = sal_True;
@@ -779,12 +797,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
default :
aLineInfo.SetLineJoin (
basegfx::B2DLINEJOIN_NONE );
}
-if ( nDashCount | nDotCount )
-{
-aLineInfo.SetStyle( LINE_DASH );
-aLineInfo.SetDashCount( nDashCount );
-aLineInfo.SetDotCount( nDotCount );
-}
pOut-CreateObject( nIndex, GDI_PEN, new
WinMtfLineStyle( ReadColor(), aLineInfo, bTransparent ) );
}
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 38e79a8..5074a5d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -714,14 +714,6 @@ void WinMtfOutput::CreateObject( GDIObjectType eType,
void* pStyle )
{
Size aSize( ((WinMtfLineStyle*)pStyle)-aLineInfo.GetWidth(), 0 );
((WinMtfLineStyle*)pStyle)-aLineInfo.SetWidth( ImplMap( aSize
).Width() );
-if ( ((WinMtfLineStyle*)pStyle)-aLineInfo.GetStyle() == LINE_DASH
)
-{
-aSize.Width() += 1;
-long nDotLen = ImplMap( aSize ).Width();
-((WinMtfLineStyle*)pStyle)-aLineInfo.SetDistance( nDotLen );
-((WinMtfLineStyle*)pStyle)-aLineInfo.SetDotLen( nDotLen );
-((WinMtfLineStyle*)pStyle)-aLineInfo.SetDashLen( nDotLen * 4
);
-}
}
}
sal_uInt32 nIndex;
@@ -750,14 +742,6 @@ void WinMtfOutput::CreateObject( sal_Int32 nIndex,
GDIObjectType eType, void* pS
{
Size aSize( ((WinMtfLineStyle*)pStyle)-aLineInfo.GetWidth(),
0 );
((WinMtfLineStyle*)pStyle)-aLineInfo.SetWidth( ImplMap( aSize
).Width() );
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-6' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx | 673 +---
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2
sd/source/ui/remotecontrol/Communicator.cxx |7
3 files changed, 609 insertions(+), 73 deletions(-)
New commits:
commit f84e67dbc791e34d3480e096f3aed43709868374
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Apr 10 21:58:29 2014 +0100
fdo#74697 Add Bluez 5 support for impress remote.
This time we:
- Don't break SAL_WARN with an fprintf like syntax.
- Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might
be building on dbus-glib versions that do not support it (however
presumably anyone running bluez 5 will have a dbus version that is
new enough to support this, i.e. purely a build-time issue).
- Remove various C++11'isms.
Reviewed-on: https://gerrit.libreoffice.org/8924
Tested-by: Andrzej Hunt andrzej.h...@collabora.com
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
(cherry picked from commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c)
Conflicts:
sd/source/ui/remotecontrol/BluetoothServer.cxx
Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32
Reviewed-on: https://gerrit.libreoffice.org/8929
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit d92b1152cb4e700902288d5694add7154045140e)
Reviewed-on: https://gerrit.libreoffice.org/9098
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index c87f1b8..0367b51 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -12,6 +12,8 @@
#include iostream
#include iomanip
+#include boost/scoped_ptr.hpp
+
#include sal/log.hxx
#ifdef LINUX_BLUETOOTH
@@ -89,25 +91,40 @@ struct DBusObject {
}
};
+static DBusObject* getBluez5Adapter(DBusConnection *pConnection);
+
struct sd::BluetoothServer::Impl {
// the glib mainloop running in the thread
GMainContext *mpContext;
DBusConnection *mpConnection;
DBusObject *mpService;
volatile bool mbExitMainloop;
+enum BluezVersion { BLUEZ4, BLUEZ5, UNKNOWN };
+BluezVersion maBluezVersion;
Impl()
: mpContext( g_main_context_new() )
, mpConnection( NULL )
, mpService( NULL )
, mbExitMainloop( false )
+, maBluezVersion( UNKNOWN )
{ }
DBusObject *getAdapter()
{
-if( !mpService )
+if (mpService)
+{
+DBusObject* pAdapter = mpService-cloneForInterface(
org.bluez.Adapter );
+return pAdapter;
+}
+else if (spServer-mpImpl-maBluezVersion == BLUEZ5)
+{
+return getBluez5Adapter(mpConnection);
+}
+else
+{
return NULL;
-return mpService-cloneForInterface( org.bluez.Adapter );
+}
}
};
@@ -155,37 +172,181 @@ sendUnrefAndWaitForReply( DBusConnection *pConnection,
DBusMessage *pMsg )
return pMsg;
}
+static bool
+isBluez5Available(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+
+// Simplest wasy to check whether we have Bluez 5+ is to check
+// that we can obtain adapters using the new interfaces.
+// The first two error checks however don't tell us anything as they should
+// succeed as long as dbus is working correctly.
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No GetManagedObjects call created);
+return false;
+}
+
+pMsg = sendUnrefAndWaitForReply( pConnection, pMsg );
+if (!pMsg)
+{
+SAL_INFO(sdremote.bluetooth, No reply received);
+return false;
+}
+
+// If dbus is working correctly and we aren't on bluez 5 this is where we
+// should actually get the error.
+if (dbus_message_get_error_name( pMsg ))
+{
+SAL_INFO( sdremote.bluetooth, GetManagedObjects call failed with \
+ dbus_message_get_error_name( pMsg )
+ \ -- we don't seem to have Bluez 5 available);
+return false;
+}
+SAL_INFO(sdremote.bluetooth, GetManagedObjects call seems to have
succeeded -- we must be on Bluez 5);
+dbus_message_unref(pMsg);
+return true;
+}
+
+
+static DBusObject*
+getBluez5Adapter(DBusConnection *pConnection)
+{
+DBusMessage *pMsg;
+// This returns a list of objects where we need to find the first
+// org.bluez.Adapter1 .
+pMsg = DBusObject( org.bluez, /, org.freedesktop.DBus.ObjectManager
).getMethodCall( GetManagedObjects );
+if (!pMsg)
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-4' - sd/source
sd/source/ui/animations/CustomAnimationCreateDialog.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 60929c3ff6b39d40a9ad81f3fd13ea0ea3ae78e2
Author: Caolán McNamara caol...@redhat.com
Date: Wed Apr 16 20:24:33 2014 +0100
Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab
(cherry picked from commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab)
Conflicts:
sd/source/ui/animations/CustomAnimationCreateDialog.cxx
Change-Id: I38deeae3135badde23b9d454d548193af654caab
Reviewed-on: https://gerrit.libreoffice.org/9076
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 8a42ecdaa6bf1c5d0c4749e3178daf2c3dc34ff3)
Reviewed-on: https://gerrit.libreoffice.org/9081
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 257d7fe..178504f 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -174,7 +174,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent
rMEvt )
class CustomAnimationCreateTabPage : public TabPage
{
public:
-CustomAnimationCreateTabPage( Window* pParent,
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const
PresetCategoryList rCategoryList, bool bHasText );
+CustomAnimationCreateTabPage( Window* pParent,
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const
PresetCategoryList rCategoryList, bool bHasText, bool bIsMotionPath = false );
~CustomAnimationCreateTabPage();
PathKind getCreatePathKind() const;
@@ -235,7 +235,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const
CustomAnimationPresetPtr
return mxCollator-compareString(p1-getLabel(), p2-getLabel()) == -1;
}
-CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent,
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const
PresetCategoryList rCategoryList, bool bHasText )
+CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent,
CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const
PresetCategoryList rCategoryList, bool bHasText, bool bIsMotionPath )
: TabPage( pParent, CustomAnimationCreateTab,
modules/simpress/ui/customanimationcreatetab.ui )
, mpParent( pDialogParent )
, mnId( nTabId )
@@ -256,7 +256,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage(
Window* pParent, Cus
sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
-if( nTabId == MOTIONPATH )
+if( bIsMotionPath )
{
mpLBEffects-InsertCategory( sMotionPathLabel );
@@ -523,7 +523,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog(
Window* pParent, Custo
mpTabControl-SetTabPage( mnEmphasisId, mpTabPages[EMPHASIS] );
mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this,
mnExitId, rPresets.getExitPresets(), bHasText );
mpTabControl-SetTabPage( mnExitId, mpTabPages[EXIT] );
-mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl,
this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText );
+mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl,
this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText, true );
mpTabControl-SetTabPage( mnMPathId, mpTabPages[MOTIONPATH] );
mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl,
this, mnMiscId, rPresets.getMiscPresets(), bHasText );
mpTabControl-SetTabPage( mnMiscId, mpTabPages[MISCEFFECTS] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 60 +++
vcl/source/filter/wmf/winmtf.cxx | 16 --
vcl/source/filter/wmf/winwmf.cxx | 60 +++
3 files changed, 98 insertions(+), 38 deletions(-)
New commits:
commit 10117d6121f3785bff1443489ba87935a684
Author: Andras Timar andras.ti...@collabora.com
Date: Sun Jan 19 15:12:15 2014 +0100
EMF/WMF: fix rendering of pen styles (dash, dot, dashdot, dashdotdot)
Change-Id: I226bac370601b75f2589f7a7c5e8830746b31e2e
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 813e1e6..5757fb8 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -728,19 +728,37 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
aLineInfo.SetWidth( aSize.Width() );
sal_Bool bTransparent = sal_False;
-sal_uInt16 nDashCount = 0;
-sal_uInt16 nDotCount = 0;
switch( nStyle 0xFF )
{
case PS_DASHDOTDOT :
-nDotCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 2 );
+aLineInfo.SetDashLen( 150 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 50 );
+break;
case PS_DASHDOT :
-nDashCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 1 );
+aLineInfo.SetDashLen( 150 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 90 );
+break;
case PS_DOT :
-nDotCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 0 );
+aLineInfo.SetDotCount( 1 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 50 );
break;
case PS_DASH :
-nDashCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 0 );
+aLineInfo.SetDashLen( 225 );
+aLineInfo.SetDistance( 100 );
break;
case PS_NULL :
bTransparent = sal_True;
@@ -777,12 +795,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
default :
aLineInfo.SetLineJoin (
basegfx::B2DLINEJOIN_NONE );
}
-if ( nDashCount | nDotCount )
-{
-aLineInfo.SetStyle( LINE_DASH );
-aLineInfo.SetDashCount( nDashCount );
-aLineInfo.SetDotCount( nDotCount );
-}
pOut-CreateObject( nIndex, GDI_PEN, new
WinMtfLineStyle( ReadColor(), aLineInfo, bTransparent ) );
}
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 9c14fd8..e5085f6 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -747,14 +747,6 @@ void WinMtfOutput::CreateObject( GDIObjectType eType,
void* pStyle )
{
Size aSize( ((WinMtfLineStyle*)pStyle)-aLineInfo.GetWidth(), 0 );
((WinMtfLineStyle*)pStyle)-aLineInfo.SetWidth( ImplMap( aSize
).Width() );
-if ( ((WinMtfLineStyle*)pStyle)-aLineInfo.GetStyle() == LINE_DASH
)
-{
-aSize.Width() += 1;
-long nDotLen = ImplMap( aSize ).Width();
-((WinMtfLineStyle*)pStyle)-aLineInfo.SetDistance( nDotLen );
-((WinMtfLineStyle*)pStyle)-aLineInfo.SetDotLen( nDotLen );
-((WinMtfLineStyle*)pStyle)-aLineInfo.SetDashLen( nDotLen * 4
);
-}
}
}
sal_uInt32 nIndex;
@@ -783,14 +775,6 @@ void WinMtfOutput::CreateObject( sal_Int32 nIndex,
GDIObjectType eType, void* pS
{
Size aSize( ((WinMtfLineStyle*)pStyle)-aLineInfo.GetWidth(),
0 );
((WinMtfLineStyle*)pStyle)-aLineInfo.SetWidth( ImplMap( aSize
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/source
include/vcl/outdev.hxx | 42 ++---
include/vcl/print.hxx | 18 +-
include/vcl/virdev.hxx |2 -
include/vcl/window.hxx |2 -
vcl/source/gdi/bitmap.cxx |2 -
vcl/source/gdi/embeddedfontshelper.cxx |2 -
vcl/source/gdi/pdfwriter_impl.cxx |6 ++--
vcl/source/gdi/print.cxx | 14 ---
vcl/source/gdi/virdev.cxx | 10 +++
vcl/source/outdev/bitmap.cxx |8 ++
vcl/source/outdev/clipping.cxx |2 -
vcl/source/outdev/curvedshapes.cxx |8 +++---
vcl/source/outdev/font.cxx | 20 +++
vcl/source/outdev/gradient.cxx |2 -
vcl/source/outdev/hatch.cxx|2 -
vcl/source/outdev/line.cxx |4 +--
vcl/source/outdev/nativecontrols.cxx |8 +++---
vcl/source/outdev/outdev.cxx | 30 +++
vcl/source/outdev/pixel.cxx| 10 +++
vcl/source/outdev/polygon.cxx |8 +++---
vcl/source/outdev/polyline.cxx |8 +++---
vcl/source/outdev/rect.cxx |4 +--
vcl/source/outdev/text.cxx | 10 +++
vcl/source/outdev/textline.cxx |4 +--
vcl/source/outdev/transparent.cxx |4 +--
vcl/source/window/window.cxx |6 ++--
vcl/source/window/window2.cxx |8 +++---
27 files changed, 120 insertions(+), 124 deletions(-)
New commits:
commit 8708d30369685ba84a0b9c335fcaccd4814fa842
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Wed Apr 23 07:22:08 2014 +1000
Rename OutputDevice::ImplGetGraphics to GetGraphics
Change-Id: I4086978f2292538c458802a7fb56c0d3826f2def
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index defa3dd..901cfbe 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -56,7 +56,7 @@
return; \
\
if ( !mpGraphics ) \
-if ( !ImplGetGraphics() ) \
+if ( !AcquireGraphics() ) \
return; \
\
if ( mbInitClipRegion ) \
@@ -401,8 +401,8 @@ public:
@returns SalGraphics instance.
*/
-SAL_DLLPRIVATE SalGraphics const *ImplGetGraphics() const;
-SAL_DLLPRIVATE SalGraphics* ImplGetGraphics();
+SAL_DLLPRIVATE SalGraphics const *GetGraphics() const;
+SAL_DLLPRIVATE SalGraphics* GetGraphics();
/** Acquire a graphics device that the output device uses to draw on.
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 2bd739e2..dee0722 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1642,7 +1642,7 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice*
pDisplay )
{
Bitmap aDispBmp( *this );
-if( mpImpBmp ( pDisplay-mpGraphics || pDisplay-ImplGetGraphics() ) )
+if( mpImpBmp ( pDisplay-mpGraphics || pDisplay-AcquireGraphics() ) )
{
ImpBitmap* pImpDispBmp = new ImpBitmap;
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index 05730b7..1eca07e 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -230,7 +230,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString
familyName, FontFamil
return url;
}
bool ok = false;
-SalGraphics* graphics = Application::GetDefaultDevice()-ImplGetGraphics();
+SalGraphics* graphics = Application::GetDefaultDevice()-GetGraphics();
PhysicalFontCollection fonts;
graphics-GetDevFontList( fonts );
boost::scoped_ptr ImplGetDevFontList fontInfo( fonts.GetDevFontList());
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 9d00716..6dcaf0a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3835,7 +3835,7 @@ void PDFWriterImpl::appendBuiltinFontsToDict(
OStringBuffer rDict ) const
bool PDFWriterImpl::emitFonts()
{
-if( ! m_pReferenceDevice-ImplGetGraphics() )
+if( ! m_pReferenceDevice-AcquireGraphics() )
return false;
OStringBuffer aLine( 1024 );
@@ -7041,7 +7041,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
rNewGlyph.m_nFontID = pMappedFontObjects[i];
rNewGlyph.m_nSubsetGlyphID = nNewId;
}
-getReferenceDevice()-ImplGetGraphics();
+getReferenceDevice()-AcquireGraphics();
const bool bVertical = ((pGlyphs[i] GF_ROTMASK) != 0);
pGlyphWidths[i] = m_aFontCache.getGlyphWidth( pCurrentFont,
nFontGlyphId,
@@ -7064,7 +7064,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-6' - readlicense_oo/odt
readlicense_oo/odt/CREDITS.odt |binary 1 file changed New commits: commit c60f0e253efea3553b7c8342e142de726452d7c6 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Apr 23 00:20:21 2014 +0200 update credits Change-Id: I397781aef6fb0dda459ffa9250f1f9c77a260b32 diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt index 606deea..3c6e418 100644 Binary files a/readlicense_oo/odt/CREDITS.odt and b/readlicense_oo/odt/CREDITS.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.6.2'
Tag 'libreoffice-4.1.6.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-22 23:25 -0700 Tag libreoffice-4.1.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTVuxiAAoJEPQ0oe+v7q6jqg4P/1Mdr9i6oAxcR7MOS7qdBxIf 4YKC5H6EgWB7eQ2VXu07ZBH+lqXmOaJPqWwVbxETa2vo3vQdl8lO2RKvLbucHPVQ IKFzeNhDJOucD/9D5Jix5AZyq4v3EtQT0QeHnDhdktZ8zQg5DZL1J+oHZX8qiJZs gmmkc/fK44zymb8/FXw2OV48kHdyG/7dbvXlDWnbpMaJV2/aM83YPEge+EKOvyQo bUnnsDq8zxUJHlPV4c41Pzlh01PLd+SAF4gQvwN0qRpkbfeCihqq3Kcvtc6s9rRy wAbOObxjFu2eSwDI9+/SI6nQ2XjTetln1vuymtkK1MqMD6EdbI26WojEiiqMqjN1 xr20K6IdrKnwZnKaURLNl5lYYuBsaNk/nKhP4K5p0xBoEYm4JHXRK2jd7Ut0Iovo EYCirdq2ausHm0b0EEIB6cW1rcfVIN6CgRHvtb8F2HIL3TqSaFJtP8Bx4gU1C3jM ZTUw0vQjgAY4jlueLkOWBZNxsojWclExd58LOqasKF0e6Mzp4y2LWzzOcCwaLGBL YmJ9PSJwzxRSlFVWubtComvNNE8+aZlpIY47qjsLQsVIv+HQKZbe1nqjiKBjs8qM CF5ZXS11es4Y1+8jnUNOtVxVxT853TFYbzSaGXAP1PFkpgSwmE3UEVqhPfuSe2Rt gJfNikg4tAesxxeKXXml =XmCk -END PGP SIGNATURE- Changes since cp-4.1-branch-point-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.6.2'
Tag 'libreoffice-4.1.6.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-22 23:25 -0700 Tag libreoffice-4.1.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTVuxtAAoJEPQ0oe+v7q6joqAQAMiiOrnfOgX5Vs0kBQiJoTZv eU9cm8INNsyp7+ZRYvQK3tDt/PmQAe+/74xBfyyyE3bAKx4BIWhMKwLbSe+SHdyF i/AY+v0qzLpHWzPCv7+l3Ep82UdtL3XSUPYgGkiPmnWLEKMtK8qAMVtJoAhUo/Hu KVSIkfrRkSHcTiDv31Od7eoPKJ3fmyces1733lmw53xVD62V9IYHb2QrTNbBdM/U 1TmqtQivXJt/PqOlh49amcWtXqRyd1gNqBZBjrL8Cuqxpr1+zoISsPh9egJbcwTZ A5MzqQbnS4nfCi2yUSzbBeeg3R2wJw/A033Uu0AVDsC44unU16ZDzUeYwdvOOujX FsCsCESNyQT/29ekT6R0WeVFxSg6k3reNVNZrVJWjCaXmdgb4fcSpwkz60Q0Yn/w IGHE8aGA0MhIrVYoGCoKLSIx2vMESDTT4MNZJ1Uq3+VkCtfP6zdAQV/HWWFtHMdO Gc6b4apTshXe7dPzNRSj19694oK48x0oVT6sqGwM+J99H5b0LLhgBna7spq/zi6k w65RmcqiuIVIaCzJeYclFtRPqQuNgpyIL6dUlPWF+Z6ADMOp7kLViqzMTjbcRvxO ByY0/wjkPr/199Z+mdJTcQEQke/9Z9zvyqPhFTQFmBFawUyeA9d9sk7n3r1J+IFx hedUO/8Tk9k47i6eTp17 =uz1n -END PGP SIGNATURE- Changes since cp-4.1-2-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.6.2'
Tag 'libreoffice-4.1.6.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-22 23:25 -0700 Tag libreoffice-4.1.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTVuxoAAoJEPQ0oe+v7q6jXwcQAMFeP62t0jmd2NZeDtDXp40Y 01M4AxX1QhxsZMW8XFsOB6pWzlWDRCyXbmZGWavnX0WIAsHpJUAHjKo33YeQ+HO+ t1xyG+TTI6f4Wq6rurEhK4R+UA6ftmbdquVXM6mGoSEE0OoCxFTTWLoeAJQu3mzI mxzqLKuVGNZezu7cAH8Vah/yNe7ENSmBrVNav0cYpmTidR+IaCQJ6NDKnsD1pfBb UPc9OQSbgURtkyNDNGuFOvUF7ACdeQWqTsvMflTkxJAg1/NT2LCJWrDZcmjCCbIr EmN9HNp6iBbvsozAjXTdVI5JgnxmRfsLL6hpt9Gfn/sq59aowOhucOtsFRqQy198 G5nDi6iTGe7iETblJh+O6TTVm21epi7/LcSQWy4BcJXxUd3Ti3IrBD3kydN+eF3t 4nyIArurcHs8Jpckcl01VGjDszlcJ7uwGCjS4lwPWsDM9p5pBtSPELdsaJe3P5Ef LCuxz1RFLTe75qS8X4e415upV9/O8TporwqDPUznmgiYfZATU9CNFIemfEncIKQ6 kVmpNSkroaesb+FTROduFX3HzIaHM1Rue9UV1b7atqMm2tsJjLD1Qo8WlQrJlK4g dPBkAOSB+gE14mHaZRp4q+82ioIjh5b1vkbHvK1pUMmV/Zq33hEm+2ol8tsXmhy8 0yXWDwMtmHeFcFxaEjFa =VNkv -END PGP SIGNATURE- Changes since cp-4.1-1-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.6.2'
Tag 'libreoffice-4.1.6.2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-22 23:25 -0700 Tag libreoffice-4.1.6.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTVuxyAAoJEPQ0oe+v7q6jfMAP/iwdXCANDAPNDoClzoiVfQf5 YQiCn2kBK1La+NA2L0dHaEAB36BeYgwidpY3VNLBEoU9bkXkkMRqCeAUrOxSsBtv cR4E9hdLnjpL5zbIvFCugEKHj4yNhjGm1ljyA1oByN7nGZnHLV6ILUmMP/+i+tkJ zFA5pgrSzQ7RHWbiqT7jgfk/5cP/HGZJpklj+VGXCIzS9Ly2Yydy9Y0TkSYH23Tk qkyxVie/aR6bx73WUgGVvtY3EcUeHapA54jI5OZ+SVsuz/yePiUeMvfgBd0ze3AO yfDw5J2lKB0dcs3IIokLdkkqpdY+n2e+aIjdiHvJvNB+b1N6IDhbnfXd1Cy2v13Y tHGciyUzbWpbbhY/HcjYtMky2Zjx01bQreiQVOPiGMsobrnKV8HqQppJPDHZm0Ar k7gCqLbk4j1ktlSofCoXzoVXcxKHOmYCDkr59NCPS+Qouq6gjHRO3UJzOt7rsMv5 1dUlWIBlzY8/CByrdKFIOIrI9TwRLLI1Ai669A9Ve0ah8u408gHkDDn76YzCXdfC v5wQQRNtVD/3tRsMboqxICr7gn9GIJtUhcN91RDxiZsXYI+Hv/YKOvokog25JGX5 0W0mOVQ3Enmd9D2nQBpltvOk48sYyDDlWDZtBZgKdrAqx86M7udOgSDJYOcXBfV9 jSToe2VAc8bYlThnHXeY =/7eP -END PGP SIGNATURE- Changes since cp-4.1-branch-point-355: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
