[Libreoffice-commits] core.git: 4 commits - comphelper/source connectivity/source dbaccess/source extensions/source include/canvas include/comphelper include/connectivity include/dbaccess include/svx
comphelper/source/container/enumerablemap.cxx | 15 +-- comphelper/source/misc/anycompare.cxx |6 - comphelper/source/property/MasterPropertySet.cxx | 10 +- comphelper/source/property/opropertybag.hxx|2 connectivity/source/commontools/sqlerror.cxx |2 connectivity/source/drivers/mozab/MConnection.hxx |2 connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx |2 connectivity/source/resource/sharedresources.cxx |2 connectivity/source/simpledbt/dbtfactory.cxx |6 - connectivity/source/simpledbt/dbtfactory.hxx |2 dbaccess/source/core/api/KeySet.cxx|9 -- dbaccess/source/core/api/KeySet.hxx| 14 +-- dbaccess/source/core/api/OptimisticSet.cxx |8 - dbaccess/source/core/api/RowSetBase.hxx|2 dbaccess/source/core/api/RowSetCache.cxx |4 dbaccess/source/core/dataaccess/ComponentDefinition.hxx|2 dbaccess/source/core/dataaccess/documenteventexecutor.hxx |2 dbaccess/source/core/dataaccess/documentevents.hxx |2 dbaccess/source/core/dataaccess/myucp_datasupplier.hxx |2 dbaccess/source/core/inc/objectnameapproval.hxx|2 dbaccess/source/core/inc/recovery/dbdocrecovery.hxx|2 dbaccess/source/core/recovery/storagetextstream.hxx|2 dbaccess/source/core/recovery/storagexmlstream.hxx |4 dbaccess/source/ext/macromigration/docinteraction.hxx |2 dbaccess/source/ext/macromigration/macromigrationdialog.hxx|2 dbaccess/source/ext/macromigration/migrationengine.hxx |2 dbaccess/source/ext/macromigration/migrationlog.hxx|2 dbaccess/source/ext/macromigration/progresscapture.hxx |2 dbaccess/source/ext/macromigration/progressmixer.hxx |2 dbaccess/source/filter/xml/xmlExport.hxx |4 dbaccess/source/filter/xml/xmlHelper.hxx |4 dbaccess/source/filter/xml/xmlfilter.hxx | 22 ++--- dbaccess/source/sdbtools/connection/datasourcemetadata.hxx |2 dbaccess/source/sdbtools/connection/objectnames.hxx|2 dbaccess/source/sdbtools/connection/tablename.hxx |2 dbaccess/source/ui/app/AppController.cxx | 42 ++ dbaccess/source/ui/app/AppController.hxx |6 - dbaccess/source/ui/app/AppControllerDnD.cxx|7 - dbaccess/source/ui/app/AppDetailPageHelper.hxx |2 dbaccess/source/ui/app/subcomponentmanager.hxx |2 dbaccess/source/ui/browser/dsEntriesNoExp.cxx |7 + dbaccess/source/ui/browser/unodatbr.cxx| 15 --- dbaccess/source/ui/control/RelationControl.cxx |2 dbaccess/source/ui/control/dbtreelistbox.cxx |2 dbaccess/source/ui/control/toolboxcontroller.cxx | 15 +-- dbaccess/source/ui/dlg/dsselect.hxx|2 dbaccess/source/ui/dlg/odbcconfig.hxx |2 dbaccess/source/ui/inc/JoinController.hxx |2 dbaccess/source/ui/inc/RelationController.hxx |2 dbaccess/source/ui/inc/TablesSingleDlg.hxx |2 dbaccess/source/ui/inc/UserAdminDlg.hxx|2 dbaccess/source/ui/inc/advancedsettingsdlg.hxx |2 dbaccess/source/ui/inc/dbadmin.hxx |2 dbaccess/source/ui/inc/dbwiz.hxx |2 dbaccess/source/ui/inc/dbwizsetup.hxx |2 dbaccess/source/ui/inc/defaultobjectnamecheck.hxx |4 dbaccess/source/ui/inc/singledoccontroller.hxx |2 dbaccess/source/ui/inc/sqlmessage.hxx |2 dbaccess/source/ui/inc/textconnectionsettings.hxx |2 dbaccess/source/ui/inc/toolboxcontroller.hxx |2 dbaccess/source/ui/inc/unodatbr.hxx|2 dbaccess/source/ui/querydesign/querycontroller.cxx |4 dbaccess/source/ui/uno/copytablewizard.cxx | 15 --- extensions/source/propctrlr/eformshelper.cxx |8 - extensions/source/propctrlr/propertyhandler.cxx|6 - include/canvas/
LibreOffice Gerrit News for dev-tools on 2014-09-25
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: + fdo#84227 Use only last patchset for modules in https://gerrit.libreoffice.org/11614 from Mathias M * 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-09-25
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Eliminate memory leak due to circular shared_ptr in https://gerrit.libreoffice.org/11629 from Matthew Francis about module cppuhelper + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman about module sfx2 + fdo#39625 Make existing CppUnit tests work in https://gerrit.libreoffice.org/11603 from Tobias Madl about module unoxml End of freshness + vcl: Merge ImpFontCharMap with FontCharMap, use intrusive_ptr to manage in https://gerrit.libreoffice.org/11565 from Chris Sherlock about module cui, include, sc, starmath, svtools, svx, vcl + Fix PythonTest on windows in https://gerrit.libreoffice.org/11631 from Peter Foley about module solenv + Resolves fdo#84283: Export to PDF with footnotes in tables crash in https://gerrit.libreoffice.org/11634 from Julien Nabet about module sw + Fix firebird without cygwin gcc in https://gerrit.libreoffice.org/11619 from Peter Foley about module external + Properly handle the hash-style linker check when cross-compiling in https://gerrit.libreoffice.org/11496 from Peter Foley about module build + DO NOT PUSH remove the versioning of the SvxPoolItem streams in https://gerrit.libreoffice.org/11628 from Noel Grandin about module editeng, include, sc, sd, sfx2, svl, svx, sw + making streamtimeout as config variable instead of environment variable in https://gerrit.libreoffice.org/11625 from Xukai Liu about module officecfg, sc, solenv + fdo#39468 Translate German comments, clean some ws in https://gerrit.libreoffice.org/11622 from Philipp Weissenbacher about module forms + Restore searching in sub directories in https://gerrit.libreoffice.org/11522 from Philipp Weissenbacher about module bin + Changing the font properties makes it look better in https://gerrit.libreoffice.org/11620 from Xukai Liu about module chart2 * Merged changes on master for project core changed in the last 25 hours: + javaunohelper: WeakBase_Test & MultiTypeInterfaceContainer_Test -> JUnit in https://gerrit.libreoffice.org/11630 from Robert Antoni Buj i Gelonch + fdo#83558 Don't change toolbar tooltip on state change in https://gerrit.libreoffice.org/11306 from Samuel Mehrbrodt + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11597 from Takeshi Abe + fdo#47302: Added insert->fields->page title button in https://gerrit.libreoffice.org/11599 from Jennifer Liebel + fdo#64302: Writer’s Special Character dialog could be simpler in https://gerrit.libreoffice.org/11621 from Szymon Kłos + fdo#81132 Remove some formatting options from the right-click menu in Wri in https://gerrit.libreoffice.org/1 from Samuel Mehrbrodt + fdo#62081: Add split menus to items in the style dropdown in https://gerrit.libreoffice.org/11581 from Szymon Kłos + Make gbuild-to-ide more pep8 compliant in https://gerrit.libreoffice.org/11633 from Peter Foley + Make gbuild-to-ide bail out before parsing if ide type is invalid in https://gerrit.libreoffice.org/11632 from Peter Foley + fdo#39468 Translated German to English in https://gerrit.libreoffice.org/11461 from Tobias Madl + fdo#73151 Always open Styles&Formatting dialog in the sidebar in https://gerrit.libreoffice.org/11253 from Samuel Mehrbrodt + fdo#78611 Don't create automatic rules on reset in https://gerrit.libreoffice.org/10988 from Jan-Marek Glogowski + fdo#81782 MM: copy most document properties in https://gerrit.libreoffice.org/10987 from Jan-Marek Glogowski + MM: restore the non-saving wizard behaviour in https://gerrit.libreoffice.org/10986 from Jan-Marek Glogowski + MM: readd CreateMonitor handling in https://gerrit.libreoffice.org/10985 from Jan-Marek Glogowski + MM: detect save error based on the return value in https://gerrit.libreoffice.org/11456 from Jan-Marek Glogowski + Removed uneeded checks. in https://gerrit.libreoffice.org/11562 from Ryan McCoskrie + Revert "Make PythonTests depend on the ExternalExecutable" in https://gerrit.libreoffice.org/11627 from Matúš Kukan + javaunohelper: migrate InterfaceContainer_Test to JUnit in https://gerrit.libreoffice.org/11615 from Robert Antoni Buj i Gelonch + Replace use of o3tl::heap_ptr with std::unique_ptr in https://gerrit.libreoffice.org/11626 from Stephan Bergmann + fdo#80654 - Add icon to 'Close Preview' button in Page Preview toolbar in https://gerrit.libreoffice.org/11576 from Yousuf Philips + fdo#55903 - fixed zoom mode button tooltip for better understanding in https://gerrit.libreoffice.org/11596 from Yousuf Philips + fdo#39625 Delete unused cppunittests in https://gerrit.libreoffice.org/11602 from Tobias Madl + fix build with coverity 7.0.2 and gcc 4.8.3 in https://gerrit.libreoffice.org/11611 from Caolán McNamara + fdo#39625 Make existing CppUnittests work in https://
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 Luke changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED --- Comment #7 from Luke --- Verified fixed in a current 4.4 build. Beautiful work, Szymon! This is a nice improvement in the UI. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-marketing] Re: LibreOffice Weekly News #5 waiting for reviews
Hi William, Also from me congrats for that huge amount of work. One small thing: > Andrew Sayers, a new LibreOffice contributor, released mid-August 17 >> patches to improve the LibreOffice Calc export filter called XSLT.[3] > > It's not called XSLT, but *uses* XSLT ;-) Just remove "called XSLT" and you're good. Or "[...] improve the LibreOffice Calc HTML XSL export filter." Maybe you can also post those to reddit.com/r/libreoffice ? We have 432 subscribers there. Cheers, Philipp On 13 September 2014 16:10, Charles-H. Schulz < charles.sch...@documentfoundation.org> wrote: > I am outside today, > I will comment later or tomorrow. Thanks for the LOWN! > > Best, > > Charles. > > > On 13 septembre 2014 11:48:28 CEST, Norbert Thiebaud > wrote: >> >> On Sat, Sep 13, 2014 at 10:38 AM, Sophie wrote: >> >>> Hi, >>> Le 13/09/2014 10:07, Norbert Thiebaud a écrit : >>> >>> [...] >>> >>> "Yet 7 new contributors to the LibreOffice project! Welcome to them!" -> "We welcomed 7 new contributors to the LibreOffice project:" >>> >>> And I would say ...7 new contributors to the development team, there are >>> new contributors to the project not cited here. >>> >> >> True.. point taken :-) >> >> > -- > Envoyé de mon téléphone avec Kaiten Mail. Excusez la brièveté. > > ___ > 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: javaunohelper/JunitTest_juh.mk javaunohelper/test
javaunohelper/JunitTest_juh.mk
|4
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
|1
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
| 167 +++---
javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
| 147 ++--
4 files changed, 100 insertions(+), 219 deletions(-)
New commits:
commit f6001fb30c516ec6da39b0ca4058f8b28058df1f
Author: Robert Antoni Buj i Gelonch
Date: Wed Sep 24 13:57:50 2014 +0200
javaunohelper: WeakBase_Test & MultiTypeInterfaceContainer_Test -> JUnit
Integrate WeakBase_Test and MultiTypeInterfaceContainer_Test in juh tests.
Remove unused import in InterfaceContainer_Test.
Remove getImplementationId() test in WeakBase_Test. Deprecated as of
the commit: 90b27c9493f4225e1612364b5813971b45b681a6
$ make JunitTest_juh
Change-Id: I1205c001e7f15bc5a28289051194fb225e114f13
Reviewed-on: https://gerrit.libreoffice.org/11630
Reviewed-by: David Ostrovsky
Tested-by: David Ostrovsky
diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 3ba2f4e..03a 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -35,13 +35,17 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test \
+
javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test
\
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
+javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test \
))
$(eval $(call gb_JunitTest_add_classes,juh,\
com.sun.star.comp.helper.ComponentContext_Test \
com.sun.star.lib.uno.helper.ComponentBase_Test \
com.sun.star.lib.uno.helper.InterfaceContainer_Test \
+com.sun.star.lib.uno.helper.MultiTypeInterfaceContainer_Test \
+com.sun.star.lib.uno.helper.WeakBase_Test \
))
# vim:set noet sw=4 ts=4:
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index c98ceab..7459fae 100644
---
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -40,7 +40,6 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class InterfaceContainer_Test
{
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
index 6f805d5..c483a04 100644
---
a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
+++
b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
@@ -30,6 +30,12 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+
public class MultiTypeInterfaceContainer_Test
{
private static final Logger logger =
Logger.getLogger(MultiTypeInterfaceContainer_Test.class.getName());
@@ -47,8 +53,8 @@ public class MultiTypeInterfaceContainer_Test
//contains original object + proxies + null value
List list3;
-/** Creates a new instance of MultiTypeInterfaceContainer_Test */
-public MultiTypeInterfaceContainer_Test()
+/** Class variables are initialized before each Test method */
+@Before public void setUp() throws Exception
{
obj1= new AWeakBase();
obj2= new AWeakBase();
@@ -58,17 +64,25 @@ public class MultiTypeInterfaceContainer_Test
proxyObj1Weak1= ProxyProvider.createProxy(obj1, XWeak.class);
proxyObj3Weak1= ProxyProvider.createProxy(obj3, XWeak.class);
proxyObj3Weak2= ProxyProvider.createProxy(obj3, XWeak.class);
+assertNotNull(proxyObj1Weak1);
+assertNotNull(proxyObj3Weak1);
+assertNotNull(proxyObj3Weak2);
+
proxyObj2TypeProv= ProxyProvider.createProxy(obj2,
XTypeProvider.class);
proxyObj3TypeProv= ProxyProvider.createProxy(obj3,
XTypeProvider.class);
+assertNotNull(proxyObj2TypeProv);
+assertNotNull(proxyObj3TypeProv);
list1= new ArrayList();
list1.add(obj1);
list1.add(obj2);
list1.add(obj3);
+
list2= new ArrayList();
list2.add(obj1);
list2.add(proxyObj2TypeProv);
list2.ad
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sdmod2.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 647f83afb618acbf75c8c6f0a4531bd1e76d8a7e
Author: Samuel Mehrbrodt
Date: Wed Sep 24 23:18:59 2014 +0200
Fix fallout
from e16c8534f446a7cc311d6d5026aae5457e4f8e6c
Change-Id: I05154dd06b062aaf7fdffe1aa3792f9710293021
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 8a25098..d0ba712 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -272,8 +272,6 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
pInfo->SetRepresentation( aRepresentation );
}
else if( dynamic_cast< const SvxPagesField* >(pField) )
- OUString aRepresentation;
-else if( dynamic_cast< const SvxPagesField* >(pField) )
{
OUString aRepresentation(" ");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Translation of /rsc/documentation useful?
> > Firstly, thanks a lot for your help translating. Nie te dankie. Nice to hear I don't need to touch that. indeed; furthermore there is a good chance that Caolan will rid us of > the "rsc" horror within the next year anyway... Go, Caolán go! On 24 September 2014 14:41, Michael Stahl wrote: > On 19/09/14 12:03, Noel Grandin wrote: > > On 2014-09-19 11:52 AM, Philipp Weissenbacher wrote: > >> While looking at Noel's commits removing VAX and PDP support, I found > /rsc/documentation. > >> > >> As the docs in there are quite large, it would be quite a time > investment to translate them. > >> > >> So: Is it still useful to translate them, or do you guys have a good > enough grasp on the subject matter already? > >> > >> > > > > Hi > > > > Firstly, thanks a lot for your help translating. > > > > But personally, I'd much rather have you working on translating comments > in the code - that RSC stuff is hardly ever > > touched and it's much less useful to have good comments there than in > other code. > > indeed; furthermore there is a good chance that Caolan will rid us of > the "rsc" horror within the next year anyway... > > > ___ > 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: framework/source
framework/source/uielement/generictoolbarcontroller.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 1fb8724f9834dbc07b741eeed31b31347bc0c2a1 Author: Samuel Mehrbrodt Date: Sat Sep 6 14:51:55 2014 +0200 fdo#83558 Don't change toolbar tooltip on state change Also removed EraseAllMnemonicChars since that method is called later by SetItemText Change-Id: I10139d437290ccfed6a8a15e8e5ce501e15c2560 Reviewed-on: https://gerrit.libreoffice.org/11306 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 38f8e23..c3a836b 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -243,9 +243,7 @@ throw ( RuntimeException, std::exception ) aTmp += aStrValue.copy( 4 ); aStrValue = aTmp; } -OUString aText( MnemonicGenerator::EraseAllMnemonicChars( aStrValue ) ); -m_pToolbar->SetItemText( m_nID, aText ); -m_pToolbar->SetQuickHelpText( m_nID, aText ); +m_pToolbar->SetItemText( m_nID, aStrValue ); } if ( m_bMadeInvisible ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/es_CR.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit aa33dd16b0e3075f28c56656678c0f5cb764 Author: Julien Nabet Date: Wed Sep 24 22:20:56 2014 +0200 Resolves fdo#84260: Wrong CRC Costa Rica currency symbol See https://en.wikipedia.org/wiki/Costa_Rican_col%C3%B3n Change-Id: I6c30b2bd244f2ea40d56c812673922f27f5d53c8 diff --git a/i18npool/source/localedata/data/es_CR.xml b/i18npool/source/localedata/data/es_CR.xml index 2513623..6a04a8e 100644 --- a/i18npool/source/localedata/data/es_CR.xml +++ b/i18npool/source/localedata/data/es_CR.xml @@ -143,22 +143,22 @@ #.###,00 - [$¢-140A] #.##0;-[$¢-140A] #.##0 + [$â¡-140A] #.##0;-[$â¡-140A] #.##0 - [$¢-140A] #.##0,00;-[$¢-140A] #.##0,00 + [$â¡-140A] #.##0,00;-[$â¡-140A] #.##0,00 - [$¢-140A] #.##0;[RED]-[$¢-140A] #.##0 + [$â¡-140A] #.##0;[RED]-[$â¡-140A] #.##0 - [$¢-140A] #.##0,00;[RED]-[$¢-140A] #.##0,00 + [$â¡-140A] #.##0,00;[RED]-[$â¡-140A] #.##0,00 #.##0,00 CCC - [$¢-140A] #.##0,--;[RED]-[$¢-140A] #.##0,-- + [$â¡-140A] #.##0,--;[RED]-[$â¡-140A] #.##0,-- 0% @@ -180,7 +180,7 @@ CRC - ¢ + â¡ CRC Colon 2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ChartView.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b067ead2ee8f162374c81b35190b0201a306ae04
Author: Kohei Yoshida
Date: Wed Sep 24 16:16:54 2014 -0400
Don't update chart view when the controllers are locked.
Change-Id: I8468925e63db3a5cc5ef3e0f942d22478fd0863e
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 9d75323..6266b87 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2581,6 +2581,9 @@ void ChartView::impl_updateView()
return;
}
+if (mrChartModel.hasControllersLocked())
+return;
+
if( m_bViewDirty && !m_bInViewUpdate )
{
m_bInViewUpdate = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #36 from Commit Notification --- Takeshi Abe committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=f8ac4e2c436505304df7020a86dfc202851a9cab fdo#75757: remove inheritance to std::vector The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/label1.cxx | 14 -
sw/source/ui/envelp/labfmt.cxx |2 -
sw/source/uibase/envelp/labimp.hxx | 33 ---
sw/source/uibase/inc/label.hxx |2 -
sw/source/uibase/inc/labelcfg.hxx |4 --
sw/source/uibase/inc/labrec.hxx| 53 +
6 files changed, 62 insertions(+), 46 deletions(-)
New commits:
commit f8ac4e2c436505304df7020a86dfc202851a9cab
Author: Takeshi Abe
Date: Tue Sep 23 15:40:34 2014 +0900
fdo#75757: remove inheritance to std::vector
from SwLabRecs, by typedef'ing it as boost::ptr_vector.
This is also a supposed fix for possible memory leaks in
SwLabDlg::_ReplaceGroup(), since erasing elements did not
delete pointers in the original code.
Change-Id: I1c8a0393cb5bdcfca3408e9c8dc770d306f6d334
Reviewed-on: https://gerrit.libreoffice.org/11597
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index e9fdf52..a44e850 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -139,8 +139,8 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet&
rSet,
for (size_t nRecPos = 0; nRecPos < pRecs->size(); ++nRecPos)
{
-if (pRec->aMake == (*pRecs)[nRecPos]->aMake &&
-pRec->aType == (*pRecs)[nRecPos]->aType)
+if (pRec->aMake == (*pRecs)[nRecPos].aMake &&
+pRec->aType == (*pRecs)[nRecPos].aType)
{
bDouble = true;
break;
@@ -203,7 +203,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName,
bool bCont)
const size_t nCount = Recs().size();
for (size_t i = 0; i < nCount; ++i)
{
-pRec = Recs()[i];
+pRec = &Recs()[i];
if (pRec->aType != sCustom &&
rRecName == pRec->aType && bCont == pRec->bCont)
{
@@ -212,7 +212,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName,
bool bCont)
}
}
if (!bFound)// User defined
-pRec = Recs()[0];
+pRec = &Recs()[0];
return(pRec);
}
@@ -362,14 +362,14 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl)
//insert the entries into the sorted list box
for ( size_t i = 0; i < nCount; ++i )
{
-const OUString aType ( GetParentSwLabDlg()->Recs()[i]->aType );
+const OUString aType ( GetParentSwLabDlg()->Recs()[i].aType );
bool bInsert = false;
-if ( GetParentSwLabDlg()->Recs()[i]->aType == sCustom )
+if ( GetParentSwLabDlg()->Recs()[i].aType == sCustom )
{
bInsert = true;
m_pTypeBox->InsertEntry(aType );
}
-else if ( GetParentSwLabDlg()->Recs()[i]->bCont == bCont )
+else if ( GetParentSwLabDlg()->Recs()[i].bCont == bCont )
{
if ( m_pHiddenSortTypeBox->GetEntryPos(aType) ==
LISTBOX_ENTRY_NOTFOUND )
{
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 19fb1c0..51a9955 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -489,7 +489,7 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem)
{
rItem.aMake = rItem.aType = SW_RESSTR(STR_CUSTOM);
-SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0];
+SwLabRec& rRec = GetParentSwLabDlg()->Recs()[0];
rItem.lHDist = rRec.lHDist = static_cast< long
>(GETFLDVAL(*m_pHDistField ));
rItem.lVDist = rRec.lVDist = static_cast< long
>(GETFLDVAL(*m_pVDistField ));
rItem.lWidth = rRec.lWidth = static_cast< long
>(GETFLDVAL(*m_pWidthField ));
diff --git a/sw/source/uibase/envelp/labimp.hxx
b/sw/source/uibase/envelp/labimp.hxx
index caaf606..982132f 100644
--- a/sw/source/uibase/envelp/labimp.hxx
+++ b/sw/source/uibase/envelp/labimp.hxx
@@ -72,43 +72,10 @@
#include
#include
#include
-#include
#define GETFLDVAL(rField)
(rField).Denormalize((rField).GetValue(FUNIT_TWIP))
#define SETFLDVAL(rField, lValue)
(rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
-class SwLabRec
-{
-public:
-SwLabRec(): lHDist(0), lVDist(0), lWidth(0), lHeight(0), lLeft(0),
lUpper(0), lPWidth(0), lPHeight(0), nCols(0), nRows(0), bCont(false) {}
-
-void SetFromItem( const SwLabItem& rItem );
-void FillItem( SwLabItem& rItem ) const;
-
-OUStringaMake;
-OUStringaType;
-longlHDist;
-longlVDist;
-longlWidth;
-longlHeight;
-longlLeft;
-longlUpper;
-longlPWidth;
-longlPHeight;
-sal_Int32 nCols;
-sal_Int32 nRows;
-boolbCont;
-};
-
-class SwLabRecs : public std::vector {
-public:
-~SwLabRecs()
-{
-for(const_iterator it = begin(); it != end(); ++it)
-delete *it;
-}
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop
Re: Greetings
That's great Abdul-Samiel Naji! I, too, was raised in Syria, but I now live in Turkey with my body guards and mercenaries. We are not far from a refugee camp. Perhaps we've seen each other when my men would visit to punish many troublemakers (we offer payment to many soldiers for this great enjoyment of ours)? I wish to speak to you about your great business opportunity. As you might understand, we seek to do business with trustworthy people like yourself only. So many times we have had to exterminate thieves, or remove tongues for lying. Let me praise you for contacting me with this honest business opportunity. Please give me your address and we will visit you tomorrow. Make sure you have all your finances with you, so we can establish our relationship without delay. I am a very impatient person, so DO NOT keep me waiting! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 47302] Adding a new field in "Insert->Fields"
https://bugs.freedesktop.org/show_bug.cgi?id=47302 Samuel Mehrbrodt changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED CC||s.mehrbr...@gmail.com -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 47302] Adding a new field in "Insert->Fields"
https://bugs.freedesktop.org/show_bug.cgi?id=47302 Samuel Mehrbrodt changed: What|Removed |Added Assignee|vishvbrahmbhat...@gmail.com |libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 47302] Adding a new field in "Insert->Fields"
https://bugs.freedesktop.org/show_bug.cgi?id=47302 Commit Notification changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicUi|SkillCpp TopicUi ||target:4.4.0 --- Comment #7 from Commit Notification --- Jennifer Liebel committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=e16c8534f446a7cc311d6d5026aae5457e4f8e6c fdo#47302: Added insert->fields->page title button The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source include/editeng offapi/com officecfg/registry scripting/workben sd/inc sd/sdi sd/source sd/uiconfig
editeng/source/items/flditem.cxx |
36 ++
include/editeng/flditem.hxx |
13 +++
offapi/com/sun/star/text/textfield/Type.idl |
1
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
5 +
scripting/workben/bindings/impressmenubar.xml|
1
sd/inc/app.hrc |
1
sd/sdi/_drvwsh.sdi |
5 +
sd/sdi/outlnvsh.sdi |
5 +
sd/sdi/sdraw.sdi |
24 ++
sd/source/ui/app/sdmod2.cxx |
27 +++
sd/source/ui/view/drviews2.cxx |
8 ++
sd/source/ui/view/drviews7.cxx |
1
sd/source/ui/view/outlnvs2.cxx |
5 +
sd/uiconfig/sdraw/menubar/menubar.xml|
1
sd/uiconfig/simpress/menubar/menubar.xml |
5 -
15 files changed, 136 insertions(+), 2 deletions(-)
New commits:
commit e16c8534f446a7cc311d6d5026aae5457e4f8e6c
Author: Jennifer Liebel
Date: Tue Sep 23 09:14:21 2014 +
fdo#47302: Added insert->fields->page title button
Change-Id: Iebc8298a7e6a7d423d2667eec8a46a936cc4d2cd
Reviewed-on: https://gerrit.libreoffice.org/11599
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 69a1b2c..73074e8 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -117,6 +117,8 @@ SvxFieldData* SvxFieldData::Create(const
uno::Reference& xTe
return new SvxPageField();
case text::textfield::Type::PAGES:
return new SvxPagesField();
+case text::textfield::Type::PAGE_TITLE:
+return new SvxPageTitleField();
case text::textfield::Type::DOCINFO_TITLE:
return new SvxFileField();
case text::textfield::Type::TABLE:
@@ -607,7 +609,40 @@ MetaAction* SvxURLField::createBeginComment() const
2*aURL.getLength() );
}
+//
+// SvxPageTitleField methods
+//
+SV_IMPL_PERSIST1( SvxPageTitleField, SvxFieldData );
+
+SvxPageTitleField::SvxPageTitleField() {}
+
+SvxFieldData* SvxPageTitleField::Clone() const
+{
+return new SvxPageTitleField();
+}
+
+bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const
+{
+return ( rCmp.Type() == TYPE(SvxPageTitleField) );
+}
+
+void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ )
+{
+}
+
+void SvxPageTitleField::Save( SvPersistStream & /*rStm*/ )
+{
+}
+
+MetaAction* SvxPageTitleField::createBeginComment() const
+{
+return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageTitleField" );
+}
+
+//
+// SvxPagesField
+//
// The fields that were removed from Calc:
@@ -1152,6 +1187,7 @@ SvClassManager& SvxFieldItem::GetClassManager()
pClassMgr->Register(SvxURLField::StaticClassId(),
SvxURLField::CreateInstance);
pClassMgr->Register(SvxDateField::StaticClassId(),
SvxDateField::CreateInstance);
pClassMgr->Register(SvxPageField::StaticClassId(),
SvxPageField::CreateInstance);
+pClassMgr->Register(SvxPageTitleField::StaticClassId(),
SvxPageTitleField::CreateInstance);
pClassMgr->Register(SvxTimeField::StaticClassId(),
SvxTimeField::CreateInstance);
pClassMgr->Register(SvxExtTimeField::StaticClassId(),
SvxExtTimeField::CreateInstance);
pClassMgr->Register(SvxExtFileField::StaticClassId(),
SvxExtFileField::CreateInstance);
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 961b5e0..96720fe 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include <../sd/inc/sdpage.hxx> // for Page Title field
#include
@@ -191,6 +192,18 @@ public:
virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
};
+class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData
+{
+public:
+SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData,
com::sun::star::text::textfield::Type::PAGE_TITLE )
+SvxPageTitleField();
+
+virtual SvxFieldData* Clone() const SAL_OVERRIDE;
+virtual booloperator==( const SvxFieldData& ) const
SAL_OVERRIDE;
+
+virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+};
+
class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
{
public:
diff --git a/offapi/com/sun/star/text/textfield/Type.idl
b/offapi/com/sun/star/text/textfield/Type.idl
index 91102af..42fcb8b 100644
--- a/offapi/com
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/dialogs/cuicharmap.cxx| 31
cui/source/inc/cuicharmap.hxx|6
cui/uiconfig/ui/specialcharacters.ui | 247 ++-
3 files changed, 103 insertions(+), 181 deletions(-)
New commits:
commit 16ea2665cdfa0b3d7b0d7abcdaae8d60f7654d24
Author: Szymon KÅos
Date: Wed Sep 24 10:30:32 2014 +0200
fdo#64302: Writerâs Special Character dialog could be simpler
Change-Id: Ia321a9df77a8741245378e5b995b3bc6922266e8
Reviewed-on: https://gerrit.libreoffice.org/11621
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index ca9ca03..5227bcf 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -53,8 +53,6 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool
bOne_, const SfxIte
m_pShowChar->SetCentered(true);
get(m_pShowText, "showtext");
get(m_pOKBtn, "ok");
-get(m_pDeleteBtn, "delete");
-get(m_pDeleteLastBtn, "deletelast");
get(m_pFontText, "fontft");
get(m_pFontLB, "fontlb");
m_pFontLB->SetStyle(m_pFontLB->GetStyle() | WB_SORT);
@@ -67,8 +65,6 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool
bOne_, const SfxIte
//lock the size request of this widget to the width of the original .ui
string
m_pCharCodeText->set_width_request(m_pCharCodeText->get_preferred_size().Width());
get(m_pSymbolText, "symboltext");
-//lock the size request of this widget to double the height of the label
-
m_pShowText->set_height_request(m_pSymbolText->get_preferred_size().Height() *
3);
SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, false );
if ( pItem )
@@ -318,8 +314,6 @@ void SvxCharacterMap::init()
{
m_pSymbolText->Hide();
m_pShowText->Hide();
-m_pDeleteBtn->Hide();
-m_pDeleteLastBtn->Hide();
}
OUString aDefStr( aFont.GetName() );
@@ -368,8 +362,6 @@ void SvxCharacterMap::init()
m_pShowSet->SetSelectHdl( LINK( this, SvxCharacterMap, CharSelectHdl ) );
m_pShowSet->SetHighlightHdl( LINK( this, SvxCharacterMap, CharHighlightHdl
) );
m_pShowSet->SetPreSelectHdl( LINK( this, SvxCharacterMap, CharPreSelectHdl
) );
-m_pDeleteLastBtn->SetClickHdl( LINK( this, SvxCharacterMap, DeleteLastHdl
) );
-m_pDeleteBtn->SetClickHdl( LINK( this, SvxCharacterMap, DeleteHdl ) );
if( SvxShowCharSet::getSelectedChar() == ' ')
m_pOKBtn->Disable();
@@ -526,7 +518,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl)
}
m_pOKBtn->Enable();
-m_pDeleteLastBtn->Enable();
return 0;
}
@@ -586,26 +577,4 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl)
return 0;
}
-
-
-IMPL_LINK_NOARG(SvxCharacterMap, DeleteLastHdl)
-{
-OUString aCurrentText = m_pShowText->GetText();
-m_pShowText->SetText( aCurrentText.copy( 0, aCurrentText.getLength() - 1 )
);
-if ( m_pShowText->GetText() == "" )
-{
-m_pOKBtn->Disable();
-m_pDeleteLastBtn->Disable();
-}
-return 0;
-}
-
-IMPL_LINK_NOARG(SvxCharacterMap, DeleteHdl)
-{
-m_pShowText->SetText( OUString() );
-m_pOKBtn->Disable();
-m_pDeleteLastBtn->Disable();
-return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index a4d9527..ebc6df7 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -69,10 +69,8 @@ private:
voidinit();
SvxShowCharSet* m_pShowSet;
-SvxShowText*m_pShowText;
+Edit* m_pShowText;
OKButton* m_pOKBtn;
-PushButton* m_pDeleteLastBtn;
-PushButton* m_pDeleteBtn;
FixedText* m_pFontText;
ListBox*m_pFontLB;
FixedText* m_pSubsetText;
@@ -91,8 +89,6 @@ private:
DECL_LINK(CharSelectHdl, void *);
DECL_LINK(CharHighlightHdl, void *);
DECL_LINK(CharPreSelectHdl, void *);
-DECL_LINK(DeleteLastHdl, void *);
-DECL_LINK(DeleteHdl, void *);
void fillAllSubsets(ListBox &rListBox);
diff --git a/cui/uiconfig/ui/specialcharacters.ui
b/cui/uiconfig/ui/specialcharacters.ui
index 961021f..edfbc30 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -59,35 +59,6 @@
2
-
-
-Delete
_Last
-True
-True
-True
-True
-
-
-False
-True
-3
-
-
-
-
-gtk-delete
-True
-True
-True
-True
-bottom
-
-
-False
-True
-4
-
[Libreoffice-commits] core.git: sw/source
sw/source/ui/app/mn.src | 43 +--
1 file changed, 1 insertion(+), 42 deletions(-)
New commits:
commit 2f59a1c8169f1492c00d884b6eb3ce954645546f
Author: Samuel Mehrbrodt
Date: Mon Aug 25 21:48:00 2014 +0200
fdo#81132 Remove some formatting options from the right-click menu in Writer
Removed:
* Font (fixes fdo#34085)
* Font size
* Text alignment
Change-Id: I176f3fa5c22aa3dee0c4110db434a66b2e195a6c
Reviewed-on: https://gerrit.libreoffice.org/1
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 2b94310..85017f9 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -51,14 +51,6 @@
#define MN_TEXT_ATTR\
MenuItem\
{\
-ITEM_FORMAT_ATTR_CHAR_FONT\
-};\
-MenuItem\
-{\
-ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\
-};\
-MenuItem\
-{\
Identifier = MN_FORMAT_STYLE ; \
Command = ".uno:StyleMenu" ; \
Text [ en-US ] = "St~yle" ; \
@@ -91,6 +83,7 @@
ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
Checkable = TRUE ; \
};\
+SEPARATOR ; \
MenuItem\
{\
ITEM_FORMAT_ATTR_CHAR_SHADOWED\
@@ -121,40 +114,6 @@
};\
MenuItem\
{\
-Identifier = MN_FORMAT_ALGN ; \
-Command = ".uno:AlignTextMenu" ; \
-Text [ en-US ] = "A~lignment" ; \
-SubMenu = Menu\
-{\
-ItemList = \
-{\
-MenuItem\
-{\
-RadioCheck = TRUE ; \
-ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\
-};\
-MenuItem\
-{\
-RadioCheck = TRUE ; \
-ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\
-};\
-MenuItem\
-{\
-RadioCheck = TRUE ; \
-ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
-HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
-RadioCheck = TRUE ; \
-Text [ en-US ] = "Justified" ; \
-};\
-};\
-};\
-};\
-MenuItem\
-{\
Identifier = MN_FORMAT_LINESPACE ; \
Command = ".uno:LineSpacingMenu" ; \
Text [ en-US ] = "Line Spacing" ; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 14 commits - android/Bootstrap android/experimental desktop/source
android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java
| 52
android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
|7
android/experimental/LOAndroid3/src/java/org/libreoffice/DirectBufferAllocator.java
| 33
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
|6
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
| 16
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
| 26
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java
| 31
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/BufferedCairoImage.java
|2
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/CheckerboardImage.java
|2
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java
| 755 ++
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
| 58
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DrawTimingQueue.java
| 95 +
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/FlexibleGLSurfaceView.java
| 196 --
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLController.java
| 77 -
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GLThread.java
|3
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
| 263 +--
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java
| 316 +---
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
| 223 +-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
| 247 ++-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
|9
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScreenshotLayer.java
|2
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java
|2
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TextLayer.java
|2
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
| 11
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java
| 325
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomController.java
| 294 ++-
desktop/source/lib/lokandroid.cxx
| 28
27 files changed, 2153 insertions(+), 928 deletions(-)
New commits:
commit 0ab9ddaf4d67e968ad22ec296fbeda02ce1a468d
Author: Tomaž Vajngerl
Date: Wed Sep 24 20:41:54 2014 +0200
android: LayerRenderer - use highp and flip in vertex shader
Change-Id: Ia517b0d94fdfb3f8fdd9b9c383c8fb337173932c
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
index 5146b22..34c5c61 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
@@ -99,6 +99,11 @@ public class LayerRenderer implements GLSurfaceView.Renderer
{
// The shaders run on the GPU directly, the vertex shader is only applying
the
// matrix transform detailed above
+
+// Note we flip the y-coordinate in the vertex shader from a
+// coordinate system with (0,0) in the top left to one with (0,0) in
+// the bottom left.
+
public static final String DEFAULT_VERTEX_SHADER =
"uniform mat4 uTMatrix;\n" +
"attribute vec4 vPosition;\n" +
@@ -106,18 +111,21 @@ public class LayerRenderer implements
GLSurfaceView.Renderer {
"varying vec2 vTexCoord;\n" +
"void main() {\n" +
"gl_Position = uTMatrix * vPosition;\n" +
-"vTexCoord = aTexCoord;\n" +
+"vTexCoord.x = aTexCoord.x;\n" +
+"vTexCoord.y = 1.0 - aTexCoord.y;\n" +
"}\n";
-// Note we flip the y-coordinate in the fragment shader from a
-// coordinate system with (0,0) in the top left to one with (0,0) in
-// the bottom left.
+// We use highp because the screenshot textures
+// we use are large and we stretch them alot
+// so we need all the precision we can get.
+// Unfortunately, highp is not required by ES 2.0
+// so on GPU's like Mali we end up getting mediump
public static final String DEFAULT_FRAGMENT_SHADER =
-"precision mediump float;\n" +
+"precision highp float;\n" +
"varying vec2 vTexCoord;\n" +
"uniform sampler2D sTexture;\n" +
"void mai
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 Samuel Mehrbrodt changed: What|Removed |Added Status|NEW |ASSIGNED CC||s.mehrbr...@gmail.com -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 Commit Notification changed: What|Removed |Added Whiteboard|EasyHack|EasyHack |DifficultyInteresting |DifficultyInteresting |SkillCpp|SkillCpp target:4.4.0 --- Comment #6 from Commit Notification --- Szymon KÅos committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4de0bd548399593ad2627afde443a569e7b8ea1 fdo#62081: Add split menus to items in the style dropdown The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/dialogs.hrc |3 +
svx/source/tbxctrls/tbcontrl.cxx | 79 +++
svx/source/tbxctrls/tbcontrl.src | 17
3 files changed, 99 insertions(+)
New commits:
commit b4de0bd548399593ad2627afde443a569e7b8ea1
Author: Szymon KÅos
Date: Sun Sep 21 19:50:09 2014 +0200
fdo#62081: Add split menus to items in the style dropdown
I added buttons to the Style dropdown. Each button opens a menu.
So far I added "apply style" and "edit style" options.
Change-Id: I3b5c153a0674d06541d403bb0f34ec73418bb778
Reviewed-on: https://gerrit.libreoffice.org/11581
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 8e24185..65e8087 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -184,6 +184,9 @@
// for Toolbox-Control style
#define RID_SVXTBX_STYLE(RID_SVX_START + 120)
+#define RID_SVX_STYLE_MENU (RID_SVX_START + 121)
+#define RID_SVX_APPLY_STYLE (RID_SVX_START + 122)
+#define RID_SVX_MODIFY_STYLE(RID_SVX_START + 123)
#define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 63d28d9..774749d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -151,8 +152,12 @@ private:
OUStringaMoreKey;
OUStringsDefaultStyle;
boolbInSpecialMode;
+MenuButton* m_pButtons[MAX_STYLES_ENTRIES];
+PopupMenu m_aMenu;
voidReleaseFocus();
+
+DECL_LINK( MenuSelectHdl, Menu * );
};
class SvxFontNameBox_Impl : public FontNameBox
@@ -312,7 +317,11 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent,
, aClearFormatKey( rClearFormatKey )
, aMoreKey( rMoreKey )
, bInSpecialMode( bInSpec )
+, m_aMenu ( SVX_RES( RID_SVX_STYLE_MENU ) )
{
+m_aMenu.SetSelectHdl( LINK( this, SvxStyleBox_Impl, MenuSelectHdl ) );
+for(int i = 0; i < MAX_STYLES_ENTRIES; i++)
+m_pButtons[i] = NULL;
aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT );
EnableAutocomplete( true );
EnableUserDraw( true );
@@ -321,6 +330,8 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent,
SvxStyleBox_Impl::~SvxStyleBox_Impl()
{
+for(int i = 0; i < MAX_STYLES_ENTRIES; i++)
+delete m_pButtons[i];
}
void SvxStyleBox_Impl::ReleaseFocus()
@@ -334,6 +345,34 @@ void SvxStyleBox_Impl::ReleaseFocus()
m_xFrame->getContainerWindow()->setFocus();
}
+IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu)
+{
+sal_uInt16 nMenuId = pMenu->GetCurItemId();
+switch(nMenuId) {
+case RID_SVX_APPLY_STYLE:
+{
+nCurSel = GetSelectEntryPos();
+SetText(GetEntry(nCurSel));
+Select();
+break;
+}
+case RID_SVX_MODIFY_STYLE:
+{
+OUString sEntry = OUString( (GetEntry(GetSelectEntryPos())) );
+ReleaseFocus();
+Sequence< PropertyValue > aArgs( 2 );
+aArgs[0].Name = "Param";
+aArgs[0].Value = makeAny( sEntry );
+aArgs[1].Name = "Family";
+aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
+SfxToolBoxControl::Dispatch( m_xDispatchProvider,
+OUString( ".uno:EditStyle" ), aArgs );
+break;
+}
+}
+return 0;
+}
+
void SvxStyleBox_Impl::Select()
{
// Tell base class about selection so that AT get informed about it.
@@ -448,6 +487,21 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
switch ( nCode )
{
case KEY_RETURN:
+{
+if(IsInDropDown())
+{
+sal_uInt16 nItem = GetSelectEntryPos() - 1;
+if(nItem < MAX_STYLES_ENTRIES)
+m_pButtons[nItem]->KeyInput(*rNEvt.GetKeyEvent());
+nHandled = true;
+}
+else
+{
+nHandled = true;
+Select();
+}
+break;
+}
case KEY_TAB:
{
if ( KEY_TAB == nCode )
@@ -505,6 +559,10 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent&
rUDEvt )
if ( nItem == 0 || nItem == GetEntryCount() - 1 )
{
+Rectangle aRect(rUDEvt.GetRect());
+unsigned int nId = (aRect.getY() / aRect.GetSize().Height());
+if(m_pButtons[nId])
+m_pButtons[nId]->Hide();
// draw the non-style entries, ie. "Clear Formatting" or "More..."
DrawEntry( r
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 75 ++
1 file changed, 42 insertions(+), 33 deletions(-)
New commits:
commit 96d7ca35f9307cd6fcf61884d0e09fba070a42f8
Author: Peter Foley
Date: Wed Sep 24 13:28:25 2014 -0400
Make gbuild-to-ide more pep8 compliant
Minor style cleanup
Remove unused variables
Change-Id: Id4c190f24f51dfc676c268dac1c19e3f03d3988d
Reviewed-on: https://gerrit.libreoffice.org/11633
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 919f787..bdb8688 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -20,6 +20,7 @@ import xml.etree.ElementTree as ET
class GbuildParserState:
+
def __init__(self):
self.target = None
self.ilib = None
@@ -32,9 +33,10 @@ class GbuildParserState:
class GbuildLinkTarget:
+
def __init__(self, name, location, include, include_sys, defs, cxxobjects,
cxxflags, linked_libs):
(self.name, self.location, self.include, self.include_sys, self.defs,
self.cxxobjects, self.cxxflags, self.linked_libs) = (
-name, location, include, include_sys, defs, cxxobjects, cxxflags,
linked_libs)
+name, location, include, include_sys, defs, cxxobjects, cxxflags,
linked_libs)
def short_name(self):
return self.name
@@ -44,11 +46,12 @@ class GbuildLinkTarget:
def __str__(self):
return '%s at %s with include path: %s, isystem includes: %s, defines:
%s, objects: %s, cxxflags: %s and linked libs: %s' % (
-self.short_name(), self.location, self.include, self.include_sys,
self.defs, self.cxxobjects,
+self.short_name(), self.location, self.include, self.include_sys,
self.defs, self.cxxobjects,
self.cxxflags, self.linked_libs)
class GbuildLib(GbuildLinkTarget):
+
def __init__(self, name, library, location, include, include_sys, defs,
cxxobjects, cxxflags, linked_libs):
GbuildLinkTarget.__init__(self, name, location, include, include_sys,
defs, cxxobjects, cxxflags, linked_libs)
self.library = library
@@ -65,6 +68,7 @@ class GbuildLib(GbuildLinkTarget):
class GbuildExe(GbuildLinkTarget):
+
def __init__(self, name, executable, location, include, include_sys, defs,
cxxobjects, cxxflags, linked_libs):
GbuildLinkTarget.__init__(self, name, location, include, include_sys,
defs, cxxobjects, cxxflags, linked_libs)
self.executable = executable
@@ -103,7 +107,7 @@ class GbuildParser:
def __mapping_to_dict(self, mapping):
mapping_dict = {}
for item in mapping.split(' '):
-library,target = item.split(':')
+library, target = item.split(':')
mapping_dict[target] = library
return mapping_dict
@@ -166,7 +170,6 @@ class GbuildParser:
state.cxxflags, state.linked_libs))
state = GbuildParserState()
continue
-includematch = GbuildParser.includepattern.match(line)
if line.find('# INCLUDE :=') == 0:
isystemmatch = GbuildParser.isystempattern.findall(line)
if isystemmatch:
@@ -196,13 +199,14 @@ class GbuildParser:
state.ilib = os.path.basename(ilibmatch.group(1))
continue
if line.find('# T_CXXFLAGS :=') == 0:
-state.cxxflags = [cxxflag.strip() for cxxflag in
GbuildParser.warningpattern.sub('', line.replace('# T_CXXFLAGS :=','')).split('
') if len(cxxflag) > 1]
+state.cxxflags = [cxxflag.strip() for cxxflag in
GbuildParser.warningpattern.sub('', line.replace('# T_CXXFLAGS :=',
'')).split(' ') if len(cxxflag) > 1]
continue
-#we could match a lot of other stuff here if needed for
integration rpaths etc.
+# we could match a lot of other stuff here if needed for
integration rpaths etc.
return self
class IdeIntegrationGenerator:
+
def __init__(self, gbuildparser):
self.gbuildparser = gbuildparser
@@ -211,6 +215,7 @@ class IdeIntegrationGenerator:
class DebugIntegrationGenerator(IdeIntegrationGenerator):
+
def __init__(self, gbuildparser):
IdeIntegrationGenerator.__init__(self, gbuildparser)
@@ -224,6 +229,7 @@ class DebugIntegrationGenerator(IdeIntegrationGenerator):
class VimIntegrationGenerator(IdeIntegrationGenerator):
+
def __init__(self, gbuildparser):
IdeIntegrationGenerator.__init__(self, gbuildparser)
@@ -236,7 +242,7 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
entry = {'directory': lib.location, 'file': filePath,
'command': self.generateCommand(lib, filePath)}
entries.append(entry)
global_list.extend(entries)
-export_file = open('compile_commands.json','w')
+export_file = open('compile_commands.json', 'w')
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 1a6737d3a008f75f2a5e08bae2732716440e37b5
Author: Peter Foley
Date: Wed Sep 24 13:21:50 2014 -0400
Make gbuild-to-ide bail out before parsing if ide type is invalid
Also fix the vim modeline to maintain consistant formatting
Change-Id: Ia42ec2a69f9c3037a6390ca4f5c4198031b7aa64
Reviewed-on: https://gerrit.libreoffice.org/11632
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 2e8bc30..919f787 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -872,27 +872,26 @@ if __name__ == '__main__':
help='the input file, not normally used, for debugging
this script')
args = parser.parse_args()
paths = {}
+generators = {
+'kdevelop': KdevelopIntegrationGenerator,
+'xcode': XcodeIntegrationGenerator,
+'vs2012': VisualStudioIntegrationGenerator,
+'vim': VimIntegrationGenerator,
+'debug': DebugIntegrationGenerator}
+
+if args.ide not in generators.keys():
+parser.print_help()
+sys.exit(1)
+
if args.input:
gbuildparser = GbuildParser().parse(open(args.input, 'r'))
else:
gbuildparser = GbuildParser().parse(sys.stdin)
-if args.ide == 'kdevelop':
-KdevelopIntegrationGenerator(gbuildparser).emit()
-elif args.ide == 'xcode':
-XcodeIntegrationGenerator(gbuildparser).emit()
-elif args.ide == 'vs2012':
-VisualStudioIntegrationGenerator(gbuildparser).emit()
-elif args.ide == 'vim':
-VimIntegrationGenerator(gbuildparser).emit()
-elif args.ide == 'debug':
-DebugIntegrationGenerator(gbuildparser).emit()
-else:
-parser.print_help()
-sys.exit(1)
+generators[args.ide](gbuildparser).emit()
# Local Variables:
# indent-tabs-mode: nil
# End:
#
-# vim: set noet sw=4 ts=4:
+# vim: set et sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #135 from Commit Notification --- Tobias Madl committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=0e55cc95dfe21e4d4800592ce8029ff039ea4307 fdo#39468 Translated German to English The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: forms/source
forms/source/component/FormComponent.cxx |2 -
forms/source/component/FormattedField.cxx | 35 ++
2 files changed, 18 insertions(+), 19 deletions(-)
New commits:
commit 0e55cc95dfe21e4d4800592ce8029ff039ea4307
Author: Tobias Madl
Date: Mon Sep 15 15:46:32 2014 +
fdo#39468 Translated German to English
Change-Id: I7405b8251b977f8e5c1b95c37fbab6ae6cb120e7
Reviewed-on: https://gerrit.libreoffice.org/11461
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index 7d606cc..e8547ac 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -761,7 +761,7 @@ void SAL_CALL OControlModel::write(const
Reference
// 2. wrting a version number
_rxOutStream->writeShort(0x0003);
-// 3. Schreiben der allgemeinen Properties
+// 3. writing the general properties
::comphelper::operator<<( _rxOutStream, m_aName);
_rxOutStream->writeShort(m_nTabIndex);
::comphelper::operator<<( _rxOutStream, m_aTag); // 3. version
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index db3221c..30d72fc 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -196,7 +196,7 @@ void OFormattedControl::keyPressed(const
::com::sun::star::awt::KeyEvent& e) thr
{
if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 )
return;
-// Steht das Control in einem Formular mit einer Submit-URL?
+// Is the control on a form with a submit URL?
Reference xSet(getModel(),
UNO_QUERY);
if( !xSet.is() )
return;
@@ -223,13 +223,13 @@ void OFormattedControl::keyPressed(const
::com::sun::star::awt::KeyEvent& e) thr
if (hasProperty(PROPERTY_CLASSID, xFCSet) &&
getINT16(xFCSet->getPropertyValue(PROPERTY_CLASSID)) ==
FormComponentType::TEXTFIELD)
{
-// Noch ein weiteres Edit gefunden ==> dann nicht submitten
+// Found another edit ==> no submit
if (xFCSet != xSet)
return;
}
}
}
-// Da wir noch im Haender stehen, submit asynchron ausloesen
+// Still in the handler, trigger submit asynchronous
if( m_nKeyEvent )
Application::RemoveUserEvent( m_nKeyEvent );
m_nKeyEvent = Application::PostUserEvent( LINK(this, OFormattedControl,
@@ -363,8 +363,8 @@ void OFormattedModel::describeFixedProperties( Sequence<
Property >& _rProps ) c
void OFormattedModel::describeAggregateProperties( Sequence< Property >&
_rAggregateProps ) const
{
OEditBaseModel::describeAggregateProperties( _rAggregateProps );
-// TreatAsNumeric nicht transient : wir wollen es an der UI anbinden (ist
noetig, um dem EffectiveDefault
-// - der kann Text oder Zahl sein - einen Sinn zu geben)
+// TreatAsNumeric not transient : we want to bind it to the UI (necessary,
because EffectiveDefault
+// - could be text or numbers - for making sense)
ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TREATASNUMERIC, 0,
PropertyAttribute::TRANSIENT);
// same for FormatKey
// (though the paragraph above for the TreatAsNumeric does not hold
anymore - we do not have an UI for this.
@@ -492,7 +492,7 @@ Reference< XNumberFormatsSupplier >
OFormattedModel::calcFormatsSupplier() const
{
Reference xSupplier;
DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::calcFormatsSupplier :
have no aggregate !");
-// hat mein aggregiertes Model einen FormatSupplier ?
+// check if my aggregated model has a FormatSupplier
if( m_xAggregateSet.is() )
m_xAggregateSet->getPropertyValue(PROPERTY_FORMATSSUPPLIER) >>=
xSupplier;
if (!xSupplier.is())
@@ -501,7 +501,7 @@ Reference< XNumberFormatsSupplier >
OFormattedModel::calcFormatsSupplier() const
if (!xSupplier.is())
xSupplier = calcDefaultFormatsSupplier();
DBG_ASSERT(xSupplier.is(), "OFormattedModel::calcFormatsSupplier : no
supplier !");
-// jetzt sollte aber einer da sein
+// now it should be there
return xSupplier;
}
@@ -509,10 +509,9 @@ Reference
OFormattedModel::calcFormFormatsSupplier() co
{
Reference xMe;
query_interface(static_cast(const_cast(this)),
xMe);
-// damit stellen wir sicher, dass wir auch fuer den Fall der Aggregation
das richtige
-// Objekt bekommen
+// now we are sure, in case of an aggregation, to get the right object
DBG_ASSERT(xMe.is(), "OFormattedModel::calcFormFormatsSupplier : I should
have a content interface !");
-// jetzt durchhangeln nach oben, bis wir auf eine starform treffen
(angefangen mit meinem eigenen Parent)
+// expand to the top, till we get to an initial form (starting with my own
parent)
Reference xParent(xMe->getParent(), UNO_Q
[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sc/source sd/source sfx2/sdi sfx2/source svx/source sw/source
include/sfx2/app.hxx|1
include/sfx2/templdlg.hxx | 10 -
officecfg/registry/data/org/openoffice/Office/Views.xcu |6 ---
sc/source/ui/view/tabvwsh.cxx |1
sd/source/ui/slideshow/slideshowimpl.cxx|1
sd/source/ui/view/drvwshrg.cxx |2 -
sd/source/ui/view/outlnvsh.cxx |1
sfx2/sdi/frmslots.sdi |1
sfx2/source/appl/appchild.cxx | 14
sfx2/source/appl/appreg.cxx |1
sfx2/source/dialog/templdlg.cxx | 16 -
sfx2/source/inc/templdgi.hxx|3 -
sfx2/source/view/viewfrm.cxx| 11 ++
svx/source/sidebar/gallery/GalleryPanel.hxx | 27
sw/source/uibase/app/docst.cxx |8
sw/source/uibase/uiview/view0.cxx |1
sw/source/uibase/web/wview.cxx |1
17 files changed, 12 insertions(+), 93 deletions(-)
New commits:
commit 473ed449a4b6f550dc1af47a07c6e0ef243a98b2
Author: Samuel Mehrbrodt
Date: Tue Sep 2 00:18:52 2014 +0200
fdo#73151 Always open Styles&Formatting dialog in the sidebar
This removes the floating window for Styles&Formatting as discussed in
fdo#73151.
Change-Id: I352d27a4d30632dcfda8963c23629e62ab850524
Reviewed-on: https://gerrit.libreoffice.org/11253
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 5c456af..1f1e831 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -175,7 +175,6 @@ public:
* @param pArgs Takes ownership
*/
sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc,
const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 );
-SfxTemplateDialog* GetTemplateDialog();
vcl::Window* GetTopWindow() const;
// members
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 4bd6ac4..6e6ed778 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -34,7 +34,6 @@ class SfxTemplateDialog_Impl;
class SfxTemplateDialog : public SfxDockingWindow
{
private:
-friend class SfxTemplateDialogWrapper;
friend class SfxTemplateDialog_Impl;
SfxTemplateDialog_Impl* pImpl;
@@ -56,15 +55,6 @@ public:
static SfxStyleFamily SFX2_DLLPUBLIC NIdToSfxFamilyId(sal_uInt16 nId);
};
-// class SfxTemplateDialogWrapper
-
-class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
-{
-public:
-SfxTemplateDialogWrapper
-(vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*);
-SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper);
-};
// class SfxTemplatePanelControl -
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu
b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index 771ed28..a2c7f43 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -19,12 +19,6 @@
http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:install="http://openoffice.org/2004/installation"; oor:name="Views"
oor:package="org.openoffice.Office">
-
-
-
-false
-
-
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 847f3f6..51aaae8 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,7 +54,6 @@ void ScTabViewShell::InitInterface_Impl()
ScResId(RID_OBJECTBAR_TOOLS));
GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS);
-
GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index a6ccac9..4704c90 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2482,7 +2482,6 @@ FncGetChildWindowId aShowChildren[] =
&SvxBmpMaskChildWindow::GetChildWindowId,
&SvxIMapDlgChildWindow::GetChildWindowId,
&SvxHlinkDlgWrapper::GetChildWindowId,
-&SfxTemplateDialogWrapper::GetChildWindowId,
&SfxInfoBarContainerChild::GetChildWindowId
};
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index
Greetings
Hello, I am Abudul-Samiel Abjaloul Naji, a citizen of Syria, I am currently residing in refugee camp in Turkey. I was searching while I find your contact. I have some reasonable and verifiable funds which I want to invest in your country with you as my managing partner. Although I have an age long interest in the Real Estate business, I would however rely on your advise on any fitable/low risk business venture since you as a citizen of your country would be more accurate as to the best type of business to venture into. Should this proposal be of any interest to you, please do not hesitate to contact me immediately. I will provide the complete details of this business proposal as soon as I hear from you. Thanks, Abdul-Samiel Naji. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docfmt.cxx | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 9fd7ca788bc8fd88b048c544edb0dc6518010e11
Author: Jan-Marek Glogowski
Date: Sat Aug 9 00:22:00 2014 +0200
fdo#78611 Don't create automatic rules on reset
As we reset all styles, there shouldn't be any unknown automatic
SwNumRules, because all should have been created by the style
copying! And in this case we also have to overwrite the existing
automatic SwNumRules to get a consistent copy.
In case of unknown automatic SwNumRules we just warn and ignore
any inconsistence.
Change-Id: I26e25bccc9a8c7be74f3dceb2e1f91894eac1d0a
Reviewed-on: https://gerrit.libreoffice.org/10988
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 1283e4a..9c3d5d5 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1578,13 +1578,21 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool
bIncludePageStyles )
for( sal_uInt16 n = 0; n < nCnt; ++n )
{
const SwNumRule& rR = *rArr[ n ];
-if( !rR.IsAutoRule() )
+SwNumRule* pNew = FindNumRulePtr( rR.GetName());
+if( pNew )
+pNew->CopyNumRule( this, rR );
+else
{
-SwNumRule* pNew = FindNumRulePtr( rR.GetName());
-if( pNew )
-pNew->CopyNumRule( this, rR );
-else
+if( !rR.IsAutoRule() )
MakeNumRule( rR.GetName(), &rR );
+else
+{
+// as we reset all styles, there shouldn't be any unknown
+// automatic SwNumRules, because all should have been
+// created by the style copying!
+// So just warn and ignore.
+SAL_WARN( "sw.styles", "Found unknown auto SwNumRule
during reset!" );
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx | 17 +
sw/source/core/doc/docglos.cxx | 121
sw/source/uibase/dbui/dbmgr.cxx | 46 +--
3 files changed, 131 insertions(+), 53 deletions(-)
New commits:
commit cde554a731596f1ca53a911656b6503c96dadcc7
Author: Jan-Marek Glogowski
Date: Sun Aug 3 12:10:40 2014 +0200
fdo#81782 MM: copy most document properties
Mail merge wasn't copying the document properties into the target
document. It also has to copy most document properties into the
working copy, as ConvertFieldsToText is called just there.
Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041
Reviewed-on: https://gerrit.libreoffice.org/10987
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 21466fa..1742d8e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -899,7 +899,22 @@ public:
void ReplaceDefaults( const SwDoc& rSource );
// Replace all compatability options with those from rSource.
-void ReplaceCompatabilityOptions(const SwDoc& rSource);
+void ReplaceCompatabilityOptions( const SwDoc& rSource );
+
+/** Replace all user defined document properties with xSourceDocProps.
+
+Convenince function used by ReplaceDocumentProperties to skip some UNO
calls.
+ */
+void ReplaceUserDefinedDocumentProperties( const
::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties > xSourceDocProps );
+
+// Replace all user defined document properties with those from rSource.
+void ReplaceUserDefinedDocumentProperties( const SwDoc& rSource );
+
+/** Replace document properties with those from rSource.
+
+This includes the user defined document properties!
+ */
+void ReplaceDocumentProperties(const SwDoc& rSource);
// Query if style (paragraph- / character- / frame- / page-) is used.
bool IsUsed( const SwModify& ) const;
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 593e257..390177e 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -35,43 +35,26 @@
using namespace ::com::sun::star;
-/// copy document properties via public interface
-static void lcl_copyDocumentProperties(
-uno::Reference i_xSource,
-uno::Reference i_xTarget) {
-OSL_ENSURE(i_xSource.is(), "null reference");
-OSL_ENSURE(i_xTarget.is(), "null reference");
-
-i_xTarget->setAuthor(i_xSource->getAuthor());
-i_xTarget->setGenerator(i_xSource->getGenerator());
-i_xTarget->setCreationDate(i_xSource->getCreationDate());
-i_xTarget->setTitle(i_xSource->getTitle());
-i_xTarget->setSubject(i_xSource->getSubject());
-i_xTarget->setDescription(i_xSource->getDescription());
-i_xTarget->setKeywords(i_xSource->getKeywords());
-i_xTarget->setLanguage(i_xSource->getLanguage());
-i_xTarget->setModifiedBy(i_xSource->getModifiedBy());
-i_xTarget->setModificationDate(i_xSource->getModificationDate());
-i_xTarget->setPrintedBy(i_xSource->getPrintedBy());
-i_xTarget->setPrintDate(i_xSource->getPrintDate());
-i_xTarget->setTemplateName(i_xSource->getTemplateName());
-i_xTarget->setTemplateURL(i_xSource->getTemplateURL());
-i_xTarget->setTemplateDate(i_xSource->getTemplateDate());
-i_xTarget->setAutoloadURL(i_xSource->getAutoloadURL());
-i_xTarget->setAutoloadSecs(i_xSource->getAutoloadSecs());
-i_xTarget->setDefaultTarget(i_xSource->getDefaultTarget());
-i_xTarget->setDocumentStatistics(i_xSource->getDocumentStatistics());
-i_xTarget->setEditingCycles(i_xSource->getEditingCycles());
-i_xTarget->setEditingDuration(i_xSource->getEditingDuration());
+void SwDoc::ReplaceUserDefinedDocumentProperties(
+uno::Reference xSourceDocProps)
+{
+OSL_ENSURE(xSourceDocProps.is(), "null reference");
+
+uno::Reference xDPS(
+GetDocShell()->GetModel(), uno::UNO_QUERY_THROW);
+uno::Reference xDocProps(
+xDPS->getDocumentProperties() );
+OSL_ENSURE(xDocProps.is(), "null reference");
uno::Reference xSourceUDSet(
-i_xSource->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
+xSourceDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
uno::Reference xTargetUD(
-i_xTarget->getUserDefinedProperties());
+xDocProps->getUserDefinedProperties());
uno::Reference xTargetUDSet(xTargetUD,
uno::UNO_QUERY_THROW);
uno::Sequence tgtprops
= xTargetUDSet->getPropertySetInfo()->getProperties();
+
for (sal_Int32 i = 0; i < tgtprops.getLength(); ++i) {
try {
xTargetUD->removeProperty(tgtprops [i].Name);
@@ -79,20 +62,71 @@ static void lcl_copyDocumentProperties(
// ignore
}
}
-try {
-uno::Reference xSetInfo
-= xSourceUDSet->getPropertySetInfo();
-uno::Sequence srcprops = xSetInfo
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dbui/dbmgr.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 3930c14be021e325c1efdb3fa7858069085286f8
Author: Jan-Marek Glogowski
Date: Tue Jul 29 15:38:32 2014 +0200
MM: restore the non-saving wizard behaviour
The wizard didn't save the MM source document, even if it was modified.
Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5
Reviewed-on: https://gerrit.libreoffice.org/10986
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 91875dd..59a43f6 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -895,8 +895,9 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
// Try saving the source document
SfxDispatcher* pSfxDispatcher =
pSourceShell->GetView().GetViewFrame()->GetDispatcher();
SwDocShell* pSourceDocSh = pSourceShell->GetView().GetDocShell();
-pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC :
SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD);
-if( !pSourceDocSh->IsModified() )
+if( !bMergeOnly && pSourceDocSh->IsModified() )
+pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC :
SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD);
+if( bMergeOnly || !pSourceDocSh->IsModified() )
{
const SfxFilter* pStoreToFilter = SwIoSystem::GetFileFilter(
pSourceDocSh->GetMedium()->GetURLObject().GetMainURL(
INetURLObject::NO_DECODE ), ::aEmptyOUStr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/uibase/dbui/dbmgr.cxx| 93 ++-
sw/source/uibase/dbui/dbui.cxx | 35
sw/source/uibase/inc/dbui.hxx | 21 +
sw/uiconfig/swriter/ui/mmcreatingdialog.ui | 116 +
4 files changed, 247 insertions(+), 18 deletions(-)
New commits:
commit bc998e5e2cf43678462c8d7da8a9d6b1425ec492
Author: Jan-Marek Glogowski
Date: Tue Jul 29 15:36:51 2014 +0200
MM: readd CreateMonitor handling
The mail merge wizard uses a different progress dialog
(CreateDialog) then the UNO functions (PrintDialog).
This restores the previously unused code and unifies some of the
dialog handling.
This reverts the dbmgr / mail merge unused code parts of
commit d49d0139a7f4b9835a2179b6dcc6741a41b0197c and
commit c16f45db0ea20db6ca3906551c01fb18f9258c84
Change-Id: I06088140f604893a33f3ee37507e551b043a193d
Reviewed-on: https://gerrit.libreoffice.org/10985
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index d89ffaf..91875dd 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -168,6 +168,31 @@ const sal_Char cActiveConnection[] = "ActiveConnection";
namespace
{
+bool lcl_getCountFromResultSet( sal_Int32& rCount, const
uno::Reference& xResultSet )
+{
+uno::Reference xPrSet(xResultSet, UNO_QUERY);
+if(xPrSet.is())
+{
+try
+{
+bool bFinal = false;
+Any aFinal = xPrSet->getPropertyValue("IsRowCountFinal");
+aFinal >>= bFinal;
+if(!bFinal)
+{
+xResultSet->last();
+xResultSet->first();
+}
+Any aCount = xPrSet->getPropertyValue("RowCount");
+if( aCount >>= rCount )
+return true;
+}
+catch(const Exception&)
+{
+}
+}
+return false;
+}
// copy compatibility options
void lcl_CopyCompatibilityOptions( SwWrtShell& rSourceShell, SwWrtShell&
rTargetShell)
{
@@ -829,9 +854,9 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
//check if the doc is synchronized and contains at least one linked section
bool bSynchronizedDoc = pSourceShell->IsLabelDoc() &&
pSourceShell->GetSectionFmtCount() > 1;
bool bNoError = true;
-bool bEMail = rMergeDescriptor.nMergeType == DBMGR_MERGE_MAILING;
+const bool bEMail = rMergeDescriptor.nMergeType == DBMGR_MERGE_MAILING;
const bool bAsSingleFile = rMergeDescriptor.nMergeType ==
DBMGR_MERGE_SINGLE_FILE;
-bool bMergeOnly = rMergeDescriptor.nMergeType == DBMGR_MERGE_ONLY;
+const bool bMergeOnly = rMergeDescriptor.nMergeType == DBMGR_MERGE_ONLY;
::rtl::Reference< MailDispatcher > xMailDispatcher;
OUString sBodyMimeType;
@@ -910,6 +935,24 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
sal_uInt16 nStartingPageNo = 0;
bool bPageStylesWithHeaderFooter = false;
+vcl::Window *pSourceWindow = 0;
+CancelableModelessDialog *pProgressDlg = 0;
+
+if (!IsMergeSilent()) {
+pSourceWindow = &pSourceShell->GetView().GetEditWin();
+if( bMergeOnly )
+pProgressDlg = new CreateMonitor( pSourceWindow );
+else {
+pProgressDlg = new PrintMonitor( pSourceWindow,
PrintMonitor::MONITOR_TYPE_PRINT );
+static_cast( pProgressDlg
)->SetText(pSourceShell->GetView().GetDocShell()->GetTitle(22));
+}
+pProgressDlg->SetCancelHdl( LINK(this, SwDBManager,
PrtCancelHdl) );
+pProgressDlg->Show();
+
+for( sal_uInt16 i = 0; i < 25; i++)
+Application::Reschedule();
+}
+
if(bAsSingleFile || rMergeDescriptor.bCreateSingleFile)
{
// create a target docshell to put the merged document into
@@ -919,6 +962,11 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
lcl_SaveDoc( xTargetDocShell, "MergeDoc" );
#endif
SfxViewFrame* pTargetFrame = SfxViewFrame::LoadHiddenDocument(
*xTargetDocShell, 0 );
+if (bMergeOnly) {
+//the created window has to be located at the same
position as the source window
+vcl::Window& rTargetWindow =
pTargetFrame->GetFrame().GetWindow();
+rTargetWindow.SetPosPixel(pSourceWindow->GetPosPixel());
+}
pTargetView = static_cast(
pTargetFrame->GetViewShell() );
@@ -948,13 +996,6 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
lcl_CopyDynamicDefaults( *pSourceShell->GetDoc(),
*pTargetShell->GetDoc() );
}
-PrintMonitor aPrtMonDlg(&pS
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/position-and-rotation.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
writerfilter/source/dmapper/GraphicImport.cxx| 14 ++
3 files changed, 25 insertions(+)
New commits:
commit 36ac7749523e0c6f40a77beac278bd9e7a667a9b
Author: Miklos Vajna
Date: Wed Sep 24 17:53:38 2014 +0200
DOCX import: make sure rotation does not affect shape position
Change-Id: I7916a24d63bb7c995267059e9bedbf1f08adc152
diff --git a/sw/qa/extras/ooxmlexport/data/position-and-rotation.docx
b/sw/qa/extras/ooxmlexport/data/position-and-rotation.docx
new file mode 100644
index 000..d883ad3
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/position-and-rotation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d45db67..af4e9dd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -272,6 +272,17 @@ DECLARE_OOXMLEXPORT_TEST(testChartDupe, "chart-dupe.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xEmbeddedObjects->getCount());
}
+DECLARE_OOXMLEXPORT_TEST(testPositionAndRotation, "position-and-rotation.docx")
+{
+// The document should look like: "This line is tricky, because
only 'This line is tricky,' is on the left."
+// But the image was pushed down, so it did not break the line into two
text portions.
+uno::Reference xShape = getShape(1);
+// Should be 1559, was -5639
+CPPUNIT_ASSERT(xShape->getPosition().X > 1500);
+// Should be 88, was 473
+CPPUNIT_ASSERT(xShape->getPosition().Y < 100);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index eb920bb..e2ad109 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -779,9 +779,23 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
if
(xServiceInfo->supportsService("com.sun.star.drawing.GroupShape") ||
xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
{
+// You would expect that position and rotation are
+// independent, but they are not. Till we are not
+// there yet to handle all scaling, translation and
+// rotation with a single transformation matrix,
+// make sure there is no rotation set when we set
+// the position.
+sal_Int32 nRotation = 0;
+xShapeProps->getPropertyValue("RotateAngle") >>=
nRotation;
+if (nRotation)
+xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(sal_Int32(0)));
+
// Position of the groupshape should be set after
children have been added.
// fdo#80555: also set position for graphic shapes
here
m_xShape->setPosition(awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
+
+if (nRotation)
+xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(nRotation));
}
m_pImpl->applyRelativePosition(xShapeProps);
___
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/uibase/dbui/dbmgr.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 2916dfdb2361e68a6bbbcb0b0e9e114e052cb6d5 Author: Jan-Marek Glogowski Date: Tue Jul 29 14:26:40 2014 +0200 MM: detect save error based on the return value There is actually GetError() and GetErrorCode(). While the error code can also be a warning, which isn't reported by GetError(), this detects the error based on the DoSaveAs return value (actually I got warnings in case of save failures in my MM unit tests). Change-Id: I3db749c798ad80336ee7ada9eaa71177e8ffb248 Reviewed-on: https://gerrit.libreoffice.org/11456 Reviewed-by: Björn Michaelsen Tested-by: Björn Michaelsen diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index cf6683d..d89ffaf 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -815,8 +815,7 @@ static void lcl_SaveDoc( SfxObjectShell *xTargetDocShell, SfxMedium* pDstMed = new SfxMedium( aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ); -xTargetDocShell->DoSaveAs( *pDstMed ); -if( xTargetDocShell->GetError() ) +if( !xTargetDocShell->DoSaveAs( *pDstMed ) ) SAL_WARN( "sw.mailmerge", "Error saving: " << aTempFile->GetURL() ); else SAL_INFO( "sw.mailmerge", "Saved doc as: " << aTempFile->GetURL() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Top posting vs posting styles
Let's stop this silly thread now. Whining about people top-posting (or bottom-posting, on those "Microsoft sites") is so last century. Not productive. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/form/FormWizard.java | 26 --
1 file changed, 5 insertions(+), 21 deletions(-)
New commits:
commit 86d05eea4578c58be8e4b7b8f3a365238bf22e02
Author: Ryan McCoskrie
Date: Sun Sep 21 14:33:53 2014 +1200
Removed uneeded checks.
Change-Id: I9fd008f0265f195a8069526cea22a288ff6238f7
Reviewed-on: https://gerrit.libreoffice.org/11562
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java
b/wizards/com/sun/star/wizards/form/FormWizard.java
index eda3821..c6cba67 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -78,10 +78,8 @@ public class FormWizard extends DatabaseObjectWizard
210, Boolean.TRUE, "DialogForm", 102, 41, 1, new
Short((short) 0), m_oResource.getResText(UIConsts.RID_FORM), 310
});
drawNaviBar();
-if (getFormResources())
-{
-setRightPaneHeaders(m_oResource, UIConsts.RID_FORM + 90, 8);
-}
+getFormResources();
+setRightPaneHeaders(m_oResource, UIConsts.RID_FORM + 90, 8);
}
public static void main(String i_args[])
@@ -175,13 +173,7 @@ public class FormWizard extends DatabaseObjectWizard
curFormDocument.oMainFormDBMetaData.initializeFieldColumns(true, sTableName,
aFieldNames);
final String[] aMainFieldNames =
curFormDocument.oMainFormDBMetaData.getFieldNames();
-try
-{
-curFormDocument.LinkFieldNames =
JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aMainFieldNames,
1);
-}
-catch (java.lang.Exception e)
-{
-}
+curFormDocument.LinkFieldNames =
JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aMainFieldNames,
1);
}
break;
case SOSUBFORM_PAGE:
@@ -193,13 +185,7 @@ public class FormWizard extends DatabaseObjectWizard
curFormDocument.oSubFormDBMetaData.initializeFieldColumns(true, sTableName,
aFieldNames);
final String[] aSubFieldNames =
curFormDocument.oSubFormDBMetaData.getFieldNames();
-try
-{
-curFormDocument.LinkFieldNames =
JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aSubFieldNames,
0);
-}
-catch (java.lang.Exception e)
-{
-}
+curFormDocument.LinkFieldNames =
JavaTools.removeOutdatedFields(curFormDocument.LinkFieldNames, aSubFieldNames,
0);
}
break;
case SOFIELDLINKER_PAGE:
@@ -370,15 +356,13 @@ public class FormWizard extends DatabaseObjectWizard
}
}
-private boolean getFormResources()
+private void getFormResources()
{
sShowBinaryFields = m_oResource.getResText(UIConsts.RID_FORM + 2);
slblTables = m_oResource.getResText(UIConsts.RID_FORM + 6);
slblFields = m_oResource.getResText(UIConsts.RID_FORM + 12);
slblSelFields = m_oResource.getResText(UIConsts.RID_FORM + 1);
serrFormNameexists = m_oResource.getResText(UIConsts.RID_FORM + 98);
-
-return true;
}
public class FieldSelectionListener implements
com.sun.star.wizards.ui.XFieldSelectionListener
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LiMux student "kick-off"
Hi all, >> * VCL: main-loop / timeout foo [ menTor ;-] >> + Making our main-loop have an 'idle' concept >>with priorities vs. mix & match timers. >> + Tobias Madl >> + Jennifer Liebel > LHM: Florian Haftmann this issue did not raise much attention so far in this thread, so I'll try to excite some… From a bird's-eye perspective, this would IMHOP consist of the following tasks: * Identify the hot-sport where events are announced. * Formally extend this interface with a priority parameter with not-yet a meaning. * Refine the event data structure to interpret priorities accordingly. * Classify all existing event sources with desired priorities. * Adjust priorities accordingly. Any comments or hints? Otherwise I guess the first item is the one to start with. All the best, Florian -- PGP available: http://home.informatik.tu-muenchen.de/haftmann/pgp/florian_haftmann_at_informatik_tu_muenchen_de signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Top posting vs posting styles
On 2014-09-24 08:04, nicholas ferguson wrote: http://en.wikipedia.org/wiki/Posting_style Here's Wikipedia: "While each online community differs on which styles are appropriate or acceptable, within some communities the use of the "wrong" method risks being seen as a breach of netiquette, and can provoke vehement response from community regulars." And further it says that community regulars citing breaches of netiquette will cite rfc1855... But wikipedia says that rfc1855 is informational only. This Wikipedia page also mentions that many businesses encourage top posting...like for blackberry etc.. And because of widespread use of top posting at businesses ( think office email ) bottom posting is now rarely seen. nicholas: Different mailing lists have different rules for posting. It is like visiting a foreign country, you have to obey their rules, not the one's on your home turf. If one was to bottom post on most Microsoft sites, one would get flamed so bad that Norbert's rebuke would be just a light slap on the wrist. TomW ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PARTICIPAR
El 24/09/14 17:14, Jacobo Aragunde Pérez escribió: > > Finalmente, aunque algunos podemos responder en español, esta lista de > correo funciona principalmente en inglés. Si es posible, plantea tus > dudas en inglés para obtener respuesta más rápido. > Se me olvidaba comentar que hay listas de correo exclusivamente en español, echa un vistazo a: https://wiki.documentfoundation.org/Local_Mailing_Lists/es -- Jacobo Aragunde Software Engineer at Igalia ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PARTICIPAR
El 20/09/14 00:41, JUAN ESTEBAN ARCILA RESTREPO escribió: > CORDIAL SALUDO > > > MI NOMBRE ES JUAN ESTEBAN ARCILA RESTREPO QUIERO SER PARTE DE > LIBREOFFICE POR QUE DESEO APRENDER MUCHO SOBRE PROGRAMACIÓN. > Hola Juan Esteban, bienvenido a la comunidad de LibreOffice :) En la web tienes algunas ideas para empezar, dependiendo de tu perfil (desarrollo, diseño, control de calidad, traducción...), con links de interés para cada área: http://www.libreoffice.org/community/get-involved/ Finalmente, aunque algunos podemos responder en español, esta lista de correo funciona principalmente en inglés. Si es posible, plantea tus dudas en inglés para obtener respuesta más rápido. Un saludo, -- Jacobo Aragunde Software Engineer at Igalia ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Compile error
Thank you your answers. It works. On Wed, Sep 24, 2014 at 3:28 PM, Michael Stahl wrote: > On 24/09/14 09:20, Miklos Vajna wrote: > > On Tue, Sep 23, 2014 at 06:28:59PM +0200, Mihály Palenik < > palenik.mih...@gmail.com> wrote: > >> > workdir/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.a(liblangtag_la-lt-utils.o): > >> In function `lt_getenv': > >> workdir/UnpackedTarball/langtag/liblangtag/lt-utils.c:57: undefined > >> reference to `__secure_getenv' > > apparently glibc 2.17 changed this function from __secure_getenv to > secure_getenv; liblangtag has a configure check for both of these; if > you upgraded your glibc and then do an incremental build it will > probably use the "wrong" symbol because liblangtag is not rebuilt, and > fail... > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708061 > https://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv > > > Does it happen if you do 'make clean && make', not just 'make'? > > actually "make liblangtag.clean" should be enough to fix it. > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: stack-allocated Window subclasses
On Tuesday 23 of September 2014, Michael Meeks wrote: > The question is; what should we replace it with. Personally I'm more of > a fan of intrusive reference counting for VCL - we don't want lots of > atomics, so that the optimizer can rid us of size inefficiency - and at > least for now we can't ref-count those guys anyway I think. > > Then again rtl::Reference lost its nasty virtual methods recently > (IIRC), so - perhaps we could use that - but for the fact that it's > unpleasantly long to type. I'd also love to avoid 'orrible casts > everywhere when converting to references to parent types [ perhaps I > just do this wrong myself ;-] > > So - possibly having a ButtonRef xFoo; type class that is (underneath) > an rtl::Reference - and yet can easily be implicitly co-erced to > a WindowRef etc. might fly ? > > I guess we need to have a plan in-place there before shunting all those > widgets off onto the heap where we can lifecycle manage them sensibly =) > > Thoughts ? I must have missed it, where can I read what problems led to requiring a solution like this instead of the primitive&working way of having parents responsible for cleaning up their children on destruction? Stack-allocated objects is probably the most sensible C++ lifecycle management ever, so if it doesn't work with vcl, vcl has got to be seriously broken in that regard. -- Lubos Lunak l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: issue solved with --enable-dbgutil for Visual Studio on Windows 7 ( solution to this mess)
On 17/09/14 21:48, Anthonys Lists wrote: > On 17/09/2014 00:27, nicholas ferguson wrote: >> >> I tossed that investigation aside thinking that that route had been >> poured over by LibreOffice experts; and took another look.…. >> >> I didn’t understand why I had to clean up this mess, with an open >> source product that has been on the market, for years…. >> > Sorry, you know the Open Source warranty, don't you? "If it breaks, you > get to keep both pieces"? > > The reality is that the guy who originally set it up presumably lost > interest, and if no-one else has been using it, it bit-rotted. That's a > very common occurrence in ALL software, be it Open Source or commercial > - indeed, LibreOffice has just been through a massive clean up of > bit-rotted code which, iirc, deleted a *third* of the code base!!! > > It wouldn't surprise me if this feature dated from the proprietary Star > Office days, and obviously got missed in the clean-up. (Which would > explain why the original guy lost interest - he would have done it > because he was told to, not because he wanted to.) while *in general* Wol gets it right, for the particular case of --enable-dbgutil, i'm doing such a build with MSVC 2012 about once a week and it's working fine for me. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO 4.3 build broken (related to bnc#891663)
On Tuesday 23 of September 2014, Andras Timar wrote: > On Tue, Sep 23, 2014 at 10:10 PM, Jean-Baptiste Faure > > wrote: > > Hi, > > > > The build of 4.3 branch fails on the following unit test : > > > > [build CUT] sw_ooxmlimport > > File tested,Execution Time (ms) > > bnc891663.docx,[...]/LibO/lo43/sw/qa/extras/ooxmlimport/ooxmlimport.cxx:2 > >284:testBnc891663::Import assertion failed > > - Expression: textNextRowTop >= imageTop + imageHeight > > Unfortunately the fix worked only for master. I accepted the patch for > libreoffice-4-3, but it was a mistake. I reverted it. My bad, the original code had several unhandled switch cases together and I overlooked that (not that I get how the fix worked in master). Andras, could you please include the commit back to 4.2+4.3 together with 74c6ba1b741ae76ad9e2f2b81be3e3178163f085 ? Thanks. -- Lubos Lunak l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/GraphicImport.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 74c6ba1b741ae76ad9e2f2b81be3e3178163f085 Author: LuboÅ¡ LuÅák Date: Wed Sep 24 16:34:42 2014 +0200 add missing break Should have been included in 3891ba42a886fa85eb43da24d1badf44e765d54c. Change-Id: I22e5ba931a58c83efdbf996ce701c52dcf0bf9c5 diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 624fc84..eb920bb 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -576,6 +576,7 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue) m_pImpl->bOpaque = false; break; case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored +break; case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored m_pImpl->bLayoutInCell = nIntValue != 0; break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 81592, which changed state. Bug 81592 Summary: Bad Quality/Rendering of EPS graphics in LO 4.2 and 4.3 https://bugs.freedesktop.org/show_bug.cgi?id=81592 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/redline-export-3.odt |binary
sw/qa/extras/ww8export/ww8export.cxx |8
sw/source/filter/ww8/wrtw8nds.cxx| 22 +++---
3 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit ded3740d2498b7a14afe8c0c63219c924cf800df
Author: Caolán McNamara
Date: Wed Sep 24 13:14:50 2014 +0100
also consider redline that starts right before the end para marker
We were currently handing the case where a paragraph end mark is right
before the *end* of a redline, now we also need to take care if the end
mark is right after the *start* of a redline
Change-Id: I816335067f60d1d9332bfdb1117fb1448b564972
diff --git a/sw/qa/extras/ww8export/data/redline-export-3.odt
b/sw/qa/extras/ww8export/data/redline-export-3.odt
new file mode 100644
index 000..6d0d80a
Binary files /dev/null and b/sw/qa/extras/ww8export/data/redline-export-3.odt
differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index cefd0db..60f583b 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -363,6 +363,14 @@ DECLARE_WW8EXPORT_TEST(testRedlineExport2,
"redline-export-2.odt")
CPPUNIT_ASSERT_EQUAL(true, hasProperty(getRun(getParagraph(3), 1),
"RedlineType"));
}
+DECLARE_WW8EXPORT_TEST(testRedlineExport3, "redline-export-3.odt")
+{
+//there must be redline information just on the para-break boundary
between para one and two
+CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(1), 1),
"RedlineType"));
+CPPUNIT_ASSERT_EQUAL(true, hasProperty(getRun(getParagraph(1), 2),
"RedlineType"));
+CPPUNIT_ASSERT_EQUAL(true, hasProperty(getRun(getParagraph(2), 1),
"RedlineType"));
+CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(2), 2),
"RedlineType"));
+}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 540ed19..24b5f2d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1261,6 +1261,7 @@ bool
SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) cons
const SwRangeRedline *pRange =
m_rExport.pDoc->getIDocumentRedlineAccess().GetRedlineTbl()[nPos];
const SwPosition* pEnd = pRange->End();
const SwPosition* pStart = pRange->Start();
+bool bBreak = true;
// In word the paragraph end marker is a real character, in writer it
is not.
// Here we find out if the para end marker we will emit is affected by
// redlining, in which case it must be included by the range of
character
@@ -1271,11 +1272,25 @@ bool
SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) cons
{
// This condition detects if the pseudo-char we will export
// should be explicitly included by the redlining char
-// properties on this node
+// properties on this node because the redlining ends right
+// after it
return true;
}
+bBreak = false;
}
-else if (pStart->nNode.GetIndex()-1 == rNd.GetIndex())
+if (pStart->nNode == rNd)
+{
+if (pStart->nContent.GetIndex() == nEnd)
+{
+// This condition detects if the pseudo-char we will export
+// should be explicitly included by the redlining char
+// properties on this node because the redlining starts right
+// before it
+return true;
+}
+bBreak = false;
+}
+if (pStart->nNode.GetIndex()-1 == rNd.GetIndex())
{
if (pStart->nContent.GetIndex() == 0)
{
@@ -1284,9 +1299,10 @@ bool
SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) cons
// properties starting on the next node.
return true;
}
+bBreak = false;
}
-else
+if (bBreak)
break;
}
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source editeng/source include/editeng include/svx sc/source sd/source starmath/source svx/source sw/source
chart2/source/controller/accessibility/AccessibleTextHelper.cxx |9 ++
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 28 ++--
editeng/source/uno/unoedprx.cxx | 13 +--
include/editeng/AccessibleStaticTextBase.hxx| 11 +--
include/editeng/unoedprx.hxx|9 --
include/svx/AccessibleTextHelper.hxx| 11 +--
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx|5 -
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 11 ++-
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx |9 ++
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx|9 ++
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx |9 ++
sd/source/ui/accessibility/AccessibleOutlineView.cxx|4 -
starmath/source/accessibility.cxx | 13 ++-
svx/source/accessibility/AccessibleShape.cxx| 14 +---
svx/source/accessibility/AccessibleTextHelper.cxx | 34
+++---
svx/source/table/accessiblecell.cxx | 10 +-
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx |9 ++
17 files changed, 103 insertions(+), 105 deletions(-)
New commits:
commit 4e820251892917a92996f1aa6978ad609112001c
Author: Stephan Bergmann
Date: Wed Sep 24 16:03:36 2014 +0200
Replace some std::auto_ptr function parameters with std::unique_ptr
Change-Id: Ic66d325fd9559c6dde9556c26e5b2a7e60376c49
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 9c3f3c1..96564fc 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -17,6 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
+#include
+#include
+
#include "AccessibleTextHelper.hxx"
#include "DrawViewWrapper.hxx"
@@ -87,9 +92,9 @@ void SAL_CALL AccessibleTextHelper::initialize( const
Sequence< uno::Any >& aArg
SdrObject * pTextObj = m_pDrawViewWrapper->getNamedSdrObject( aCID
);
if( pTextObj )
{
-SvxEditSource * pEditSource = new SvxTextEditSource(
*pTextObj, 0, *pView, *pWindow );
+std::unique_ptr pEditSource(new
SvxTextEditSource( *pTextObj, 0, *pView, *pWindow ));
m_pTextHelper = new ::accessibility::AccessibleTextHelper(
-::std::auto_ptr< SvxEditSource >( pEditSource ));
+std::move(pEditSource));
if( m_pTextHelper )
m_pTextHelper->SetEventSource( xEventSource );
}
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 9d70af9..37a30c6 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -25,6 +25,7 @@
#include
+#include
#include
#include
#include
@@ -124,9 +125,8 @@ namespace accessibility
return maEditSource;
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource );
-SAL_WNODEPRECATED_DECLARATIONS_POP
+
+void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource
);
void SetEventSource( const uno::Reference< XAccessible >& rInterface )
{
@@ -230,15 +230,13 @@ namespace accessibility
{
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-void AccessibleStaticTextBase_Impl::SetEditSource( ::std::auto_ptr<
SvxEditSource > pEditSource )
+void AccessibleStaticTextBase_Impl::SetEditSource( ::std::unique_ptr<
SvxEditSource > && pEditSource )
{
-maEditSource.SetEditSource( pEditSource );
+maEditSource.SetEditSource( std::move(pEditSource) );
if( mpTextParagraph )
mpTextParagraph->SetEditSource( &maEditSource );
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
void AccessibleStaticTextBase_Impl::SetOffset( const Point& rPoint )
{
@@ -495,17 +493,13 @@ namespace accessibility
// AccessibleStaticTextBase implementation
-
-
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr<
SvxEditSource >pEditSource ) :
+AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::unique_ptr<
SvxEditSource > && pEditSource ) :
mpImpl( new AccessibleStaticTextBase_Impl() )
{
SolarMutexGuard aGuard;
-SetEditSource( pEditSource );
+SetEditSource( std::move(pEditSource) );
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
AccessibleStaticTextBase::~AccessibleStaticTextBa
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/PythonTest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bf8c9ba4f031fa8c838321b0cf4c7bb8dd44753 Author: Matúš Kukan Date: Wed Sep 24 14:04:16 2014 + Revert "Make PythonTests depend on the ExternalExecutable" This reverts commit 9416f4e8ab5fe9e1006bf8afd0b9d0ed2655a315. Change-Id: Id187b98c26e0fb109c26b31fb88bb50d0960d6fb Reviewed-on: https://gerrit.libreoffice.org/11627 Reviewed-by: Matúš Kukan Tested-by: Matúš Kukan diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index c78a896..ce5f5ed 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -15,7 +15,7 @@ gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB) ifeq ($(OS),MACOSX) gb_PythonTest_DEPS := $(call gb_GeneratedPackage_get_target,python3) else -gb_PythonTest_DEPS := $(call gb_ExternalExecutable_get_dependencies,python) +gb_PythonTest_DEPS := $(call gb_Package_get_target,python3) endif gb_PythonTest_DEPS += $(if $(filter-out WNT,$(OS)),$(call gb_Package_get_target,python_shell)) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/perfwork'
New branch 'feature/perfwork' available with the following commits: commit 8124fddc5803b4e104d4fc2456cb92cb030d9436 Author: Matúš Kukan Date: Wed Sep 24 14:55:02 2014 +0200 FastSerializer: Buffer output and write it only at the end Use OSequenceOutputStream class to concatenate strings in a Sequence buffer. And write data to file only at the end. The design is a bit fragile, since all FSHelpers need to be destroyed before calling FilterBase::commitStorage(). Otherwise data is not written. Change-Id: I26b02335ef36011bfcda17484b560811d18c7657 commit 73d7e866ae5e99067133c907b9f82eef87c07ce2 Author: Matúš Kukan Date: Wed Sep 24 12:46:49 2014 +0200 Unused PowerPointExport::mpMasterFSArray member Change-Id: I02b9c31146396a39a624fbb869a5880b176e0f9e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Chained Text Boxes - Cleaning up code before incorporation to master - Are we okay with changes to #i119885#?
On 24/09/14 01:49, Matteo Campanelli wrote: > What I did: > - make check > - make slowcheck > - make subsequentcheck > So far, so good. > Do such commands already run tests? yes, although it's a bit redundant: "make check" runs every automated test already (and does a full build too); the other ones run just some subset of the tests. and btw --without-java will disable most of the "subsequentcheck" tests, so don't use that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-epptooxml.cxx |7 --- 1 file changed, 7 deletions(-) New commits: commit 3b69e188fdf770079d330c60c7dba63eca208c74 Author: Matúš Kukan Date: Tue Sep 23 17:12:21 2014 +0200 unused using-declarations Change-Id: I2bfb15821579b2636f6ae6b453b821ddfa0ccfcc diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 1be7ade..e829fca 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -58,7 +58,6 @@ #include #include #include -#include #include #include @@ -84,13 +83,7 @@ using namespace ::com::sun::star::util; using namespace ::ppt; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::beans::XPropertySetInfo; -using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::container::XIndexAccess; -using ::com::sun::star::frame::XModel; -using ::com::sun::star::io::XOutputStream; -using ::com::sun::star::task::XStatusIndicator; -using ::com::sun::star::text::XSimpleText; -using ::sax_fastparser::FastSerializerHelper; using ::sax_fastparser::FSHelperPtr; DBG(void dump_pset(Reference< XPropertySet > rXPropSet);) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/oox oox/inc oox/source sax/source
include/oox/token/tokenmap.hxx |3 ---
oox/inc/drawingml/customshapeproperties.hxx|2 +-
oox/source/drawingml/customshapeproperties.cxx |6 +++---
oox/source/drawingml/shape.cxx |6 +-
oox/source/mathml/importutils.cxx | 11 ++-
oox/source/token/tokenmap.cxx | 12
sax/source/tools/fastserializer.hxx|1 -
7 files changed, 15 insertions(+), 26 deletions(-)
New commits:
commit b697e5a8feb0b6ca7a7066528cd7e56ceaf39c5f
Author: Matúš Kukan
Date: Wed Sep 24 08:45:13 2014 +0200
Unused FastSaxSerializer::maSavedMarkStack member
Change-Id: Ib665b3870f3d4b00c70d3f928452639464adca69
diff --git a/sax/source/tools/fastserializer.hxx
b/sax/source/tools/fastserializer.hxx
index da8c527..a88e3ca 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -204,7 +204,6 @@ private:
};
::std::stack< boost::shared_ptr< ForMerge > > maMarkStack;
-::std::stack< boost::shared_ptr< ForMerge > > maSavedMarkStack;
#ifdef DBG_UTIL
::std::stack m_DebugStartedElements;
commit c566814e0411f1357f63b503e76aa51a396d82d0
Author: Matúš Kukan
Date: Wed Sep 24 00:13:11 2014 +0200
Remove TokenMap::getUnicodeTokenName()
Change-Id: I778dc43085b6afbb6456cbf53fe8c95b624b75b3
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index a00475f..6298773 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -35,9 +35,6 @@ public:
explicitTokenMap();
~TokenMap();
-/** Returns the Unicode name of the passed token identifier. */
-OUString getUnicodeTokenName( sal_Int32 nToken ) const;
-
/** Returns the token identifier for the passed Unicode token name. */
sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName )
const;
diff --git a/oox/inc/drawingml/customshapeproperties.hxx
b/oox/inc/drawingml/customshapeproperties.hxx
index d27fc66..ff80b52 100644
--- a/oox/inc/drawingml/customshapeproperties.hxx
+++ b/oox/inc/drawingml/customshapeproperties.hxx
@@ -116,7 +116,7 @@ public:
const ::com::sun::star::uno::Reference <
::com::sun::star::drawing::XShape > & xShape, const ::com::sun::star::awt::Size
&aSize );
sal_Int32 getShapePresetType() const { return mnShapePresetType; }
-OUString getShapePresetTypeName() const;
+css::uno::Sequence< sal_Int8 > getShapePresetTypeName() const;
void setShapePresetType( sal_Int32 nShapePresetType ){ mnShapePresetType =
nShapePresetType; };
boolgetShapeTypeOverride(){ return
mbShapeTypeOverride; };
voidsetShapeTypeOverride( bool
bShapeTypeOverride ) { mbShapeTypeOverride = bShapeTypeOverride; };
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 5758d79..64fe535 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -56,9 +56,9 @@ CustomShapeProperties::~CustomShapeProperties()
{
}
-OUString CustomShapeProperties::getShapePresetTypeName() const
+uno::Sequence< sal_Int8 > CustomShapeProperties::getShapePresetTypeName() const
{
-return StaticTokenMap::get().getUnicodeTokenName( mnShapePresetType );
+return StaticTokenMap::get().getUtf8TokenName( mnShapePresetType );
}
sal_Int32 CustomShapeProperties::SetCustomShapeGuideValue( std::vector<
CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide )
@@ -136,7 +136,7 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase& /* rFi
}
else if (maPresetDataMap.find(mnShapePresetType) !=
maPresetDataMap.end())
{
-OSL_TRACE("found property map for preset: %s (%d)",
USS(getShapePresetTypeName()), mnShapePresetType);
+OSL_TRACE("found property map for preset: %d", mnShapePresetType);
aPropertyMap = maPresetDataMap[mnShapePresetType];
#ifdef DEBUG
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index dbd2aa7..1276c97 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -678,7 +678,11 @@ Reference< XShape > Shape::createAndInsert(
sal_Int32 length = aGrabBag.getLength();
aGrabBag.realloc( length+1);
aGrabBag[length].Name = "mso-orig-shape-type";
-aGrabBag[length].Value =
uno::makeAny(mpCustomShapePropertiesPtr->getShapePresetTypeName());
+const uno::Sequence< sal_Int8 > aNameSeq =
+mpCustomShapePropertiesPtr->getShapePresetTypeName();
+OUString sShapePresetTypeName(reinterpret_cast< const
char* >(
+aNameSeq.getConstArray()), aNameSeq.getLength(),
RT
Re: Compile error
On 24/09/14 09:20, Miklos Vajna wrote: > On Tue, Sep 23, 2014 at 06:28:59PM +0200, Mihály Palenik > wrote: >> workdir/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.a(liblangtag_la-lt-utils.o): >> In function `lt_getenv': >> workdir/UnpackedTarball/langtag/liblangtag/lt-utils.c:57: undefined >> reference to `__secure_getenv' apparently glibc 2.17 changed this function from __secure_getenv to secure_getenv; liblangtag has a configure check for both of these; if you upgraded your glibc and then do an incremental build it will probably use the "wrong" symbol because liblangtag is not rebuilt, and fail... https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708061 https://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv > Does it happen if you do 'make clean && make', not just 'make'? actually "make liblangtag.clean" should be enough to fix it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - sysui/desktop
sysui/desktop/macosx/Info.plist.in | 666 - 1 file changed, 665 insertions(+), 1 deletion(-) New commits: commit d69588f4234cd170fd3a5a5d914de74cccb306a2 Author: Tor Lillqvist Date: Wed Sep 24 16:11:39 2014 +0300 Seems that CFBundleDocumentTypes is needed after all Change-Id: I8ad7de1fc432ddff5e64af0431644afc1afcbc1d diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 60c5934..c10a3b1 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1275,7 +1275,671 @@ - + + + + CFBundleDocumentTypes + + + CFBundleTypeName + OpenOffice.org 1.0 Text + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.text + + + + CFBundleTypeName + OpenDocument Text + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.text + + + + CFBundleTypeName + OpenOffice.org 1.0 Spreadsheet + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.spreadsheet + + + + CFBundleTypeName + OpenDocument Spreadsheet + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.spreadsheet + + + + CFBundleTypeName + OpenOffice.org 1.0 Presentation + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.presentation + + + + CFBundleTypeName + OpenDocument Presentation + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.presentation + + + + CFBundleTypeName + OpenOffice.org 1.0 Drawing + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.graphics + + + + CFBundleTypeName + OpenDocument Drawing + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.graphics + + + + CFBundleTypeName + OpenDocument Chart + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.chart + + + + CFBundleTypeName + OpenOffice.org 1.0 Master + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.text-master + + + + CFBundleTyp
Re: LiMux student "kick-off"
Hi Florian, On Wed, 2014-09-24 at 14:18 +0200, Florian Haftmann wrote: > From a bird's-eye perspective, this would IMHOP consist of the following > tasks: I love your breakdown =) > * Identify the hot-sport where events are announced. Sure - so, this is a matter of looking for finding / documenting all 'Timer' sub-classes. > * Formally extend this interface with a priority parameter with not-yet > a meaning. Sure - so, what I'd do is create a 'Idle' class - initially derived from Timer (I guess), and start to add a series of #defines or similar to give each an integer priority [ leaving some nice spaces ]. Then inside the Timer class map that back to the ~awful '35ms is low priority' '50ms is after that' etc. ;-) Of course, -some- things we may actually want to do inside a timer - eg. blinking the cursor =) for this we really want a 'TimerSeconds' sub-class that moves the timeouts to a second boundary: this is important for reducing power-use: so the CPU wakes up once per second sharp on the transition, and does as much work as possible before going back to sleep =) [ we're missing that concept sadly - for now just stub / wrap that ]. Our cursor should blink either once-per-second or every half-second I think to get the benefit there. Having done that I hope we are back where we started - but we have a nice series of priorities for these various things. > Any comments or hints? Otherwise I guess the first item is the one to > start with. I think we missed some unit tests =) it'd be great to create some of these too particularly for Timers - which we've just re-worked on Windows to make them might higher resolution. Personally, I'd do the API work as described above first - then take a long hard look at it =) before starting to work on the implementations of prioritized idle handlers in the backends. Of course - we can detect if the backend can do the priority foo (should be easy for glib users eg.) and if not use the fall-back 'orrible hard-coded times. Perhaps that gives a good, incremental path to go so commits can go to master, and we can keep everything working ? Anyhow - thanks for the investigation, a good plan; HTH, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - configure.ac sysui/desktop
configure.ac |2 sysui/desktop/macosx/Info.plist.in | 666 - 2 files changed, 666 insertions(+), 2 deletions(-) New commits: commit 18c9b28024215acd2a30da5b029eea7a2d73e620 Author: Tor Lillqvist Date: Wed Sep 24 14:58:54 2014 +0300 Seems that CFBundleDocumentTypes is needed after all Change-Id: I4b45b13289666d89c81e0326f859e890158fcc75 diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 42c2f52..77c4c58 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1275,7 +1275,671 @@ - + + + + CFBundleDocumentTypes + + + CFBundleTypeName + OpenOffice.org 1.0 Text + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.text + + + + CFBundleTypeName + OpenDocument Text + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.text + + + + CFBundleTypeName + OpenOffice.org 1.0 Spreadsheet + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.spreadsheet + + + + CFBundleTypeName + OpenDocument Spreadsheet + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.spreadsheet + + + + CFBundleTypeName + OpenOffice.org 1.0 Presentation + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.presentation + + + + CFBundleTypeName + OpenDocument Presentation + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.presentation + + + + CFBundleTypeName + OpenOffice.org 1.0 Drawing + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.graphics + + + + CFBundleTypeName + OpenDocument Drawing + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.graphics + + + + CFBundleTypeName + OpenDocument Chart + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.oasis-open.opendocument.chart + + + + CFBundleTypeName + OpenOffice.org 1.0 Master + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openoffice.text-master + + +
[Libreoffice-commits] core.git: basctl/source bridges/source hwpfilter/inc hwpfilter/source include/o3tl mysqlc/source o3tl/CppunitTest_o3tl_tests.mk o3tl/qa o3tl/README sc/inc sc/source tools/inc too
basctl/source/basicide/bastype2.cxx | 20 +-
basctl/source/basicide/bastype2.hxx |8
basctl/source/basicide/moduldl2.cxx |4
basctl/source/basicide/moduldlg.cxx |8
bridges/source/jni_uno/jni_bridge.cxx |6
bridges/source/jni_uno/jni_data.cxx | 16 -
bridges/source/jni_uno/jni_helper.h |6
bridges/source/jni_uno/jni_uno2java.cxx |4
hwpfilter/inc/pch/precompiled_hwp.hxx |1
hwpfilter/source/hwpreader.cxx|4
include/o3tl/heap_ptr.hxx | 283 --
mysqlc/source/mysqlc_statement.cxx| 10 -
o3tl/CppunitTest_o3tl_tests.mk|1
o3tl/README |3
o3tl/qa/test-heap_ptr.cxx | 157
sc/inc/pch/precompiled_scfilt.hxx |1
sc/source/filter/oox/revisionfragment.cxx |7
tools/inc/pch/precompiled_tl.hxx |1
tools/source/fsys/urlobj.cxx |6
19 files changed, 59 insertions(+), 487 deletions(-)
New commits:
commit 9703cc63cea3c47d13afe5f9b0eb22c631000958
Author: Stephan Bergmann
Date: Wed Sep 24 14:54:51 2014 +0200
Remove o3tl/heap_ptr.hxx, use std::unique_ptr instead
Change-Id: Iac70c9be13892a36bfb5975f62e5345b88d4f144
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 4c9f52a..42f7b0d 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -41,6 +41,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -246,7 +248,7 @@ void TreeListBox::ScanEntry( const ScriptDocument&
rDocument, LibraryLocation eL
OUString aRootName( GetRootEntryName( rDocument, eLocation ) );
Image aImage;
GetRootEntryBitmaps( rDocument, aImage );
-o3tl::heap_ptr e(new DocumentEntry(rDocument, eLocation));
+std::unique_ptr e(new DocumentEntry(rDocument, eLocation));
AddEntry(
aRootName,
aImage,
@@ -309,7 +311,7 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry*
pDocumentRootEntry, cons
}
else
{
-o3tl::heap_ptr e(new Entry(OBJ_TYPE_LIBRARY));
+std::unique_ptr e(new Entry(OBJ_TYPE_LIBRARY));
AddEntry(
aLibName,
Image( IDEResId( nId ) ),
@@ -345,7 +347,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry*
pLibRootEntry, const
SvTreeListEntry* pModuleEntry = FindEntry(
pLibRootEntry, aModName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
{
-o3tl::heap_ptr e(new
Entry(OBJ_TYPE_MODULE));
+std::unique_ptr e(new
Entry(OBJ_TYPE_MODULE));
pModuleEntry = AddEntry(
aModName,
Image( IDEResId( RID_IMG_MODULE ) ),
@@ -365,7 +367,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry*
pLibRootEntry, const
SvTreeListEntry* pEntry = FindEntry(
pModuleEntry, aName, OBJ_TYPE_METHOD );
if ( !pEntry )
{
-o3tl::heap_ptr e(
+std::unique_ptr e(
new Entry(OBJ_TYPE_METHOD));
pEntry = AddEntry(
aName,
@@ -404,7 +406,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry*
pLibRootEntry, const
SvTreeListEntry* pDialogEntry = FindEntry( pLibRootEntry,
aDlgName, OBJ_TYPE_DIALOG );
if ( !pDialogEntry )
{
-o3tl::heap_ptr e(new Entry(OBJ_TYPE_DIALOG));
+std::unique_ptr e(new Entry(OBJ_TYPE_DIALOG));
pDialogEntry = AddEntry(
aDlgName,
Image( IDEResId( RID_IMG_DIALOG ) ),
@@ -443,7 +445,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode(
SvTreeListEntry* pLibRootEntr
}
else
{
-o3tl::heap_ptr e(new Entry(eType));
+std::unique_ptr e(new Entry(eType));
AddEntry(
aEntryName,
Image( IDEResId( RID_IMG_MODLIB ) ),
@@ -505,7 +507,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode(
SvTreeListEntry* pLibSubRo
SvTreeListEntry* pModuleEntry = FindEntry( pLibSubRootEntry,
aEntryName, OBJ_TYPE_MODULE );
if ( !pModuleEntry )
{
-o3tl::heap_ptr e(new Entry(OBJ_TYPE_MODULE));
+std::unique_ptr e(new Entry(OBJ_TYPE_MODULE));
pModuleEntry = AddEntry(
aEn
Re: LiMux student "kick-off"
> since the LiMux students are already working on various LO > EasyHacks, I really want to get the long-term projects started. > > We're using currently using the #libreoffice-lhm channel for > communication. I hope the respective groups get organized themself. > > And I hope I have all involved persons in the CC. And here is an initial wiki page for our benefit: https://wiki.documentfoundation.org/Development/LHM_LiMux Florian -- PGP available: http://home.informatik.tu-muenchen.de/haftmann/pgp/florian_haftmann_at_informatik_tu_muenchen_de signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Translation of /rsc/documentation useful?
On 19/09/14 12:03, Noel Grandin wrote: > On 2014-09-19 11:52 AM, Philipp Weissenbacher wrote: >> While looking at Noel's commits removing VAX and PDP support, I found >> /rsc/documentation. >> >> As the docs in there are quite large, it would be quite a time investment to >> translate them. >> >> So: Is it still useful to translate them, or do you guys have a good enough >> grasp on the subject matter already? >> >> > > Hi > > Firstly, thanks a lot for your help translating. > > But personally, I'd much rather have you working on translating comments in > the code - that RSC stuff is hardly ever > touched and it's much less useful to have good comments there than in other > code. indeed; furthermore there is a good chance that Caolan will rid us of the "rsc" horror within the next year anyway... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Top posting vs posting styles
It seems to be an issue where one's view point is attacked with religious zeal. The fact that people feel so strongly on both sides is an indicator to me that it is nothing more than personal preference. The posting style used affects the best way to follow the thread. If you leave everything in every response, then it is easier to read from the top to the bottom to understand everything if bottom posting is used. If you read every post as it comes in, it is easier to follow if top posting is used unless your mail reader auto-magically hides all of the contained previous posts. Well, that is my opinion anyway. A sufficient number of people bottom post that I installed a plug-in that hides all previous posts unless I expand them out manually. Annoying that I need to do that, but, otherwise, it just takes too long to read the emails. It is then annoying when I want to read something part way through, but, I don't generally complain about it. My general approach is to reply using whatever method has already been used in posts. So, if there is already a response, I will make my response to be top or bottom based on the previous responses. Consistency within a single message strikes me as a good choice. I make random decisions of top or bottom based on not much when I am the first responder. I am more likely to top post for a person that appears to be a "newbie" since it seems to me that people without exposure to mailing lists are more inclined to to top post. I don't know if that is because that seems to be the way that outlook operates or that is simply what is more natural for them to use. I do know that if I used outlook from work to respond to these messages, it would be a bunch of extra effort to do anything but top post. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: #4 can someone spot problem with simplebootstrap_cpp.cxx
On 24/09/14 01:27, nicholas ferguson wrote: > As the wikipedia explains, many businesses encourage top posting...like for > blackberry etc.. so I had no clue there was a community of regulars around > lists...that would give a vehement reaction if their email netiquette was > not followed. European right? Well, I did say that, as an American, you're probably in the minority here ... And top posting is fine on a corporate lan, or when SOMEBODY ELSE is paying the bill :-) But a lot of people here are private individuals. And a lot of people still pay for the internet by the minute, or by the megabyte. In other words, every time you don't trim, you're wasting other peoples' money. And time. And disk space. etc etc. Doesn't actually bother me now. But I used to be in that situation, and I have every sympathy for people who are still there. Oh - and by the way - a lot of the best programmers grew up in the days when resources were scarce. They learnt that conserving resources was a far better strategy than throwing resources at the problem. In fact, throwing resources at it (even if possible, oftentimes it isn't) can easily make matters worse. Don't waste other peoples' resources, don't waste your own resources, and you'll turn into a better programmer (Linus is on record as saying "the best programmers are all lazy. They can't be bothered to do it twice so they get it right first time"). Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Top posting vs posting styles
http://en.wikipedia.org/wiki/Posting_style Here's Wikipedia: "While each online community differs on which styles are appropriate or acceptable, within some communities the use of the "wrong" method risks being seen as a breach of netiquette, and can provoke vehement response from community regulars." And further it says that community regulars citing breaches of netiquette will cite rfc1855... But wikipedia says that rfc1855 is informational only. This Wikipedia page also mentions that many businesses encourage top posting...like for blackberry etc.. And because of widespread use of top posting at businesses ( think office email ) bottom posting is now rarely seen. -Original Message- From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Norbert Thiebaud Sent: Tuesday, September 23, 2014 7:23 PM To: nicholas ferguson Cc: libreoffice Subject: Re: #4 can someone spot problem with simplebootstrap_cpp.cxx On Tue, Sep 23, 2014 at 3:25 PM, nicholas ferguson wrote: > (2) Just tell someone they need to make their emails friendly to > grouping in archives... what the heck does this mean: "who need > n.(n+1)/2 messages instead of n ?" Your first post had one message you second one, not only changed the title, but also contained you new message + a full copy of the previous message.. iow 2 messages your third one contained a new message a a full copy ot the 2 previous one so the total number of message is SUM(i=1 to n ; i) = n(n+1)/2 > (3) I didn't understand why one of my emails needed a moderator's > review... so I started numbering my follow-ups...to insure I knew they > went through. Because one or more of them triggered the automated spam filter... and eventually the message was released from moderation... no need for paranoia there. > (1) when you say "top posting"... someone sent me a rather insulting > explanation.. and I didn't read it past its first insult. you have been told by at least 2 different persons on this l ML that top posting is rude and undesirable for instance Michael told you: > In general it is also polite netiquette not to top-post, and to cut > the context of the mail to the minimum necessary for the discussion. of course if you think Michael (or I) does not know what he is talking about, maybe you'll give more weight to a IETF RFC: https://www.ietf.org/rfc/rfc1855.txt --- [...] - Be brief without being overly terse. When replying to a message, include enough original material to be understood but no more. It is extremely bad form to simply reply to a message by including all the previous message: edit out all the irrelevant material. --- You can, of course, chose to ignore these advices and keep being rude. heck you may as well post in all-cap at this point... it really depend what you expect to achieve here... if your goal is to end-up in the /dev/null filter of most people, you're on the right path. Norbert ___ 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: javaunohelper/JunitTest_juh.mk javaunohelper/test
javaunohelper/JunitTest_juh.mk |
2
javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java |
5
javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java |
718 +++---
3 files changed, 249 insertions(+), 476 deletions(-)
New commits:
commit b39a778b5efa73936893a91b3223bb350bae1fb2
Author: Robert Antoni Buj i Gelonch
Date: Wed Sep 24 01:05:37 2014 +0200
javaunohelper: migrate InterfaceContainer_Test to JUnit
integrate InterfaceContainer_Test in juh tests
use java.util.logging in ComponentContext_Test
$ make JunitTest_juh
Change-Id: I92a855f8dea4bc893bb65e23e57ea4b12f59a31d
Reviewed-on: https://gerrit.libreoffice.org/11615
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index 4bbd3f8..3ba2f4e 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -34,12 +34,14 @@ $(eval $(call gb_JunitTest_add_sourcefiles,juh,\
javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \
javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
+javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test \
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
))
$(eval $(call gb_JunitTest_add_classes,juh,\
com.sun.star.comp.helper.ComponentContext_Test \
com.sun.star.lib.uno.helper.ComponentBase_Test \
+com.sun.star.lib.uno.helper.InterfaceContainer_Test \
))
# vim:set noet sw=4 ts=4:
diff --git
a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
index 22ecab8..122ed2c 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
@@ -18,6 +18,8 @@
package com.sun.star.comp.helper;
import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiComponentFactory;
@@ -30,7 +32,10 @@ import org.junit.Test;
public class ComponentContext_Test {
+private static final Logger logger =
Logger.getLogger(ComponentContext_Test.class.getName());
+
@Test public void test() throws Exception {
+logger.log(Level.INFO, "Testing ComponentContext");
HashMap table = new HashMap();
table.put("bla1", new ComponentContextEntry(null, Integer.valueOf(1)));
XComponentContext xInitialContext =
Bootstrap.createInitialComponentContext(table);
diff --git
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
index e352314..c98ceab 100644
---
a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
+++
b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -26,9 +26,22 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.NoSuchElementException;
+
import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
public class InterfaceContainer_Test
{
private static final Logger logger =
Logger.getLogger(InterfaceContainer_Test.class.getName());
@@ -47,26 +60,36 @@ public class InterfaceContainer_Test
//contains original object + proxies + null value
List list3;
-public InterfaceContainer_Test()
+/** Class variables are initialized before each Test method */
+@Before public void setUp() throws Exception
{
obj1= new AWeakBase();
obj2= new AWeakBase();
obj3= new AWeakBase();
obj4= new AWeakBase();
+
proxyObj1Weak1= ProxyProvider.createProxy(obj1, XWeak.class);
proxyObj3Weak1= ProxyProvider.createProxy(obj3, XWeak.class);
proxyObj3Weak2= ProxyProvider.createProxy(obj3, XWeak.class);
+assertNotNull(proxyObj1Weak1);
+assertNotNull(proxyObj3Weak1);
+assertNotNull(proxyObj3Weak2);
+
proxyObj2TypeProv= ProxyProvider.createProxy(obj2,
XTypeProvider.class);
proxyObj3TypeProv= ProxyProvider.createProxy(obj3,
XTypeProvider.class);
+assertNotNull(proxyObj2TypeProv);
+assertNotNull(proxyObj3TypeProv);
list1= new ArrayList();
Re: Reverts notification?
On 17/09/14 14:07, Jan Holesovsky wrote: > Eike Rathke píše v St 17. 09. 2014 v 12:50 +0200: > >> Also, if bug IDs are present in the revert summary, shouldn't the >> corresponding bugs be set to REOPENED if they were already resolved or >> closed? > > I'd prefer not to do it, similarly as we don't close the bugs > automagically when the commit has the bug id. > > Sometimes there are partial reverts, sometimes there are 'Related' > commits that can be not crucial for the bug itself. even better, sometimes the actual fix is reverted and some other commit actually fixed the bug already in a "better" way :) the revert's commit message should indicate this of course. > The comment will go to the bug, so I'd prefer to leave the decision > whether to re-open or not up to the QA guys, probably? yes that's enough. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Missing image warning
Yow, sorry Maxim - just saw this, I'm way behind on my mail. When I checked, it didn't have the image. Chris On Fri, Sep 12, 2014 at 11:00 PM, Maxim Monastirsky wrote: > On Friday 12 September 2014 21:11:16 Chris Sherlock wrote: > > I can't see where in the code it goes to a fallback theme. Any pointers? > Was surprised to discover that it's actually done at build time. Missing > images are simply copied from galaxy to any other zip. It's specified at > [1]. > Does your images_tango.zip have this svx/res/notcertificate_16.png inside? > > Maxim > > [1] > > http://opengrok.libreoffice.org/xref/core/postprocess/CustomTarget_images.mk#39 > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: stack-allocated Window subclasses
Oh, I just saw this email. I recently posted a gerrit change for review around FontCharMap, you can find it here: https://gerrit.libreoffice.org/#/c/11565/ I've never looked at what Reference actually does, but now that I do it seems that it relies on a class that exposes an acquire() and release() function - and a set function that I *think* is the equivalent of swap(). Seems very similar to what intrusive_ptr does. Am I correct in my understanding? Out of interest, what do smart pointers do, if anything, to polymorphism? If I have an intrusive_ptr to vcl::Window, then can I cast this to SystemWindow? Chris On Wed, Sep 24, 2014 at 2:19 AM, Michael Meeks wrote: > Hi Noel, > > On Tue, 2014-09-23 at 14:52 +0200, Noel Grandin wrote: > > Otherwise we should just standardise on boost::intrusive_ptr and remove > SvRef. > > Yep - my concern is only that boost::intrusive_ptr< Window > - is > some > horribly long horror =) and that having some semi-standard means of > having widget refs that are not so grim might be nicer: > > WindowRef xRef; > vs. boost::intrusive_ptr< Window > xRef; > vs. vcl::ref< Window > xRef; > > etc. but would love to hear other people's views; in general, I > think > fewer tokens for the mind to swallow when reading the bulk of the code > is a good thing. > > > This should be fixable if it doesn't already work - myself and sberg > > already did this for rtl::Reference. > > Nice =) > > > Mostly I guess we need to figure out where and when to destroy them - > > is it in the destructor, or in some other method specific to this task? > > Of course, the ideal is to migrate these stuff incrementally. To do > that, I'd suggest we use the new intrusive_ptr and destroy the Window in > the normal way at the end; but that we slowly migrate all explicit > 'delete' calls to be virtual dispose calls, and split out reference > releasing / cyclic references later. > > My hope is that all these non-heap Window's are leafs in the > hierarchy > anyhow and/or that we can clean them up without worrying about a proper > 'dispose' mechanism just now. > > Does that make sense ? > > ATB, > > Michael. > > -- > michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: binaryurp/source
binaryurp/source/reader.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5045400eb3ae5622d18e9a9b1b928d4ecc78bbf2
Author: Stephan Bergmann
Date: Wed Sep 24 12:44:55 2014 +0200
Replace use of o3tl::heap_ptr with std::unique_ptr
Change-Id: Idbcb1be271ccda1885728ec5a6a75cfaec15f6f5
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 92da485..3accf57 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -21,6 +21,7 @@
#include
#include
+#include
#include
#include "boost/scoped_ptr.hpp"
@@ -35,7 +36,6 @@
#include "com/sun/star/uno/XCurrentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "cppu/unotype.hxx"
-#include "o3tl/heap_ptr.hxx"
#include "rtl/byteseq.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
@@ -328,7 +328,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
}
break;
}
-o3tl::heap_ptr< IncomingRequest > req(
+std::unique_ptr< IncomingRequest > req(
new IncomingRequest(
bridge_, tid, oid, obj, type, functionId, synchronous,
memberTd,
setter, inArgs, ccMode, cc));
@@ -441,7 +441,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal,
sal_uInt8 flags1) {
switch (req.kind) {
case OutgoingRequest::KIND_NORMAL:
{
-o3tl::heap_ptr< IncomingReply > resp(
+std::unique_ptr< IncomingReply > resp(
new IncomingReply(exc, ret, outArgs));
uno_threadpool_putJob(
bridge_->getThreadPool(), tid.getHandle(), resp.get(), 0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/graphicfilter/data/png/fail/EDB-34720-1.png |binary 1 file changed New commits: commit 6990ec19679d837edae17497e1173f2dae46c947 Author: Caolán McNamara Date: Wed Sep 24 11:25:10 2014 +0100 add test case for EDB-34720 Change-Id: I9ef73811b93dfff502a2430a1e3e9aa3b46c9935 diff --git a/vcl/qa/cppunit/graphicfilter/data/png/fail/EDB-34720-1.png b/vcl/qa/cppunit/graphicfilter/data/png/fail/EDB-34720-1.png new file mode 100644 index 000..3165f2c Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/png/fail/EDB-34720-1.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
opening up the ESC call ...
Hi guys, Cf. the last ESC minutes, we're trying out opening up the ESC call to anyone interested out there, as such you are warmly invited (if you can make a phone-call) to hear what we get up to, ask questions at a suitable time in the agenda etc. Room number: 21 24 86 Thursdays at 16:00 central European time. All the best, Michael. Country Number Czech Republic +420 22 888 07 95 Germany +49 30 34044134 Finland +35 89 42 45 00 19 France (Paris) +33 170 743 070 Great Britain +44 333 202 00 22 Great Britain +44 1 777 29 56 08 Hungary +36 18 08 84 82 Italy (Milan) +39 02 87 212 000 Italy (Rome)+39 06 888 12 000 Japan +81 3 45 20 93 34 Netherlands +3 12 52 74 40 06 Norway +47 21 04 92 14 Poland +48 22 30 70 70 4 Portugal+351 30 88 00 624 Romania +40 333 63 000 3 Slovakia+421 2 33 45 66 16 Slovenia+386 16 00 14 01 South Africa+27 2 13 00 95 90 Spain +34 911 822 733 Sweden +46 8 40 30 96 98 USA (N.Y.) +1 347 416 5028 USA +1 917 200 9279 More numbers: https://wiki.documentfoundation.org/Talkyoo -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-15'
Tag 'cp-4.2-15' created by Andras Timar at 2014-09-24 11:09 -0700 cp-4.2-15 Changes since cp-4.2-9-99: --- 0 files changed --- ___ 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-15'
Tag 'cp-4.2-15' created by Andras Timar at 2014-09-24 11:09 -0700 cp-4.2-15 Changes since cp-4.2-9: Olivier R (1): French dictionary update: v5.2 --- fr_FR/README_fr.txt | 13 fr_FR/description.xml |2 fr_FR/fr.aff |14658 +++--- fr_FR/fr.dic |15695 ++ 4 files changed, 15644 insertions(+), 14724 deletions(-) --- ___ 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-15'
Tag 'cp-4.2-15' created by Andras Timar at 2014-09-24 11:09 -0700 cp-4.2-15 Changes since cp-4.2-6: Andras Timar (1): sync with libreoffice-4-2-5 branch --- source/cy/scp2/source/accessories.po | 18 source/cy/svx/source/unodialogs/textconversiondlgs.po | 9 source/cy/sw/source/ui/config.po | 14 source/de/officecfg/registry/data/org/openoffice/Office/UI.po | 6 source/de/svx/uiconfig/ui.po | 10 source/et/helpcontent2/source/text/swriter/01.po | 8 source/et/sw/source/ui/fldui.po| 10 source/fr/sd/uiconfig/sdraw/ui.po | 9 source/gl/scp2/source/accessories.po | 22 - source/gl/sfx2/source/dialog.po| 8 source/gl/sfx2/uiconfig/ui.po | 10 source/gl/svx/source/unodialogs/textconversiondlgs.po | 9 source/gl/sw/source/ui/inc.po | 14 source/gl/sw/uiconfig/swriter/ui.po| 10 source/id/cui/source/options.po| 10 source/id/cui/uiconfig/ui.po | 10 source/id/extensions/source/propctrlr.po | 10 source/id/filter/uiconfig/ui.po| 14 source/id/officecfg/registry/data/org/openoffice/Office/UI.po | 26 - source/id/sc/source/ui/drawfunc.po | 12 source/id/sc/source/ui/navipi.po | 10 source/id/sc/source/ui/src.po | 16 source/id/sd/source/ui/app.po | 40 - source/id/sd/source/ui/dlg.po | 18 source/id/sd/uiconfig/sdraw/ui.po | 16 source/id/sd/uiconfig/simpress/ui.po | 12 source/id/sfx2/source/appl.po | 20 source/nl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po | 9 source/nl/cui/uiconfig/ui.po | 6 source/nl/dbaccess/source/ui/dlg.po| 6 source/nl/extensions/source/abpilot.po | 13 source/nl/filter/source/pdf.po | 12 source/nl/helpcontent2/source/text/shared/guide.po | 8 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/nl/reportdesign/source/ui/dlg.po| 10 source/nl/sc/source/ui/StatisticsDialogs.po| 10 source/nl/sc/source/ui/dbgui.po| 14 source/nl/sc/source/ui/src.po | 18 source/nl/scaddins/source/analysis.po | 10 source/nl/starmath/source.po | 10 source/nn/helpcontent2/source/text/shared/guide.po | 204 +- source/pl/cui/source/dialogs.po| 10 source/pl/filter/source/config/fragments/filters.po| 10 source/pl/helpcontent2/source/text/sbasic/shared.po| 8 source/pl/helpcontent2/source/text/shared/00.po| 8 source/pl/helpcontent2/source/text/shared/01.po| 10 source/pl/helpcontent2/source/text/shared/optionen.po | 10 source/pl/sc/source/ui/styleui.po | 14 source/pl/sfx2/source/appl.po | 8 source/pl/svx/source/items.po | 16 source/pl/svx/source/stbctrls.po | 14 source/pl/svx/uiconfig/ui.po | 12 source/pl/sw/source/core/undo.po | 10 source/pl/sw/source/ui/dbui.po | 10 source/pl/sw/uiconfig/swriter/ui.po| 16 source/ru/chart2/uiconfig/ui.po| 10 source/sk/dbaccess/officecfg/registry/data/org/openoffice
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-15'
Tag 'cp-4.2-15' created by Andras Timar at 2014-09-24 11:09 -0700 cp-4.2-15 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: 3 commits - icon-themes/tango officecfg/registry sw/qa sw/uiconfig
icon-themes/tango/links.txt | 3 ++- officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3 +++ sw/qa/extras/htmlexport/htmlexport.cxx | 10 -- sw/uiconfig/swriter/toolbar/previewobjectbar.xml | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) New commits: commit ea89ff15ed52c70aa2606e76106ba4580a5c1d5b Author: Tomaž Vajngerl Date: Wed Sep 24 11:24:03 2014 +0200 Disable HTML any check which uses twip->pixel conversion on OSX Change-Id: Ifae32518aa503bfa8c912c18220bbbf28b76be09 diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index d04e34c..1c479a0 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -184,13 +184,19 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt") assertXPath(pDoc, "/html/body/p/a/font/img", "name", "Text"); assertXPath(pDoc, "/html/body/p/a/font/img", "alt", "Four colors"); assertXPath(pDoc, "/html/body/p/a/font/img", "align", "middle"); -#ifndef MACOSX // For some reason the hspace is "28" on OSX - disable this check for now + +// Probably the DPI in OSX is different and Twip -> Pixel conversion produces +// different results - so disable OSX for now. +// +// It would make sense to switch to use CSS and use "real world" units instead +// i.e. (style="margin: 0cm 1.5cm; width: 1cm; height: 1cm") +#ifndef MACOSX assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38"); assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19"); assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222"); assertXPath(pDoc, "/html/body/p/a/font/img", "height", "222"); -#endif assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3"); +#endif assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1"); } commit a37a8733609a59eccabf89b2ff67d5ee6bf194bb Author: Yousuf Philips Date: Mon Sep 22 05:37:06 2014 +0400 fdo#80654 - Add icon to 'Close Preview' button in Page Preview toolbar Change-Id: I287f8549b6bfb8435c6ad1daabbb8ac2c1a51c2b Reviewed-on: https://gerrit.libreoffice.org/11576 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index c14bf4e..d3f954e 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -149,7 +149,8 @@ cmd/lc_commentchangetracking.png cmd/lc_editdoc.png cmd/sc_commentchangetracking.png cmd/sc_editdoc.png cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png - +cmd/lc_closepreview.png cmd/lc_closedoc.png +cmd/sc_closepreview.png cmd/sc_closedoc.png # Duplicates cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 6154bf2..4d71def 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -983,6 +983,9 @@ Close Preview + + 1 + diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index e50a23c..e140b40 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -38,5 +38,5 @@ - + commit c5cacc506d8243b8278aa036cd4e6b2ccee65142 Author: Yousuf Philips Date: Tue Sep 23 07:19:34 2014 +0400 fdo#55903 - fixed zoom mode button tooltip for better understanding Change-Id: I42c5ad557c00d2db80e691332756a544651ab7de Reviewed-on: https://gerrit.libreoffice.org/11596 Reviewed-by: Maxim Monastirsky Tested-by: Maxim Monastirsky diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 4e2f83f..6e32a5e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1491,7 +1491,7 @@ - Zoom Tool + Zoom & Pan (CTRL to Zoom Out, SHIFT to Pan) 1 ___ 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/ww8export/data/redline-export-2.odt |binary
sw/qa/extras/ww8export/ww8export.cxx |9 -
sw/source/filter/ww8/ww8scan.cxx |9 ++---
3 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 705a8c226aee3e68db492083b7cf8b704335328b
Author: Caolán McNamara
Date: Tue Sep 23 20:35:50 2014 +0100
WW8PLCFMan::AdjustEnds deeply flawed concept wrt change tracking
The whole idea of clipping the char attributes to before the cr that word
uses
as the end of para marker is flawed from especially the perspective of
redlining which is a char property in word.
If the redline encompasses the newline in order to state that it is deleted,
then if the prop is clipped to before that newline then the end-of-para
doesn't
get marked as deleted
For now just remove the character attributes clipping from here to be as
conservative as possible.
Hopefully the ordering of processing start pap before start chp and end chp
before end pap and the other million improvements in the parser that came
about
after AdjustEnds was created avoids whatever problems were trying to be
worked
around here.
Change-Id: I5a72e462db2fff60f52b12c2125ea6ac363de695
diff --git a/sw/qa/extras/ww8export/data/redline-export-2.odt
b/sw/qa/extras/ww8export/data/redline-export-2.odt
new file mode 100644
index 000..2aca5ee
Binary files /dev/null and b/sw/qa/extras/ww8export/data/redline-export-2.odt
differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 184815d..cefd0db 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -349,7 +349,7 @@ DECLARE_WW8EXPORT_TEST(testRedlineExport1,
"redline-export-1.odt")
uno::Reference xParagraph = getParagraph(1);
uno::Reference xRunEnumAccess(xParagraph,
uno::UNO_QUERY);
uno::Reference xRunEnum =
xRunEnumAccess->createEnumeration();
-//there must be no redline information on the first line before or after
reloading
+//there must be no redline information on the first line before and after
reloading
while (xRunEnum->hasMoreElements())
{
uno::Reference xRun(xRunEnum->nextElement(),
uno::UNO_QUERY);
@@ -357,6 +357,13 @@ DECLARE_WW8EXPORT_TEST(testRedlineExport1,
"redline-export-1.odt")
}
}
+DECLARE_WW8EXPORT_TEST(testRedlineExport2, "redline-export-2.odt")
+{
+//there must be redline information on the first portion of the third
paragraph before and after reloading
+CPPUNIT_ASSERT_EQUAL(true, hasProperty(getRun(getParagraph(3), 1),
"RedlineType"));
+}
+
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index d1898fe..9c3d266 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4235,20 +4235,15 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
nLineEnd = pPap->nEndPos;// nLineEnd zeigt *hinter* das
pPap->nEndPos--;// Absatzende um 1 Zeichen verkuerzen
-// gibt es bereits ein CharAttr-Ende das auf das jetzige
-// Absatzende zeigt ? ... dann auch um 1 Zeichen verkuerzen
-if (pChp->nEndPos == nLineEnd)
-pChp->nEndPos--;
-
// gibt es bereits ein Sep-Ende, das auf das jetzige Absatzende
// zeigt ? ... dann auch um 1 Zeichen verkuerzen
if( pSep->nEndPos == nLineEnd )
pSep->nEndPos--;
}
}
-else if ( (&rDesc == pChp) || (&rDesc == pSep) )
+else if (&rDesc == pSep)
{
-// Char Adjust oder Sep Adjust Wenn Ende Char-Attr == Absatzende ...
+// Sep Adjust Wenn Ende Char-Attr == Absatzende ...
if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) )
rDesc.nEndPos--;// ... dann um 1 Zeichen verkuerzen
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
FontCharMap change - request for comment
Hi all, As many of you know, I'm particularly interested in VCL and how it fits together. One thing I've noticed is that a lot of VCL classes have their own built-in reference counting code. I am interested in changing this situation. In https://gerrit.libreoffice.org/#/c/11565/4 I used a shared_ptr, but I have since switched to use boost's intrusive_ptr I am interested in someone looking at my general approach. In a nutshell, I have kept a reference counter variable in FontCharMap, and merged ImplFontCharMap with FontCharMap. I have also used a typedef PtrFontCharMap, which is intrusive_ptr. I would love to see some comments, good or bad so that I can start rolling out this sort of thing to other parts of the VCL module. Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sw/uiconfig
icon-themes/galaxy/links.txt | 18 - icon-themes/tango/links.txt| 19 ++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu|6 +++ officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |3 - sw/uiconfig/swriter/toolbar/changes.xml| 18 - 5 files changed, 34 insertions(+), 30 deletions(-) New commits: commit 6332c643016ce4c4d254c8429a5eceae6664bf5c Author: Samuel Mehrbrodt Date: Wed Sep 24 10:36:38 2014 +0200 fdo#83955 Fix changes toolbar to display icons+text Change-Id: I88ab66f60fc477f0e1e33d4049af7721e9435272 diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index c5d321d..ebeb714 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -6,21 +6,3 @@ cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png cmd/lc_zoommode.png cmd/lc_zoomoptimal.png cmd/sc_zoommode.png cmd/sc_zoomoptimal.png -cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png -cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png -cmd/lc_trackchanges.png cmd/lc_recsave.png -cmd/sc_trackchanges.png cmd/sc_recsave.png -cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png -cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png -cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png -cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png -cmd/lc_accepttracedchange.png cmd/lc_zoomin.png -cmd/sc_accepttracedchange.png cmd/sc_zoomin.png -cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png -cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png -cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png -cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png -cmd/lc_commentchangetracking.png cmd/lc_editdoc.png -cmd/sc_commentchangetracking.png cmd/sc_editdoc.png -cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png -cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 9bfda77..c14bf4e 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -131,6 +131,25 @@ avmedia/res/av02048.png cmd/sc_open.png svx/res/id02.png cmd/sc_open.png cmd/lc_pagesetup.png cmd/lc_setdocumentproperties.png cmd/sc_pagesetup.png cmd/sc_setdocumentproperties.png +cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png +cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png +cmd/lc_trackchanges.png cmd/lc_recsave.png +cmd/sc_trackchanges.png cmd/sc_recsave.png +cmd/lc_previoustrackedchange.png cmd/lc_upsearch.png +cmd/sc_previoustrackedchange.png cmd/sc_upsearch.png +cmd/lc_nexttrackedchange.png cmd/lc_downsearch.png +cmd/sc_nexttrackedchange.png cmd/sc_downsearch.png +cmd/lc_accepttracedchange.png cmd/lc_zoomin.png +cmd/sc_accepttracedchange.png cmd/sc_zoomin.png +cmd/lc_rejecttracedchange.png cmd/lc_zoomminus.png +cmd/sc_rejecttracedchange.png cmd/sc_zoomminus.png +cmd/lc_protecttracechangemode.png cmd/lc_chainframes.png +cmd/sc_protecttracechangemode.png cmd/sc_chainframes.png +cmd/lc_commentchangetracking.png cmd/lc_editdoc.png +cmd/sc_commentchangetracking.png cmd/sc_editdoc.png +cmd/lc_accepttrackedchanges.png cmd/lc_insertobjectfloatingframe.png +cmd/sc_accepttrackedchanges.png cmd/sc_insertobjectfloatingframe.png + # Duplicates cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c0bd421..6154bf2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -184,11 +184,17 @@ ~Next Change + + 1 + Pr~evious Change + + 1 + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 05d318e..4dcc178 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -744,9 +744,6 @@ false - - 2 - diff --git a/sw/uiconfig/swriter/toolbar/changes.xml b/sw/uiconfig/swriter/toolbar/changes.xml index 1b7bf95..0b094ef 100644 --- a/sw/uiconfig/swriter/toolbar/changes.xml +++ b/sw/uiconfig/swriter/toolbar/changes.xml @@ -18,17 +18,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - - + + - - - - - + + + + + - - + + ___ Libr
[Libreoffice-commits] core.git: include/svl include/svtools
include/svl/svdde.hxx | 14 +++
include/svl/undo.hxx | 31 +++--
include/svtools/ivctrl.hxx | 82 ++---
3 files changed, 61 insertions(+), 66 deletions(-)
New commits:
commit 0e9aa656aa3ca12ae14e2c68473f1ae0264cd11a
Author: Florian Reisinger
Date: Wed Sep 24 09:26:20 2014 +0100
German comment translation.
Change-Id: I8c0e90eda94bc2304289cdf27b85cd57dbca0ef9
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 2890966..57f69a8 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -276,7 +276,7 @@ public:
virtual DdeData* Get( sal_uLong );
virtual boolPut( const DdeData* );
-virtual voidAdviseLoop( bool ); // AdviseLoop starten/stoppen
+virtual voidAdviseLoop( bool ); // Start / Stop AdviseLoop
};
@@ -293,11 +293,11 @@ public:
virtual DdeData* Get( sal_uLong );
virtual boolPut( const DdeData* );
virtual boolExecute( const OUString* );
-// evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
+// Eventually create a new item. return 0 -> Item creation failed
virtual boolMakeItem( const OUString& rItem );
-// es wird ein Warm-/Hot-Link eingerichtet. Return-Wert
-// besagt ob es geklappt hat
+
+// A Warm-/Hot-Link is created. Return true if successful
virtual boolStartAdviseLoop();
virtual boolStopAdviseLoop();
@@ -337,8 +337,8 @@ public:
voidNotifyClient( const OUString& );
boolIsSystemTopic();
-voidInsertItem( DdeItem* ); // fuer eigene Ableitungen!
-DdeItem*AddItem( const DdeItem& ); // werden kopiert !
+voidInsertItem( DdeItem* ); // For own superclasses
+DdeItem*AddItem( const DdeItem& ); // Will be cloned
voidRemoveItem( const DdeItem& );
const OUString& GetCurItem() { return aItem; }
const std::vector& GetItems() const { return aItems; }
@@ -359,7 +359,7 @@ class SVL_DLLPUBLIC DdeService
public:
virtual boolIsBusy();
virtual OUString GetHelp();
-// evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
+// Eventually creating a new item. return 0 -> Topic creation failed
virtual boolMakeTopic( const OUString& rItem );
protected:
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 2a53e47..f18ae84 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -151,15 +151,12 @@ struct SVL_DLLPUBLIC SfxUndoArray
really really have to! */
class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public
SfxUndoArray
-/* [Beschreibung]
-
-UndoAction zur Klammerung mehrerer Undos in einer UndoAction.
-Diese Actions werden vom SfxUndoManager verwendet. Dort
-wird mit < SfxUndoManager::EnterListAction > eine Klammerebene
-geoeffnet und mit wieder
-geschlossen. Redo und Undo auf SfxListUndoActions wirken
-Elementweise.
+/* [Explanation]
+UndoAction to composite multiple Undos in one UndoAction.
+These actions are used by SfxUndomanager. With <
SfxUndoManager::EnterListAction >
+you can go one composite level down and with <
SfxUndoManager::LeaveListAction > up again.
+Redo and Undo work element wise on SfxListUndoActions.
*/
{
public:
@@ -433,18 +430,16 @@ private:
class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction
-/* [Beschreibung]
-
-Die SfxLinkUndoAction dient zur Verbindung zweier SfxUndoManager. Die
-im ersten SfxUndoManager eingefuegten SfxUndoAction leiten ihr Undo und
Redo
-an den zweiten weiter, so dass ein Undo und Redo am ersten
-SfxUndoManager wie eine am zweiten wirkt.
+/* [Explanation]
-Die SfxLinkUndoAction ist nach dem Einfuegen der SfxUndoAction am
-zweiten SfxUndoManager einzufuegen. Waehrend der zweite SfxUndoManager
-vom ersten ferngesteuert wird, duerfen an ihm weder Actions eingefuegt
werden,
-noch darf Undo/Redo aufgerufen werden.
+SfxLinkUndoAction is used to link two SfxUndoManager. The Undo/Redos
inserted
+in the first SfxUndoManager redict their Undo/Redo to the second. With
this it
+does not matter, if the undo/redo initially was on the first or the second.
+After inserting SfxLinkUndoAction on the first SfxUndoManager, you have to
+insert it on the second as well. While the second SfxUndoManager is steered
+from the first, you must not insert neither Actions nor issue a undo/redo
+command to the second, while it is steered by the first.
*/
{
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index f336a98..5edd15f 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -36,27 +36,27 @@ class Image;
#define ICNVIEW_FLAG_SELECTED 0x0002
#define ICNVIEW_FLAG_FOCUSED0x0004
#define ICNVIEW_FLAG_IN_USE 0x0008
-#define ICNVI
[Bug 39631] add optimisation helpers
https://bugs.freedesktop.org/show_bug.cgi?id=39631 --- Comment #9 from Michael Meeks --- As you like; we have less and less C these days I guess, and IIRC we compile it as C++ (?) =) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39625] Make existing cppunittests work
https://bugs.freedesktop.org/show_bug.cgi?id=39625 --- Comment #16 from Commit Notification --- Tobias Madl committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=18cc5cb2fdb8bca18a6c55d0a165b749f6730420 fdo#39625 Delete unused cppunittests The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/bootstrap/bootstrap_process.cxx | 110 ---
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 901 -
sal/qa/rtl/bootstrap/rtl_Bootstrap.xsce| 24
3 files changed, 1035 deletions(-)
New commits:
commit 18cc5cb2fdb8bca18a6c55d0a165b749f6730420
Author: Tobias Madl
Date: Mon Sep 15 16:19:46 2014 +
fdo#39625 Delete unused cppunittests
As discussed with Stephan Bergmann, these files, which contained unused
cppunittests, could be removed.
Change-Id: I91844b96967e3c3e0e8367452f2dda420f479ffe
Signed-off-by: Stephan Bergmann
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
deleted file mode 100644
index 914e25f..000
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-#include
-#include "sal/main.h"
-#include
-#include
-#include
-
-using namespace ::rtl;
-
-// --- Main ---
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-{
-(void)argc;
-Bootstrap aBootstrap;
-//custom .ini/rc file
-Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) );
-OUString suValue;
-OUString suDefault( "mydefault" );
-int flag = atoi( argv[1] );
-
-switch( flag ) {
-case 1:
-// parameters may be passed by command line arguments
-aBootstrap.getFrom(
-OUString("UNO_SERVICES"),
-suValue );
-if ( suValue == "service.rdb" )
-{
-return 10;
-}
-else
-return 11;
-case 2:
-// parameters may be passed by ini file
-aBootstrap.getFrom(
-OUString("EXECUTABLE_RC"),
-suValue );
-if ( suValue == "true" )
-{
-return 20;
-}
-else
-return 21;
-case 3:
-// parameters may be passed by command line arguments
-aBootstrap.getFrom(
-OUString("QADEV_BOOTSTRAP"),
-suValue );
-if ( suValue == "sun&ms" )
-{
-return 30;
-}
-else
-return 31;
-case 4:
-// parameters may be passed by custom .ini/rc file
-aBs_custom.getFrom(
-OUString("RTLVALUE"),
-suValue );
-if ( suValue == "qadev17" )
-{
-return 40;
-}
-else
-return 41;
-case 5:
-// parameters may be passed by inheritance
-aBs_custom.getFrom(
-OUString("EXECUTABLE_RC"),
-suValue );
-if ( suValue == "true" )
-{
-return 50;
-}
-else
-return 51;
-default:
-// parameters may be passed by inheritance
-aBs_custom.getFrom(
-OUString("ABCDE"),
-suValue, suDefault );
-if ( suValue == "mydefault" )
-{
-return 60;
-}
-else
-return 61;
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
deleted file mode 100644
index a80d108..000
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ /dev/null
@@ -1,901 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
[Bug 39631] add optimisation helpers
https://bugs.freedesktop.org/show_bug.cgi?id=39631 --- Comment #8 from Stephan Bergmann --- (In reply to comment #7) > I just dug throught he commit log for glib =) I'd be inclined to simply > re-use G_LIKELY and G_UNLIKELY with a SAL prefix myself. That _G_BOOLEAN_EXPR trick would work. An alternative would be to restrict this to C++ and instead stick an explicit conversion to bool into the __builtin_expect call. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d801b901bfac152ed8d08e21822940d1588dfc32
Author: Tor Lillqvist
Date: Thu Apr 24 23:11:39 2014 +0300
Blind fix: writerfilter::TableManager used without template parameters
Change-Id: I351478d9dbde6f7459145b82a73fb5bb119a6bdb
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 1162387..8fe9fb3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -149,7 +149,7 @@ public:
bool isInCell()
{
-return TableManager::isInCell();
+return DomainMapperTableManager_Base_t::isInCell();
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Compile error
On Tue, Sep 23, 2014 at 06:28:59PM +0200, Mihály Palenik wrote: > workdir/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.a(liblangtag_la-lt-utils.o): > In function `lt_getenv': > workdir/UnpackedTarball/langtag/liblangtag/lt-utils.c:57: undefined > reference to `__secure_getenv' Does it happen if you do 'make clean && make', not just 'make'? signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/com
include/com/sun/star/uno/Any.hxx |8
1 file changed, 8 deletions(-)
New commits:
commit c09a0d8516b7a53e8e9dd802ba63c17ba6ee20d3
Author: Caolán McNamara
Date: Tue Sep 23 20:53:31 2014 +0100
fix build with coverity 7.0.2 and gcc 4.8.3
these "forbid use with ambiguous type" things already appear with deleted
markup in Any.h which is included by Any.hxx
WARNING: cov-emit returned with code 2
"coverity/include/com/sun/star/uno/Any.hxx", line 163: error #1810:
function
"com::sun::star::uno::Any::has() const [with T=sal_uInt16]"
(declared at line 244 of
"coverity/include/com/sun/star/uno/Any.h")
cannot be specialized because it is deleted
bool Any::has() const;
^
"coverity/include/com/sun/star/uno/Any.hxx", line 604: error #1810:
function
"com::sun::star::uno::Any::get() const [with T=sal_uInt16]"
(declared at line 243 of
"coverity/include/com/sun/star/uno/Any.h")
cannot be specialized because it is deleted
sal_uInt16 Any::get() const;
Change-Id: I7d8b8ee1015c3e598143a2240297ce81a9e36987
Reviewed-on: https://gerrit.libreoffice.org/11611
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index edb0da4..8d5b7dd 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -158,11 +158,6 @@ inline bool Any::has() const
(uno_ReleaseFunc) cpp_release );
}
-// not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
-template <>
-bool Any::has() const;
-
-
inline bool Any::operator == ( const Any & rAny ) const
{
return ::uno_type_equalData(
@@ -599,9 +594,6 @@ T Any::get() const
}
return value;
}
-// not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
-template <>
-sal_uInt16 Any::get() const;
/**
Support for Any in std::ostream (and thus in CPPUNIT_ASSERT or SAL_INFO
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 5 commits - configure.ac Makefile.in sc/source sw/qa writerfilter/source
Makefile.in |1 +
configure.ac |2 +-
dev/null |binary
sc/source/ui/dbgui/filtdlg.cxx|5 -
sc/source/ui/dbgui/validate.cxx |3 ++-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 -
writerfilter/source/dmapper/GraphicImport.cxx |7 ---
writerfilter/source/dmapper/PropertyIds.cxx |1 -
writerfilter/source/dmapper/PropertyIds.hxx |1 -
9 files changed, 8 insertions(+), 21 deletions(-)
New commits:
commit 71fc278fd98b4439fc1119b591107f0608ebe3af
Author: Tor Lillqvist
Date: Wed Sep 24 10:10:51 2014 +0300
Bump patch (build) number
Change-Id: I075150f72ffc5d95eb73da048808ba14b02bcccd
diff --git a/configure.ac b/configure.ac
index 3452a1f..a297829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.3.3.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.3.3.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 51b96c1d8c406f4544ab299d93b311a4451af5cd
Author: Laurent Balland-Poirier
Date: Mon Sep 22 08:07:01 2014 +0200
fdo#83848 Add GetAddressConvention to RefButton
Reviewed-on: https://gerrit.libreoffice.org/11578
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
(cherry picked from commit 2c7595a911c3b0102162c2ad9cef4a84538b66f8)
Change-Id: I20d633909d3c13bf49998a6cca054ab125b6c991
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index df23c4b..e858bdf 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -47,6 +47,7 @@
#include
#include
#include "reffact.hxx"
+#include
/* Position indexes for "Allow" list box.
They do not map directly to ScValidationMode and can safely be modified to
@@ -105,7 +106,7 @@ void ScTPValidationValue::SetReferenceHdl( const
ScRange&rRange , ScDocument* pD
if ( m_pRefEdit )
{
-OUString aStr(rRange.Format(SCR_ABS_3D, pDoc));
+OUString aStr(rRange.Format(SCR_ABS_3D, pDoc,
pDoc->GetAddressConvention()));
m_pRefEdit->SetRefString( aStr );
}
}
commit 39e3dc4efe321fcff28862141c4d410f8a4b81d2
Author: David Ostrovsky
Date: Wed Sep 24 02:11:28 2014 +0200
fdo#65281 Empty/Not empty doesn't work in columns with date format
"Empty" and "Not empty" predicates were unconditionally overriden
in filter dialog for date format columns. Rectify it by preventing
the overriding for these functions.
Test Plan:
* open calc document
* define column with date format
* put some data and let some columns empty
* apply standard filter on date column with "Not empty" function
* verify that rows with non empty columns still visible
Change-Id: I2111c5a6b6350cab63173d42419069813d1137b6
Reviewed-on: https://gerrit.libreoffice.org/11613
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
(cherry picked from commit 551ee32dfaaddd2aa48efebaefab0730474b656d)
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index b6ff4e1..a19b958 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -1078,15 +1078,18 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
bool bDoThis = (pLbField->GetSelectEntryPos() != 0);
rEntry.bDoQuery = bDoThis;
+bool bByEmptyOrNotByEmpty = false;
if ( rEntry.bDoQuery || maRefreshExceptQuery[nQE] )
{
if ( aStrEmpty.equals(aStrVal) )
{
+bByEmptyOrNotByEmpty = true;
rEntry.SetQueryByEmpty();
}
else if ( aStrNotEmpty.equals(aStrVal) )
{
+bByEmptyOrNotByEmpty = true;
rEntry.SetQueryByNonEmpty();
}
else
@@ -1106,7 +1109,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos();
rEntry.eOp = eOp;
-if (maHasDates[nQE])
+if (maHasDates[nQE] && !bByEmptyOrNotByEmpty)
rItem.meType = ScQueryEntry::ByDate;
}
}
commit c892ec1bc259ee3587a2471f58df35b2f231a6f8
Author: Andras Timar
Date: Tue Sep 23 23:40:56 2014 +0200
Revert "handle docx's w:anchor layoutInCell attribute (bnc#891663)"
This reverts commit 2a632bb30f78f02042ce333d426468087639305b.
diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
deleted file mode 100644
index d5f057e..000
Binary files a
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/button.hxx| 13 +-
vcl/source/control/button.cxx | 51 ++
vcl/source/window/builder.cxx |2 +
3 files changed, 65 insertions(+), 1 deletion(-)
New commits:
commit 0a56da5b110d6a3329ed7ebf296856f839e9980c
Author: Jan Holesovsky
Date: Wed Sep 24 09:06:18 2014 +0200
vcl button: Allow automatic handling of UNO commands (like .uno:Something).
Change-Id: I71c00286dde2e5a01a7a592305c1790f1ed63a93
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 7a96232..13fd506 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -42,7 +42,10 @@ class VCL_DLLPUBLIC Button : public Control
{
private:
ImplCommonButtonData *mpButtonData;
-Link maClickHdl;
+Link maClickHdl;
+
+/// Command URL (like .uno:Save) in case the button should handle it.
+OUString maCommand;
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE Button (const Button &);
@@ -72,6 +75,9 @@ public:
voidSetClickHdl( const Link& rLink ) { maClickHdl = rLink;
}
const Link& GetClickHdl() const { return maClickHdl; }
+/// Setup handler for UNO commands so that commands like .uno:Something
are handled automagically by this button.
+voidSetCommandHandler(const OUString& aCommand);
+
static OUString GetStandardText( StandardButtonType eButton );
boolSetModeImage( const Image& rImage );
@@ -87,6 +93,11 @@ public:
boolIsSmallSymbol() const;
voidSetSmallSymbol(bool bSmall = true);
virtual boolset_property(const OString &rKey, const OString
&rValue) SAL_OVERRIDE;
+
+protected:
+
+/// Handler for click, in case we want the button to handle uno commands
(.uno:Something).
+static long dispatchCommandHandler(void *, void *pCaller);
};
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index cef9d0d..1ee4014 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -41,6 +41,16 @@
#include
#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+using namespace css;
+
#define PUSHBUTTON_VIEW_STYLE (WB_3DLOOK |\
WB_LEFT | WB_CENTER | WB_RIGHT | \
WB_TOP | WB_VCENTER | WB_BOTTOM | \
@@ -94,6 +104,12 @@ Button::~Button()
delete mpButtonData;
}
+void Button::SetCommandHandler(const OUString& aCommand)
+{
+maCommand = aCommand;
+SetClickHdl(Link(NULL, dispatchCommandHandler));
+}
+
void Button::Click()
{
ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, maClickHdl, this
);
@@ -583,6 +599,41 @@ bool Button::set_property(const OString &rKey, const
OString &rValue)
return true;
}
+long Button::dispatchCommandHandler(void *, void *pCaller)
+{
+const Button *pButton = reinterpret_cast(pCaller);
+if (pButton == NULL)
+return 0;
+
+// Target where we will execute the .uno: command
+uno::Reference xContext =
::comphelper::getProcessComponentContext();
+uno::Reference xDesktop =
frame::Desktop::create(xContext);
+
+uno::Reference xFrame(xDesktop->getActiveFrame());
+if (!xFrame.is())
+xFrame = uno::Reference(xDesktop, uno::UNO_QUERY);
+
+uno::Reference xDispatchProvider(xFrame,
uno::UNO_QUERY);
+if (!xDispatchProvider.is())
+return 0;
+
+util::URL aCommandURL;
+aCommandURL.Complete = pButton->maCommand;
+uno::Reference xParser =
util::URLTransformer::create(xContext);
+xParser->parseStrict(aCommandURL);
+
+uno::Reference xDisp =
xDispatchProvider->queryDispatch(aCommandURL, OUString(), 0);
+if (!xDisp.is())
+return 0;
+
+// And do the work...
+xDisp->dispatch(aCommandURL, uno::Sequence());
+
+return 1;
+}
+
+
+
void PushButton::ImplInitPushButtonData()
{
mpWindowImpl->mbPushButton= true;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e0c71e9..a66ad77 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -833,6 +833,8 @@ namespace
Image aImage(VclBuilder::getCommandImage(aCommand, /* bLarge = */
false, xContext, rFrame, aModuleId));
pButton->SetModeImage(aImage);
+
+pButton->SetCommandHandler(aCommand);
}
Button* extractStockAndBuildPushButton(vcl::Window *pParent,
VclBuilder::stringmap &rMap)
___
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/ConversionHelper.cxx | 22
writerfilter/source/dmapper/ConversionHelper.hxx |1
writerfilter/source/dmapper/DomainMapper.cxx | 107 +++
3 files changed, 36 insertions(+), 94 deletions(-)
New commits:
commit 0bcd32da2efd287bbab51e335b382ec27e023644
Author: Miklos Vajna
Date: Wed Sep 24 09:00:34 2014 +0200
Unused writerfilter::dmapper::ConversionHelper::MakeBorderLine() variant
Change-Id: Idbf7f6b8a1ec395c229e2ff6c173b8b0a6262977
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index d2dd41e..920ec4e 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -36,28 +36,6 @@ namespace writerfilter {
namespace dmapper{
namespace ConversionHelper{
-sal_Int32 MakeBorderLine( sal_Int32 nSprmValue, table::BorderLine2& rToFill )
-{
-//TODO: Lines are always solid
-//Border
-//borders are defined as:
-// 0x XX XX XX XX
-//|| || || ||
-//|| || || Line width in 1/8 pt
-//|| || ||
-//|| || --- Line type: 0 - none 1 - single ... 25 - engrave 3D
and 64 - 230 page borders
-//|| ||
-//|| -- Line color
-//||
-// - seven bits line space
-//-- first bit: with shading
-sal_Int16 nLineThicknessTwip = (sal_Int16)((nSprmValue & 0xff) * 20)/8L ;
-sal_Int32 nLineType = ((nSprmValue & 0xff00) >> 8);
-sal_Int32 nLineColor= (nSprmValue & 0xff)>>16;
-sal_Int32 nLineDistance = (((nSprmValue & 0x3f00)>>24) * 2540 +
36)/72L;
-MakeBorderLine( nLineThicknessTwip, nLineType, nLineColor, rToFill, false);
-return nLineDistance;
-}
void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType,
sal_Int32 nLineColor,
table::BorderLine2& rToFill, bool
bIsOOXML )
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx
b/writerfilter/source/dmapper/ConversionHelper.hxx
index 596237c..7a49663 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -36,7 +36,6 @@ namespace dmapper{
namespace ConversionHelper{
// create a border line and return the distance value
-sal_Int32 MakeBorderLine( sal_Int32 nSprmValue,
::com::sun::star::table::BorderLine2& rToFill );
void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType,
sal_Int32 nLineColor,
::com::sun::star::table::BorderLine2& rToFill,
bool bIsOOXML );
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6d07ca6..2fe97d9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1219,83 +1219,48 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
case NS_ooxml::LN_CT_PBdr_bottom:
case NS_ooxml::LN_CT_PBdr_right:
case NS_ooxml::LN_CT_PBdr_between:
+{
+writerfilter::Reference::Pointer_t pProperties =
rSprm.getProps();
+if( pProperties.get())
{
-//in binary format the borders are directly provided in OOXML they
are inside of properties
-if( IsOOXMLImport() || IsRTFImport() )
+BorderHandlerPtr pBorderHandler( new BorderHandler( true ) );
+pProperties->resolve(*pBorderHandler);
+PropertyIds eBorderId = PropertyIds( 0 );
+PropertyIds eBorderDistId = PropertyIds( 0 );
+switch( nSprmId )
{
-writerfilter::Reference::Pointer_t pProperties =
rSprm.getProps();
-if( pProperties.get())
-{
-BorderHandlerPtr pBorderHandler( new BorderHandler( true )
);
-pProperties->resolve(*pBorderHandler);
-PropertyIds eBorderId = PropertyIds( 0 );
-PropertyIds eBorderDistId = PropertyIds( 0 );
-switch( nSprmId )
-{
-case NS_ooxml::LN_CT_PBdr_top:
-eBorderId = PROP_TOP_BORDER;
-eBorderDistId = PROP_TOP_BORDER_DISTANCE;
-break;
-case NS_ooxml::LN_CT_PBdr_left:
-eBorderId = PROP_LEFT_BORDER;
-eBorderDistId = PROP_LEFT_BORDER_DISTANCE;
-break;
-case NS_ooxml::LN_CT_PBdr_bottom:
-eBorderId = PROP_BOTTOM_BORDER ;
-eBorderDistId = PROP_BOTTOM_BORDER_DISTANCE;
-break;
-case NS_ooxml::LN_CT_PBdr_right:
-
