LibreOffice Gerrit News for core on 2014-08-07
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Convert PAGE_LDAP to .ui in https://gerrit.libreoffice.org/10799 from Mihály Palenik about module dbaccess + Convert PAGE_ADO and PAGE_MYSQL_ODBC to .ui in https://gerrit.libreoffice.org/10798 from Mihály Palenik about module dbaccess + Remove redundant inclusions of header cppuhelper/shlib.h in https://gerrit.libreoffice.org/10797 from Matthew Pottage about module cli_ure, cppuhelper + [API CHANGE] Removed two cppuhelper deprecated headers. in https://gerrit.libreoffice.org/10783 from Matthew Pottage about module cli_ure, cppuhelper, filter, include, odk + fdo#70625 Add --cat parameter to make git diffs pretty in https://gerrit.libreoffice.org/10623 from Deena P. F. about module desktop + fix external/coinmp on OSX: bad symlinking in https://gerrit.libreoffice.org/10614 from Douglas Mencken about module external + vcl/source/opengl/OpenGLContext.cxx: fix build for OSX 10.6 in https://gerrit.libreoffice.org/10592 from Douglas Mencken about module vcl + OSX: drop -malign-natural flag for non-clang compilers in https://gerrit.libreoffice.org/10479 from Douglas Mencken about module solenv + l10ntools: fixes and improvements for transex3 executable in https://gerrit.libreoffice.org/10212 from Douglas Mencken about module l10ntools + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji about module sw End of freshness + XStyleLoader2 loadStylesFromDocument - unit tests in https://gerrit.libreoffice.org/10755 from Laurent Godard about module include, sc, test * Merged changes on master for project core changed in the last 25 hours: + deleted TP_LAYOUT resource in https://gerrit.libreoffice.org/10784 from Szymon Kłos + RID_SCDLG_CONFLICTS conversion to .ui in https://gerrit.libreoffice.org/10778 from Szymon Kłos + DLG_MAILMERGE conversion to .ui in https://gerrit.libreoffice.org/10753 from Szymon Kłos + fdo#82151 when constructing column object, replace m_aCurrentRow by a fun in https://gerrit.libreoffice.org/10792 from Lionel Elie Mamane + Don't leak the previous cache in https://gerrit.libreoffice.org/10793 from Lionel Elie Mamane + TAB_WIZ_TYPE_SELECT and TAB_WIZ_NAME_MATCHING conversion to .ui in https://gerrit.libreoffice.org/10776 from Szymon Kłos + Convert PAGE_ODBC to .ui in https://gerrit.libreoffice.org/10787 from Mihály Palenik + Kill XSUN Xinerama support in https://gerrit.libreoffice.org/10756 from Riccardo Magliocchetti + Convert PAGE_MYSQL_JDBC and PAGE_ORACLE_JDBC to .ui in https://gerrit.libreoffice.org/10785 from Mihály Palenik + Related fdo#69006: Reintroduce some height calculation back. in https://gerrit.libreoffice.org/10499 from Jan Holesovsky + Convert PAGE_DBASE to .ui in https://gerrit.libreoffice.org/10777 from Mihály Palenik * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Rel fdo#48068: fix errors when 2 decimals in svg path position in https://gerrit.libreoffice.org/10544 from Joren De Cuyper + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad 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-commits] core.git: configure.ac Makefile.in oox/source README.cross
Makefile.in | 14 -- README.cross |4 ++-- configure.ac |4 ++-- oox/source/drawingml/customshapes/README |6 +++--- 4 files changed, 7 insertions(+), 21 deletions(-) New commits: commit 0acc3300f14e7f961bc165f58e97d1f35164d781 Author: Tor Lillqvist t...@collabora.com Date: Thu Aug 7 09:04:45 2014 +0300 If dev-install is obsolete, why have it at all? Replace mentions of it in a few (dcumentation) places with test-install. Change-Id: I6fc8e58fa5813b05de16feec35215c83e0e45834 diff --git a/Makefile.in b/Makefile.in index 028c55c..0c9893c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -277,20 +277,6 @@ install-strip: @$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR)) endif # !MACOSX -dev-install: - @echo echo dev-install is obsolete! Just build with \make check\ and run -ifeq ($(OS),MACOSX) - @echo open instdir/$(PRODUCTNAME).app - @echo - @echo To debug: gdb instdir/$(PRODUCTNAME).app/Contents/MacOS/soffice -else - @echo instdir/program/soffice -endif - @echo - @echo (only if you have good reason to test an actual installation: make test-install) - @echo - @false - test-install: build @rm -rf $(TESTINSTALLDIR) @mkdir -p $(TESTINSTALLDIR) diff --git a/README.cross b/README.cross index cfeaadc..5ad963f 100644 --- a/README.cross +++ b/README.cross @@ -220,9 +220,9 @@ TODO: others; would be best to avoid that if at all possible (using a free cab implementation, part of Wine or something) - MSI generation - - if at all possible, the make dev-install installation (with links + - if at all possible, the make test-install installation (with links back to the build) should be done so that it would be directly -executable via wine after doing make dev-install :-) +executable via wine after doing make test-install :-) - runtime - no idea if the entire thing works after the installation at all; I diff --git a/configure.ac b/configure.ac index 3aadd12..17c8d3f 100644 --- a/configure.ac +++ b/configure.ac @@ -9868,7 +9868,7 @@ if test $_os = WINNT -a $cross_compiling != yes; then if test $WITH_MINGW = yes; then AC_PATH_PROG([UUIDGEN], [uuid]) if test -z $UUIDGEN; then -AC_MSG_WARN([uuid is needed for dev-install]) +AC_MSG_WARN([uuid is needed for test-install]) fi else # presence is already tested above in the WINDOWS_SDK_HOME check @@ -9878,7 +9878,7 @@ if test $_os = WINNT -a $cross_compiling != yes; then else AC_PATH_PROG([UUIDGEN], [uuidgen]) if test -z $UUIDGEN; then -AC_MSG_WARN([uuid is needed for dev-install]) +AC_MSG_WARN([uuid is needed for test-install]) fi fi diff --git a/oox/source/drawingml/customshapes/README b/oox/source/drawingml/customshapes/README index 0b3ef8f..e537c24 100755 --- a/oox/source/drawingml/customshapes/README +++ b/oox/source/drawingml/customshapes/README @@ -10,9 +10,9 @@ set -o errexit -# To re-generate the code, you need to be on Linux (I think). You need -# to have done a make dev-install. oox needs to be build with -# dbglevel=2 so that DEBUG is defined. +# To re-generate the code, you need to be on Linux (I think). You +# might need to have done a make test-install. oox needs to be build +# with dbglevel=2 so that DEBUG is defined. make oox.clean make oox dbglevel=2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salprn-gtk.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 1d7751dd7d055c13324ff714523905e95e44fd4c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 08:55:56 2014 +0200 including gtk/gtkunixprint.h appears unnecessary ...and at least gtk2-devel-2.10.4-30.el5, while new enough to cause ENABLE_GTK_PRINT=TRUE, does not contain /usr/include/gtk-unix-print-2.0/gtk/gtkunixprint.h Change-Id: I6ff98e0c67047c0d8c35cfcad45be47ff09ca97a diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 0251ffd..2056a13 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -21,7 +21,6 @@ #include vcl/window.hxx #include gtk/gtk.h -#include gtk/gtkunixprint.h #include comphelper/processfactory.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/dbadmin.hrc |5 -
dbaccess/source/ui/dlg/dbadmin.src | 93 ---
dbaccess/source/ui/dlg/detailpages.cxx | 72 +-
dbaccess/source/ui/dlg/detailpages.hxx | 14 --
dbaccess/uiconfig/ui/ldappage.ui | 161 +
6 files changed, 192 insertions(+), 154 deletions(-)
New commits:
commit 2159107594e2e4665e8d0724a56000d3be30d11e
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Wed Aug 6 22:02:43 2014 +0200
Convert PAGE_LDAP to .ui
Conflicts:
dbaccess/source/ui/dlg/dbadmin.src
Change-Id: I2655cc1d58c87a254c7074682fd7814e4d00fe73
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 289cd48..8a45cf1 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/jdbcconnectionpage \
dbaccess/uiconfig/ui/joindialog \
dbaccess/uiconfig/ui/ldapconnectionpage \
+dbaccess/uiconfig/ui/ldappage \
dbaccess/uiconfig/ui/migratepage \
dbaccess/uiconfig/ui/mysqlnativepage \
dbaccess/uiconfig/ui/mysqlnativesettings \
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc
b/dbaccess/source/ui/dlg/dbadmin.hrc
index 4e1dcc8..5fa069f 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -24,21 +24,16 @@
#define FT_OPTIONS 5
#define FT_HOSTNAME 10
-#define FT_BASEDN 11
#define FT_PORTNUMBER 12
-#define FT_LDAPROWCOUNT 13
#define ET_OPTIONS 3
#define ET_HOSTNAME 5
-#define ET_BASEDN 6
-#define CB_USESSL 3
#define CB_USECATALOG 4
#define TLB_ACTIONS 1
#define NF_PORTNUMBER 1
-#define NF_LDAPROWCOUNT 2
#endif // _DBAUI_DBADMIN_HRC_
diff --git a/dbaccess/source/ui/dlg/dbadmin.src
b/dbaccess/source/ui/dlg/dbadmin.src
index f81b75a..e67416d 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -77,99 +77,6 @@ String STR_DATABASE_TYPE_CHANGE
Text [ en-US ] = Database properties ;
};
-TabPage PAGE_ADO
-{
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_PAGE_ADO;
-AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
-};
-
-TabPage PAGE_MYSQL_ODBC
-{
-HelpID = dbaccess:TabPage:PAGE_MYSQL_ODBC;
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-
-AUTO_CHARSET( UNRELATED_CONTROLS, PAGE_X )
-};
-
-TabPage PAGE_LDAP
-{
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_PAGE_LDAP;
-
-FixedLine FL_SEPARATOR1
-{
-Pos = MAP_APPFONT ( 4 , UNRELATED_CONTROLS ) ;
-Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = Connection Settings;
-};
-
-FixedText FT_BASEDN
-{
-Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + RELATED_CONTROLS +
FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = ~Base DN;
-};
-Edit ET_BASEDN
-{
-TabStop = TRUE ;
-Border = TRUE ;
-HelpId = HID_DSADMIN_LDAP_BASEDN;
-
-Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS + RELATED_CONTROLS +
FIXEDTEXT_HEIGHT -1 ) ;
-Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
-};
-CheckBox CB_USESSL
-{
-Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS +
2*FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( PAGE_X - 12 , CHECKBOX_HEIGHT ) ;
-Text [ en-US ] = Use secure connection (SSL);
-HelpId = HID_DSADMIN_USESSL_LDAP;
-};
-
-FixedText FT_PORTNUMBER
-{
-Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + RELATED_CONTROLS +
2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = ~Port number;
-};
-NumericField NF_PORTNUMBER
-{
-TabStop = TRUE ;
-Border = TRUE ;
-HelpId = HID_DSADMIN_LDAP_PORTNUMBER;
-NoThousandSep = TRUE;
-
-Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS +
2*FIXEDTEXT_HEIGHT-1 + CHECKBOX_HEIGHT) ;
-Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
-};
-FixedText FT_LDAPROWCOUNT
-{
-Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + RELATED_CONTROLS +
3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT ) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = Maximum number of ~records;
-};
-NumericField NF_LDAPROWCOUNT
-{
-TabStop = TRUE ;
-Border = TRUE ;
-HelpId =
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/detailpages.cxx |4 -
dbaccess/uiconfig/ui/autocharsetpage.ui | 81
3 files changed, 84 insertions(+), 2 deletions(-)
New commits:
commit b6b77711bb3f3a4293a203a151b2de7bc39cba5a
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Wed Aug 6 21:07:00 2014 +0200
Convert PAGE_ADO and PAGE_MYSQL_ODBC to .ui
Conflicts:
dbaccess/source/ui/dlg/dbadmin.src
Change-Id: Idaba7ea38b8ca6b7d0d9cc9599e9a76836573086
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 8a45cf1..e30fc52 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/applycolpage \
dbaccess/uiconfig/ui/authentificationpage \
+dbaccess/uiconfig/ui/autocharsetpage \
dbaccess/uiconfig/ui/backuppage \
dbaccess/uiconfig/ui/choosedatasourcedialog \
dbaccess/uiconfig/ui/collectionviewdialog \
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx
b/dbaccess/source/ui/dlg/detailpages.cxx
index 165ef84..4bf718b 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -320,7 +320,7 @@ namespace dbaui
// OAdoDetailsPage
OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet
_rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs,
CBTP_USE_CHARSET )
+:OCommonBehaviourTabPage(pParent, AutoCharset,
dbaccess/ui/autocharsetpage.ui, _rCoreAttrs, CBTP_USE_CHARSET )
{
}
@@ -433,7 +433,7 @@ namespace dbaui
}
// OMySQLODBCDetailsPage
OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( Window* pParent, const
SfxItemSet _rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_MYSQL_ODBC, _rCoreAttrs,
CBTP_USE_CHARSET )
+:OCommonBehaviourTabPage(pParent, AutoCharset,
dbaccess/ui/autocharsetpage.ui, _rCoreAttrs, CBTP_USE_CHARSET )
{
}
diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui
b/dbaccess/uiconfig/ui/autocharsetpage.ui
new file mode 100644
index 000..8954f02
--- /dev/null
+++ b/dbaccess/uiconfig/ui/autocharsetpage.ui
@@ -0,0 +1,81 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+ !-- interface-requires LibreOffice 1.0 --
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkBox id=AutoCharset
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+property name=border_width6/property
+property name=orientationvertical/property
+property name=spacing12/property
+child
+ object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+ object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+ object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=spacing6/property
+child
+ object class=GtkLabel id=charsetlabel
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yes_Character
set/property
+property name=use_underlineTrue/property
+property name=mnemonic_widgetcharset/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=dbulo-CharSetListBox id=charset
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=hexpandTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+ /packing
+/child
+ /object
+/child
+ /object
+/child
+child type=label
+ object class=GtkLabel
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/CRowSetDataColumn.cxx | 13 +
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 174 +
2 files changed, 106 insertions(+), 81 deletions(-)
New commits:
commit 90b09303ef4f9163428107be7b8db23022ce10b7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 09:40:02 2014 +0200
Tunnel SQLException through getPropertyValue
Regression introduced with 03a2b4a80c5854bcb8520f2a43e485b98e3eba8f
fdo#82151
when constructing column object, replace m_aCurrentRow by a function, where
the other call to m_pGetValue in ORowSetDataColumn::fireValueChange appears
OK,
as ORowSetBase::firePropertyChange already wraps the fireValueChange calls
in a
try--catch.
Change-Id: I527cc35ae120cf083f7c69a9a23526839a2bbddb
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index a047725..50ff4ad 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -22,6 +22,7 @@
#include dbastrings.hrc
#include apitools.hxx
#include comphelper/types.hxx
+#include cppuhelper/exc_hlp.hxx
#include cppuhelper/typeprovider.hxx
#include com/sun/star/beans/PropertyAttribute.hpp
#include tools/debug.hxx
@@ -105,7 +106,17 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue(
Any rValue, sal_Int32 nH
{
if ( PROPERTY_ID_VALUE == nHandle )
{
-rValue = m_pGetValue(m_nPos).makeAny();
+try
+{
+rValue = m_pGetValue(m_nPos).makeAny();
+}
+catch (css::sdbc::SQLException e)
+{
+css::uno::Any a(cppu::getCaughtException());
+throw css::lang::WrappedTargetException(
+wrapped css::sdbc::SQLException: + e.Message,
+css::uno::Referencecss::uno::XInterface(), a);
+}
}
else if ( PROPERTY_ID_LABEL == nHandle !m_sLabel.isEmpty() )
rValue = m_sLabel;
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 26134b2..34f12dc 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1506,82 +1506,83 @@ void SAL_CALL
OSingleSelectQueryComposer::setStructuredHavingClause( const Seque
void OSingleSelectQueryComposer::setConditionByColumn( const Reference
XPropertySet column, bool andCriteria
,::std::mem_fun1_tbool,OSingleSelectQueryComposer,const OUString
_aSetFunctor,sal_Int32 filterOperator)
{
-::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
-
-if ( !column.is()
-|| !column-getPropertySetInfo()-hasPropertyByName(PROPERTY_VALUE)
-|| !column-getPropertySetInfo()-hasPropertyByName(PROPERTY_NAME)
-|| !column-getPropertySetInfo()-hasPropertyByName(PROPERTY_TYPE))
-throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,Any()
);
+try
+{
+::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
-sal_Int32 nType = 0;
-column-getPropertyValue(PROPERTY_TYPE) = nType;
-sal_Int32 nSearchable = dbtools::getSearchColumnFlag(m_xConnection,nType);
-if(nSearchable == ColumnSearch::NONE)
-throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_SEARCHABLE),*this,SQLSTATE_GENERAL,1000,Any()
);
+if ( !column.is()
+ ||
!column-getPropertySetInfo()-hasPropertyByName(PROPERTY_VALUE)
+ || !column-getPropertySetInfo()-hasPropertyByName(PROPERTY_NAME)
+ ||
!column-getPropertySetInfo()-hasPropertyByName(PROPERTY_TYPE))
+throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,Any()
);
-::osl::MutexGuard aGuard( m_aMutex );
+sal_Int32 nType = 0;
+column-getPropertyValue(PROPERTY_TYPE) = nType;
+sal_Int32 nSearchable =
dbtools::getSearchColumnFlag(m_xConnection,nType);
+if(nSearchable == ColumnSearch::NONE)
+throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_SEARCHABLE),*this,SQLSTATE_GENERAL,1000,Any()
);
-OUString aName;
-column-getPropertyValue(PROPERTY_NAME) = aName;
+::osl::MutexGuard aGuard( m_aMutex );
-Any aValue;
-column-getPropertyValue(PROPERTY_VALUE) = aValue;
+OUString aName;
+column-getPropertyValue(PROPERTY_NAME) = aName;
-OUStringBuffer aSQL;
-const OUString aQuote= m_xMetaData-getIdentifierQuoteString();
-getColumns();
+Any aValue;
+column-getPropertyValue(PROPERTY_VALUE) = aValue;
-// TODO: if this is called for HAVING, check that the column is a GROUP BY
column
-// or that it is an aggregate function
+OUStringBuffer aSQL;
+const OUString aQuote= m_xMetaData-getIdentifierQuoteString();
+getColumns();
-if (
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/SingleSelectQueryComposer.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 47585cea02f00ac15b05c092e5392bd76e78daf9 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 09:55:54 2014 +0200 Missing include Change-Id: I1dc2b46109e62b3df1e887472e0bd927cb4bedb7 diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 34f12dc..d420d06 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -46,6 +46,7 @@ #include comphelper/processfactory.hxx #include comphelper/sequence.hxx #include comphelper/types.hxx +#include cppuhelper/exc_hlp.hxx #include cppuhelper/typeprovider.hxx #include connectivity/predicateinput.hxx #include unotools/syslocale.hxx ___ 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/bparr.hxx |3 +--
sw/source/core/docnode/nodes.cxx | 18 --
2 files changed, 5 insertions(+), 16 deletions(-)
New commits:
commit ca16ec4346cec871163c0b9ff361c7ad8bc74c16
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 10:09:07 2014 +0200
Avoid illegal downcasts from BigPtrEntry to SwNode
...and while at it, remove the need for the TempBigPtrEntry derivation.
Change-Id: Ic758f646578a90a28632b1368fed209eb84f9c1c
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 3c5ea87..741534d 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -34,9 +34,8 @@ class BigPtrEntry
BlockInfo* pBlock;
sal_uInt16 nOffset;
public:
-virtual ~BigPtrEntry() {}
-protected:
BigPtrEntry() : pBlock(0), nOffset(0) {}
+virtual ~BigPtrEntry() {}
inline sal_uLong GetPos() const;
inline BigPtrArray GetArray() const;
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 06375d9..8efb977 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -2213,16 +2213,6 @@ void SwNodes::ForEach( const SwNodeIndex rStart, const
SwNodeIndex rEnd,
ForEach( rStart.GetIndex(), rEnd.GetIndex(), fnForEach, pArgs );
}
-namespace {
-
-//TODO: seems to be not/wrongly used
-struct TempBigPtrEntry : public BigPtrEntry
-{
-TempBigPtrEntry() {}
-};
-
-}
-
void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong nSz, bool bDel )
{
sal_uLong nEnd = nDelPos + nSz;
@@ -2275,11 +2265,11 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong
nSz, bool bDel )
}
}
-std::vectorTempBigPtrEntry aTempEntries;
+std::vectorBigPtrEntry aTempEntries;
if( bDel )
{
sal_uLong nCnt = nSz;
-SwNode *pDel = (*this)[ nDelPos+nCnt-1 ], *pPrev = (*this)[
nDelPos+nCnt-2 ];
+BigPtrEntry *pDel = (*this)[ nDelPos+nCnt-1 ], *pPrev = (*this)[
nDelPos+nCnt-2 ];
// set temporary object
// JP 24.08.98: this should actually be removed because one could
@@ -2292,13 +2282,13 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong
nSz, bool bDel )
{
delete pDel;
pDel = pPrev;
-sal_uLong nPrevNdIdx = pPrev-GetIndex();
+sal_uLong nPrevNdIdx = pPrev-GetPos();
BigPtrEntry* pTempEntry = aTempEntries[nCnt];
BigPtrArray::Replace( nPrevNdIdx+1, pTempEntry );
if( nCnt )
pPrev = (*this)[ nPrevNdIdx - 1 ];
}
-nDelPos = pDel-GetIndex() + 1;
+nDelPos = pDel-GetPos() + 1;
}
BigPtrArray::Remove( nDelPos, nSz );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/fontsubset/cff.cxx | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 5591c9c2ab77d32a923200f980e8fe7af61ffd5b
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 5 12:50:05 2014 +0200
fdo#81516: vcl: limit number of CFFs read from font
(cherry picked from commit 45b0b47d114437198c9e0872d427576e6e7e6cc6)
Conflicts:
vcl/source/fontsubset/cff.cxx
Change-Id: I9928b9805169a2dbb41be669dc37617b30bc672b
Reviewed-on: https://gerrit.libreoffice.org/10752
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 35b6679..476e458 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -369,7 +369,7 @@ public:
explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
virtual ~CffSubsetterContext( void);
-voidinitialCffRead( void);
+boolinitialCffRead();
boolemitAsType1( class Type1Emitter,
const long* pGlyphIDs, const U8* pEncoding,
GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo );
@@ -1569,9 +1569,7 @@ CffGlobal::CffGlobal( void)
// TODO; maFontMatrix.clear();
}
-//
-
-void CffSubsetterContext::initialCffRead( void)
+bool CffSubsetterContext::initialCffRead()
{
// get the CFFHeader
mpReadPtr = mpBasePtr;
@@ -1629,7 +1627,11 @@ void CffSubsetterContext::initialCffRead( void)
// assert( mnFontDictBase == tellRel());
mpReadPtr = mpBasePtr + mnFontDictBase;
mnFDAryCount = (mpReadPtr[0]8) + mpReadPtr[1];
-assert( mnFDAryCount (int)(sizeof(maCffLocal)/sizeof(*maCffLocal)));
+if (static_castsize_t(mnFDAryCount) = SAL_N_ELEMENTS(maCffLocal))
+{
+SAL_INFO(vcl.fonts, CffSubsetterContext: too many CFF in font);
+return false;
+}
// read FDArray details to get access to the PRIVDICTs
for( int i = 0; i mnFDAryCount; ++i) {
@@ -1670,6 +1672,8 @@ void CffSubsetterContext::initialCffRead( void)
}
// ignore the Notices info
+
+return true;
}
//
@@ -2340,14 +2344,16 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter
rEmitter,
bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
{
CffSubsetterContext aCff( mpInFontBytes, mnInByteLength);
-aCff.initialCffRead();
+bool bRC = aCff.initialCffRead();
+if (!bRC)
+return bRC;
// emit Type1 subset from the CFF input
// TODO: also support CFF-CFF subsetting (when PDF-export and PS-printing
need it)
const bool bPfbSubset = (0 != (mnReqFontTypeMask
FontSubsetInfo::TYPE1_PFB));
Type1Emitter aType1Emitter( mpOutFile, bPfbSubset);
aType1Emitter.setSubsetName( mpReqFontName);
-bool bRC = aCff.emitAsType1( aType1Emitter,
+bRC = aCff.emitAsType1( aType1Emitter,
mpReqGlyphIds, mpReqEncodedIds,
pOutGlyphWidths, mnReqGlyphCount, *this);
return bRC;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/doc/docfmt.cxx | 16 1 file changed, 16 insertions(+) New commits: commit f23d6a124dc413bcbb98f5145d230de707ca85db Author: Michael Stahl mst...@redhat.com Date: Tue Aug 5 22:50:23 2014 +0200 fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles() SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes, but not first-master and first-left. They will contain exactly the same attributes as master and left but they still need to be copied... (see also: that FIXME in pagedesc.hxx) (regression from 75084f6c42c27dc95418df9cefed2fddfb26000e) Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004 (cherry picked from commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2) Reviewed-on: https://gerrit.libreoffice.org/10774 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 561cb0f..b987918 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2148,6 +2148,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc rSrcDesc, SwPageDesc rDstDesc, rDstDesc.GetLeft().DelDiffs( aAttrSet ); rDstDesc.GetLeft().SetFmtAttr( aAttrSet ); + +aAttrSet.ClearItem(); +aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() ); +aAttrSet.ClearItem( RES_HEADER ); +aAttrSet.ClearItem( RES_FOOTER ); + +rDstDesc.GetFirstMaster().DelDiffs( aAttrSet ); +rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet ); + +aAttrSet.ClearItem(); +aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() ); +aAttrSet.ClearItem( RES_HEADER ); +aAttrSet.ClearItem( RES_FOOTER ); + +rDstDesc.GetFirstLeft().DelDiffs( aAttrSet ); +rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet ); } CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/doc/docfmt.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 01db6d0f9b3cfa88eaedd3b9ac98f76c2a90571b
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 5 22:56:17 2014 +0200
SwDoc::CopyPageDesc(): probably sending Modify for first too cannot hurt
Change-Id: I2056bee7555d3f6723ac374863187d82e4ad9edd
(cherry picked from commit 2e9840d18c09ce5552eec2f9d489d952da1034ae)
Reviewed-on: https://gerrit.libreoffice.org/10775
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index b987918..43cfe77 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2215,6 +2215,12 @@ void SwDoc::CopyPageDesc( const SwPageDesc rSrcDesc,
SwPageDesc rDstDesc,
{
rDstDesc.GetLeft().ModifyBroadcast( aInfo, 0, TYPE(SwFrm) );
}
+{
+rDstDesc.GetFirstMaster().ModifyBroadcast( aInfo, 0, TYPE(SwFrm)
);
+}
+{
+rDstDesc.GetFirstLeft().ModifyBroadcast( aInfo, 0, TYPE(SwFrm) );
+}
}
}
___
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/section.hxx |2 +-
sw/source/core/docnode/ndsect.cxx |5 ++---
sw/source/core/docnode/section.cxx |2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 58f837d2267e002a6a323b6b37c9e62eb6ca711b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 11:06:41 2014 +0200
Avoid unnecessary illegal downcasts from SwFrmFmt to SwSectionFmt
Change-Id: I2ca8d57a09b6f8c6d760b5fb6a3d2f94ad22ada3
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index ba34359..833c681 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -291,7 +291,7 @@ class SW_DLLPUBLIC SwSectionFmt
SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed.
protected:
-SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc );
+SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc );
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
SAL_OVERRIDE;
public:
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index 067c7f5..e622c40 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -504,9 +504,8 @@ SwSection* SwDoc::GetCurrSection( const SwPosition rPos )
const
SwSectionFmt* SwDoc::MakeSectionFmt( SwSectionFmt *pDerivedFrom )
{
-if( !pDerivedFrom )
-pDerivedFrom = (SwSectionFmt*)mpDfltFrmFmt;
-SwSectionFmt* pNew = new SwSectionFmt( pDerivedFrom, this );
+SwSectionFmt* pNew = new SwSectionFmt(
+pDerivedFrom == 0 ? mpDfltFrmFmt : pDerivedFrom, this );
mpSectionFmtTbl-push_back( pNew );
return pNew;
}
diff --git a/sw/source/core/docnode/section.cxx
b/sw/source/core/docnode/section.cxx
index 6ee567a..ca563ac 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -625,7 +625,7 @@ const SwTOXBase* SwSection::GetTOXBase() const
return pRet;
}
-SwSectionFmt::SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc )
+SwSectionFmt::SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc )
: SwFrmFmt( pDoc-GetAttrPool(), OUString(), pDrvdFrm )
{
LockModify();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/svx sd/source svx/source
cui/source/tabpages/measure.cxx |6 +++---
include/svx/sxmsuitm.hxx|9 +++--
sd/source/core/drawdoc4.cxx |2 +-
svx/source/sdr/properties/measureproperties.cxx |2 +-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdomeas.cxx |4 ++--
6 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 5ecec388bb117426661c4e5f65cb84aeb245064c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 11:27:26 2014 +0200
Consistency around SdrYesNoItem in svx/sxmsuitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I25002e5b6043baa8c93b180a03f475bea5906e4f
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index bf93704..f5d2749 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -292,7 +292,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
// SdrMeasureShowUnitItem
if( rAttrs-GetItemState( SDRATTR_MEASURESHOWUNIT ) != SFX_ITEM_DONTCARE )
{
-m_pTsbShowUnit-SetState( ( ( const SdrMeasureShowUnitItem
)rAttrs-Get( SDRATTR_MEASURESHOWUNIT ) ).
+m_pTsbShowUnit-SetState( ( ( const SdrYesNoItem )rAttrs-Get(
SDRATTR_MEASURESHOWUNIT ) ).
GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
m_pTsbShowUnit-EnableTriState( false );
}
@@ -486,7 +486,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
eState = m_pTsbShowUnit-GetState();
if( m_pTsbShowUnit-IsValueChangedFromSaved() )
{
-rAttrs-Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
+rAttrs-Put( makeSdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
bModified = true;
}
@@ -717,7 +717,7 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
{
TriState eState = m_pTsbShowUnit-GetState();
if( eState != TRISTATE_INDET )
-aAttrSet.Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
+aAttrSet.Put( makeSdrMeasureShowUnitItem( TRISTATE_TRUE == eState
) );
}
if( p == m_pLbUnit )
diff --git a/include/svx/sxmsuitm.hxx b/include/svx/sxmsuitm.hxx
index c16a51f..9238913 100644
--- a/include/svx/sxmsuitm.hxx
+++ b/include/svx/sxmsuitm.hxx
@@ -22,12 +22,9 @@
#include svx/svddef.hxx
#include svx/sdynitm.hxx
-// Include the unit of measure when displaying
-class SdrMeasureShowUnitItem: public SdrYesNoItem {
-public:
-SdrMeasureShowUnitItem(bool bOn=false):
SdrYesNoItem(SDRATTR_MEASURESHOWUNIT,bOn) {}
-SdrMeasureShowUnitItem(SvStream rIn):
SdrYesNoItem(SDRATTR_MEASURESHOWUNIT,rIn) {}
-};
+inline SdrYesNoItem makeSdrMeasureShowUnitItem(bool bOn) {
+return SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, bOn);
+}
#endif
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index f4ba67f..fbaf8919 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -488,7 +488,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet-Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
pISet-Put(XLineEndWidthItem(200));
pISet-Put(XLineStyleItem(XLINE_SOLID));
-pISet-Put(SdrMeasureShowUnitItem(true));
+pISet-Put(makeSdrMeasureShowUnitItem(true));
// Generate presentation templates for default layout.
OUString aPrefix = SD_RESSTR(STR_LAYOUT_DEFAULT_NAME);
diff --git a/svx/source/sdr/properties/measureproperties.cxx
b/svx/source/sdr/properties/measureproperties.cxx
index d124045..033464b2 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -109,7 +109,7 @@ namespace sdr
//#71958# by default, the show units Bool-Item is set as hard
// attribute to sal_True to aviod confusion when copying
SdrMeasureObj's
// from one application to another
-mpItemSet-Put(SdrMeasureShowUnitItem(true));
+mpItemSet-Put(makeSdrMeasureShowUnitItem(true));
basegfx::B2DPolygon aNewPolygon;
aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index bf296e0..188668a 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -197,7 +197,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_MEASUREOVERHANG -SDRATTR_START]=new
SdrMeasureOverhangItem(600);
mppLocalPoolDefaults[SDRATTR_MEASUREUNIT -SDRATTR_START]=new
SdrMeasureUnitItem;
mppLocalPoolDefaults[SDRATTR_MEASURESCALE-SDRATTR_START]=new
SdrMeasureScaleItem;
-mppLocalPoolDefaults[SDRATTR_MEASURESHOWUNIT -SDRATTR_START]=new
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/CRowSetDataColumn.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 5be4407d0716f78acdcdf24de135af91f17e51be
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Aug 7 11:16:18 2014 +0200
fdo#82151 fixup
The dbaccess unoapi test calls
css::sdb::XSingleSelectQueryComposer::appendFilterByColumn
in a state where there is no current row, and thus no column value.
This does not make sense, but let's not break the build while I
figure out how to fix the unoapi test.
Change-Id: If813a1544ec9a5dac6f87197982d10576c91cd8c
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 50ff4ad..e367828 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -25,6 +25,7 @@
#include cppuhelper/exc_hlp.hxx
#include cppuhelper/typeprovider.hxx
#include com/sun/star/beans/PropertyAttribute.hpp
+#include com/sun/star/lang/WrappedTargetRuntimeException.hpp
#include tools/debug.hxx
using namespace dbaccess;
@@ -110,12 +111,18 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue(
Any rValue, sal_Int32 nH
{
rValue = m_pGetValue(m_nPos).makeAny();
}
-catch (css::sdbc::SQLException e)
+catch(const SQLException e)
{
-css::uno::Any a(cppu::getCaughtException());
-throw css::lang::WrappedTargetException(
-wrapped css::sdbc::SQLException: + e.Message,
-css::uno::Referencecss::uno::XInterface(), a);
+// TODO: doing nothing matches the previous behaviour,
+// (and keeps dbaccess unoapi test working...)
+// but should be investigated... If the value could not be
+// fetched, that's a different result than value is null,
+// which corresponds to an empty Any.
+//throw WrappedTargetRuntimeException(Could not retrieve column
value, *const_castORowSetDataColumn*(this), Any(e));
+// css::uno::Any a(cppu::getCaughtException());
+// throw css::lang::WrappedTargetException(
+// wrapped css::sdbc::SQLException: + e.Message,
+// css::uno::Referencecss::uno::XInterface(), a);
}
}
else if ( PROPERTY_ID_LABEL == nHandle !m_sLabel.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
| 254 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java
| 72 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
| 162 ++---
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
| 234
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java
| 48 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java
| 62 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java
| 186 +++---
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java
| 80 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java
| 40 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java
| 88 +--
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java
| 46 -
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java
| 246
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java
| 78 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
| 282 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine.java
| 50 -
15 files changed, 964 insertions(+), 964 deletions(-)
New commits:
commit 414a6e4e0ce35ead40d2a0476f18fba1f746b7bf
Author: Noel Grandin n...@peralex.com
Date: Thu Aug 7 11:37:32 2014 +0200
convert EvolutionarySolver source to unix LF
so I dont keep getting problems when moving patches between Windows
and Linux
Change-Id: Ia2323ecb388bf5996279686e1bd2b1676c5ae213
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
index 02043f5..3107fa8 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
@@ -1,127 +1,127 @@
-package net.adaptivebox.deps;
-
-/**
- * Description: The description of agent with hybrid differential evolution
and particle swarm.
- *
- * @ AuthorCreate/Modi Note
- * Xiaofeng XieJun 10, 2004
- * Xiaofeng XieJul 01, 2008
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Please acknowledge the author(s) if you use this code in any way.
- *
- * @version 1.0
- * @Since MAOS1.0
- *
- * @References:
- * [1] Zhang W J, Xie X F. DEPSO: hybrid particle swarm with differential
- * evolution operator. IEEE International Conference on Systems, Man
Cybernetics,
- * Washington D C, USA, 2003: 3816-3821
- * [2] X F Xie, W J Zhang. SWAF: swarm algorithm framework for numerical
- * optimization. Genetic and Evolutionary Computation Conference (GECCO),
- * Seattle, WA, USA, 2004: 238-250
- * - an agent perspective
- */
-
-import net.adaptivebox.deps.behavior.*;
-import net.adaptivebox.goodness.IGoodnessCompareEngine;
-import net.adaptivebox.knowledge.*;
-import net.adaptivebox.problem.*;
-import net.adaptivebox.space.*;
-
-public class DEPSAgent implements ILibEngine {
-
- //Describes the problem to be solved
- protected ProblemEncoder problemEncoder;
- //Forms the goodness landscape
- protected IGoodnessCompareEngine qualityComparator;
-
- //store the point that generated in current learning cycle
- protected SearchPoint trailPoint;
-
- //temp variable
- private AbsGTBehavior selectGTBehavior;
-
- //The referred library
- protected Library socialLib;
- //the own memory: store the point that generated in old learning cycle
- protected BasicPoint pold_t;
- //the own memory: store the point that generated in last learning cycle
- protected BasicPoint pcurrent_t;
- //the own memory: store the personal best point
- protected SearchPoint pbest_t;
-
- //Generate-and-test Behaviors
- protected DEGTBehavior deGTBehavior;
- protected PSGTBehavior psGTBehavior;
- public double switchP = 0.5;
-
- public
[Libreoffice-commits] core.git: 3 commits - configure.ac cui/source include/svx oox/source README.cross sfx2/source svx/source
README.cross |3 -
configure.ac |4 -
cui/source/tabpages/measure.cxx | 30 ++---
include/svx/sxmlhitm.hxx | 40 ++
oox/source/drawingml/customshapes/README |6 +-
sfx2/source/dialog/filedlghelper.cxx | 23 --
svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx | 10 ++--
svx/source/svdraw/svdattr.cxx | 10 ++--
svx/source/svdraw/svdomeas.cxx| 16 +++
9 files changed, 63 insertions(+), 79 deletions(-)
New commits:
commit 7fb48e7e3aa76ba48174d74da7b603b25ef68f56
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 11:53:30 2014 +0200
Consistency around SdrMetricItem in svx/sxmlhitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I65c36bde166c5f78db8c76364fd057017982fed6
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index f5d2749..319f558 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -178,7 +178,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
pItem = pPool-GetDefaultItem( SDRATTR_MEASURELINEDIST );
if( pItem )
{
-long nValue = ( ( const SdrMeasureLineDistItem* )pItem )-GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )-GetValue();
SetMetricValue( *m_pMtrFldLineDist, nValue, eUnit );
}
else
@@ -193,7 +193,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
pItem = pPool-GetDefaultItem( SDRATTR_MEASUREHELPLINEOVERHANG );
if( pItem )
{
-long nValue = ( ( const SdrMeasureHelplineOverhangItem* )pItem
)-GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )-GetValue();
SetMetricValue( *m_pMtrFldHelplineOverhang, nValue, eUnit );
}
else
@@ -208,7 +208,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
pItem = pPool-GetDefaultItem( SDRATTR_MEASUREHELPLINEDIST );
if( pItem )
{
-long nValue = ( ( const SdrMeasureHelplineDistItem* )pItem
)-GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )-GetValue();
SetMetricValue( *m_pMtrFldHelplineDist, nValue, eUnit );
}
else
@@ -223,7 +223,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
pItem = pPool-GetDefaultItem( SDRATTR_MEASUREHELPLINE1LEN );
if( pItem )
{
-long nValue = ( ( const SdrMeasureHelpline1LenItem* )pItem
)-GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )-GetValue();
SetMetricValue( *m_pMtrFldHelpline1Len, nValue, eUnit );
}
else
@@ -238,7 +238,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs )
pItem = pPool-GetDefaultItem( SDRATTR_MEASUREHELPLINE2LEN );
if( pItem )
{
-long nValue = ( ( const SdrMeasureHelpline2LenItem* )pItem
)-GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )-GetValue();
SetMetricValue( *m_pMtrFldHelpline2Len, nValue, eUnit );
}
else
@@ -428,35 +428,35 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
if( m_pMtrFldLineDist-IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLineDist, eUnit );
-rAttrs-Put( SdrMeasureLineDistItem( nValue ) );
+rAttrs-Put( makeSdrMeasureLineDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelplineOverhang-IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelplineOverhang, eUnit );
-rAttrs-Put( SdrMeasureHelplineOverhangItem( nValue ) );
+rAttrs-Put( makeSdrMeasureHelplineOverhangItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelplineDist-IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelplineDist, eUnit );
-rAttrs-Put( SdrMeasureHelplineDistItem( nValue ) );
+rAttrs-Put( makeSdrMeasureHelplineDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelpline1Len-IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelpline1Len, eUnit );
-rAttrs-Put( SdrMeasureHelpline1LenItem( nValue ) );
+rAttrs-Put( makeSdrMeasureHelpline1LenItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelpline2Len-IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelpline2Len, eUnit );
-rAttrs-Put( SdrMeasureHelpline2LenItem( nValue ) );
+rAttrs-Put( makeSdrMeasureHelpline2LenItem( nValue ) );
bModified = true;
}
@@ -665,31 +665,31 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p )
if( p ==
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - comphelper/inc comphelper/source sfx2/source svtools/source
comphelper/inc/comphelper/embeddedobjectcontainer.hxx |3 +
comphelper/source/container/embeddedobjectcontainer.cxx | 36
sfx2/source/appl/linkmgr2.cxx | 10
svtools/source/misc/embedhlp.cxx| 29
4 files changed, 61 insertions(+), 17 deletions(-)
New commits:
commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3
Author: Armin Le Grand a...@apache.org
Date: Thu Aug 7 09:59:26 2014 +
i125386 secured user request and changed some bools to bitfield
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index 060fd73..f2682af 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
@@ -178,6 +178,9 @@ sal_BoolRemoveEmbeddedObject( const
::com::sun::star::uno::Reference
* \return FALSE/ if no error occurred, otherwise TRUE/.
*/
sal_Bool SetPersistentEntries(const
com::sun::star::uno::Reference com::sun::star::embed::XStorage
_xStorage,bool _bClearModifedFlag = true);
+
+bool getUserAllowsLinkUpdate() const;
+void setUserAllowsLinkUpdate(bool bNew);
};
}
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 91a9a86..41d93ec 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -92,7 +92,10 @@ struct EmbedImpl
uno::WeakReference uno::XInterface m_xModel;
//EmbeddedObjectContainerNameMap maTempObjectContainer;
//uno::Reference embed::XStorage mxTempStorage;
-sal_Bool bOwnsStorage;
+
+/// bitfield
+bool mbOwnsStorage : 1;
+bool mbUserAllowsLinkUpdate : 1;
const uno::Reference embed::XStorage GetReplacements();
};
@@ -123,7 +126,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
{
pImpl = new EmbedImpl;
pImpl-mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
-pImpl-bOwnsStorage = sal_True;
+pImpl-mbOwnsStorage = true;
+pImpl-mbUserAllowsLinkUpdate = true;
pImpl-mpTempObjectContainer = 0;
}
@@ -131,7 +135,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const
uno::Reference embed::
{
pImpl = new EmbedImpl;
pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = sal_False;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
pImpl-mpTempObjectContainer = 0;
}
@@ -139,7 +144,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const
uno::Reference embed::
{
pImpl = new EmbedImpl;
pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = sal_False;
+pImpl-mbOwnsStorage = false;
+pImpl-mbUserAllowsLinkUpdate = true;
pImpl-mpTempObjectContainer = 0;
pImpl-m_xModel = xModel;
}
@@ -148,11 +154,11 @@ void EmbeddedObjectContainer::SwitchPersistence( const
uno::Reference embed::X
{
ReleaseImageSubStorage();
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
pImpl-mxStorage-dispose();
pImpl-mxStorage = rStor;
-pImpl-bOwnsStorage = sal_False;
+pImpl-mbOwnsStorage = false;
}
sal_Bool EmbeddedObjectContainer::CommitImageSubStorage()
@@ -208,7 +214,7 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer()
{
ReleaseImageSubStorage();
-if ( pImpl-bOwnsStorage )
+if ( pImpl-mbOwnsStorage )
pImpl-mxStorage-dispose();
delete pImpl-mpTempObjectContainer;
@@ -1401,7 +1407,7 @@ sal_Bool
EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
xStream = GetGraphicStream( xObj, aMediaType );
}
-if ( !xStream.is() )
+if ( !xStream.is() getUserAllowsLinkUpdate() )
{
// the image must be regenerated
// TODO/LATER: another aspect could be used
@@ -1685,4 +1691,18 @@ sal_Bool
EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference emb
}
return bError;
}
+
+bool EmbeddedObjectContainer::getUserAllowsLinkUpdate() const
+{
+return pImpl-mbUserAllowsLinkUpdate;
+}
+
+void EmbeddedObjectContainer::setUserAllowsLinkUpdate(bool bNew)
+{
+if(pImpl-mbUserAllowsLinkUpdate != bNew)
+{
+pImpl-mbUserAllowsLinkUpdate = bNew;
+}
+}
+
}
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 1ae6ff2..afde1d4 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -318,7 +318,17 @@ void LinkManager::UpdateAllLinks(
{
int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId(
STR_QUERY_UPDATE_LINKS ) ).Execute();
if( RET_YES != nRet )
+{
+SfxObjectShell* pShell = pLink-GetLinkManager()-GetPersist();
+
+if(pShell)
+{
+
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/UnpackedTarball.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 91bfacea9058b0a00feb58879c14666d31089c21 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Aug 7 13:09:20 2014 +0200 Fix tarball.rebuild on windows Change-Id: I0a649548088428bd1a1fcedab76325fffa6b72a0 diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index c7d707c..da2e967 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -413,7 +413,7 @@ endef %.rebuild : if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \ touch $(call gb_UnpackedTarball_get_target,$*) ; \ - make ;\ + $(MAKE) ;\ fi %.genpatch : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/flowfrm.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a30ce480fa6044b1545145559cd23df140307bd0
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 13:30:44 2014 +0200
These SwTxtFrm calls shall apparently be done via pOwn, not m_rThis
...given the initialization of pOwn based on m_rThis at the start of
CalcUpperSpace and the pOwn-IsTxtFrm() checks preceeding these casts.
At least CppunitTest_sw_odfimport via
SwFlowFrm::CalcUpperSpace
SwSectionFrm::Format
SwLayoutFrm::MakeAll
SwSectionFrm::MakeAll
SwFrm::PrepareMake
SwFrm::Calc
SwLayAction::FormatLayout
SwLayAction::FormatLayout
SwLayAction::FormatLayout
SwLayAction::InternalAction
SwLayAction::Action
SwViewShell::ImplEndAction
SwViewShell::EndAction
SwCrsrShell::EndAction
SwView::OuterResizePixel
SfxViewFrame::DoAdjustPosSizePixel
SfxViewFrame::Resize
SfxFrameViewWindow_Impl::Resize
Window::ImplCallResize
Window::Show
SfxBaseController::ConnectSfxFrame_Impl
SfxBaseController::attachFrame
(anonymous namespace)::SfxFrameLoader_Impl::impl
(anonymous namespace)::SfxFrameLoader_Impl::load
framework::LoadEnv::impl_loadContent
framework::LoadEnv::startLoading
framework::LoadEnv::loadComponentFromURL
unotest::MacrosTest::loadFromDesktop
SwModelTestBase::load
SwModelTestBase::executeImportTest
testFdo55814::Import
leads to calls where m_rThis is not a SwTxtFrm.
As this mixed usage of m_rThis and pOwn is in there since
84a3db80b4fd66c6854b3135b5f69b61fd828e62 initial import it is hard to tell
whether further uses of m_rThis should be replace with uses of pOwn, too.
Change-Id: I6a59aa3aec2d28b8aec13cd4b9528fdbe4ab093a
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index a13ddbc..6874092 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1382,7 +1382,7 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
// former consideration
if ( pOwn-IsTxtFrm() )
{
-nAdd = std::max( nAdd,
static_castSwTxtFrm(m_rThis).GetLineSpace() );
+nAdd = std::max( nAdd,
static_castSwTxtFrm*(pOwn)-GetLineSpace() );
}
nUpper += nAdd;
}
@@ -1404,11 +1404,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
// spacing is built.
if ( bPrevLineSpacingPorportional )
{
-nAdd +=
static_castSwTxtFrm(m_rThis).GetLineSpace( true );
+nAdd +=
static_castSwTxtFrm*(pOwn)-GetLineSpace( true );
}
else
{
-nAdd = std::max( nAdd,
static_castSwTxtFrm(m_rThis).GetLineSpace( true ) );
+nAdd = std::max( nAdd,
static_castSwTxtFrm*(pOwn)-GetLineSpace( true ) );
}
}
nUpper += nAdd;
@@ -1450,11 +1450,11 @@ SwTwips SwFlowFrm::CalcUpperSpace( const SwBorderAttrs
*pAttrs,
// spacing is built.
if ( bPrevLineSpacingPorportional )
{
-nAdd +=
static_castSwTxtFrm(m_rThis).GetLineSpace( true );
+nAdd +=
static_castSwTxtFrm*(pOwn)-GetLineSpace( true );
}
else
{
-nAdd = std::max( nAdd,
static_castSwTxtFrm(m_rThis).GetLineSpace( true ) );
+nAdd = std::max( nAdd,
static_castSwTxtFrm*(pOwn)-GetLineSpace( true ) );
}
}
nUpper += nAdd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/languageguessing/guesslang.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit f31424e650c4f7d4a09a166377ee4890fd317292
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 13:44:03 2014 +0200
Fix *_component_getFactory function type
Change-Id: Ib86d37e1570c9a64ef83beaf11bf0ec4676533eb
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index c778ff9..66f8b6d 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -31,7 +31,6 @@
#include simpleguesser.hxx
#include guess.hxx
-#include com/sun/star/registry/XRegistryKey.hpp
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/linguistic2/XLanguageGuessing.hpp
#include unotools/pathoptions.hxx
@@ -377,8 +376,8 @@ extern C
{
SAL_DLLPUBLIC_EXPORT void * SAL_CALL guesslang_component_getFactory(
-sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
-registry::XRegistryKey * xRegistry )
+sal_Char const * implName, void * xMgr,
+void * xRegistry )
{
return ::cppu::component_getFactoryHelper(
implName, xMgr, xRegistry, s_component_entries );
___
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/docvw/SidebarWin.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 529bb272e296c7f41416d9392787bc2cdf5fe362 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 13:53:13 2014 +0200 RemoveEventListener on self again ...as otherwise base class ~Window would call into WindowEventListener with this no longer a SwSidebarWin. Change-Id: Icfe942eef9a0adb58a59397b4f41514e0c696543 diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 7f57460..a284a79 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -185,6 +185,8 @@ SwSidebarWin::~SwSidebarWin() mpVScrollbar = 0; } +RemoveEventListener( LINK( this, SwSidebarWin, WindowEventListener ) ); + AnchorOverlayObject::DestroyAnchorOverlayObject( mpAnchor ); mpAnchor = NULL; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/chart_opengl_window'
New branch 'feature/chart_opengl_window' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
|4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit efbc5ac6cc4f8d7b57e4d24a70bae92fa0d22060
Author: rbuj robert@gmail.com
Date: Thu Aug 7 14:19:04 2014 +0200
nlpsolver: Number parsing
Change-Id: I37a83b8e8c0f084ae175be5a5c58fc6b852e23a1
Reviewed-on: https://gerrit.libreoffice.org/10807
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
index 0a17c11..8d3436a 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java
@@ -128,12 +128,12 @@ public class GlobalString {
static public int toInteger(Object oVal) throws Exception {
if(oVal==null) throw new Exception(Null string);
-return new Integer(oVal.toString()).intValue();
+return Integer.parseInt(oVal.toString());
}
static public double toDouble(Object oVal) throws Exception {
if(oVal==null) throw new Exception(Null string);
-return new Double(oVal.toString()).doubleValue();
+return Double.parseDouble(oVal.toString());
}
public static Object toObject(String key) throws Exception{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
|4 +---
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
|4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 90b4217e20af48e08352bdd6b478e7a8c59ee035
Author: rbuj robert@gmail.com
Date: Thu Aug 7 14:06:11 2014 +0200
nlpsolver: Use System.arraycopy
Change-Id: I2550bf0799bd5ebc7f6ff299752fa90b7a31674d
Reviewed-on: https://gerrit.libreoffice.org/10806
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
index 0085ff7..c33d649 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java
@@ -42,9 +42,7 @@ public class SearchPoint extends BasicPoint implements
IEncodeEngine {
}
private void importEncodeInfo(double[] info) {
-for(int i=0; iencodeInfo.length; i++) {
- encodeInfo[i] = info[i];
-}
+System.arraycopy(info, 0, encodeInfo, 0, encodeInfo.length);
}
private void importEncodeInfo(IEncodeEngine point) {
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
index 48f4df4..35e2ac0 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java
@@ -131,9 +131,7 @@ public class DesignSpace {
public double[] getRealLoc(double[] imageLoc) {
double[] realLoc = new double[imageLoc.length];
-for (int i=0; iimageLoc.length; i++) {
- realLoc[i] = imageLoc[i];
-}
+System.arraycopy(imageLoc, 0, realLoc, 0, imageLoc.length);
annulusAdjust(realLoc);
return realLoc;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source
sfx2/source/dialog/filedlghelper.cxx | 23 ++-
1 file changed, 10 insertions(+), 13 deletions(-)
New commits:
commit cddfd33a3bea009394ec2b5c1cb94d09d8c40b23
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 7 11:24:18 2014 +0200
rhbz#1079672: FileDialogHelper: don't hand out stale preview Graphic
The maGraphic is updated from a timer, and if you double-click on a file
then the dialog may exit with the previous file still previewed in
maGraphic, so the wrong image is returned by the dialog.
Change-Id: I99094d85d8d68d5c8a842f52e7039dbbbf095995
(cherry picked from commit f1589f768bbd1d8baea6e442f392831851bdbb3b)
Reviewed-on: https://gerrit.libreoffice.org/10802
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index c04ae90..78a14ee 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -789,23 +789,20 @@ ErrCode FileDialogHelper_Impl::getGraphic( Graphic
rGraphic ) const
{
ErrCode nRet = ERRCODE_NONE;
-if ( ! maGraphic )
-{
-OUString aPath;;
-Sequence OUString aPathSeq = mxFileDlg-getFiles();
+// rhbz#1079672 do not return maGraphic, it need not be the selected file
-if ( aPathSeq.getLength() == 1 )
-{
-aPath = aPathSeq[0];
-}
+OUString aPath;;
+SequenceOUString aPathSeq = mxFileDlg-getFiles();
-if ( !aPath.isEmpty() )
-nRet = getGraphic( aPath, rGraphic );
-else
-nRet = ERRCODE_IO_GENERAL;
+if (aPathSeq.getLength() == 1)
+{
+aPath = aPathSeq[0];
}
+
+if (!aPath.isEmpty())
+nRet = getGraphic(aPath, rGraphic);
else
-rGraphic = maGraphic;
+nRet = ERRCODE_IO_GENERAL;
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/dialog/filedlghelper.cxx | 23 ++-
1 file changed, 10 insertions(+), 13 deletions(-)
New commits:
commit e1b57d025b0523479fe906f050c5639ad280b481
Author: Michael Stahl mst...@redhat.com
Date: Thu Aug 7 11:24:18 2014 +0200
rhbz#1079672: FileDialogHelper: don't hand out stale preview Graphic
The maGraphic is updated from a timer, and if you double-click on a file
then the dialog may exit with the previous file still previewed in
maGraphic, so the wrong image is returned by the dialog.
Change-Id: I99094d85d8d68d5c8a842f52e7039dbbbf095995
(cherry picked from commit f1589f768bbd1d8baea6e442f392831851bdbb3b)
Reviewed-on: https://gerrit.libreoffice.org/10804
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index c8178a4..28a8060 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -789,23 +789,20 @@ ErrCode FileDialogHelper_Impl::getGraphic( Graphic
rGraphic ) const
{
ErrCode nRet = ERRCODE_NONE;
-if ( ! maGraphic )
-{
-OUString aPath;;
-Sequence OUString aPathSeq = mxFileDlg-getFiles();
+// rhbz#1079672 do not return maGraphic, it need not be the selected file
-if ( aPathSeq.getLength() == 1 )
-{
-aPath = aPathSeq[0];
-}
+OUString aPath;;
+SequenceOUString aPathSeq = mxFileDlg-getFiles();
-if ( !aPath.isEmpty() )
-nRet = getGraphic( aPath, rGraphic );
-else
-nRet = ERRCODE_IO_GENERAL;
+if (aPathSeq.getLength() == 1)
+{
+aPath = aPathSeq[0];
}
+
+if (!aPath.isEmpty())
+nRet = getGraphic(aPath, rGraphic);
else
-rGraphic = maGraphic;
+nRet = ERRCODE_IO_GENERAL;
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/ExternalPackage_coinmp.mk | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 6c4de449094048465b81abf93139bb5950fa12c9 Author: Douglas Mencken dougmenc...@gmail.com Date: Tue Jul 29 11:24:38 2014 -0400 fix external/coinmp on OSX: bad symlinking instdir/LibreOfficeDev.app/Contents/MacOS/libCbc.3.dylib - libCbc.3.8.8.dylib (which does not exist) See also: 9f339a89453808b917177a3ee675a76385758902 Change-Id: I398d649c2e918b496c9b92364189da4796682653 Reviewed-on: https://gerrit.libreoffice.org/10614 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk index b0d29c2..694a886 100644 --- a/external/coinmp/ExternalPackage_coinmp.mk +++ b/external/coinmp/ExternalPackage_coinmp.mk @@ -16,14 +16,14 @@ $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,C else ifneq ($(DISABLE_DYNLOADING),) # Just use the static archives from workdir. See bin/lo-all-static-libs else ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.dylib)) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.8.8.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.8.8.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.8.5.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.12.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.7.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.11.5.dylib)) else $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.so.3,Cbc/src/.libs/libCbc.so.3.8.8)) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.so.3,Cbc/src/.libs/libCbcSolver.so.3.8.8)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - writerfilter/source
writerfilter/source/dmapper/ThemeTable.cxx |4 +-
writerfilter/source/ooxml/OOXMLFactory.cxx | 35
writerfilter/source/ooxml/OOXMLFactory.hxx | 14 +---
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 16 -
writerfilter/source/ooxml/factory_ns.py|2 -
writerfilter/source/ooxml/factoryimpl_ns.py| 36 +
6 files changed, 38 insertions(+), 69 deletions(-)
New commits:
commit 617623fb783d6588a2999cae978ee9bb147e3847
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Aug 7 12:51:24 2014 +0200
Revert ugly hack for NS_ooxml::LN_CT_Style_type being the first
attribute...
I believe this is not necessary after the recent removal of unordered_map
from
handling the attributes.
This reverts commit 76336334e669519cfa42413b851584fa321c004d.
Change-Id: I631bc2613954953a30448dbe2a5bf564c529e2a0
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 902d5a7..3a6b1be 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -23,7 +23,6 @@
#include resourcemodel/QNameToString.hxx
#include com/sun/star/drawing/XShape.hpp
#include oox/token/tokens.hxx
-#include ooxml/resourceids.hxx
namespace writerfilter {
namespace ooxml
@@ -471,20 +470,7 @@ void OOXMLPropertySetImpl::add(OOXMLProperty::Pointer_t
pProperty)
{
if (pProperty.get() != NULL pProperty-getId() != 0x0)
{
-/*
- HACK: Ugly hack. This retarded overdesigned writerfilter thing
- processes attributes in random order (as given by boost::unordered_map
- when iterating it), but StyleSheetTable::lcl_attribute() needs
- to know whether NS_ooxml::LN_CT_Style_type is STYLE_TYPE_TABLE first.
- And all this overdesigned machinery doesn't even give a reasonable
- way to find out if an attribute is there before encountering it
- in random order in lcl_attribute(), so just make sure here that
- the attribute comes first.
-*/
-if( pProperty-getId() == NS_ooxml::LN_CT_Style_type )
-mProperties.insert( mProperties.begin(), pProperty );
-else
-mProperties.push_back(pProperty);
+mProperties.push_back(pProperty);
}
}
commit 00db42fec1056999e8aaa5a5cd671ecb7f89c57a
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Aug 7 12:30:13 2014 +0200
writerfilter: This depended on the order of attributes.
This code actually worked by mistake, thanks to the wrong ordering of
attributes that was caused by the usage of the boost::unordered_map.
Change-Id: I72cc5b54496b03183987d4d004f985d368e63deb
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx
b/writerfilter/source/dmapper/ThemeTable.cxx
index 7817175..68efb48 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -112,8 +112,10 @@ void ThemeTable::lcl_sprm(Sprm rSprm)
dmapper_logger-chars(rSprm.toString());
#endif
-sal_uInt32 nSprmId = rSprm.getId();
+m_pImpl-m_supplementalFontName = ;
+m_pImpl-m_supplementalFontId = 0;
+sal_uInt32 nSprmId = rSprm.getId();
switch(nSprmId)
{
case NS_ooxml::LN_CT_BaseStyles_fontScheme:
commit 345a3a394e082595924bf219796627f6c00ae2dd
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Aug 7 08:27:45 2014 +0200
writerfilter: Kill AttributeToResourceMap.
IMPORTANT: From now on, the order of attributes becomes stable, based on the
order in model.xml (not on implementation details of unordered_map), and the
code that handles attributes may depend on a particular order. If you want
to
change the order how the attributes are handled, change model.xml, and check
you achieved what you wanted in the generated ::getAttributeInfoArray()'s.
[Writerfilter loses another 250k (stripped dbgutil). And the usage of
unordered_map here was just completely bogus from the very beginning, as it
was only iterated as a normal array anyway ;-)]
Change-Id: Ic70c37793e313c4ccda1d6f374cc2d366307ba1b
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 75bee97..1318c9e 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -30,16 +30,6 @@ namespace ooxml {
using namespace com::sun::star;
-AttributeInfo::AttributeInfo()
-:m_nResource(RT_NoResource), m_nRef(0)
-{
-}
-
-AttributeInfo::AttributeInfo(ResourceType_t nResource, Id nRef)
- :m_nResource(nResource), m_nRef(nRef)
-{
-}
-
CreateElement::CreateElement()
:m_nResource(RT_NoResource), m_nId(0)
{
@@ -56,14 +46,6 @@ OOXMLFactory_ns::~OOXMLFactory_ns()
{
}
-AttributeToResourceMapPointer OOXMLFactory_ns::getAttributeToResourceMap(Id
nId)
-{
-
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde/fpicker/kdefpmain.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b4589038b35f684d270f2beb43fad579f2e4b25b Author: Jan Holesovsky ke...@collabora.com Date: Thu Aug 7 15:24:43 2014 +0200 Update my address. Change-Id: If08154e617250ab78638e149da1ca34a11ceba75 diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx index d7152a53..ee0f0c4 100644 --- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++ b/vcl/unx/kde/fpicker/kdefpmain.cxx @@ -72,7 +72,7 @@ int main( int argc, char* argv[] ) 0.1, I18N_NOOP( kdefilepicker is an implementation of the THIS_DESKENV_NAME_CAP file dialog for LibreOffice. ), KAboutData::License_LGPL, (c) 2004, Jan Holesovsky ); -qAboutData.addAuthor( Jan Holesovsky, I18N_NOOP(Original author and current maintainer), ke...@openoffice.org ); +qAboutData.addAuthor( Jan Holesovsky, I18N_NOOP(Original author), ke...@collabora.com ); // Let the user see that this does something... ::std::cerr kdefilepicker, an implementation of a THIS_DESKENV_NAME_CAP file dialog for OOo. ::std::endl ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |8
1 file changed, 8 insertions(+)
New commits:
commit 7479729487e167c61c69b77f5e270e639160005b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 15:25:15 2014 +0200
Work around dirty Qt4 test code
...failing under -fsanitize=undefined -fno-sanitize-recover
Change-Id: I33a72bc1474708847f4cfc6d3d2ae6a19eb80c7f
diff --git a/configure.ac b/configure.ac
index 8706f17..12e5f81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11498,6 +11498,13 @@ int main(int argc, char **argv) {
qt4_fix_warning=
AC_LANG_PUSH([C++])
+# tst_exclude_socket_notifiers.moc:70:28: runtime error: member
access within address 0x60d0bb20 which does not point to an object of type
'QObjectData'
+# 0x60d0bb20: note: object is of type 'QObjectPrivate'
+# 02 00 80 3a 90 8a 4e d2 3a 00 00 00 f0 b4 b9 a7 ff 7f 00 00
00 00 00 00 00 00 00 00 20 d8 4e d2
+# ^~~
+# vptr for 'QObjectPrivate'
+save_CXX=$CXX
+CXX=$(printf %s $CXX | sed -e s/-fno-sanitize-recover//)
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
save_LIBS=$LIBS
@@ -11574,6 +11581,7 @@ int main(int argc, char *argv[])
LIBS=$save_LIBS
CXXFLAGS=$save_CXXFLAGS
+CXX=$save_CXX
AC_LANG_POP([C++])
],
AC_MSG_WARN([[No Glib found, KDE4 support will not use native file
pickers!]]))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/source config_host/config_features.h.in config_host.mk.in configure.ac include/avmedia RepositoryExternal.mk sd/source
RepositoryExternal.mk |6 +-
avmedia/Library_avmedia.mk |5 +
avmedia/source/framework/modeltools.cxx |9 ++---
config_host.mk.in |1 +
config_host/config_features.h.in|5 +
configure.ac| 23 +++
include/avmedia/modeltools.hxx |4
sd/source/ui/func/fuinsert.cxx |9 +
8 files changed, 50 insertions(+), 12 deletions(-)
New commits:
commit 191f0944fd8fc30493eda58c7adfdfa0b538f507
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Aug 7 15:21:41 2014 +0200
Handle collada libraries seperately: --disable-collada
Depends on gltf support.
Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1961829..1822f95 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3373,6 +3373,8 @@ endef
endif # SYSTEN_LIBGLTF
+ifeq ($(ENABLE_COLLADA),TRUE)
+
define gb_LinkTarget__use_opencollada_parser
$(call gb_LinkTarget_set_include,$(1),\
-I$(call
gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
@@ -3403,7 +3405,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
)
endef
-endif
+endif # ENABLE_COLLADA
+
+endif # ENABLE_GLTF
### Jars
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 184c66c..7cc08fa 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
))
endif
-ifneq (,$(filter COLLADA2GLTF,$(BUILD_TYPE)))
+ifeq ($(ENABLE_COLLADA),TRUE)
$(eval $(call gb_Library_set_warnings_not_errors,avmedia))
ifeq ($(OS),LINUX)
@@ -68,9 +68,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\
png \
))
-$(eval $(call gb_Library_add_defs,avmedia,\
- -DENABLE_COLLADA2GLTF \
-))
endif
$(eval $(call gb_Library_add_exception_objects,avmedia,\
diff --git a/avmedia/source/framework/modeltools.cxx
b/avmedia/source/framework/modeltools.cxx
index 87c7519..4360f42 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -29,7 +29,9 @@
#include boost/foreach.hpp
#include boost/optional.hpp
-#ifdef ENABLE_COLLADA2GLTF
+#include config_features.h
+
+#if HAVE_FEATURE_COLLADA
#include COLLADA2GLTFWriter.h
#include GLTFAsset.h
#endif
@@ -42,7 +44,7 @@ using namespace boost::property_tree;
namespace avmedia {
-#ifdef ENABLE_COLLADA2GLTF
+#if HAVE_FEATURE_COLLADA
static void lcl_UnzipKmz(const OUString rSourceURL, const OUString
rOutputFolderURL, OUString o_rDaeFileURL)
{
@@ -241,7 +243,8 @@ bool Embed3DModel( const uno::Referenceframe::XModel
xModel,
const OUString rSourceURL, OUString o_rEmbeddedURL)
{
OUString sSource = rSourceURL;
-#ifdef ENABLE_COLLADA2GLTF
+
+#if HAVE_FEATURE_COLLADA
if( !rSourceURL.endsWithIgnoreAsciiCase(.json) )
KmzDae2Gltf(rSourceURL, sSource);
#endif
diff --git a/config_host.mk.in b/config_host.mk.in
index 31dea01..1d4520cf 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -112,6 +112,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@
export SYSTEM_COINMP=@SYSTEM_COINMP@
export COINMP_CFLAGS=@COINMP_CFLAGS@
export COINMP_LIBS=@COINMP_LIBS@
+export ENABLE_COLLADA=@ENABLE_COLLADA@
export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
export ENABLE_CUPS=@ENABLE_CUPS@
export ENABLE_CURL=@ENABLE_CURL@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 3fd1da5..f87ee27 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -142,4 +142,9 @@
*/
#define HAVE_FEATURE_GLTF 0
+/*
+ * Whether we have COLLADA support.
+ */
+#define HAVE_FEATURE_COLLADA 0
+
#endif
diff --git a/configure.ac b/configure.ac
index 12e5f81..ee388ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1438,6 +1438,10 @@ AC_ARG_ENABLE(gltf,
AS_HELP_STRING([--disable-gltf],
[Determines whether to build libraries related to glTF 3D model
rendering.]))
+AC_ARG_ENABLE(collada,
+AS_HELP_STRING([--disable-collada],
+[Disable collada support (Rendering 3D models stored in *.dae and
*.kmz format).]))
+
dnl ===
dnl Optional Packages (--with/without-)
dnl ===
@@ -10640,10 +10644,6 @@ if test x$enable_gltf != xno -a $_os != iOS -a
$_os != Android; then
else
BUILD_TYPE=$BUILD_TYPE LIBGLTF
fi
-# otherwise build fails in collada2gltf external because of std::shared_ptr
-if test $have_std_shared_ptr = yes; then
-BUILD_TYPE=$BUILD_TYPE COLLADA2GLTF
-fi
else
AC_MSG_RESULT([no])
fi
@@ -10652,6 +10652,21 @@ AC_SUBST(SYSTEM_LIBGLTF)
AC_SUBST(LIBGLTF_CFLAGS)
AC_SUBST(LIBGLTF_LIBS)
+dnl
[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/para-shading.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 14
sw/source/filter/ww8/docxattributeoutput.cxx| 59 +-
writerfilter/source/ooxml/model.xml | 492
4 files changed, 286 insertions(+), 279 deletions(-)
New commits:
commit 6e31cbb4eaea3c6600248ba59a22853acc1d6606
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Aug 7 13:46:37 2014 +0200
DOCX export: avoid empty attributes in paragraph shading
Change-Id: I4bdf3f2d7f2aee3ce735a52185e736a8861d85e4
diff --git a/sw/qa/extras/ooxmlexport/data/para-shading.docx
b/sw/qa/extras/ooxmlexport/data/para-shading.docx
new file mode 100644
index 000..9c2af1a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/para-shading.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b242714..6cd31bc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3474,6 +3474,20 @@ DECLARE_OOXMLEXPORT_TEST(testFdo80902, fdo80902.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:sectPr/w:docGrid, type,
lines);
}
+DECLARE_OOXMLEXPORT_TEST(testParaShading, para-shading.docx)
+{
+// Make sure the themeColor attribute is not written when it would be
empty.
+if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+{
+xmlXPathObjectPtr pXPath = getXPathNode(pXmlDoc,
/w:document/w:body/w:p/w:pPr/w:shd);
+xmlNodeSetPtr pXmlNodes = pXPath-nodesetval;
+CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+// The attribute existed, so xmlGetProp() returned non-NULL.
+CPPUNIT_ASSERT_EQUAL(static_castxmlChar*(0), xmlGetProp(pXmlNode,
BAD_CAST(themeColor)));
+}
+}
+
DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, first-header-footer.docx)
{
// Test import and export of a section's headerf/footerf properties.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2ba2b4b..cfd3ef4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7710,42 +7710,35 @@ void DocxAttributeOutput::ParaGrabBag(const
SfxGrabBagItem rItem)
{
uno::Sequencebeans::PropertyValue aGrabBagSeq;
i-second = aGrabBagSeq;
-OUString sVal, sShdFill, sShdColor,
-sThemeColor, sThemeTint, sThemeShade,
-sThemeFill, sThemeFillTint, sThemeFillShade;
+
for (sal_Int32 j=0; j aGrabBagSeq.getLength(); ++j)
{
+OString sVal =
OUStringToOString(aGrabBagSeq[j].Value.getOUString(), RTL_TEXTENCODING_UTF8);
+
+if (sVal.isEmpty())
+continue;
+
if (aGrabBagSeq[j].Name == val)
-aGrabBagSeq[j].Value = sVal;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w, XML_val),
sVal.getStr());
else if (aGrabBagSeq[j].Name == color)
-aGrabBagSeq[j].Value = sShdColor;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_color), sVal.getStr());
else if (aGrabBagSeq[j].Name == themeColor)
-aGrabBagSeq[j].Value = sThemeColor;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_themeColor), sVal.getStr());
else if (aGrabBagSeq[j].Name == themeTint)
-aGrabBagSeq[j].Value = sThemeTint;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_themeTint), sVal.getStr());
else if (aGrabBagSeq[j].Name == themeShade)
-aGrabBagSeq[j].Value = sThemeShade;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_themeShade), sVal.getStr());
else if (aGrabBagSeq[j].Name == fill)
-aGrabBagSeq[j].Value = sShdFill;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_fill), sVal.getStr());
else if (aGrabBagSeq[j].Name == themeFill)
-aGrabBagSeq[j].Value = sThemeFill;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_themeFill), sVal.getStr());
else if (aGrabBagSeq[j].Name == themeFillTint)
-aGrabBagSeq[j].Value = sThemeFillTint;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_themeFillTint), sVal.getStr());
else if (aGrabBagSeq[j].Name == themeFillShade)
-aGrabBagSeq[j].Value = sThemeFillShade;
+AddToAttrList(m_pBackgroundAttrList, FSNS(XML_w,
XML_themeFillShade), sVal.getStr());
else if (aGrabBagSeq[j].Name == originalColor)
aGrabBagSeq[j].Value =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6b/426a17dbbefac6ed88b5d3c15f53054e4c2dda
6b/426a17dbbefac6ed88b5d3c15f53054e4c2dda |1 + 1 file changed, 1 insertion(+) New commits: commit acd3b4a3f9fe1084824b2cafe62fa103eb037d04 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 15:04:01 2014 +0100 Notes added by 'git notes add' diff --git a/6b/426a17dbbefac6ed88b5d3c15f53054e4c2dda b/6b/426a17dbbefac6ed88b5d3c15f53054e4c2dda new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/6b/426a17dbbefac6ed88b5d3c15f53054e4c2dda @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/table/XMLTableExport.cxx | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 248437e4fd0cbc0cc18c802a202c290644176faf
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Aug 7 23:16:16 2014 +0900
fdo#75757: remove inheritance to std::map
Change-Id: I2fd0b43c62c331d866d697c94dd57d17f903111b
Reviewed-on: https://gerrit.libreoffice.org/10810
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/xmloff/source/table/XMLTableExport.cxx
b/xmloff/source/table/XMLTableExport.cxx
index 7c5631d..a102b79 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -87,21 +87,24 @@ const XMLPropertyMapEntry* getRowPropertiesMap()
return aXMLRowProperties[0];
}
-class StringStatisticHelper : public std::map OUString, sal_Int32
+class StringStatisticHelper
{
+private:
+std::map OUString, sal_Int32 mStats;
+
public:
void add( const OUString rStyleName );
-void clear() { std::map OUString, sal_Int32 ::clear(); }
+void clear() { mStats.clear(); }
sal_Int32 getModeString( /* out */ OUString rModeString );
};
void StringStatisticHelper::add( const OUString rStyleName )
{
-std::map OUString, sal_Int32 ::iterator iter( find( rStyleName ) );
-if( iter == end() )
+std::map OUString, sal_Int32 ::iterator iter( mStats.find( rStyleName )
);
+if( iter == mStats.end() )
{
-(*this)[rStyleName] = 1;
+mStats[rStyleName] = 1;
}
else
{
@@ -112,8 +115,8 @@ void StringStatisticHelper::add( const OUString rStyleName
)
sal_Int32 StringStatisticHelper::getModeString( OUString rStyleName )
{
sal_Int32 nMax = 0;
-const std::map OUString, sal_Int32 ::const_iterator aEnd( end() );
-for( std::map OUString, sal_Int32 ::iterator iter( begin() );
+const std::map OUString, sal_Int32 ::const_iterator aEnd( mStats.end() );
+for( std::map OUString, sal_Int32 ::iterator iter( mStats.begin() );
iter != aEnd; ++iter)
{
if( (*iter).second nMax )
___
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 #17 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=248437e4fd0cbc0cc18c802a202c290644176faf fdo#75757: remove inheritance to std::map 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: extensions/source extensions/uiconfig extensions/UIConfig_spropctrlr.mk
extensions/UIConfig_spropctrlr.mk|2
extensions/source/propctrlr/formlinkdialog.cxx | 84 +
extensions/source/propctrlr/formlinkdialog.hrc | 38
extensions/source/propctrlr/formlinkdialog.hxx | 12 -
extensions/source/propctrlr/formlinkdialog.src | 135 +--
extensions/source/propctrlr/formresid.hrc|3
extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui| 50 +
extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui | 168 +++
8 files changed, 284 insertions(+), 208 deletions(-)
New commits:
commit cd4de68ccdd26945e9a1d885ed75b552a9c8e935
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Thu Aug 7 16:08:29 2014 +0200
Convert RID_DLG_FORMLINKS to .ui
I converted RID_DLG_FORMLINKS dialog and FormLinkDialog control to .ui
Change-Id: I770b26f98f745f1717e97aa167e73644b7260fe2
Reviewed-on: https://gerrit.libreoffice.org/10808
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/extensions/UIConfig_spropctrlr.mk
b/extensions/UIConfig_spropctrlr.mk
index 87b91736..9793906 100644
--- a/extensions/UIConfig_spropctrlr.mk
+++ b/extensions/UIConfig_spropctrlr.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr))
$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
extensions/uiconfig/spropctrlr/ui/controlfontdialog \
extensions/uiconfig/spropctrlr/ui/datatypedialog \
+ extensions/uiconfig/spropctrlr/ui/fieldlinkrow \
+ extensions/uiconfig/spropctrlr/ui/formlinksdialog \
extensions/uiconfig/spropctrlr/ui/labelselectiondialog \
extensions/uiconfig/spropctrlr/ui/taborder \
))
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx
b/extensions/source/propctrlr/formlinkdialog.cxx
index c586db6..76d9ad5 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -19,7 +19,6 @@
#include formlinkdialog.hxx
-#include formlinkdialog.hrc
#include modulepcr.hxx
#include formresid.hrc
@@ -27,6 +26,8 @@
#include vcl/combobox.hxx
#include vcl/msgbox.hxx
#include vcl/waitobj.hxx
+#include vcl/tabpage.hxx
+#include vcl/layout.hxx
#include svtools/localresaccess.hxx
#include connectivity/dbtools.hxx
#include connectivity/dbexception.hxx
@@ -60,17 +61,16 @@ namespace pcr
//= FieldLinkRow
-class FieldLinkRow : public Window
+class FieldLinkRow : public TabPage
{
private:
-ComboBoxm_aDetailColumn;
-FixedText m_aEqualSign;
-ComboBoxm_aMasterColumn;
+ComboBox* m_pDetailColumn;
+ComboBox* m_pMasterColumn;
Linkm_aLinkChangeHandler;
public:
-FieldLinkRow( Window* _pParent, const ResId _rId );
+FieldLinkRow( Window* _pParent );
inline void SetLinkChangeHandler( const Link _rHdl ) {
m_aLinkChangeHandler = _rHdl; }
@@ -92,25 +92,23 @@ namespace pcr
};
-FieldLinkRow::FieldLinkRow( Window* _pParent, const ResId _rId )
-:Window( _pParent, _rId )
-,m_aDetailColumn( this, ResId( 1, *_rId.GetResMgr() ) )
-,m_aEqualSign ( this, ResId( 1, *_rId.GetResMgr() ) )
-,m_aMasterColumn( this, ResId( 2, *_rId.GetResMgr() ) )
+FieldLinkRow::FieldLinkRow( Window* _pParent )
+:TabPage( _pParent, FieldLinkRow,
modules/spropctrlr/ui/fieldlinkrow.ui )
{
-FreeResource();
+get(m_pDetailColumn, detailCombobox);
+get(m_pMasterColumn, masterCombobox);
-m_aDetailColumn.SetDropDownLineCount( 10 );
-m_aMasterColumn.SetDropDownLineCount( 10 );
+m_pDetailColumn-SetDropDownLineCount( 10 );
+m_pMasterColumn-SetDropDownLineCount( 10 );
-m_aDetailColumn.SetModifyHdl( LINK( this, FieldLinkRow,
OnFieldNameChanged ) );
-m_aMasterColumn.SetModifyHdl( LINK( this, FieldLinkRow,
OnFieldNameChanged ) );
+m_pDetailColumn-SetModifyHdl( LINK( this, FieldLinkRow,
OnFieldNameChanged ) );
+m_pMasterColumn-SetModifyHdl( LINK( this, FieldLinkRow,
OnFieldNameChanged ) );
}
void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence
OUString _rFieldNames )
{
-ComboBox* pBox = ( _eWhich == eDetailField ) ? m_aDetailColumn :
m_aMasterColumn;
+ComboBox* pBox = ( _eWhich == eDetailField ) ? m_pDetailColumn :
m_pMasterColumn;
const OUString* pFieldName= _rFieldNames.getConstArray();
const OUString* pFieldNameEnd = pFieldName + _rFieldNames.getLength();
@@ -121,7 +119,7 @@ namespace pcr
bool FieldLinkRow::GetFieldName( LinkParticipant _eWhich, OUString /*
[out] */ _rName ) const
{
-const ComboBox* pBox = ( _eWhich == eDetailField ) ? m_aDetailColumn
: m_aMasterColumn;
+const ComboBox* pBox = ( _eWhich == eDetailField ) ? m_pDetailColumn :
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 73a31771ad7775d7900b328967eb2f8628261d64 Author: David Tardon dtar...@redhat.com Date: Thu Aug 7 16:42:05 2014 +0200 Updated core Project: help 577577fd7006327a85f420360c769ca70e96b50c diff --git a/helpcontent2 b/helpcontent2 index 9411c73..577577f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9411c73cf8ac2f036ce21c99962788e59148158c +Subproject commit 577577fd7006327a85f420360c769ca70e96b50c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst
helpers/help_hid.lst | 13 - 1 file changed, 13 deletions(-) New commits: commit 577577fd7006327a85f420360c769ca70e96b50c Author: David Tardon dtar...@redhat.com Date: Thu Aug 7 16:42:05 2014 +0200 drop unused help id Change-Id: I82441f90fbf9f096e4655bebc3e20dd207fcf56e diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 496d687..372f0a5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -4859,7 +4859,6 @@ UID_RPT_RPT_PROP_DLG_FONT_TYPE,64525, UID_RPT_SCROLLWINDOW,64450, UID_RPT_SECTIONSWINDOW,64453, UID_RPT_VIEWSWINDOW,64454, -UID_SEARCH_RECORDSTATUS,38203, UID_SQLERROR_BUTTONMORE,38844, WID_SIMPLE_REF,25728,.uno:SimpleReferenz basctl_Edit_RID_MACROCHOOSER_RID_ED_MACRONAME,1317865477, commit 5cfd95968c332b5b873fe3bcfc0449f6bc792465 Author: David Tardon dtar...@redhat.com Date: Thu Aug 7 16:38:33 2014 +0200 drop unused help idsbbb Change-Id: I3a7ee22d0e3f8d513468283fbefdd5f497c886bb diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8a97f7f..496d687 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1387,8 +1387,6 @@ HID_FAX_PAGE5,53283, HID_FAX_PAGE6,53284, HID_FAX_PAGE7,53285, HID_FAX_PAGE8,53286, -HID_FIELDLINK_DETAIL_COLUMN,37917, -HID_FIELDLINK_MASTER_COLUMN,37918, HID_FIELD_SEL,38070, HID_FIELD_SEL_WIN,38071, HID_FILEDLG_CHARDLG,53063, @@ -4824,14 +4822,6 @@ UID_DLGINDEX_INDEXDETAILS_BACK,38971, UID_DLGINDEX_INDEXDETAILS_MAIN,38972, UID_DLG_TABLE_FILTER,39029, UID_EVT_MACRODLG,37963, -UID_FIELDLINK_DETAIL1,37919, -UID_FIELDLINK_DETAIL2,37921, -UID_FIELDLINK_DETAIL3,37923, -UID_FIELDLINK_DETAIL4,37925, -UID_FIELDLINK_MASTER1,37920, -UID_FIELDLINK_MASTER2,37922, -UID_FIELDLINK_MASTER3,37924, -UID_FIELDLINK_MASTER4,37926, UID_FIRSTSTART_HELP,42783, UID_FORMPROPBROWSER_FRAME,38205, UID_PROP_ADD_DATA_TYPE,38016, @@ -5015,11 +5005,9 @@ extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836, extensions_ListBox_RID_DLG_SELECTION_LB_ENTRIES,1090178561, extensions_ListBox_RID_PAGE_LCW_CONTENTSELECTION_FIELD_LB_SELECTFIELD,859770374, extensions_ListBox_RID_PAGE_OPTION_DBFIELD_LB_STOREINFIELD,859721220, -extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592, extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040, extensions_ModalDialog_RID_DLG_SELECTION,1090174976, extensions_MultiLineEdit_RID_TP_LICENSE_ML_LICENSE,553667083, -extensions_PushButton_RID_DLG_FORMLINKS_PB_SUGGEST,1090163204, extensions_PushButton_RID_DLG_OEMWIZARD_PB_NEXT,1090523650, extensions_PushButton_RID_DLG_OEMWIZARD_PB_PREV,1090523649, extensions_PushButton_RID_TP_LICENSE_PB_PAGEDOWN,553669138, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 38a3d53d8b9e6dd66c19f721be9b4b3e350eb249
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Aug 7 23:35:02 2014 +0900
fdo#75757: remove inheritance to std::vector
Change-Id: I04a5832c86823718146c78238ea648be21bf1f53
Reviewed-on: https://gerrit.libreoffice.org/10811
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index c563395..11aec87 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -155,12 +155,16 @@ struct NWFWidgetData
// easily and quickly reset each to a default state before using
// them
static boost::unordered_maplong, guintgWidgetDefaultFlags;
-class WidgetDataVector : public std::vectorNWFWidgetData
+class WidgetDataVector
{
+private:
+std::vectorNWFWidgetData mData;
+
public:
-WidgetDataVector(size_t nElems = 0) : std::vectorNWFWidgetData( nElems )
{}
-NWFWidgetData operator [](size_t i) { return at(i); }
-NWFWidgetData operator [](const SalX11Screen s) { return
at(s.getXScreen()); }
+WidgetDataVector(size_t nElems = 0) : mData( nElems ) {}
+size_t size() const { return mData.size(); }
+NWFWidgetData operator [](size_t i) { return mData.at(i); }
+NWFWidgetData operator [](const SalX11Screen s) { return
mData.at(s.getXScreen()); }
};
static WidgetDataVector gWidgetData;
___
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 #18 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=38a3d53d8b9e6dd66c19f721be9b4b3e350eb249 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: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d5dc37b958f8d01782c63affcdd04a5be1ec995d
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 17:45:02 2014 +0200
Need for chainging only if there is a next link
Change-Id: I2d44ce25a8795188b3c2fb98027e76b905a56cc8
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 1c6a524..d70995b 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1945,7 +1945,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
ImpAutoFitText(*pEdtOutl);
mbInDownScale = false;
}
-else if (/* TODO: IsChained() */ pEditStatus-IsPageOverflow())
+else if ( GetNextLinkInChain() != NULL
pEditStatus-IsPageOverflow())
{
// FIXME(matteocam): should include check that the TextBox has a
next chain link
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 9fc83ae4e479f7e6784dfdce87de35c283fbadd2
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Thu Aug 7 11:37:02 2014 +0200
fdo#82241 fix autocompletion for calc functions with
dot or underscore in function name
Change-Id: Id460cad619098265b4ae000894df64a996ef0514
Reviewed-on: https://gerrit.libreoffice.org/10801
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 91b4cac..050c254 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1121,7 +1121,7 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
}
namespace {
-
+
bool needToExtendSelection(const OUString rSelectedText, const OUString
rInsertText)
{
SAL_DEBUG(rSelectedText);
@@ -1138,12 +1138,12 @@ void completeFunction( EditView* pView, const OUString
rInsert, bool rParInser
pView-SetSelection(aSel);
pView-SelectCurrentWord();
-// a dot is a word separator so we need special
-// treatment for any formula containing a dot
-if(rInsert.indexOf(.) != -1)
+// a dot and underscore are word separators so we need special
+// treatment for any formula containing a dot or underscore
+if(rInsert.indexOf(.) != -1 || rInsert.indexOf(_) != -1)
{
// need to make sure that we replace also the part before the dot
-// incrementally go through the word to find the match with the
insert string
+// go through the word to find the match with the insert string
aSel = pView-GetSelection();
ESelection aOldSelection = aSel;
OUString aSelectedText = pView-GetSelected();
@@ -1156,6 +1156,7 @@ void completeFunction( EditView* pView, const OUString
rInsert, bool rParInser
pView-SelectCurrentWord();
aSelectedText = pView-GetSelected();
}
+aSel.nStartPos -= ( aSelectedText.getLength() - 1 );
aSel.nEndPos = aOldSelection.nEndPos;
pView-SetSelection(aSel);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source svx/source
editeng/source/editeng/impedit3.cxx |1 +
svx/source/svdraw/svdotext.cxx |3 ---
svx/source/svdraw/svdotxed.cxx |2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit ff6679cf9410bdcce2a47228d1a8ece4f168a046
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 18:10:57 2014 +0200
Debugging output for Overflowing paragraph
Change-Id: I0ac2fc1da4d70d8f382d4652934ceb63944dd3fc
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index db1aad8..a6a21ae 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -429,6 +429,7 @@ void ImpEditEngine::FormatDoc()
// FIXME(matteocam)
// set possible point for chainging
mnOverflowingPara = nPara;
+fprintf(stderr, [CHAINING] Setting first overflowing para:
%d\n, nPara);
}
// InvalidRect set only once...
commit f5a1c7c94ddd06d44393db4cec2a4912075dde00
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 18:01:26 2014 +0200
Check whether text box is not its own next link in chain
Change-Id: I440856afa23ef77b65df0b8e77482383bfc54934
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d70995b..cbdec1e 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1947,11 +1947,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
}
else if ( GetNextLinkInChain() != NULL
pEditStatus-IsPageOverflow())
{
-// FIXME(matteocam): should include check that the TextBox has a
next chain link
-
// set the need for chaining
SetToBeChained( true );
-
//impDecomposeChainedTextPrimitive();
}
}
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index cffa559..76d3296 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -261,7 +261,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
// FIXME(matteocam)
// TODO: move this to one level higher
-if ( IsToBeChained() )
+if ( IsToBeChained() GetNextLinkInChain() != this) // XXX:
defensive check
{
// set non overflow part of text to current box
pNewText = rOutl.GetNonOverflowingParaObject();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/ooxml/OOXMLFactory.cxx | 140 ++--
writerfilter/source/ooxml/factoryimpl_ns.py | 21 ++--
2 files changed, 84 insertions(+), 77 deletions(-)
New commits:
commit 525063f24d2a95bd0ae47780f7e7cb15333f0d33
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Aug 7 18:12:12 2014 +0200
writerfilter: Old Python does not know OrderedDict, work that around.
Change-Id: I08fc7ba8e94d3d258f9e00ac45cd1a8a0b6b3ff3
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py
b/writerfilter/source/ooxml/factoryimpl_ns.py
index eee675e..e619ffd 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -9,7 +9,6 @@
from __future__ import print_function
from xml.dom import minidom
-from collections import OrderedDict
import sys
@@ -127,7 +126,8 @@ def fastToken(attrNode):
def collectAttributeToResource(nsNode, defineNode):
-ret = OrderedDict()
+ret_dict = {}
+ret_order = []
defineName = defineNode.getAttribute(name)
for refNode in getChildrenByName(defineNode, ref):
refName = refNode.getAttribute(name)
@@ -135,7 +135,9 @@ def collectAttributeToResource(nsNode, defineNode):
if parent.localName in (element, attribute):
continue
for define in [i for i in getChildrenByName(getChildByName(nsNode,
grammar), define) if i.getAttribute(name) == refName]:
-ret.update(collectAttributeToResource(nsNode, define))
+ret = collectAttributeToResource(nsNode, define)
+ret_dict.update(ret[0])
+ret_order.extend(ret[1])
attrNodes = defineNode.getElementsByTagName(attribute)
for attrNode in attrNodes:
@@ -147,16 +149,21 @@ def collectAttributeToResource(nsNode, defineNode):
refName = refNode.getAttribute(name)
for define in [i for i in
getChildrenByName(getChildByName(nsNode, grammar), define) if
i.getAttribute(name) == refName]:
refDefine = idForDefine(nsNode, define)
-ret[attrToken] = RT_%s, %s % (resourceName, refDefine)
+ret_dict[attrToken] = RT_%s, %s % (resourceName, refDefine)
+ret_order.append(attrToken)
-return ret
+return [ret_dict, ret_order]
def factoryAttributeToResourceMapInner(nsNode, defineNode):
ret = []
attributes = collectAttributeToResource(nsNode, defineNode)
-for k in attributes.keys():
-ret.append({ %s, %s }, % (k, attributes[k]))
+already_used = set()
+for k in attributes[1]:
+if not (k in already_used):
+ret.append({ %s, %s }, % (k, attributes[0][k]))
+already_used.add(k)
+
return ret
commit fea94f214e4a8dea58b1c1e3f09cbde339f0465f
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Aug 7 15:41:10 2014 +0200
writerfilter: Kill unnecessary indentation (return or continue early).
Change-Id: Iad20b8f9b453d413ce0d249c65b5f44767f0264b
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 1318c9e..813982d 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -85,84 +85,84 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler *
pHandler,
Id nDefine = pHandler-getDefine();
OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine);
-if (pFactory.get() != NULL)
+if (pFactory.get() == NULL)
+return;
+
+assert( dynamic_cast sax_fastparser::FastAttributeList *( Attribs.get()
) != NULL );
+sax_fastparser::FastAttributeList *pAttribs;
+pAttribs = static_cast sax_fastparser::FastAttributeList *(
Attribs.get() );
+
+const AttributeInfo *pAttr = pFactory-getAttributeInfoArray(nDefine);
+if (!pAttr)
+return;
+
+for (; pAttr-m_nToken != -1; ++pAttr)
{
-assert( dynamic_cast sax_fastparser::FastAttributeList *(
Attribs.get() ) != NULL );
-sax_fastparser::FastAttributeList *pAttribs;
-pAttribs = static_cast sax_fastparser::FastAttributeList *(
Attribs.get() );
+sal_Int32 nToken = pAttr-m_nToken;
+if (!pAttribs-hasAttribute(nToken))
+continue;
-const AttributeInfo *pAttr = pFactory-getAttributeInfoArray(nDefine);
-if (!pAttr)
-return;
+Id nId = pFactory-getResourceId(nDefine, nToken);
-for (; pAttr-m_nToken != -1; ++pAttr)
+switch (pAttr-m_nResource)
{
-sal_Int32 nToken = pAttr-m_nToken;
-if (pAttribs-hasAttribute(nToken))
+case RT_Boolean:
{
-Id nId = pFactory-getResourceId(nDefine, nToken);
-
-switch (pAttr-m_nResource)
+const char *pValue = ;
+pAttribs-getAsChar(nToken, pValue);
+OOXMLValue::Pointer_t
[Libreoffice-commits] core.git: bridges/inc bridges/Library_cpp_uno.mk bridges/source
bridges/Library_cpp_uno.mk |2 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx| 14 + bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx |3 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx |3 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx|3 bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx |2 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx| 11 + bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 130 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |1 bridges/source/cpp_uno/gcc3_macosx_intel/cpp2uno.cxx|3 bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx |3 bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx |3 bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx |3 bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx |3 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx |3 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx|3 bridges/source/cpp_uno/shared/vtablefactory.cxx | 15 + 31 files changed, 83 insertions(+), 164 deletions(-) New commits: commit 9c9f0ea2c38929d133b0fe2faf616ecab17e07c9 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:21:08 2014 +0200 Include RTTI in generated vtables for ubsan's vptr-based checks ...though only on gcc3_linux_x86-64 for now. Change-Id: Id90554425e78b38a5a97149f2a7d3ac04cbe0c9b diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index d929c86..e971442 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -125,7 +125,7 @@ ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_x86-64 bridge_asm_objects := call bridge_noncallexception_noopt_objects := callvirtualmethod -bridge_exception_objects := abi cpp2uno except uno2cpp +bridge_exception_objects := abi cpp2uno except rtti uno2cpp else ifeq ($(OS),MACOSX) bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64 bridge_exception_objects := abi call cpp2uno except uno2cpp diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 613358d..5b4b06b 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -128,9 +128,11 @@ private: void freeBlock(Block const block) const; -void createVtables( +sal_Int32 createVtables( GuardedBlocks blocks, BaseOffset const baseOffset, -typelib_InterfaceTypeDescription * type, bool includePrimary) const; +typelib_InterfaceTypeDescription * type, sal_Int32 vtableNumber, +typelib_InterfaceTypeDescription * mostDerived, bool includePrimary) +const; // This function is not defined in the generic part, but instead has to be // defined individually for each CPP--UNO bridge: @@ -150,9 +152,15 @@ private: @param block the start address of the raw vtable block @param slotCount the number of slots +@param vtableNumber zero-based count across all the most derived type's +vtables (for vtable's offset to top slot) +@param type non-null most derived type (for vtable's typeinfo pointer +slot) @return a pointer past the last vtable slot */ -static Slot * initializeBlock(void * block, sal_Int32 slotCount); +static Slot * initializeBlock( +void * block, sal_Int32 slotCount, sal_Int32 vtableNumber, +typelib_InterfaceTypeDescription * type); // This function is not defined in the generic part, but instead has to be // defined individually for each CPP--UNO bridge: diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx index d98d32f..33bb5fa 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx @@ -579,7 +579,8 @@
[Libreoffice-commits] core.git: cppu/source
cppu/source/uno/IdentityMapping.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bcc719d52e6c470c3bb66548418230b48336e888
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 18:24:41 2014 +0200
Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy
Change-Id: Iaa470f710295e65347c9d12a3bce0d0b68b02417
diff --git a/cppu/source/uno/IdentityMapping.cxx
b/cppu/source/uno/IdentityMapping.cxx
index fce98bd..270d065 100644
--- a/cppu/source/uno/IdentityMapping.cxx
+++ b/cppu/source/uno/IdentityMapping.cxx
@@ -19,6 +19,7 @@
#include IdentityMapping.hxx
+#include typelib/typedescription.h
#include uno/mapping.h
#include uno/environment.hxx
@@ -67,7 +68,7 @@ static void SAL_CALL s_release(uno_Mapping * pMapping)
static void SAL_CALL s_mapInterface(uno_Mapping *
pMapping,
void ** ppOut,
void *
pInterface,
-SAL_UNUSED_PARAMETER struct
_typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/)
+SAL_UNUSED_PARAMETER
typelib_InterfaceTypeDescription * /*pInterfaceTypeDescr*/)
{
*ppOut = pInterface;
___
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/filewriter.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit abdae7c281f6449833c920c5a9ba22459be484bd
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 18:29:15 2014 +0200
Fix function types
Change-Id: I295f587e48e2882f87091a3a86610e316cd903fb
diff --git a/i18npool/source/localedata/filewriter.cxx
b/i18npool/source/localedata/filewriter.cxx
index 0a83b42..19b2558 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -73,7 +73,7 @@ void OFileWriter::writeRefFunction(const char *func, const
OUString useLocale)
void OFileWriter::writeFunction(const char *func, const char *count, const
char *array, const char *from, const char *to) const
{
-fprintf(m_f, sal_Unicode ** SAL_CALL %s%s(sal_Int16 count, const
sal_Unicode* from, const sal_Unicode* to)\n{\n, func, theLocale);
+fprintf(m_f, sal_Unicode const * const * SAL_CALL %s%s(sal_Int16 count,
const sal_Unicode* from, const sal_Unicode* to)\n{\n, func, theLocale);
fprintf(m_f, \tcount = %s;\n, count);
fprintf(m_f, \tfrom = %s;\n, from);
fprintf(m_f, \tto = %s;\n, to);
@@ -84,8 +84,8 @@ void OFileWriter::writeRefFunction(const char *func, const
OUString useLocale,
{
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
-fprintf(m_f, extern sal_Unicode ** SAL_CALL %s%s(sal_Int16 count, const
sal_Unicode* from, const sal_Unicode* to);\n, func, locale);
-fprintf(m_f, sal_Unicode ** SAL_CALL %s%s(sal_Int16 count, const
sal_Unicode* from, const sal_Unicode* to)\n{\n, func, theLocale);
+fprintf(m_f, extern sal_Unicode const * const * SAL_CALL %s%s(sal_Int16
count, const sal_Unicode* from, const sal_Unicode* to);\n, func, locale);
+fprintf(m_f, sal_Unicode const * const * SAL_CALL %s%s(sal_Int16 count,
const sal_Unicode* from, const sal_Unicode* to)\n{\n, func, theLocale);
fprintf(m_f, \tto = %s;\n, to);
fprintf(m_f, \tconst sal_Unicode* tmp;\n);
fprintf(m_f, \treturn %s%s(count, from, tmp);\n}\n, func, locale);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/ppt/dgmimport.cxx |1 + oox/source/ppt/dgmlayout.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit ca730eed1e61551d77fb6d788eab9214579ed4ff Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:35:09 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I9d58782c3d3bd09dc0d1d7121c057541f1186b43 diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index e760b2e..dcb80319 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -23,6 +23,7 @@ #include oox/dump/pptxdumper.hxx #include com/sun/star/drawing/XShape.hpp +#include com/sun/star/uno/XComponentContext.hpp #include services.hxx diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index f9db4c7..9af11a2 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -25,6 +25,7 @@ #include com/sun/star/drawing/XShape.hpp #include com/sun/star/drawing/XMasterPageTarget.hpp +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/xml/dom/XDocument.hpp #include com/sun/star/xml/sax/XFastSAXSerializable.hpp #include com/sun/star/container/XChild.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/expatwrap/sax_expat.cxx |5 +
sax/source/expatwrap/saxwriter.cxx |5 +
sax/source/fastparser/fastparser.cxx |5 +
3 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit f740673ed74b1e2daf2a65d9b167dc3a38e1dd25
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 18:35:59 2014 +0200
Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy
Change-Id: I2d4e4be562cc752e7545792b148d5ed0cf551f25
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 9735e07..78906eb 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -26,6 +26,7 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/lang/XInitialization.hpp
+#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/xml/sax/XExtendedDocumentHandler.hpp
#include com/sun/star/xml/sax/XParser.hpp
#include com/sun/star/xml/sax/SAXParseException.hpp
@@ -48,10 +49,6 @@ using namespace ::com::sun::star::io;
#include attrlistimpl.hxx
#include xml2utf.hxx
-namespace com { namespace sun { namespace star { namespace uno {
-class XComponentContext;
-} } } }
-
namespace {
// Useful macros for correct String conversion depending on the chosen
expat-mode
diff --git a/sax/source/expatwrap/saxwriter.cxx
b/sax/source/expatwrap/saxwriter.cxx
index 331173e..0409240 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -24,6 +24,7 @@
#include stack
#include com/sun/star/lang/XServiceInfo.hpp
+#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/util/XCloneable.hpp
#include com/sun/star/xml/sax/XParser.hpp
#include com/sun/star/xml/sax/SAXParseException.hpp
@@ -51,10 +52,6 @@ using namespace ::com::sun::star::io;
#include xml2utf.hxx
#include boost/scoped_array.hpp
-namespace com { namespace sun { namespace star { namespace uno {
-class XComponentContext;
-} } } }
-
#define LINEFEED 10
#define SEQUENCESIZE 1024
#define MAXCOLUMNCOUNT 72
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index d3103d1..1e08851 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -22,6 +22,7 @@
#include xml2utf.hxx
#include com/sun/star/lang/DisposedException.hpp
+#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/xml/sax/FastToken.hpp
#include com/sun/star/xml/sax/SAXParseException.hpp
#include com/sun/star/xml/sax/XFastContextHandler.hpp
@@ -45,10 +46,6 @@
#include cstring
#include expat.h
-namespace com { namespace sun { namespace star { namespace uno {
-class XComponentContext;
-} } } }
-
using namespace ::std;
using namespace ::osl;
using namespace ::cppu;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewfac.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit f54f5dea9778bc4a3103fe97921c6e952c2d6c46 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:37:04 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I712d10c80ffbd3c4b9d628497eca006a912955ce diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index cae47b6..6e778c6 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -19,6 +19,8 @@ #include sfx2/app.hxx #include sfx2/viewfac.hxx +#include sfx2/viewfrm.hxx +#include sfx2/viewsh.hxx #include rtl/ustrbuf.hxx SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldSh ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit b08553f0491e8f23ba890b206a4c9c5c9633b390 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:38:59 2014 +0200 Under -fsanitize=undefined, always link with C++ compiler Change-Id: I4ded563245dd6d491420a69903796d933cbd449c diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 6d89207..94526ab 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -158,9 +158,13 @@ endif # note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10 # we want to use @$(extraobjectlist) in the long run # link with C compiler if there are no C++ files (pyuno_wrapper depends on this) +# But always link with C++ compiler e.g. under -fsanitze=undefined, as sal uses +# __ubsan_handle_dynamic_type_cache_miss_abort and __ubsan_vptr_type_cache from +# libclang_rt.ubsan_cxx-x86_64.a, and oosplash links against sal but itself only +# contains .c sources: define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ - $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ + $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(gb_LTOFLAGS) \ $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: stoc/source
stoc/source/typeconv/convert.cxx |1 + stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx |1 + stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |1 + 3 files changed, 3 insertions(+) New commits: commit e80c3152fdd343829af9e196aa6c72aaf9c7597f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:40:17 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I004905375489fa5533ab4af13ebba439ba792384 diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 3a0e127..6e10a0c 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -40,6 +40,7 @@ #include com/sun/star/script/FailReason.hpp #include com/sun/star/container/XSet.hpp #include com/sun/star/registry/XRegistryKey.hpp +#include com/sun/star/uno/XComponentContext.hpp #include stocservices.hxx diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index 38bc99a..a0a7600 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -29,6 +29,7 @@ #include com/sun/star/uno/Reference.hxx #include com/sun/star/uno/RuntimeException.hpp #include com/sun/star/uno/Sequence.hxx +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/uno/XInterface.hpp #include com/sun/star/uri/XUriReference.hpp #include com/sun/star/uri/XUriSchemeParser.hpp diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index 465800b..5866c31 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -28,6 +28,7 @@ #include com/sun/star/uno/Reference.hxx #include com/sun/star/uno/RuntimeException.hpp #include com/sun/star/uno/Sequence.hxx +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/uno/XInterface.hpp #include com/sun/star/uri/XUriReference.hpp #include com/sun/star/uri/XUriSchemeParser.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/graphic/provider.cxx |1 + svtools/source/graphic/renderer.cxx |1 + svtools/source/hatchwindow/hatchwindowfactory.cxx |1 + 3 files changed, 3 insertions(+) New commits: commit 5b9c8241ea3a536cd0652bddbca110d86e09dcf9 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:40:50 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I11db6f87f3b8b32578c0c83d3df7b11d3533b5ef diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 1cf6620..c21577b 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -34,6 +34,7 @@ #include vcl/settings.hxx #include com/sun/star/io/XStream.hpp #include com/sun/star/text/GraphicCrop.hpp +#include com/sun/star/uno/XComponentContext.hpp #include comphelper/servicehelper.hxx #include cppuhelper/supportsservice.hxx diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index e262f31..297166f 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -21,6 +21,7 @@ #include com/sun/star/beans/PropertyState.hpp #include com/sun/star/beans/PropertyAttribute.hpp #include com/sun/star/awt/Rectangle.hpp +#include com/sun/star/uno/XComponentContext.hpp #include osl/mutex.hxx #include vcl/svapp.hxx #include toolkit/helper/vclunohelper.hxx diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index 51dbdfe..d31c989 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -19,6 +19,7 @@ #include com/sun/star/embed/XHatchWindowFactory.hpp #include com/sun/star/lang/XServiceInfo.hpp +#include com/sun/star/uno/XComponentContext.hpp #include cppuhelper/implbase2.hxx #include cppuhelper/supportsservice.hxx #include rtl/ref.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/asynccallback.cxx |1 + toolkit/source/awt/vclxmenu.cxx|1 + toolkit/source/awt/vclxprinter.cxx |1 + toolkit/source/awt/vclxtoolkit.cxx |1 + toolkit/source/controls/dialogcontrol.cxx |1 + toolkit/source/controls/formattedcontrol.cxx |1 + toolkit/source/controls/grid/gridcontrol.cxx |1 + toolkit/source/controls/grid/sortablegriddatamodel.cxx |1 + toolkit/source/controls/roadmapcontrol.cxx |1 + toolkit/source/controls/spinningprogress.cxx |1 + toolkit/source/controls/stdtabcontroller.cxx |1 + toolkit/source/controls/tabpagecontainer.cxx |1 + toolkit/source/controls/tabpagemodel.cxx |1 + toolkit/source/controls/tkscrollbar.cxx|1 + toolkit/source/controls/tkspinbutton.cxx |1 + toolkit/source/controls/tree/treecontrol.cxx |1 + toolkit/source/controls/unocontrolcontainer.cxx|1 + toolkit/source/controls/unocontrolcontainermodel.cxx |2 +- toolkit/source/controls/unocontrols.cxx|1 + 19 files changed, 19 insertions(+), 1 deletion(-) New commits: commit 1579d8ed79fb70308599b2329803b3d679718ec8 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 18:42:35 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I536353b86ee023eb630ea89786d2205a628d95e3 diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index b8cb52e..41109f6 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -28,6 +28,7 @@ #include cppuhelper/implbase2.hxx #include cppuhelper/supportsservice.hxx #include com/sun/star/lang/XServiceInfo.hpp +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/awt/XRequestCallback.hpp /// anonymous implementation namespace diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 8bcc7d3..9f82e29 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -23,6 +23,7 @@ #include toolkit/helper/servicenames.hxx #include toolkit/helper/vclunohelper.hxx +#include com/sun/star/uno/XComponentContext.hpp #include cppuhelper/supportsservice.hxx #include cppuhelper/typeprovider.hxx #include rtl/uuid.h diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 206201f..a9c632c 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include com/sun/star/uno/XComponentContext.hpp #include toolkit/awt/vclxprinter.hxx #include toolkit/helper/macros.hxx #include cppuhelper/typeprovider.hxx diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 88aa88f..be5ee82 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -36,6 +36,7 @@ #include com/sun/star/lang/EventObject.hpp #include com/sun/star/uno/Reference.hxx #include com/sun/star/uno/Sequence.hxx +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/uno/XInterface.hpp #include com/sun/star/beans/NamedValue.hpp #include com/sun/star/datatransfer/clipboard/SystemClipboard.hpp diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 0da0984..8e3d5b1 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -29,6 +29,7 @@ #include com/sun/star/awt/PosSize.hpp #include com/sun/star/awt/WindowAttribute.hpp #include com/sun/star/resource/XStringResourceResolver.hpp +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/graphic/XGraphicProvider.hpp #include cppuhelper/typeprovider.hxx #include tools/debug.hxx diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 38f2d37..ba3374f 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -21,6 +21,7 @@ #include toolkit/helper/property.hxx #include com/sun/star/awt/XVclWindowPeer.hpp +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/util/NumberFormatter.hpp #include com/sun/star/util/NumberFormatsSupplier.hpp diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 0500ee4..18736fe 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -21,6 +21,7 @@ #include gridcontrol.hxx #include grideventforwarder.hxx +#include com/sun/star/uno/XComponentContext.hpp #include com/sun/star/view/SelectionType.hpp #include com/sun/star/awt/grid/XGridControl.hpp
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 201 ++
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.hxx | 37
2 files changed, 238 insertions(+)
New commits:
commit 26ed25538fab12c4b1e3ff2516487a29897ba122
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 18:46:21 2014 +0200
New files missing from prev commit
Change-Id: I9889e97a7f9e70d8b2d82e26d9e0f971a943d007
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
new file mode 100644
index 000..b0f300d
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -0,0 +1,201 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include sal/config.h
+
+#include cassert
+#include typeinfo
+#include utility
+
+#include dlfcn.h
+
+#include boost/unordered_map.hpp
+#include osl/mutex.hxx
+#include rtl/instance.hxx
+#include rtl/strbuf.hxx
+#include rtl/ustring.hxx
+#include typelib/typedescription.h
+
+#include rtti.hxx
+#include share.hxx
+
+namespace {
+
+class RTTI
+{
+typedef boost::unordered_map OUString, std::type_info *, OUStringHash
t_rtti_map;
+
+osl::Mutex m_mutex;
+t_rtti_map m_rttis;
+t_rtti_map m_generatedRttis;
+
+void * m_hApp;
+
+public:
+RTTI();
+~RTTI();
+
+std::type_info * getRTTI(typelib_TypeDescription const );
+};
+
+RTTI::RTTI()
+#if defined(FREEBSD) __FreeBSD_version 702104
+: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
+#else
+: m_hApp( dlopen( 0, RTLD_LAZY ) )
+#endif
+{
+}
+
+RTTI::~RTTI()
+{
+dlclose( m_hApp );
+}
+
+std::type_info * RTTI::getRTTI(typelib_TypeDescription const pTypeDescr)
+{
+std::type_info * rtti;
+
+OUString const unoName = *(OUString const *)pTypeDescr.pTypeName;
+
+osl::MutexGuard guard( m_mutex );
+t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
+if (iFind == m_rttis.end())
+{
+// RTTI symbol
+OStringBuffer buf( 64 );
+buf.append( _ZTIN );
+sal_Int32 index = 0;
+do
+{
+OUString token( unoName.getToken( 0, '.', index ) );
+buf.append( token.getLength() );
+OString c_token( OUStringToOString( token,
RTL_TEXTENCODING_ASCII_US ) );
+buf.append( c_token );
+}
+while (index = 0);
+buf.append( 'E' );
+
+OString symName( buf.makeStringAndClear() );
+#if defined(FREEBSD) __FreeBSD_version 702104 /* #i22253# */
+rtti = (std::type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
+#else
+rtti = (std::type_info *)dlsym( m_hApp, symName.getStr() );
+#endif
+
+if (rtti)
+{
+std::pair t_rtti_map::iterator, bool insertion (
+m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
+SAL_WARN_IF( !insertion.second, bridges, key unoName
already in rtti map );
+}
+else
+{
+// try to lookup the symbol in the generated rtti map
+t_rtti_map::const_iterator iFind2( m_generatedRttis.find( unoName
) );
+if (iFind2 == m_generatedRttis.end())
+{
+// we must generate it !
+// symbol and rtti-name is nearly identical,
+// the symbol is prefixed with _ZTI
+char const * rttiName = symName.getStr() +4;
+#if OSL_DEBUG_LEVEL 1
+fprintf( stderr,generated rtti for %s\n, rttiName );
+#endif
+switch (pTypeDescr.eTypeClass) {
+case typelib_TypeClass_EXCEPTION:
+{
+typelib_CompoundTypeDescription const ctd
+= reinterpret_cast
+typelib_CompoundTypeDescription const (
+pTypeDescr);
+if (ctd.pBaseTypeDescription)
+{
+// ensure availability of base
+std::type_info * base_rtti = getRTTI(
+
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/editeng/impedit.hxx |1 +
editeng/source/editeng/impedit3.cxx | 16 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 32d7b1b4f452fbb27bf7722d5e54824d03938023
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 18:51:37 2014 +0200
Check that overflowing para hasn't been updated yet. No reset.
Change-Id: Id1346ff9f203978a08e6af80b408f30033bb88cb
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index a1ddccc..533b47d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -466,6 +466,7 @@ private:
// For Chaining
sal_Int32 mnOverflowingPara = -1;
+void SetOverflowingParaNum();
IdleFormattter aIdleFormatter;
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a6a21ae..e810501 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -427,8 +427,12 @@ void ImpEditEngine::FormatDoc()
pParaPortion-SetMustRepaint( false );
// FIXME(matteocam)
-// set possible point for chainging
-mnOverflowingPara = nPara;
+// set possible point for chaining
+
+// XXX: This may not work all the time: imp. edit engine is a
shared resource!!
+// Can it be that two boxes modify it before it's used?
+UpdateOverflowingPara( nPara );
+
fprintf(stderr, [CHAINING] Setting first overflowing para:
%d\n, nPara);
}
@@ -4602,4 +4606,12 @@ void ImpEditEngine::ImplExpandCompressedPortions(
EditLine* pLine, ParaPortion*
}
}
+void ImpEditEngine::SetOverflowingParaNum(int nPara)
+{
+// update if not already updated
+if ( mnOverflowingPara == -1 )
+mnOverflowingPara = nPara;
+// XXX: where is this reset?
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 41 commits - basegfx/source chart2/source cppcanvas/source cui/source dbaccess/source editeng/source hwpfilter/source i18npool/source include/editeng package/source pyu
basegfx/source/polygon/b3dpolypolygontools.cxx | 20 +++---
chart2/source/view/charttypes/GL3DBarChart.cxx | 13 ++-
cppcanvas/source/mtfrenderer/textaction.cxx | 22 +++---
cui/source/dialogs/hangulhanjadlg.cxx |1
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 45 -
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx |1
dbaccess/source/ui/dlg/detailpages.cxx |1
editeng/source/editeng/eerdll.cxx | 10 ++-
hwpfilter/source/hbox.cxx |8 +-
hwpfilter/source/hwpeq.cxx | 10 +--
i18npool/source/localedata/LocaleNode.cxx | 80 +---
i18npool/source/localedata/LocaleNode.hxx | 11 ---
include/editeng/eerdll.hxx |3
package/source/zippackage/zipfileaccess.cxx | 10 +--
pyuno/source/module/pyuno_runtime.cxx |2
sal/osl/unx/socket.c|7 --
sc/qa/unit/ucalc_sharedformula.cxx |7 +-
sc/source/ui/condformat/condformatdlg.cxx |1
sc/source/ui/dbgui/filtdlg.cxx | 13 ++-
sc/source/ui/vba/vbachartobjects.cxx| 31 -
svtools/source/control/valueset.cxx |2
svx/source/dialog/dialmgr.cxx |6 -
svx/source/form/fmvwimp.cxx |2
sw/source/core/access/acctextframe.cxx | 15 ++--
sw/source/core/doc/SwStyleNameMapper.cxx|3
sw/source/core/docnode/node.cxx |2
sw/source/core/layout/fly.cxx | 26 ---
sw/source/core/layout/flyincnt.cxx |9 +-
sw/source/core/layout/tabfrm.cxx|8 +-
sw/source/filter/html/wrthtml.cxx | 58 -
sw/source/filter/ww8/ww8par2.cxx|2
sw/source/uibase/utlui/glbltree.cxx |5 +
vcl/source/filter/sgvmain.cxx |1
vcl/source/filter/sgvmain.hxx | 39 +++
writerfilter/source/dmapper/StyleSheetTable.cxx |4 -
35 files changed, 266 insertions(+), 212 deletions(-)
New commits:
commit 444600442beb69365d47de188a30a3565c45eafc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 7 17:54:14 2014 +0100
coverity#706946 Uncaught exception
Change-Id: I836e353ae3a8274842465719b3d8ae82ad433375
diff --git a/sc/source/ui/vba/vbachartobjects.cxx
b/sc/source/ui/vba/vbachartobjects.cxx
index cdb300e..1b6928a 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -43,9 +43,34 @@ public:
ChartObjectEnumerationImpl( const uno::Reference uno::XComponentContext
xContext, const uno::Reference container::XEnumeration xEnumeration,
const uno::Reference drawing::XDrawPageSupplier _xDrawPageSupplier, const
uno::Reference XHelperInterface _xParent ) throw ( uno::RuntimeException )
: EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier(
_xDrawPageSupplier ) {}
virtual uno::Any SAL_CALL nextElement( ) throw
(container::NoSuchElementException, lang::WrappedTargetException,
uno::RuntimeException, std::exception) SAL_OVERRIDE
{
-uno::Reference table::XTableChart xTableChart(
m_xEnumeration-nextElement(), uno::UNO_QUERY_THROW );
-// parent Object is sheet
-return uno::makeAny( uno::Reference excel::XChartObject ( new
ScVbaChartObject( m_xParent, m_xContext, xTableChart, xDrawPageSupplier ) ) );
+uno::Any ret;
+
+try
+{
+uno::Reference table::XTableChart xTableChart(
m_xEnumeration-nextElement(), uno::UNO_QUERY_THROW );
+// parent Object is sheet
+ret = uno::makeAny( uno::Reference excel::XChartObject ( new
ScVbaChartObject( m_xParent, m_xContext, xTableChart, xDrawPageSupplier ) ) );
+}
+catch (const lang::WrappedTargetException)
+{
+throw;
+}
+catch (const container::NoSuchElementException)
+{
+throw;
+}
+catch (const uno::RuntimeException)
+{
+throw;
+}
+catch (const uno::Exception e)
+{
+throw lang::WrappedTargetException(
+Error creating ScVbaChartObject!,
+static_cast OWeakObject * ( this ),
+makeAny( e ) );
+}
+return ret;
}
};
commit e88157144d59f277190f40492790a3375acc3bbb
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 7 17:15:22 2014 +0100
coverity#706587 Uncaught exception
Change-Id: I33836bfc2d0e18a12774a9e65d814f50ae10d7b8
diff --git a/package/source/zippackage/zipfileaccess.cxx
b/package/source/zippackage/zipfileaccess.cxx
index 7ee2298..c070d83 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -350,7 +350,7 @@ sal_Bool
Minutes of ESC call: 2014-08-07
* Present: + Stephan, Lionel, Christian, Eike, Kendy, Adam, Moggi, Andras, Muthu, Norbert, Miklos, Robinson, Michael S. * Completed Action Items + branch / git access for OS X 10.5 - Doug (Norbert) + Norbert will ping Doug about how to use that * Pending Action Items: + ask UX advise wrt. wrench icons (revert or not ?) (Astron) + blog about the sad realities of web plugins (Bjoern) + setup some VM's that can be created on-demand (Cloph) + done for the hackfest, non-public + working on creating a public machine + open-source newer Synezip tests / speak at the conference (Umesh) + Ask for 1-2 more dev-list moderators re-visit next-week (Michael) + contact Michael / the list when students show up (Jan Marek) + help Cloph with the quickstarter disabling (Andras) * GSOC Update (Cedric) + at least 6 students will be at the conference in Bern + a student presentation slot has been created: + thus students can prepare a 5-6 minute lightning talk on their project + August 11th - suggested pencils down (http://www.google-melange.com/gsoc/events/google/gsoc2014) + * the last 4 days remaining! * + merge the code to master! * Release Engineering update (Christian) + 4.3.0 retrospective / MABs ... + 4.3.1 status + RC1 late + tagged yesterday, Windows uploading, will announce after the call + RC2 end of the next week + 15th to be tagged + 4.3.1 late feature + OpenGL context on OSX including 3D models in impress (Markus) + building, but still some runtime errors + to RC2 if Moggi manages to sort them out + + Windows quickstarter status https://gerrit.libreoffice.org/#/c/10669/ + checkbox in the installer seems to cause problems :-( + reverted the right way, but still has problems + Andras will check it + tooling fix related to permissions (Cloph) + Android Remote * Crashtest update (Markus) + http://dev-builds.libreoffice.org/crashtest/fe817d66727e0bdebbb8885708a28a4e60277583/ + new results - complete run + script will from now on mail the dev list when it finishes * Certification Committee (Stephan/Bjoern/Kendy) + waiting until ~September * Hackfests (Bjoern) + Munich hack-fest (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + we should drop by with 2 or 3 developers, if possible + Toulouse Hackfest ... + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + Be great to have -really- easy easy hacks for devs (Bjoern) * QA (Robinson) * UX Update (Astron / Mirek) * Bern Conference + book your hotels! * QA stats: + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html +235-228(+7 overall) many thanks to the top bug squashers: QA Administrators 110 Maxim Monastirsky 14 tommy27 9 ign_christian7 Michael Stahl7 Jay Philips 6 raal 5 Michel Dänzer5 Adolfo Jayme 5 sophie 4 Owen Genat 3 * Open 4.4 MAB + 4/8 3/7 3/7 2/5 1/2 1/1 + https://bugs.freedesktop.org/showdependencytree.cgi?id=79641hide_resolved=1 * Open 4.3 MAB + 14/50 11/47 14/47 14/45 19/43 10/32 6/27 5/24 5/22 3/20 5/16 4/12 2/8 3/7 2/5 28% 23% 29% 33% 44% 31% 22% 20% 22% 15% + https://bugs.freedesktop.org/showdependencytree.cgi?id=75025hide_resolved=1 * Open 4.2 MAB + 83/243 84/236 85/235 82/229 81/222 76/215 74/212 74/210 71/207 71/205 73/200 34% 35%36%35%36%35%34%35%34%34%36% + https://bugs.freedesktop.org/showdependencytree.cgi?id=65675hide_resolved=1 * Bibisected bugs open: whiteboard 'bibsected' + 127/349 119/331 102/308 92/296 84/283 84/280 81/274 79/265 75/259 70/249 + http://bit.ly/VQfF3Q * all bugs tagged with 'regression' + 439(+12) bugs open of 2944(+42) total * ~Component count net * Writer - 132 (+5) Spreadsheet - 78 (-2) Crashes - 31 (-1) Presentation - 29 (+2) UI - 27 (+0) Libreoffice - 27 (+0) Graphics - 22 (+0) Database - 21 (+0) Borders - 19 (+2) Filters - 14 (+1) Drawing - 13 (+0) Print / PDF - 11 (+0) Chart - 7 (+0) Formula - 5 (+0) Extensions - 5 (+0) BASIC - 5 (+1)
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 80476, which changed state. Bug 80476 Summary: Start Center sidebar button labels are too large and vary in size on different operating systems https://bugs.freedesktop.org/show_bug.cgi?id=80476 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: sfx2/source
sfx2/source/dialog/backingwindow.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 04b02f2f5a4f71198e0cb616404c4721c918afe6 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 18:11:25 2014 +0100 Resolves: fdo#82043 use a bold font for the start-center buttons Change-Id: I4d947060815559f68cd200d8103868014ea6ac2d diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 488bafd..1c356c9 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -244,6 +244,7 @@ void BackingWindow::initControls() mpCreateLabel-SetControlForeground(aButtonsText); Font aFont(mpCreateLabel-GetSettings().GetStyleSettings().GetLabelFont()); aFont.SetSize(Size(0, aFont.GetSize().Height() * fMultiplier)); +aFont.SetWeight(WEIGHT_BOLD); mpCreateLabel-SetControlFont(aFont); mpHelpButton-SetControlForeground(aButtonsText); @@ -276,6 +277,7 @@ void BackingWindow::setupButton( PushButton* pButton ) // the buttons should have a bit bigger font Font aFont(pButton-GetSettings().GetStyleSettings().GetPushButtonFont()); aFont.SetSize(Size(0, aFont.GetSize().Height() * fMultiplier)); +aFont.SetWeight(WEIGHT_BOLD); pButton-SetControlFont(aFont); // color that fits the theme ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgdocument.hxx |5
svgio/inc/svgio/svgreader/svgnode.hxx |4
svgio/inc/svgio/svgreader/svgstylenode.hxx |8 -
svgio/source/svgreader/svgdocument.cxx | 10 +
svgio/source/svgreader/svgnode.cxx | 188 +
svgio/source/svgreader/svgstylenode.cxx| 160 +---
6 files changed, 250 insertions(+), 125 deletions(-)
New commits:
commit 2c7d4665a08591aea2cf30d09485ae166d997138
Author: Armin Le Grand a...@apache.org
Date: Tue Jul 29 14:36:29 2014 +
Related: #i125293# More unified (still simple) CssStyles and solvers
(cherry picked from commit b760428400bbc7ab3db4d5de6239589e79981a06)
Conflicts:
svgio/inc/svgio/svgreader/svgdocument.hxx
svgio/inc/svgio/svgreader/svgnode.hxx
svgio/inc/svgio/svgreader/svgstylenode.hxx
svgio/source/svgreader/svgdocument.cxx
svgio/source/svgreader/svgnode.cxx
svgio/source/svgreader/svgstylenode.cxx
Change-Id: Ifcfc665df18f56e2cbc359411b633271c3b8d4bb
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx
b/svgio/inc/svgio/svgreader/svgdocument.hxx
index e61b291..cbc651b 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -65,10 +65,11 @@ namespace svgio
/// add/remove styles to mapper
void addSvgStyleAttributesToMapper(const OUString rStr, const
SvgStyleAttributes rSvgStyleAttributes);
+void removeSvgStyleAttributesFromMapper(const OUString rStr);
/// find a style by it's Id
-bool hasSvgStyleAttributesById() const { return
!maIdStyleTokenMapperList.empty(); }
-const SvgStyleAttributes* findSvgStyleAttributesById(const
OUString rStr) const;
+bool hasGlobalCssStyleAttributes() const { return
!maIdStyleTokenMapperList.empty(); }
+const SvgStyleAttributes* findGlobalCssStyleAttributes(const
OUString rStr) const;
/// data read access
const SvgNodeVector getSvgNodeVector() const { return maNodes; }
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx
b/svgio/inc/svgio/svgreader/svgnode.hxx
index 4793ddf..9fa9e72 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -126,6 +126,10 @@ namespace svgio
/// helper for filling the CssStyle vector once dependent on
mbCssStyleVectorBuilt
void fillCssStyleVector(const OUString rClassStr);
+void fillCssStyleVectorUsingHierarchyAndSelectors(
+const OUString rClassStr,
+const SvgNode rCurrent,
+OUString aConcatenated);
public:
SvgNode(
diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx
b/svgio/inc/svgio/svgreader/svgstylenode.hxx
index fc851df..e113ea9 100644
--- a/svgio/inc/svgio/svgreader/svgstylenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx
@@ -45,8 +45,12 @@ namespace svgio
/// #i125258# tell if this node is allowed to have a parent style
(e.g. defs do not)
virtual bool supportsParentStyle() const SAL_OVERRIDE;
-virtual void parseAttribute(const OUString rTokenName, SVGToken
aSVGToken, const OUString aContent) SAL_OVERRIDE;
-void addCssStyleSheet(const OUString aContent);
+virtual void parseAttribute(const OUString rTokenName, SVGToken
aSVGToken, const OUString aContent);
+
+/// CssStyleSheet add helpers
+void addCssStyleSheet(const OUString aSelectors, const
SvgStyleAttributes rNewStyle);
+void addCssStyleSheet(const OUString aSelectors, const OUString
aContent);
+void addCssStyleSheet(const OUString aSelectorsAndContent);
/// textCss access
bool isTextCss() const { return mbTextCss; }
diff --git a/svgio/source/svgreader/svgdocument.cxx
b/svgio/source/svgreader/svgdocument.cxx
index ff95628..6f4e0a5 100644
--- a/svgio/source/svgreader/svgdocument.cxx
+++ b/svgio/source/svgreader/svgdocument.cxx
@@ -85,7 +85,15 @@ namespace svgio
}
}
-const SvgStyleAttributes*
SvgDocument::findSvgStyleAttributesById(const OUString rStr) const
+void SvgDocument::removeSvgStyleAttributesFromMapper(const OUString
rStr)
+{
+if(!rStr.isEmpty())
+{
+maIdStyleTokenMapperList.erase(rStr);
+}
+}
+
+const SvgStyleAttributes*
SvgDocument::findGlobalCssStyleAttributes(const OUString rStr) const
{
const IdStyleTokenMapper::const_iterator
aResult(maIdStyleTokenMapperList.find(rStr));
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 1652a25..d771c51 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -40,102 +40,96 @@ namespace svgio
return 0;
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b7/60428400bbc7ab3db4d5de6239589e79981a06
b7/60428400bbc7ab3db4d5de6239589e79981a06 |1 + 1 file changed, 1 insertion(+) New commits: commit b3d36d5f93aa36ac1704e91e7a8b59d8d32732a9 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 18:51:50 2014 +0100 Notes added by 'git notes add' diff --git a/b7/60428400bbc7ab3db4d5de6239589e79981a06 b/b7/60428400bbc7ab3db4d5de6239589e79981a06 new file mode 100644 index 000..73f4d39 --- /dev/null +++ b/b7/60428400bbc7ab3db4d5de6239589e79981a06 @@ -0,0 +1 @@ +merged as: 2c7d4665a08591aea2cf30d09485ae166d997138 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit bbf2ba56505b92c9efeb21a9aeacba491a0301a1 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 18:51:37 2014 +0100 WaE: -Werror=unused-parameter Change-Id: I064c738b371999bb73726bde3669c710742fae80 diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index dd6537d..b8a6363 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -457,6 +457,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( slots[-2].fn = reinterpret_castvoid *(-(vtableNumber * sizeof (void *))); #if ENABLE_RUNTIME_OPTIMIZATIONS slots[-1].fn = 0; +(void)type; #else slots[-1].fn = x86_64::getRtti(type-aBase); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/filter/ImportFilter.cxx | 34 +--- writerfilter/source/ooxml/model.xml | 16 ++--- 2 files changed, 20 insertions(+), 30 deletions(-) New commits: commit 2b54e4a616582a190a0bdc22f18b434321925dfe Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Aug 7 19:52:36 2014 +0200 Use comphelper::SequenceAsHashMap Change-Id: I50e32d275c99c445033fc5f9ecfcaf2a9bbc72c8 diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index c149648..2a49e97 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -113,43 +113,33 @@ sal_Bool WriterFilter::filter( const uno::Sequence beans::PropertyValue aDes pDocument-resolve(*pStream); // Adding some properties to the document's grab bag for interoperability purposes: -uno::Sequencebeans::PropertyValue aGrabBagProperties(10); +comphelper::SequenceAsHashMap aGrabBagProperties; // Adding the saved Theme DOM -aGrabBagProperties[0].Name = OOXTheme; -aGrabBagProperties[0].Value = uno::makeAny( pDocument-getThemeDom() ); +aGrabBagProperties[OOXTheme] = uno::makeAny( pDocument-getThemeDom() ); // Adding the saved custom xml DOM -aGrabBagProperties[1].Name = OOXCustomXml; -aGrabBagProperties[1].Value = uno::makeAny( pDocument-getCustomXmlDomList() ); -aGrabBagProperties[2].Name = OOXCustomXmlProps; -aGrabBagProperties[2].Value = uno::makeAny( pDocument-getCustomXmlDomPropsList() ); +aGrabBagProperties[OOXCustomXml] = uno::makeAny( pDocument-getCustomXmlDomList() ); +aGrabBagProperties[OOXCustomXmlProps] = uno::makeAny( pDocument-getCustomXmlDomPropsList() ); // Adding the saved ActiveX DOM -aGrabBagProperties[3].Name = OOXActiveX; -aGrabBagProperties[3].Value = uno::makeAny( pDocument-getActiveXDomList() ); -aGrabBagProperties[4].Name = OOXActiveXBin; -aGrabBagProperties[4].Value = uno::makeAny( pDocument-getActiveXBinList() ); +aGrabBagProperties[OOXActiveX] = uno::makeAny( pDocument-getActiveXDomList() ); +aGrabBagProperties[OOXActiveXBin] = uno::makeAny( pDocument-getActiveXBinList() ); // Adding the saved w:themeFontLang setting -aGrabBagProperties[5].Name = ThemeFontLangProps; -aGrabBagProperties[5].Value = uno::makeAny( aDomainMapper-GetThemeFontLangProperties() ); +aGrabBagProperties[ThemeFontLangProps] = uno::makeAny( aDomainMapper-GetThemeFontLangProperties() ); // Adding the saved Glossary Documnet DOM to the document's grab bag -aGrabBagProperties[6].Name = OOXGlossary; -aGrabBagProperties[6].Value = uno::makeAny( pDocument-getGlossaryDocDom() ); -aGrabBagProperties[7].Name = OOXGlossaryDom; -aGrabBagProperties[7].Value = uno::makeAny( pDocument-getGlossaryDomList() ); +aGrabBagProperties[OOXGlossary] = uno::makeAny( pDocument-getGlossaryDocDom() ); +aGrabBagProperties[OOXGlossaryDom] = uno::makeAny( pDocument-getGlossaryDomList() ); // Adding the saved embedding document to document's grab bag -aGrabBagProperties[8].Name = OOXEmbeddings; -aGrabBagProperties[8].Value = uno::makeAny( pDocument-getEmbeddingsList() ); +aGrabBagProperties[OOXEmbeddings] = uno::makeAny( pDocument-getEmbeddingsList() ); // Adding the saved compat settings -aGrabBagProperties[9].Name = CompatSettings; -aGrabBagProperties[9].Value = uno::makeAny( aDomainMapper-GetCompatSettings() ); +aGrabBagProperties[CompatSettings] = uno::makeAny( aDomainMapper-GetCompatSettings() ); -putPropertiesToDocumentGrabBag( aGrabBagProperties ); +putPropertiesToDocumentGrabBag( aGrabBagProperties.getAsConstPropertyValueList() ); writerfilter::ooxml::OOXMLStream::Pointer_t pVBAProjectStream(writerfilter::ooxml::OOXMLDocumentFactory::createStream( pDocStream, writerfilter::ooxml::OOXMLStream::VBAPROJECT )); oox::StorageRef xVbaPrjStrg( new ::oox::ole::OleStorage( m_xContext, pVBAProjectStream-getDocumentStream(), false ) ); commit 5b606654158a06f3fab1a266c02ca6da953a3d0a Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Aug 7 19:52:06 2014 +0200 Unused todo attributes Change-Id: I598081eab191087c0d64f71059da7b5f00e82c62 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 0173cf2..e2479ab 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -847,7 +847,7 @@ value name=perspectiveRelaxedModerately tokenid=ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRelaxedModeratelyperspectiveRelaxedModerately/value /resource /namespace - namespace name=dml-baseStylesheet file=dml-baseStylesheet.rng todo=ignore +
[Libreoffice-commits] core.git: oox/source
oox/source/core/xmlfilterbase.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b0eff57aaeb34d25dc011249828f5029df951f57
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Aug 7 20:14:30 2014 +0200
cppcheck: Same iterator used with different containers
Change-Id: Idc7f16dc4c81857d7a3f508ed830904d90a762b0
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index f236a9e..b54cd51 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -679,7 +679,7 @@ writeAppProperties( XmlFilterBase rSelf, Reference
XDocumentProperties xProp
uno::Referencebeans::XPropertyAccess
xUserDefinedProperties(xProperties-getUserDefinedProperties(), uno::UNO_QUERY);
comphelper::SequenceAsHashMap
aUserDefinedProperties(xUserDefinedProperties-getPropertyValues());
it = aUserDefinedProperties.find(Company);
-if (it != aStats.end())
+if (it != aUserDefinedProperties.end())
{
OUString aValue;
if (it-second = aValue)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - chart2/qa oox/inc oox/source
chart2/qa/extras/chart2export.cxx | 42
chart2/qa/extras/charttest.hxx |1
chart2/qa/extras/data/docx/doughnut-chart-labels.docx |binary
chart2/qa/extras/data/docx/line-chart-label-default-placement.docx |binary
oox/inc/drawingml/chart/typegroupconverter.hxx |2
oox/source/drawingml/chart/typegroupconverter.cxx |5 +
oox/source/export/chartexport.cxx | 48
+++---
7 files changed, 88 insertions(+), 10 deletions(-)
New commits:
commit fb1473692e9be2093924ab4df7c982dc282af18f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 14:17:11 2014 -0400
Default data label placement may vary depending on chart types. Get it
right.
If we export a wrong placement value, MS Office will flag the file corrupt
and
the loading will fail.
Change-Id: I7ca1239cd390494c1181ecdb3310c5f88bb18f9b
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx
b/oox/inc/drawingml/chart/typegroupconverter.hxx
index c4930e7..6c5e855 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -93,6 +93,8 @@ struct TypeGroupInfo
boolmbPictureOptions; /// True = bitmaps support
options from c:pictureOptions.
};
+const TypeGroupInfo GetTypeGroupInfo( TypeId eType );
+
struct UpDownBarsModel;
class UpDownBarsConverter : public ConverterBase UpDownBarsModel
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 36fd0ec..3a23d44 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -96,6 +96,11 @@ const TypeGroupInfo lclGetTypeInfoFromTypeId( TypeId
eTypeId )
} // namespace
+const TypeGroupInfo GetTypeGroupInfo( TypeId eType )
+{
+return lclGetTypeInfoFromTypeId(eType);
+}
+
UpDownBarsConverter::UpDownBarsConverter( const ConverterRoot rParent,
UpDownBarsModel rModel ) :
ConverterBase UpDownBarsModel ( rParent, rModel )
{
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 389485e..027a566 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2535,6 +2535,16 @@ void ChartExport::_exportAxis(
namespace {
+struct LabelPlacementParam
+{
+bool mbExport;
+sal_Int32 meDefault;
+
+LabelPlacementParam() :
+mbExport(true),
+meDefault(css::chart::DataLabelPlacement::OUTSIDE) {}
+};
+
const char* toOOXMLPlacement( sal_Int32 nPlacement )
{
switch (nPlacement)
@@ -2556,7 +2566,7 @@ const char* toOOXMLPlacement( sal_Int32 nPlacement )
}
void writeLabelProperties(
-FSHelperPtr pFS, const uno::Referencebeans::XPropertySet xPropSet, bool
bLabelPlacement )
+FSHelperPtr pFS, const uno::Referencebeans::XPropertySet xPropSet,
const LabelPlacementParam rLabelParam )
{
if (!xPropSet.is())
return;
@@ -2583,11 +2593,11 @@ void writeLabelProperties(
pFS-endElement(FSNS(XML_c, XML_spPr));
}
-if (bLabelPlacement)
+if (rLabelParam.mbExport)
{
-sal_Int32 nLabelPlacement = css::chart::DataLabelPlacement::OUTSIDE;
-xPropSet-getPropertyValue(LabelPlacement) = nLabelPlacement;
-pFS-singleElement(FSNS(XML_c, XML_dLblPos), XML_val,
toOOXMLPlacement(nLabelPlacement), FSEND);
+sal_Int32 nLabelPlacement = rLabelParam.meDefault;
+if (xPropSet-getPropertyValue(LabelPlacement) = nLabelPlacement)
+pFS-singleElement(FSNS(XML_c, XML_dLblPos), XML_val,
toOOXMLPlacement(nLabelPlacement), FSEND);
}
pFS-singleElement(FSNS(XML_c, XML_showLegendKey), XML_val,
BS(aLabel.ShowLegendSymbol), FSEND);
@@ -2618,17 +2628,20 @@ void ChartExport::exportDataLabels(
// We must not export label placement property when the chart type doesn't
// support this option in MS Office, else MS Office would think the file
// is corrupt refuse to open it.
-bool bLabelPlacement = !mbIs3DChart;
-eChartType = getChartType();
-switch (eChartType)
+
+const chart::TypeGroupInfo rInfo =
chart::GetTypeGroupInfo(static_castchart::TypeId(eChartType));
+LabelPlacementParam aParam;
+aParam.mbExport = !mbIs3DChart;
+aParam.meDefault = rInfo.mnDefLabelPos;
+switch (getChartType()) // diagram chart type
{
case chart::TYPEID_PIE:
// All pie charts support label placement.
-bLabelPlacement = true;
+aParam.mbExport = true;
break;
case chart::TYPEID_DOUGHNUT:
// Doughnut charts don't support label placement.
-bLabelPlacement = false;
+aParam.mbExport = false;
break;
default:
;
@@ -2646,12 +2659,12 @@ void ChartExport::exportDataLabels(
[Libreoffice-commits] core.git: sd/source setup_native/source
sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c |
1 +
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |
1 +
setup_native/source/win32/customactions/shellextensions/checkpatches.cxx |
1 +
setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx |
1 +
setup_native/source/win32/customactions/tools/checkversion.cxx |
1 +
setup_native/source/win32/customactions/tools/seterror.cxx |
1 +
6 files changed, 6 insertions(+)
New commits:
commit 47999a4304cdb72ee1e78d223e671d17f240bd61
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Aug 7 20:36:00 2014 +0200
cppcheck: va_list 'args' was opened but not closed by va_end()
Change-Id: Id7602dd19ac142dbe2680ddf7eab308a087e971a
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
index 0aa0717..3e5a181 100644
--- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
@@ -76,6 +76,7 @@ static void syslog( int priority, const char * message, ...)
buffer = malloc( len * sizeof(char) );
if ( buffer ) { vsprintf( buffer, message, args ); OutputDebugString(
buffer ); free( buffer ); }
WSASetLastError( err );
+va_end(args);
}
#else
diff --git
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 40ed84b..728121b 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -80,6 +80,7 @@ inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
va_start( args, pFormat );
StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
OutputDebugStringA( buffer );
+va_end(args);
}
#else
static inline void OutputDebugStringFormat( LPCSTR, ... )
diff --git
a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index d76b764..33ad29f 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -54,6 +54,7 @@ inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
va_start( args, pFormat );
StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
OutputDebugStringA( buffer );
+va_end(args);
}
#else
static inline void OutputDebugStringFormat( LPCSTR, ... )
diff --git
a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index 5253b41..ab039e2 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -55,6 +55,7 @@ inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
va_start( args, pFormat );
StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
OutputDebugStringA( buffer );
+va_end(args);
}
#else
static inline void OutputDebugStringFormat( LPCSTR, ... )
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx
b/setup_native/source/win32/customactions/tools/checkversion.cxx
index 526cc76..fb6f77d 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -64,6 +64,7 @@ inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
va_start( args, pFormat );
StringCchVPrintf( buffer, sizeof(buffer), pFormat, args );
OutputDebugString( buffer );
+va_end(args);
}
#else
static inline void OutputDebugStringFormat( LPCTSTR, ... )
diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx
b/setup_native/source/win32/customactions/tools/seterror.cxx
index c7de7b7..a9af467 100644
--- a/setup_native/source/win32/customactions/tools/seterror.cxx
+++ b/setup_native/source/win32/customactions/tools/seterror.cxx
@@ -44,6 +44,7 @@ inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
va_start( args, pFormat );
StringCchVPrintf( buffer, sizeof(buffer), pFormat, args );
OutputDebugString( buffer );
+va_end(args);
}
#else
static inline void OutputDebugStringFormat( LPCTSTR, ... )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng svx/source
editeng/source/editeng/editeng.cxx |3 +++
editeng/source/editeng/impedit.hxx |2 +-
editeng/source/editeng/impedit3.cxx |4 ++--
editeng/source/outliner/outliner.cxx |9 -
include/editeng/editeng.hxx |1 +
include/editeng/outliner.hxx |1 +
svx/source/svdraw/svdotxed.cxx |6 +-
7 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit b687077202c921033a67a867e9ded55aa92e735c
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 20:22:06 2014 +0200
Reset mnOverflowPara
Change-Id: Ie07ee16d0f181bfedfe1d2459ab6915984235b20
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 6cbac8d..2709740 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2775,6 +2775,9 @@ sal_Int32 EditEngine::GetOverflowingParaNum() const {
return pImpEditEngine-GetOverflowingParaNum();
}
+void EditEngine::ClearOverflowingParaNum() {
+pImpEditEngine-ClearOverflowingParaNum();
+}
EFieldInfo::EFieldInfo()
{
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 533b47d..426d235 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -466,7 +466,6 @@ private:
// For Chaining
sal_Int32 mnOverflowingPara = -1;
-void SetOverflowingParaNum();
IdleFormattter aIdleFormatter;
@@ -1023,6 +1022,7 @@ public:
sal_Int32 GetOverflowingParaNum() const { return mnOverflowingPara; }
void SetOverflowingParaNum(sal_Int32 nPara) { mnOverflowingPara = nPara; }
+void ClearOverflowingParaNum() { mnOverflowingPara = -1; }
};
inline EPaM ImpEditEngine::CreateEPaM( const EditPaM rPaM )
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index e810501..4c27985 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -431,7 +431,7 @@ void ImpEditEngine::FormatDoc()
// XXX: This may not work all the time: imp. edit engine is a
shared resource!!
// Can it be that two boxes modify it before it's used?
-UpdateOverflowingPara( nPara );
+UpdateOverflowingParaNum( nPara );
fprintf(stderr, [CHAINING] Setting first overflowing para:
%d\n, nPara);
}
@@ -4606,7 +4606,7 @@ void ImpEditEngine::ImplExpandCompressedPortions(
EditLine* pLine, ParaPortion*
}
}
-void ImpEditEngine::SetOverflowingParaNum(int nPara)
+void ImpEditEngine::UpdateOverflowingParaNum(sal_Int32 nPara)
{
// update if not already updated
if ( mnOverflowingPara == -1 )
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index e4c2614..66d9cd4 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2131,7 +2131,9 @@ OutlinerParaObject
*Outliner::GetNonOverflowingParaObject() const
OutlinerParaObject *Outliner::GetOverflowingParaObject() const
{
if ( pEditEngine-GetOverflowingParaNum() )
-return CreateParaObject( pEditEngine-GetOverflowingParaNum() );
+return CreateParaObject( pEditEngine-GetOverflowingParaNum() );
+
+return NULL;
/*
// XXX: returns second paragraph if there is one, first otherwise
if ( GetParagraphCount() = 2 )
@@ -2141,4 +2143,9 @@ OutlinerParaObject *Outliner::GetOverflowingParaObject()
const
*/
}
+void Outliner::ClearOverflowingParaNum()
+{
+pEditEngine-ClearOverflowingParaNum();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index a66c6d1..33dd8f0 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -596,6 +596,7 @@ public:
bool Redo(EditView* pView);
sal_Int32 GetOverflowingParaNum() const;
+void ClearOverflowingParaNum();
};
#endif // INCLUDED_EDITENG_EDITENG_HXX
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index b00d8c7..dedc476 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -760,6 +760,7 @@ public:
OutlinerParaObject *GetNonOverflowingParaObject() const;
OutlinerParaObject *GetOverflowingParaObject() const;
+void ClearOverflowingParaNum();
virtual voidDepthChangedHdl();
voidSetDepthChangedHdl(const Link
rLink){aDepthChangedHdl=rLink;}
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 76d3296..b32a8be 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -268,7 +268,11 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
// set overflowing text for SdrChainedTextPrimitive2D
pNextText = rOutl.GetOverflowingParaObject();
mpOverflowingText = pNextText;
-//SetOverflowingText( pNextText );
+//
[Libreoffice-commits] core.git: 3 commits - chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 21 +++--
chart2/qa/extras/data/docx/area-chart-labels.docx |binary
oox/source/export/chartexport.cxx |1 +
3 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit f4677f58a26d1183af5c91470be0e4f782e6cbeb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 14:43:36 2014 -0400
Area chart also doesn't support label position property.
Change-Id: I612ca7426b2b3de07d4afe1d78cd809f1f6b37bb
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 027a566..0845f71 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2640,6 +2640,7 @@ void ChartExport::exportDataLabels(
aParam.mbExport = true;
break;
case chart::TYPEID_DOUGHNUT:
+case chart::TYPEID_AREA:
// Doughnut charts don't support label placement.
aParam.mbExport = false;
break;
commit 9c2af3c885bd007bb36877f7b59e4035282d14f4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 14:40:38 2014 -0400
Fix the test. It's bar3DChart not barChart.
Change-Id: I8e504dfee81557a1965bb4bbce4ea975c13fe775
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 46fe22d..664dba5 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -822,8 +822,8 @@ void Chart2ExportTest::testDataLabel3DChartDOCX()
// We must not export label position attributes for 3D bar charts. The
// same rule also applies to several other 3D charts, apparently.
-assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos, 0);
-assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:dLblPos,
0);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLblPos, 0);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLbl/c:dLblPos,
0);
}
void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
commit 3683cddee869ed4d3025bd8039df5625c016199d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 14:38:01 2014 -0400
Write test for exporting data labels in area chart for OOXML.
Change-Id: Icbb17f56643f7d89bf739b0f218b2ca8a6309d9a
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 2ebfd9d..46fe22d 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -72,6 +72,7 @@ public:
void testDataLabelBordersDOCX();
void testDataLabel3DChartDOCX();
void testDataLabelDoughnutChartDOCX();
+void testDataLabelAreaChartDOCX();
void testDataLabelDefaultLineChartDOCX();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
@@ -110,6 +111,7 @@ public:
CPPUNIT_TEST(testDataLabelBordersDOCX);
CPPUNIT_TEST(testDataLabel3DChartDOCX);
CPPUNIT_TEST(testDataLabelDoughnutChartDOCX);
+CPPUNIT_TEST(testDataLabelAreaChartDOCX);
CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX);
CPPUNIT_TEST_SUITE_END();
@@ -839,6 +841,21 @@ void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLbl/c:dLblPos,
0);
}
+void Chart2ExportTest::testDataLabelAreaChartDOCX()
+{
+load(/chart2/qa/extras/data/docx/, area-chart-labels.docx);
+
+Referencechart2::XChartDocument xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart,Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// We must not export label position attributes for area charts.
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLblPos, 0);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl/c:dLblPos,
0);
+}
+
void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
{
// This file was created by Word 2007, which doesn't provide default data
diff --git a/chart2/qa/extras/data/docx/area-chart-labels.docx
b/chart2/qa/extras/data/docx/area-chart-labels.docx
new file mode 100755
index 000..4db8441
Binary files /dev/null and b/chart2/qa/extras/data/docx/area-chart-labels.docx
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/ppt/pptshape.hxx |7 ++-
oox/source/ppt/pptgraphicshapecontext.cxx | 13 +-
oox/source/ppt/pptshape.cxx | 62 +-
oox/source/ppt/pptshapecontext.cxx| 60 ++---
4 files changed, 67 insertions(+), 75 deletions(-)
New commits:
commit cc6ae367280d205a88c6f907b20b84613221ca52
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu Aug 7 13:25:51 2014 +0200
bnc#821916: Better algorithm to find placeholder shape.
Placeholder type seems to be more relevant than index.
Change-Id: I9d6c6cad8e0a51b2385801f65d7d1c697ad7998e
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 41941fd..18126d3 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -58,8 +58,11 @@ public:
void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) {
mpPlaceholder = pPlaceholder; }
void setModelId( const OUString rId ) { msModelId = rId; }
-static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32
nMasterPlaceholder, std::vector oox::drawingml::ShapePtr rShapes, bool
bMasterOnly = false );
-static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32
nIdx, std::vector oox::drawingml::ShapePtr rShapes, bool bMasterOnly =
false );
+static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32
nFirstSubType,
+const sal_Int32 nSecondSubType, const OptValue sal_Int32
oSubTypeIndex,
+std::vector oox::drawingml::ShapePtr rShapes, bool bMasterOnly
= false );
+static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32
nIdx,
+std::vector oox::drawingml::ShapePtr rShapes, bool bMasterOnly
= false );
static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const
SlidePersist rSlidePersist, sal_Int32 nSubType );
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx
b/oox/source/ppt/pptgraphicshapecontext.cxx
index 124b35e..229867d 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -53,13 +53,6 @@ PPTGraphicShapeContext::PPTGraphicShapeContext(
ContextHandler2Helper rParent,
{
}
-// if nFirstPlaceholder can't be found, it will be searched for
nSecondPlaceholder
-static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder,
sal_Int32 nSecondPlaceholder, std::vector oox::drawingml::ShapePtr rShapes )
-{
-oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholder(
nFirstPlaceholder, rShapes );
-return !nSecondPlaceholder || pPlaceholder.get() ? pPlaceholder :
PPTShape::findPlaceholder( nSecondPlaceholder, rShapes );
-}
-
ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32
aElementToken, const AttributeList rAttribs )
{
switch( aElementToken )
@@ -135,12 +128,14 @@ ContextHandlerRef
PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
if ( nFirstPlaceholder )
{
if ( eShapeLocation == Layout ) // for layout
objects the referenced object can be found within the same shape tree
-pPlaceholder = findPlaceholder( nFirstPlaceholder,
nSecondPlaceholder, mpSlidePersistPtr-getShapes()-getChildren() );
+pPlaceholder = PPTShape::findPlaceholder(
nFirstPlaceholder, nSecondPlaceholder,
+pPPTShapePtr-getSubTypeIndex(),
mpSlidePersistPtr-getShapes()-getChildren(), true );
else if ( eShapeLocation == Slide ) // normal slide
shapes have to search within the corresponding master tree for referenced
objects
{
SlidePersistPtr pMasterPersist(
mpSlidePersistPtr-getMasterPersist() );
if ( pMasterPersist.get() )
-pPlaceholder = findPlaceholder(
nFirstPlaceholder, nSecondPlaceholder,
pMasterPersist-getShapes()-getChildren() );
+pPlaceholder = PPTShape::findPlaceholder(
nFirstPlaceholder, nSecondPlaceholder,
+pPPTShapePtr-getSubTypeIndex(),
pMasterPersist-getShapes()-getChildren() );
}
}
}
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 8b02702..cca5e37 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -227,7 +227,7 @@ void PPTShape::addShape(
if( mnSubType getSubTypeIndex().has() meShapeLocation ==
Layout ) {
oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex( getSubTypeIndex().get(),
rSlidePersist.getShapes()-getChildren(), true );
if (!pPlaceholder.get())
-pPlaceholder = PPTShape::findPlaceholder( mnSubType,
[Libreoffice-commits] core.git: include/toolkit
include/toolkit/helper/listenermultiplexer.hxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit bb182b47ca7362b05c03d583d3547643d9a99562 Author: Michael Stahl mst...@redhat.com Date: Thu Aug 7 21:18:56 2014 +0200 toolkit: export some ListenerMultiplexer types These are used from svx and apparently some (buggy?) toolchains fail with fmgridif.cxx:: undefined reference to `non-virtual thunk to WindowListenerMultiplexer::acquire()' Change-Id: Iea0a6eab1ad7f69e4a732f763bc8dbc16bf1be1c diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index a3de5ff..61fdbdc 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -83,7 +83,7 @@ DECL_LISTENERMULTIPLEXER_END // class FocusListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) +DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, ::com::sun::star::awt::XFocusListener ) void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END @@ -92,7 +92,7 @@ DECL_LISTENERMULTIPLEXER_END // class WindowListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) +DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, ::com::sun::star::awt::XWindowListener ) void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -112,7 +112,7 @@ DECL_LISTENERMULTIPLEXER_END // class KeyListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) +DECL_LISTENERMULTIPLEXER_START_DLLPUB( KeyListenerMultiplexer, ::com::sun::star::awt::XKeyListener ) void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END @@ -130,7 +130,7 @@ DECL_LISTENERMULTIPLEXER_END // class MouseMotionListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) +DECL_LISTENERMULTIPLEXER_START_DLLPUB( MouseMotionListenerMultiplexer, ::com::sun::star::awt::XMouseMotionListener ) void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END @@ -138,7 +138,7 @@ DECL_LISTENERMULTIPLEXER_END // class PaintListenerMultiplexer -DECL_LISTENERMULTIPLEXER_START( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) +DECL_LISTENERMULTIPLEXER_START_DLLPUB( PaintListenerMultiplexer, ::com::sun::star::awt::XPaintListener ) void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent e ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LISTENERMULTIPLEXER_END ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Minutes of ESC call: 2014-08-07
On Thu, Aug 7, 2014 at 7:02 PM, Jan Holesovsky ke...@collabora.com wrote: + help Cloph with the quickstarter disabling (Andras) + Windows quickstarter status https://gerrit.libreoffice.org/#/c/10669/ + checkbox in the installer seems to cause problems :-( + reverted the right way, but still has problems + Andras will check it See https://gerrit.libreoffice.org/#/c/10817/ If we do not package quickstarter.exe, then the installer will not offer Quickstart feature as an optional component, and the checkbox will not be displayed on the last page of installer wizard. It is the cleanest solution and it can be reverted easily, when the correct functionality is restored. Cheers, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - basegfx/source drawinglayer/source
basegfx/source/polygon/b2dpolygonclipper.cxx | 73 +
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 65 +--
2 files changed, 84 insertions(+), 54 deletions(-)
New commits:
commit 5554be7f4cddcfeb450bfe41d0b588c8e8f6de76
Author: Armin Le Grand a...@apache.org
Date: Wed Aug 6 10:42:28 2014 +
Related: #i125349# refined to exclude possible recursive calls
(cherry picked from commit a02eb39b84d130e5923f72edb2abb3b21adf6fff)
Change-Id: Id068928f77a6efed44da9b83ecbf547302826591
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx
b/basegfx/source/polygon/b2dpolygonclipper.cxx
index e73c388..c9f1587 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -341,71 +341,6 @@ namespace basegfx
if(rCandidate.count() rClip.count())
{
-// #125349# detect if both given PolyPolygons are indeed ranges
-bool bBothRectangle(false);
-
-if(basegfx::tools::isRectangle(rCandidate))
-{
-if(basegfx::tools::isRectangle(rClip))
-{
-// both are ranges
-bBothRectangle = true;
-}
-else
-{
-// rCandidate is rectangle - clip rClip on
rRectangle, use the much
-// cheaper and numerically more stable clipping
against a range
-// This simplification (exchanging content and clip)
is valid
-// since we do a logical AND operation
-return clipPolyPolygonOnRange(rClip,
rCandidate.getB2DRange(), bInside, bStroke);
-}
-}
-else if(basegfx::tools::isRectangle(rClip))
-{
-if(basegfx::tools::isRectangle(rCandidate))
-{
-// both are ranges
-bBothRectangle = true;
-}
-else
-{
-// rClip is rectangle - clip rCandidate on
rRectangle, use the much
-// cheaper and numerically more stable clipping
against a range
-return clipPolyPolygonOnRange(rCandidate,
rClip.getB2DRange(), bInside, bStroke);
-}
-}
-
-if(bBothRectangle)
-{
-// both are rectangle
-if(rCandidate.getB2DRange().equal(rClip.getB2DRange()))
-{
-// if both are equal - no change
-return rCandidate;
-}
-else
-{
-// not equal - create new intersection from both
ranges,
-// but much cheaper based on the ranges
-basegfx::B2DRange
aIntersectionRange(rCandidate.getB2DRange());
-
-aIntersectionRange.intersect(rClip.getB2DRange());
-
-if(aIntersectionRange.isEmpty())
-{
-// no common IntersectionRange - the clip will be
empty
-return B2DPolyPolygon();
-}
-else
-{
-// use common aIntersectionRange as result, convert
-// to expected PolyPolygon form
-return basegfx::B2DPolyPolygon(
-
basegfx::tools::createPolygonFromRect(aIntersectionRange));
-}
-}
-}
-
// one or both are no rectangle - go the hard way and clip
PolyPolygon
// against PolyPolygon...
if(bStroke)
@@ -476,6 +411,77 @@ namespace basegfx
}
else
{
+// check for simplification with ranges if !bStroke
(handling as stroke is more simple),
+// but also only when bInside, else the simplification may
lead to recursive calls (see
+// calls to clipPolyPolygonOnPolyPolygon in
clipPolyPolygonOnRange and clipPolygonOnRange)
+if(bInside)
+{
+// #i125349# detect if both given PolyPolygons are
indeed ranges
+bool bBothRectangle(false);
+
+if(basegfx::tools::isRectangle(rCandidate))
+{
+if(basegfx::tools::isRectangle(rClip))
+{
+// both are ranges
+bBothRectangle = true;
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7c/5e9b9b3c5c899d63bf171ee1c9050db860337e
7c/5e9b9b3c5c899d63bf171ee1c9050db860337e |1 + 1 file changed, 1 insertion(+) New commits: commit 77a7a5a9ed9e86c1c499c4f0f5725b5fd5194d33 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 20:35:28 2014 +0100 Notes added by 'git notes add' diff --git a/7c/5e9b9b3c5c899d63bf171ee1c9050db860337e b/7c/5e9b9b3c5c899d63bf171ee1c9050db860337e new file mode 100644 index 000..42dcd92 --- /dev/null +++ b/7c/5e9b9b3c5c899d63bf171ee1c9050db860337e @@ -0,0 +1 @@ +merged as: 1ca06ce59b7d3cea873d2dc109a2acaec0a80759 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a0/2eb39b84d130e5923f72edb2abb3b21adf6fff
a0/2eb39b84d130e5923f72edb2abb3b21adf6fff |1 + 1 file changed, 1 insertion(+) New commits: commit 613e053a03fc5abcf72d5d34e89a4ce538da0c9a Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 20:35:44 2014 +0100 Notes added by 'git notes add' diff --git a/a0/2eb39b84d130e5923f72edb2abb3b21adf6fff b/a0/2eb39b84d130e5923f72edb2abb3b21adf6fff new file mode 100644 index 000..aa7e305 --- /dev/null +++ b/a0/2eb39b84d130e5923f72edb2abb3b21adf6fff @@ -0,0 +1 @@ +merged as: 5554be7f4cddcfeb450bfe41d0b588c8e8f6de76 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/flycnt.cxx | 22 ++
1 file changed, 6 insertions(+), 16 deletions(-)
New commits:
commit 3c873206a9450058a11ab87cab5942d319c75c82
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Thu Aug 7 21:24:01 2014 +0200
fix picture jumping to incorrect X position after dragging
If a picture anchored to character is dragged vertically, it can actually
jump to the left, even though X should stay the same. This change
basically reverts part of 5ddd93f4f90b3627a0ba63b62a5367c5e6c112a1.
I haven't figured out how this GetBaseOfstForFly() actually works, but
I'm reasonably sure that the relative X offset introduced by it
in SwFlyAtCntFrm::SetAbsPos() is not undone anywhere in
SwFlyFrm::ChgRelPos()
or otherwise acted upon, it simply causes relative X position change, even
though
the absolute position remained the same.
Change-Id: Iabf4f4e4268711a36f02aa47ca9624f9007a22a6
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 0ca29c2..b69e3eb 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1295,39 +1295,29 @@ void SwFlyAtCntFrm::SetAbsPos( const Point rNew )
}
SwFlyFrmFmt *pFmt = (SwFlyFrmFmt*)GetFmt();
-const SwFmtSurround rSurround = pFmt-GetSurround();
-const bool bWrapThrough =
-rSurround.GetSurround() == SURROUND_THROUGHT;
-SwTwips nBaseOfstForFly = 0;
-const SwFrm* pTmpFrm = pFrm ? pFrm : pCnt;
-if ( pTmpFrm-IsTxtFrm() )
-nBaseOfstForFly =
-((SwTxtFrm*)pTmpFrm)-GetBaseOfstForFly( !bWrapThrough );
if( bVert )
{
if( !pFrm )
-nX += rNew.Y() - pCnt-Frm().Top() - nBaseOfstForFly;
+nX += rNew.Y() - pCnt-Frm().Top();
else
-nX = rNew.Y() - pFrm-Frm().Top() - nBaseOfstForFly;
+nX = rNew.Y() - pFrm-Frm().Top();
}
else
{
if( !pFrm )
{
if ( pCnt-IsRightToLeft() )
-nX += pCnt-Frm().Right() - rNew.X() - Frm().Width() +
- nBaseOfstForFly;
+nX += pCnt-Frm().Right() - rNew.X() - Frm().Width();
else
-nX += rNew.X() - pCnt-Frm().Left() - nBaseOfstForFly;
+nX += rNew.X() - pCnt-Frm().Left();
}
else
{
if ( pFrm-IsRightToLeft() )
-nX += pFrm-Frm().Right() - rNew.X() - Frm().Width() +
- nBaseOfstForFly;
+nX += pFrm-Frm().Right() - rNew.X() - Frm().Width();
else
-nX = rNew.X() - pFrm-Frm().Left() - nBaseOfstForFly;
+nX = rNew.X() - pFrm-Frm().Left();
}
}
GetFmt()-GetDoc()-GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/writer/libwpd/pass/EDB-14344-1.wpd |binary 1 file changed New commits: commit fb0fdaaaeb4ebb6b8debbfe9c95ec8e25824edbf Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 20:49:25 2014 +0100 add EDB-14344 testcase Change-Id: Ia4c6486d2d54103951765ce3e273dece6f022372 diff --git a/writerperfect/qa/unit/data/writer/libwpd/pass/EDB-14344-1.wpd b/writerperfect/qa/unit/data/writer/libwpd/pass/EDB-14344-1.wpd new file mode 100644 index 000..8d2e51d Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libwpd/pass/EDB-14344-1.wpd differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
editeng/source/editeng/impedit.hxx |1 +
editeng/source/editeng/impedit3.cxx |6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit c016277686979e769a403cbac6d0cee1b68c5425
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 22:02:57 2014 +0200
Moved debugging output for UpdateOverflowingParaNum in the right place
Change-Id: If8a58e434794639f7fcdffbe4a71c92ffd460234
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 426d235..de32cbd 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1023,6 +1023,7 @@ public:
sal_Int32 GetOverflowingParaNum() const { return mnOverflowingPara; }
void SetOverflowingParaNum(sal_Int32 nPara) { mnOverflowingPara = nPara; }
void ClearOverflowingParaNum() { mnOverflowingPara = -1; }
+void UpdateOverflowingParaNum(sal_Int32);
};
inline EPaM ImpEditEngine::CreateEPaM( const EditPaM rPaM )
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 4c27985..973ae96 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -432,8 +432,6 @@ void ImpEditEngine::FormatDoc()
// XXX: This may not work all the time: imp. edit engine is a
shared resource!!
// Can it be that two boxes modify it before it's used?
UpdateOverflowingParaNum( nPara );
-
-fprintf(stderr, [CHAINING] Setting first overflowing para:
%d\n, nPara);
}
// InvalidRect set only once...
@@ -4609,8 +4607,10 @@ void ImpEditEngine::ImplExpandCompressedPortions(
EditLine* pLine, ParaPortion*
void ImpEditEngine::UpdateOverflowingParaNum(sal_Int32 nPara)
{
// update if not already updated
-if ( mnOverflowingPara == -1 )
+if ( mnOverflowingPara == -1 ) {
mnOverflowingPara = nPara;
+fprintf(stderr, [CHAINING] Setting first overflowing para: %d\n,
nPara);
+}
// XXX: where is this reset?
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source writerperfect/qa
editeng/source/editeng/eerdll.cxx |4 ++--
writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd |binary
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 48c5934af13710e83f094c5e2902787828065f51
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 7 21:04:37 2014 +0100
loplugin:staticcall
Change-Id: I966c0d6e61e1815252a83e22d142837e26302b30
diff --git a/editeng/source/editeng/eerdll.cxx
b/editeng/source/editeng/eerdll.cxx
index af588fc..b317064 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -192,8 +192,8 @@ uno::Reference linguistic2::XLanguageGuessing
GlobalEditData::GetLanguageGues
return xLanguageGuesser;
}
-EditResId::EditResId( sal_uInt16 nId ):
-ResId( nId, *EE_DLL().GetResMgr() )
+EditResId::EditResId(sal_uInt16 nId)
+: ResId(nId, *EditDLL::GetResMgr())
{
}
commit 8f2a714b60d35d7f17b317fa16ab4caac806e932
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 7 20:55:17 2014 +0100
add test-case for CVE-2007-1735
Change-Id: If505b45bd197fb24a2bacaf44cb46f84de8b61ff
diff --git a/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd
b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd
new file mode 100644
index 000..4d11b93
Binary files /dev/null and
b/writerperfect/qa/unit/data/writer/libwpd/pass/CVE-2007-1735-1.wpd differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - writerperfect/qa
writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22310-1.pub |binary writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22655-1.pub |binary 2 files changed New commits: commit e84664d30207549e641b0fc76d22968dd3a8d837 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 21:15:07 2014 +0100 add test-case for EDB-22310 Change-Id: I6a7b659b562218e4bdd1b1badf655f65266e8d85 diff --git a/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22310-1.pub b/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22310-1.pub new file mode 100644 index 000..741676f Binary files /dev/null and b/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22310-1.pub differ commit 238259080a486ff25b683f690e9da949b1ed Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 21:10:43 2014 +0100 add test-case for EDB-22655 Change-Id: I96c8ea50425ed82cbbd1f235bd778621956b59ba diff --git a/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22655-1.pub b/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22655-1.pub new file mode 100644 index 000..e3654a1 Binary files /dev/null and b/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-22655-1.pub differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/qa
writerperfect/qa/unit/data/draw/libmspub/pass/EDB-29664-1.pub |binary 1 file changed New commits: commit 345e148b8b19c36a57e821b3e95ebe94afacd339 Author: Caolán McNamara caol...@redhat.com Date: Thu Aug 7 21:21:19 2014 +0100 add test-case for EDB-29664 Change-Id: Ib57c7846523f7b8b3b08d19355e10a47c778a524 diff --git a/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-29664-1.pub b/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-29664-1.pub new file mode 100644 index 000..18287fc Binary files /dev/null and b/writerperfect/qa/unit/data/draw/libmspub/pass/EDB-29664-1.pub differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source vcl/source
svx/source/svdraw/svdotxed.cxx |7 ---
vcl/source/outdev/text.cxx |2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 31e66b9856671bb12e89997dae5df11c2235de3e
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 22:24:36 2014 +0200
Some minor changes
Change-Id: I90e8df3405e95c6295add0532fb6fa49c6517325
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index b25a324..9151fe4 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -277,8 +277,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
pNewText = rOutl.CreateParaObject( 0, nParaAnz );
}
-// we do not need the bookmark at the overflowing check anymore.
-rOutl.ClearOverflowingParaNum();
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
@@ -287,6 +285,9 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
SetOutlinerParaObject(pNewText);
}
+// we do not need the bookmark at the overflowing check anymore.
+rOutl.ClearOverflowingParaNum();
+
pEdtOutl = NULL;
rOutl.Clear();
sal_uInt32 nStat = rOutl.GetControlWord();
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 7a587a6..b5177aa 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -966,11 +966,13 @@ void OutputDevice::DrawTextArray( const Point rStartPt,
const OUString rStr,
const sal_Int32* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen )
{
+/*
if ( maFont.IsTransparent() )
fprintf(stderr, [Actually transparent font] Real color = %x\n,
maFont.GetFillColor().GetColor() );
fprintf(stderr, TextFillColor printing %c is %x\n,
(char) rStr.toChar(),
GetTextFillColor().GetColor());
+*/
if(nLen == 0x0)
{
commit 8e0e4419c0224528155dbc778826622042df3200
Author: matteocam matteo.campane...@gmail.com
Date: Thu Aug 7 22:14:50 2014 +0200
Moved clearing for mnOverflowPara in the right place
Change-Id: I3fd78af6d7338c6ce7c75c97148ab791118862eb
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index b32a8be..b25a324 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -268,9 +268,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
// set overflowing text for SdrChainedTextPrimitive2D
pNextText = rOutl.GetOverflowingParaObject();
mpOverflowingText = pNextText;
-// we do not need the bookmark at the overflowing check anymore.
-rOutl.ClearOverflowingParaNum();
-
// TODO: factor the lines of code above in a single function
}
@@ -280,6 +277,9 @@ void SdrTextObj::EndTextEdit(SdrOutliner rOutl)
pNewText = rOutl.CreateParaObject( 0, nParaAnz );
}
+// we do not need the bookmark at the overflowing check anymore.
+rOutl.ClearOverflowingParaNum();
+
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
// to work correct
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
new tool for vim users
Hey, looking for a task that does not make my head spin while being sick in bed I worked on support for YouCompleteMe [1]. For people who don't know it, it is a VIM plugin -- one more reason for emacs users to switch to the good side ;) -- that provides code-completition based on clang. Therefore it actually understands the code and can give correct suggestions. As it is compiling the code in the background it needs a way to know how to compile the code. For that I'm currently using the clang json database format. The file is being written by the gbuild-to-ide script which can be invoked now with make vim-ide-integration. You will additionally need a python script that contains some logic. Attached is the one that I'm currently using. It is currently mostly a proof-of-concept and I hope that others are playing a bit with it. I tested that it provides correct suggestions but currently the warning support is disabled and I'm not sure if it would not make some sense to additionally provide a smaller database for each module. Feedback is highly appreciated. The patches are still pending in gerrit as I'm having a slight problem with our build system regarding include paths coming from external libraries. Regards, Markus [1] http://valloric.github.io/YouCompleteMe/ # This file is NOT licensed under the GPLv3, which is the license for the rest # of YouCompleteMe. # # Here's the license text for this file: # # This is free and unencumbered software released into the public domain. # # Anyone is free to copy, modify, publish, use, compile, sell, or # distribute this software, either in source code form or as a compiled # binary, for any purpose, commercial or non-commercial, and by any # means. # # In jurisdictions that recognize copyright laws, the author or authors # of this software dedicate any and all copyright interest in the # software to the public domain. We make this dedication for the benefit # of the public at large and to the detriment of our heirs and # successors. We intend this dedication to be an overt act of # relinquishment in perpetuity of all present and future rights to this # software under copyright law. # # THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. # IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. # # For more information, please refer to http://unlicense.org/ import os import ycm_core # These are the compilation flags that will be used in case there's no # compilation database set (by default, one is not set). # CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR. flags = [ '-Wall', '-Wextra', '-Werror', '-Wc++98-compat', '-Wno-long-long', '-Wno-variadic-macros', '-fexceptions', '-DNDEBUG', # You 100% do NOT need -DUSE_CLANG_COMPLETER in your flags; only the YCM # source code needs it. '-DUSE_CLANG_COMPLETER', # THIS IS IMPORTANT! Without a -std=something flag, clang won't know which # language to use when compiling headers. So it will guess. Badly. So C++ # headers will be compiled as C headers. You don't want that so ALWAYS specify # a -std=something. # For a C project, you would set this to something like 'c99' instead of # 'c++11'. '-std=c++11', # ...and the same thing goes for the magic -x option which specifies the # language that the files to be compiled are written in. This is mostly # relevant for c++ headers. # For a C project, you would set this to 'c' instead of 'c++'. '-x', 'c++', '-isystem', '../BoostParts', '-isystem', # This path will only work on OS X, but extra paths that don't exist are not # harmful '/System/Library/Frameworks/Python.framework/Headers', '-isystem', '../llvm/include', '-isystem', '../llvm/tools/clang/include', '-I', '.', '-I', './ClangCompleter', '-isystem', './tests/gmock/gtest', '-isystem', './tests/gmock/gtest/include', '-isystem', './tests/gmock', '-isystem', './tests/gmock/include', '-isystem', '/usr/include', '-isystem', '/usr/local/include', '-isystem', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1', '-isystem', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include', ] # Set this to the absolute path to the folder (NOT the file!) containing the # compile_commands.json file to use that instead of 'flags'. See here for # more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html # # You can get CMake to generate this file for you by adding: # set( CMAKE_EXPORT_COMPILE_COMMANDS 1 ) # to your CMakeLists.txt file. # # Most projects will NOT need to set this to anything; you can just change the # 'flags' list of compilation flags. Notice that YCM itself uses
[Libreoffice-commits] core.git: svgio/inc
svgio/inc/svgio/svgreader/svgstylenode.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90ebe26e5d7c23579987bdb4115167beb6f6a66f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Aug 7 23:18:37 2014 +0200 loplugin:saloverride Change-Id: Ifbcd602203708519f7b4416cf31d94d45b552556 diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx index e113ea9..d2f9e60 100644 --- a/svgio/inc/svgio/svgreader/svgstylenode.hxx +++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx @@ -45,7 +45,7 @@ namespace svgio /// #i125258# tell if this node is allowed to have a parent style (e.g. defs do not) virtual bool supportsParentStyle() const SAL_OVERRIDE; -virtual void parseAttribute(const OUString rTokenName, SVGToken aSVGToken, const OUString aContent); +virtual void parseAttribute(const OUString rTokenName, SVGToken aSVGToken, const OUString aContent) SAL_OVERRIDE; /// CssStyleSheet add helpers void addCssStyleSheet(const OUString aSelectors, const SvgStyleAttributes rNewStyle); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgnode.hxx |2 +-
svgio/source/svgreader/svgnode.cxx|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f120be20792ab862389a3dc24d9706821f91c571
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 7 23:18:54 2014 +0200
loplugin:passstuffbyref
Change-Id: Ib2b244f466d21835229a5a42e6decf4cf4aba653
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx
b/svgio/inc/svgio/svgreader/svgnode.hxx
index 9fa9e72..ac91af9 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -129,7 +129,7 @@ namespace svgio
void fillCssStyleVectorUsingHierarchyAndSelectors(
const OUString rClassStr,
const SvgNode rCurrent,
-OUString aConcatenated);
+const OUString aConcatenated);
public:
SvgNode(
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index d771c51..b68d083 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -43,7 +43,7 @@ namespace svgio
void SvgNode::fillCssStyleVectorUsingHierarchyAndSelectors(
const OUString rClassStr,
const SvgNode rCurrent,
-OUString aConcatenated)
+const OUString aConcatenated)
{
const SvgDocument rDocument = getDocument();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 41e05f48dd3bf08552db3675f5285276095ba0bf
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Aug 7 23:24:04 2014 +0200
cppcheck: Exception should be caught by reference
Change-Id: Ie6438d67aa09fd1dfb746b4ac7ff34d6494ee453
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 25e7b50..51892f4 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2263,7 +2263,7 @@ SvStringsISortDtor*
SvxAutoCorrectLanguageLists::LoadWrdSttExceptList()
if( xStg.Is() xStg-IsContained( sTemp ) )
LoadXMLExceptList_Imp( pWrdStt_ExcptLst,
pXMLImplWrdStt_ExcptLstStr, xStg );
}
-catch (const css::ucb::ContentCreationException e)
+catch (const css::ucb::ContentCreationException e)
{
SAL_WARN(editeng,
SvxAutoCorrectLanguageLists::LoadWrdSttExceptList: Caught exception:
e.Message);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test sc/CppunitTest_sc_styleloaderobj.mk sc/Module_sc.mk sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xstyleloader.hxx | 40 +++
sc/CppunitTest_sc_styleloaderobj.mk | 109
sc/Module_sc.mk |3
sc/qa/extras/scstyleloaderobj.cxx | 125
sc/qa/extras/testdocuments/ScStyleLoaderObj.ods |binary
test/Library_subsequenttest.mk |1
test/source/sheet/xstyleloader.cxx | 100 +++
7 files changed, 377 insertions(+), 1 deletion(-)
New commits:
commit 949279c8013022ff2935d73276cd57c9af069b97
Author: Laurent Godard lgodard.li...@laposte.net
Date: Tue Aug 5 17:02:49 2014 +0200
XStyleLoader2 loadStylesFromDocument - unit tests
Change-Id: Id143689f573e6f8585db9bc48a252e311ff0e721
diff --git a/include/test/sheet/xstyleloader.hxx
b/include/test/sheet/xstyleloader.hxx
new file mode 100644
index 000..7986cb7
--- /dev/null
+++ b/include/test/sheet/xstyleloader.hxx
@@ -0,0 +1,40 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XSTYLELOADER_HXX
+#define INCLUDED_TEST_SHEET_XSTYLELOADER_HXX
+
+#include rtl/ustring.hxx
+#include com/sun/star/style/XStyleLoader2.hpp
+#include test/testdllapi.hxx
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XStyleLoader
+{
+public:
+virtual css::uno::Reference css::uno::XInterface init() = 0;
+
+virtual OUString getTestURL() = 0;
+virtual css::uno::Reference css::lang::XComponent getTargetComponent()
= 0;
+virtual css::uno::Reference css::lang::XComponent getSourceComponent()
= 0;
+
+// XStyleLoader
+void testLoadStylesFromURL();
+// XStyleLoader2
+void testLoadStylesFromDocument();
+
+protected:
+~XStyleLoader() {}
+
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XSTYLELOADER_HXX
\ No newline at end of file
diff --git a/sc/CppunitTest_sc_styleloaderobj.mk
b/sc/CppunitTest_sc_styleloaderobj.mk
new file mode 100644
index 000..128a132
--- /dev/null
+++ b/sc/CppunitTest_sc_styleloaderobj.mk
@@ -0,0 +1,109 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_styleloaderobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_styleloaderobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_styleloaderobj, \
+sc/qa/extras/scstyleloaderobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_styleloaderobj, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+sfx \
+sot \
+subsequenttest \
+svl \
+svt \
+svx \
+svxcore \
+ test \
+tk \
+tl \
+ucbhelper \
+ unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_styleloaderobj,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_styleloaderobj,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_styleloaderobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_styleloaderobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_styleloaderobj,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+filter/source/config/cache/filterconfig1 \
+filter/source/storagefilterdetect/storagefd \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+ linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sc/util/sc \
+sc/util/scd \
+sc/util/scfilt \
+$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
+ sc/util/vbaobj) \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+
[Libreoffice-commits] core.git: 2 commits - chart2/qa oox/source
chart2/qa/extras/chart2export.cxx| 17
chart2/qa/extras/data/docx/bar-chart-labels.docx |binary
oox/source/export/chartexport.cxx| 44 +++
3 files changed, 54 insertions(+), 7 deletions(-)
New commits:
commit 7b8073906adca8dae24c04a23708a3f3d582218f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 18:57:50 2014 -0400
Ensure we export correct labal placement value for percent/stacked charts.
Normal charts allow a variety of label placement options, but
percent/stacked
charts only allow three variants, and exporting a wrong value would trigger
MS Office to think the file is corrupt.
Change-Id: I8bdc1dc072b29e8df2c506b6b16c61279df12045
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 0845f71..882c52c 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -86,6 +86,7 @@
#include xmloff/SchXMLSeriesHelper.hxx
#include ColorPropertySet.hxx
#include set
+#include boost/unordered_set.hpp
#include rtl/math.hxx
@@ -443,6 +444,8 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace,
FSHelperPtr pFS, Reference f
, mbHasCategoryLabels( false )
, mbHasZAxis( false )
, mbIs3DChart( false )
+, mbStacked(false)
+, mbPercent(false)
{
}
@@ -2540,9 +2543,24 @@ struct LabelPlacementParam
bool mbExport;
sal_Int32 meDefault;
+boost::unordered_setsal_Int32 maAllowedValues;
+
LabelPlacementParam() :
mbExport(true),
meDefault(css::chart::DataLabelPlacement::OUTSIDE) {}
+
+void allowAll()
+{
+maAllowedValues.insert(css::chart::DataLabelPlacement::OUTSIDE);
+maAllowedValues.insert(css::chart::DataLabelPlacement::INSIDE);
+maAllowedValues.insert(css::chart::DataLabelPlacement::CENTER);
+maAllowedValues.insert(css::chart::DataLabelPlacement::NEAR_ORIGIN);
+maAllowedValues.insert(css::chart::DataLabelPlacement::TOP);
+maAllowedValues.insert(css::chart::DataLabelPlacement::BOTTOM);
+maAllowedValues.insert(css::chart::DataLabelPlacement::LEFT);
+maAllowedValues.insert(css::chart::DataLabelPlacement::RIGHT);
+maAllowedValues.insert(css::chart::DataLabelPlacement::AVOID_OVERLAP);
+}
};
const char* toOOXMLPlacement( sal_Int32 nPlacement )
@@ -2597,7 +2615,11 @@ void writeLabelProperties(
{
sal_Int32 nLabelPlacement = rLabelParam.meDefault;
if (xPropSet-getPropertyValue(LabelPlacement) = nLabelPlacement)
+{
+if (!rLabelParam.maAllowedValues.count(nLabelPlacement))
+nLabelPlacement = rLabelParam.meDefault;
pFS-singleElement(FSNS(XML_c, XML_dLblPos), XML_val,
toOOXMLPlacement(nLabelPlacement), FSEND);
+}
}
pFS-singleElement(FSNS(XML_c, XML_showLegendKey), XML_val,
BS(aLabel.ShowLegendSymbol), FSEND);
@@ -2633,6 +2655,7 @@ void ChartExport::exportDataLabels(
LabelPlacementParam aParam;
aParam.mbExport = !mbIs3DChart;
aParam.meDefault = rInfo.mnDefLabelPos;
+aParam.allowAll();
switch (getChartType()) // diagram chart type
{
case chart::TYPEID_PIE:
@@ -2641,9 +2664,18 @@ void ChartExport::exportDataLabels(
break;
case chart::TYPEID_DOUGHNUT:
case chart::TYPEID_AREA:
-// Doughnut charts don't support label placement.
+// Doughnut and area charts don't support label placement.
aParam.mbExport = false;
break;
+case chart::TYPEID_BAR:
+if (mbStacked || mbPercent)
+{
+aParam.maAllowedValues.clear();
+
aParam.maAllowedValues.insert(css::chart::DataLabelPlacement::CENTER);
+
aParam.maAllowedValues.insert(css::chart::DataLabelPlacement::INSIDE);
+
aParam.maAllowedValues.insert(css::chart::DataLabelPlacement::NEAR_ORIGIN);
+aParam.meDefault = css::chart::DataLabelPlacement::CENTER;
+}
default:
;
}
@@ -2768,17 +2800,15 @@ void ChartExport::exportGrouping( bool isBar )
FSHelperPtr pFS = GetFS();
Reference XPropertySet xPropSet( mxDiagram , uno::UNO_QUERY);
// grouping
-bool bStacked = false;
if( GetProperty( xPropSet, Stacked ) )
-mAny = bStacked;
-bool bPercentage = false;
+mAny = mbStacked;
if( GetProperty( xPropSet, Percent ) )
-mAny = bPercentage;
+mAny = mbPercent;
const char* grouping = NULL;
-if( bStacked )
+if (mbStacked)
grouping = stacked;
-else if( bPercentage )
+else if (mbPercent)
grouping = percentStacked;
else
{
commit 3119e04b45a5598833aee2b114f6abcaf3c6808c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 18:57:17 2014 -0400
Write test for exporting data label positions for percent stack bar chart.
Re: [Libreoffice-qa] Minutes of ESC call: 2014-08-07
On Thu, 2014-08-07 at 19:02 +0200, Jan Holesovsky wrote: * Pending Action Items: + ... + setup some VM's that can be created on-demand (Cloph) + done for the hackfest, non-public + working on creating a public machine I think that a publicly available VM set up for testing--especially for testing Base--would be useful, something like Drew Jensen started working on a few years ago https://wiki.documentfoundation.org/User:Drew/baseQA_VM. Resources permitting, I can imagine the following being useful: (*) LibreOffice stuff: - The bibisect-43all repository - The daily dbgutil bibisect repository - The release builds which are getting bug reports. - One non-Latin language and its dictionary - One right-to-left language and its dictionary - One ideographic language and its dictionary (*) System stuff: - such JRE's as can conveniently coexist (although, it is a while since I remember a bug report peculiar to a particular JRE) - gdb (and lots of memory) - valgrind - the most common desktop managers This might allow triagers to work with things (I think of database engines) that they do not have access to or which they do not feel competent to set up. Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 17 +
chart2/qa/extras/data/docx/radar-chart-labels.docx |binary
oox/source/export/chartexport.cxx |4 +++-
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit b3857330980232fe9869371007b20e35bfd05922
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 19:32:03 2014 -0400
Disable export of label placement properties for radar charts.
Change-Id: Ib9e5801bc13ccf146ddd5aa79b7cd7d2a640e203
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 882c52c..9b49db2 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2664,7 +2664,9 @@ void ChartExport::exportDataLabels(
break;
case chart::TYPEID_DOUGHNUT:
case chart::TYPEID_AREA:
-// Doughnut and area charts don't support label placement.
+case chart::TYPEID_RADARLINE:
+case chart::TYPEID_RADARAREA:
+// These chart types don't support label placement.
aParam.mbExport = false;
break;
case chart::TYPEID_BAR:
commit 5c5f083186a787bbfbcf125f856f96efcd2e025c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Aug 7 19:31:20 2014 -0400
Another test for radar chart data label export.
This one doesn't support label placement property either.
Change-Id: If1f17a135eabd810033644e27db6b1e5c049daff
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index a76b43d..280d2fc 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -72,6 +72,7 @@ public:
void testDataLabelBordersDOCX();
void testDataLabel3DChartDOCX();
void testDataLabelBarChartDOCX();
+void testDataLabelRadarChartDOCX();
void testDataLabelDoughnutChartDOCX();
void testDataLabelAreaChartDOCX();
void testDataLabelDefaultLineChartDOCX();
@@ -112,6 +113,7 @@ public:
CPPUNIT_TEST(testDataLabelBordersDOCX);
CPPUNIT_TEST(testDataLabel3DChartDOCX);
CPPUNIT_TEST(testDataLabelBarChartDOCX);
+CPPUNIT_TEST(testDataLabelRadarChartDOCX);
CPPUNIT_TEST(testDataLabelDoughnutChartDOCX);
CPPUNIT_TEST(testDataLabelAreaChartDOCX);
CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX);
@@ -843,6 +845,21 @@ void Chart2ExportTest::testDataLabelBarChartDOCX()
assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos,
val, inBase);
}
+void Chart2ExportTest::testDataLabelRadarChartDOCX()
+{
+load(/chart2/qa/extras/data/docx/, radar-chart-labels.docx);
+
+Referencechart2::XChartDocument xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart,Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// We must not export label position attributes for radar charts.
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLblPos, 0);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLbl/c:dLblPos,
0);
+}
+
void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
{
load(/chart2/qa/extras/data/docx/, doughnut-chart-labels.docx);
diff --git a/chart2/qa/extras/data/docx/radar-chart-labels.docx
b/chart2/qa/extras/data/docx/radar-chart-labels.docx
new file mode 100755
index 000..2cb876d
Binary files /dev/null and b/chart2/qa/extras/data/docx/radar-chart-labels.docx
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/sheet/xstyleloader.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 932e37abca820479db439cd883859d0d5f4a3709 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri Aug 8 02:29:03 2014 +0200 fix ambiguity in argument Change-Id: I00146441b1271d7a3c866ad58d1b3c72b845dc0c diff --git a/test/source/sheet/xstyleloader.cxx b/test/source/sheet/xstyleloader.cxx index 77a5a69..41528b8 100644 --- a/test/source/sheet/xstyleloader.cxx +++ b/test/source/sheet/xstyleloader.cxx @@ -57,7 +57,7 @@ void XStyleLoader::testLoadStylesFromURL() OUString aCellStyleName(CellBackColor); uno::Any aBackColor = xPropSet-getPropertyValue(aCellStyleName); - uno::Any expectedBackColor(16724787); + uno::Any expectedBackColor(sal_Int32(16724787)); CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong CellBackColor , expectedBackColor, aBackColor); @@ -89,7 +89,7 @@ void XStyleLoader::testLoadStylesFromDocument() OUString aCellStyleName(CellBackColor); uno::Any aBackColor = xPropSet-getPropertyValue(aCellStyleName); - uno::Any expectedBackColor(16724787); + uno::Any expectedBackColor(sal_Int32(16724787)); CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong CellBackColor , expectedBackColor, aBackColor); @@ -97,4 +97,4 @@ void XStyleLoader::testLoadStylesFromDocument() } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox
include/oox/export/chartexport.hxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 57dcc9f3e9a7d2ebc86cf444729a7a08820418a1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Aug 7 20:43:30 2014 -0400 I forgot to check this in. Change-Id: Icc32c336495a1d0a29b24b976dd5f359d03a0bba diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 7eb7e81..2fd383b 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -100,7 +100,8 @@ private: AxisVector maAxes; boolmbHasZAxis; boolmbIs3DChart; - +boolmbStacked; +boolmbPercent; private: sal_Int32 getChartType(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/use-ogl-context-in-canvas'
New branch 'feature/use-ogl-context-in-canvas' available with the following commits: commit d4bcd57f28b5dba5f5434c0da1a0c757effa4615 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Aug 8 01:55:33 2014 +0200 reuse OpenGLContext in OGL canvas The only thing that needs to be reimplemented is the pbuffer based custom sprite rendering. We should use a FBO with a texture backend for that. This will also save several OpenGL context switches! Change-Id: I4aef33ae2499e44c8b5f41c296d8721cb94a37a1 commit 5b839ba4d7927cf71d26b6d72762b25fbf45bdb5 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Aug 7 00:01:02 2014 +0200 extract shaders to own file and use shared shader loading Change-Id: I1af7e03a3e46f3cb49162be9351ce22f54d08c52 commit 6d0610adb41ad60e8e7f6db71ae8cc52a8fb7304 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Wed Aug 6 23:49:30 2014 +0200 make sure that we always delete the shader and not only the program Change-Id: Ia02fb20d335e2172f607f13a0de78ea666d094f5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[no subject]
___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
v4.3.0.4 not working on SSE1 CPUs anymore
Hallo, LibreOffice v4.3.0.4 doesn't work on SSE1 CPUs anymore. Tested on AMD AthlonXP (AMD K7) with Windows7 32Bit. Previous version was v4.1.0 that worked properly. Exception code is c01d (illegal instruction). Probably thrown by SSE2 instruction (or higher) that the K7 doesn't understand (it supports MMX, Extended 3DNow, SSE, PowerNow!). This can usually be fixed by limiting the compiler (GCC) to SSE instruction set. Can you fix that? Regards -Maniaxx Crash report: Problemereignisname:APPCRASH Anwendungsname:soffice.bin Anwendungsversion:4.3.0.4 Anwendungszeitstempel:53d3e2db Fehlermodulname:sal3.dll Fehlermodulversion:4.3.0.4 Fehlermodulzeitstempel:53d201f6 Ausnahmecode:c01d Ausnahmeoffset:000268d5 Betriebsystemversion:6.1.7601.2.1.0.256.1 Gebietsschema-ID:1031 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82319] use modern OpenGL for OpenGL canvas
https://bugs.freedesktop.org/show_bug.cgi?id=82319 Markus Mohrhard markus.mohrh...@googlemail.com changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.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
[Libreoffice-commits] core.git: Branch 'feature/use-ogl-context-in-canvas' - 3 commits - canvas/source include/vcl vcl/source
canvas/source/opengl/ogl_buffercontext.hxx |9 --
canvas/source/opengl/ogl_canvascustomsprite.cxx |7 ++--
canvas/source/opengl/ogl_spritedevicehelper.cxx | 30 +++--
include/vcl/opengl/OpenGLHelper.hxx |6 ++--
vcl/source/opengl/OpenGLHelper.cxx | 34 ++--
5 files changed, 63 insertions(+), 23 deletions(-)
New commits:
commit 062d9c7b8af0557398f399af0a4d4709b0c7d304
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri Aug 8 05:28:02 2014 +0200
reimplement custom sprite rendering with FBO
Change-Id: I8d7a54fac61a3072d4f34615e71e37c70dec4e50
diff --git a/canvas/source/opengl/ogl_buffercontext.hxx
b/canvas/source/opengl/ogl_buffercontext.hxx
index 7d85e9a..a99446b 100644
--- a/canvas/source/opengl/ogl_buffercontext.hxx
+++ b/canvas/source/opengl/ogl_buffercontext.hxx
@@ -10,20 +10,25 @@
#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
+#include GL/glew.h
+
#include sal/config.h
#include boost/shared_ptr.hpp
+
namespace oglcanvas
{
struct IBufferContext
{
virtual ~IBufferContext() {}
-/// start render to buffer. changes gl current context
+/// start render to buffer. changes current framebuffer
virtual bool startBufferRendering() = 0;
-/// end render to buffer. switches to window context, and selects
rendered texture
+/// end render to buffer. switches to default framebuffer
virtual bool endBufferRendering() = 0;
+
+virtual GLuint getTextureId() = 0;
};
typedef ::boost::shared_ptrIBufferContext IBufferContextSharedPtr;
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 86cbac6..2f2853e 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -159,9 +159,8 @@ namespace oglcanvas
// composite that to screen
// TODO(P3): buffer texture
-// TODO: moggi: reimplement as FBO with rendering to texture
-pBufferContext = NULL;
-// pBufferContext-startBufferRendering();
+pBufferContext =
maCanvasHelper.getDeviceHelper()-createBufferContext(aSpriteSizePixel);
+pBufferContext-startBufferRendering();
}
// this ends up in pBufferContext, if that one's current
@@ -174,6 +173,8 @@ namespace oglcanvas
// screen now. Calls below switches us back to window
// context, and binds to generated, dynamic texture
pBufferContext-endBufferRendering();
+GLuint nTexture = pBufferContext-getTextureId();
+glBindTexture(GL_TEXTURE_2D, nTexture);
glEnable(GL_TEXTURE_2D);
glTexParameteri(GL_TEXTURE_2D,
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index cd29f37..3f6b534 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -537,21 +537,29 @@ namespace oglcanvas
namespace
{
-/*
- * TODO: mogg: reimplement through FBO with texture as backend
class BufferContextImpl : public IBufferContext
{
::basegfx::B2IVector maSize;
const SpriteDeviceHelper mrDeviceHelper;
+GLuint mnFrambufferId;
+GLuint mnDepthId;
+GLuint mnTextureId;
virtual bool startBufferRendering() SAL_OVERRIDE
{
-return false;
+glBindFramebuffer(GL_FRAMEBUFFER, mnFrambufferId);
+return true;
}
virtual bool endBufferRendering() SAL_OVERRIDE
{
-return false;
+glBindFramebuffer(GL_FRAMEBUFFER, 0);
+return true;
+}
+
+virtual GLuint getTextureId() SAL_OVERRIDE
+{
+return mnTextureId;
}
public:
@@ -559,20 +567,26 @@ namespace oglcanvas
const ::basegfx::B2IVector rSize) :
maSize(rSize),
mrDeviceHelper(rDeviceHelper),
-mnTexture(0)
+mnFrambufferId(0),
+mnDepthId(0),
+mnTextureId(0)
{
+OpenGLHelper::createFramebuffer(maSize.getX(), maSize.getY(),
mnFrambufferId,
+mnDepthId, mnTextureId, false);
}
virtual ~BufferContextImpl()
{
+glDeleteTextures(1, mnTextureId);
+glDeleteRenderbuffers(1, mnDepthId);
+glDeleteFramebuffers(1, mnFrambufferId);
}
};
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/filter/ww8/ww8graf.cxx | 23 +--
1 file changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 700479573567e82f9bd9ae065f18f9ec9d943300
Author: Steve Yin stev...@apache.org
Date: Fri Aug 8 03:10:58 2014 +
Issue 125391 - The textbox object's location changes after importing the
sample file
Fixed by Oliver-Rainer Wittmann
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 091d366..ea6d2b7 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2260,27 +2260,22 @@ RndStdIds
SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
sal_uInt32 nXAlign = nCntXAlign pRecord-nXAlign ? pRecord-nXAlign : 1;
sal_uInt32 nYAlign = nCntYAlign pRecord-nYAlign ? pRecord-nYAlign : 1;
-if (pFSPA)
+if ( pFSPA != NULL )
{
-/*
-#74188# #i15718# #i19008#
-Strangely in this case the FSPA value seems to be considered before
-the newer escher nXRelTo record.
-*/
-// -- OD 2005-08-04 #i52565# - correct condition checking:
-// first check, if nXRelTo and nYRelTo have default values. This
-// is a hint that these values aren't set by the escher import - see
-// method SwMSDffManager::ProcessObj(..). Then, check if for each
-// values, if it differs from the one in the FSPA.
-if ( pRecord-nXRelTo == 2 pRecord-nYRelTo == 2
!bCurSectionVertical)
+// #52565# - try to handle special case for objects in tables
regarding its X Rel
+
+// if X and Y Rel values are on default take it as a hint, that they
have not been set
+// by SwMSDffManager::ProcessObj(..)
+const bool bXYRelHaveDefaultValues = pRecord-nXRelTo == 2
pRecord-nYRelTo == 2;
+if ( bXYRelHaveDefaultValues
+ nInTable 0
+ !bCurSectionVertical )
{
-// if nYRelTo differs from FSPA.nby overwrite nYRelTo
if ( pFSPA-nby != pRecord-nYRelTo )
{
pRecord-nYRelTo = pFSPA-nby;
}
}
-// --
}
sal_uInt32 nXRelTo = nCntRelTo pRecord-nXRelTo ? pRecord-nXRelTo : 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LibreOffice 4.3.1 rc1 test builds available
Hi *, for the upcoming new version 4.3.1 the builds for RC1 are now available on pre-releases. It is a build in release-configuration, meaning that it will update a previous version of LibreOffice on Windows. Linux and Mac users can install alongside LibreOffice 4.2 See https://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.1_release for the complete schedule. Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ The list of fixed bugs relative to 4.3.0 final (rc4) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-3-1-release-4.3.1.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 4.3.1 rc1 test builds available
Le 07/08/2014 18:13, Christian Lohmaier a écrit : Hi *, for the upcoming new version 4.3.1 the builds for RC1 are now available on pre-releases. It is a build in release-configuration, meaning that it will update a previous version of LibreOffice on Windows. Linux and Mac users can install alongside LibreOffice 4.2 For information, a Moztrap is ready for your tests :) Thanks in advance Kind regards Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
