LibreOffice Gerrit News for core on 2014-04-08
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#45001 fdo#77105 PDF Import: rotated text fixes in https://gerrit.libreoffice.org/8890 from Vort about module sdext + Fix and deduplicate the test code in SwStyleNameMapper::getHashTable. in https://gerrit.libreoffice.org/8877 from Chris Laplante about module sw End of freshness + fdo#43157 Remove OSL_POSTCOND, prefer SAL_WARN_IF in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre about module basic, dbaccess, fpicker, include, sal, shell, store + fdo#43157 Remove deprecated_OSL_GLOBAL in https://gerrit.libreoffice.org/ from Michaël Lefèvre about module include, registry + fdo#43157 : Remove OSL_THIS_FILE in https://gerrit.libreoffice.org/8886 from Michaël Lefèvre about module include, registry + Unit test for .doc export of full colour borders in https://gerrit.libreoffice.org/8887 from Luke Deller about module sw + fdo#73147 improve function code for speed and extend unit test in https://gerrit.libreoffice.org/8841 from Winfried Donkers about module sc + vcl quartz: cache per-run glyphs information in https://gerrit.libreoffice.org/8879 from Norbert Thiebaud about module vcl * Merged changes on master for project core changed in the last 25 hours: + scp2: move firebird into base. in https://gerrit.libreoffice.org/8647 from Andrzej Hunt + Ignore sprmTFCantSplit90 in .doc file per MS spec in https://gerrit.libreoffice.org/8885 from Luke Deller + Rename .doc SPRM IDs to match current MS specs in https://gerrit.libreoffice.org/8884 from Luke Deller + Full colour table borders in .doc export in https://gerrit.libreoffice.org/8838 from Luke Deller + cppcheck: else if condition matches previous condition in https://gerrit.libreoffice.org/8874 from Julien Nabet + Refactored OutputDevice::DrawGradient in https://gerrit.libreoffice.org/8880 from Chris Sherlock + Typo for SERVICE_SDB_CALLABLESTATEMENT in https://gerrit.libreoffice.org/8831 from Julien Nabet * 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: + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here:
Re: Writing MS Visio Format
On Tue, Apr 8, 2014 at 7:42 AM, David Tardon dtar...@redhat.com wrote: Hi, On Tue, Apr 08, 2014 at 07:31:23AM +0200, John Smith wrote: On Tue, Apr 8, 2014 at 12:43 AM, Mat M m...@gmx.fr wrote: .vsdx (Visio XML format) could be a solution. There are some links with more or less extensive description of the format [0]. Would it fit your purpose ? Well I tried this in practice, by creating a new drawing in Visio 2013 and saving it as vsdx, but it resulted in a binary file and not xml ? Not sure what that means, though. VSDX is ZIP with a bunch of XML files inside. D. Ah. I didnt know that. Thanks! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc vcl/source vcl/unx
vcl/generic/fontmanager/fontmanager.cxx | 10 -
vcl/generic/fontmanager/fontsubst.cxx|6 -
vcl/generic/fontmanager/parseAFM.cxx |5
vcl/generic/print/bitmap_gfx.cxx |5
vcl/generic/print/genprnpsp.cxx | 10 -
vcl/generic/print/genpspgraphics.cxx |3
vcl/headless/svpprn.cxx |2
vcl/inc/factory.hxx | 81 +++
vcl/inc/svdata.hxx |1
vcl/source/app/dbggui.cxx| 157 ---
vcl/source/app/session.cxx |1
vcl/source/app/svapp.cxx |2
vcl/source/app/svdata.cxx| 31 --
vcl/source/components/dtranscomp.cxx |8 -
vcl/source/components/factory.cxx| 26 -
vcl/source/components/fontident.cxx |1
vcl/source/edit/vclmedit.cxx |6 -
vcl/source/filter/jpeg/JpegWriter.cxx|5
vcl/source/filter/jpeg/jpeg.cxx |1
vcl/source/filter/sgvspln.cxx|2
vcl/source/fontsubset/cff.cxx| 30 -
vcl/source/gdi/bmpfast.cxx |1
vcl/source/gdi/impvect.cxx | 15 --
vcl/source/gdi/sallayout.cxx |1
vcl/source/window/dockmgr.cxx|2
vcl/source/window/dockwin.cxx|2
vcl/source/window/menu.cxx |2
vcl/source/window/toolbox.cxx|5
vcl/unx/generic/app/i18n_im.cxx | 88 -
vcl/unx/generic/gdi/salgdi.cxx |5
vcl/unx/generic/printer/ppdparser.cxx|7 -
vcl/unx/generic/window/salframe.cxx |5
vcl/unx/gtk/app/gtksys.cxx |2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |8 -
34 files changed, 105 insertions(+), 431 deletions(-)
New commits:
commit 213bc71f84c8f8494f5b5009b730b5a7af2c7cee
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 8 08:39:36 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I382289c7188dfdc9839ff9e6362b6e039ffc5f9e
diff --git a/vcl/generic/fontmanager/fontmanager.cxx
b/vcl/generic/fontmanager/fontmanager.cxx
index 12bc307..3936c88 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -97,16 +97,6 @@ inline sal_uInt16 getUInt16BE( const sal_uInt8* pBuffer )
return nRet;
}
-inline sal_uInt32 getUInt32BE( const sal_uInt8* pBuffer )
-{
-sal_uInt32 nRet = (((sal_uInt32)pBuffer[0]) 24) |
- (((sal_uInt32)pBuffer[1]) 16) |
- (((sal_uInt32)pBuffer[2]) 8) |
- (((sal_uInt32)pBuffer[3]) );
-pBuffer += 4;
-return nRet;
-}
-
static FontWeight parseWeight( const OString rWeight )
{
FontWeight eWeight = WEIGHT_DONTKNOW;
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index 269fd92..8ac1e1e 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -37,12 +37,6 @@
// platform specific font substitution hooks
-struct FontSelectPatternAttributesHash
-{
-size_t operator()(const FontSelectPatternAttributes rAttributes) const
-{ return rAttributes.hashCode(); }
-};
-
class FcPreMatchSubstititution
: public ImplPreMatchFontSubstitution
{
diff --git a/vcl/generic/fontmanager/parseAFM.cxx
b/vcl/generic/fontmanager/parseAFM.cxx
index 8d5690e..145fe1b 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -110,11 +110,6 @@ class FileInputStream
if( m_nPos 0 )
m_nPos--;
}
-unsigned int tell() const { return m_nPos; }
-void seek( unsigned int nPos )
-// NOTE: do not check input data since only results of tell()
-// get seek()ed in this file
-{ m_nPos = nPos; }
};
FileInputStream::FileInputStream( const char* pFilename ) :
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index 4b7017b..a7bac34 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -64,8 +64,6 @@ private:
sal_uInt32 mnOffset;
sal_CharmpFileBuffer[nBufferSize + 16];
-HexEncoder (); /* dont use */
-
public:
HexEncoder (osl::File* pFile);
@@ -135,8 +133,6 @@ private:
sal_uInt32 mnOffset;
sal_CharmpFileBuffer[nBufferSize + 16];
-Ascii85Encoder (); /* dont use */
-
inline void PutByte (sal_uInt8 nByte);
inline void PutEOD ();
voidConvertToAscii85 ();
@@ -286,7 +282,6 @@ private:
sal_uInt32 mnOffset;
sal_uInt32 mdwShift;
-LZWEncoder ();
voidWriteBits (sal_uInt16 nCode, sal_uInt16 nCodeLen);
public:
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 2b92a64..f7e5a86 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/OpenGLRender.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cab4831d02c9933f3d12313f54f2fb4073611bb5 Author: Jan Holesovsky ke...@collabora.com Date: Tue Apr 8 08:44:47 2014 +0200 Fix typo. Change-Id: I37c0c48e19b43189b9cae3a1adcf875127859804 diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 610eb72..01331a0 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -1451,4 +1451,4 @@ int OpenGLRender::RenderSymbol2DShape(float x, float y, float , float , sal_Int3 return 0; } -/* iim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* 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: external/glew
external/glew/ExternalPackage_glew.mk |1 + external/glew/UnpackedTarball_glew.mk |5 + external/glew/glew-macosx-install-name.patch.1 | 13 + 3 files changed, 19 insertions(+) New commits: commit 3b3cf0ecae4838c70b326d0a2854bb2712ad39ad Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 8 10:47:04 2014 +0300 Fix libGLEW build for OS X Change-Id: I996f88544c4cdedaf8aa047abb1888409b949800 diff --git a/external/glew/ExternalPackage_glew.mk b/external/glew/ExternalPackage_glew.mk index 9f18cfb..a110f70 100644 --- a/external/glew/ExternalPackage_glew.mk +++ b/external/glew/ExternalPackage_glew.mk @@ -12,6 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,glew,glew)) $(eval $(call gb_ExternalPackage_use_external_project,glew,glew)) ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.1.10.0.dylib,lib/libGLEW.1.10.0.dylib)) else ifeq ($(OS)-$(COM),WNT-GCC) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_files,glew,$(LIBO_LIB_FOLDER), \ diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 1043612..64544b9 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -25,5 +25,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\ )) endif +ifeq ($(OS),MACOSX) +$(eval $(call gb_UnpackedTarball_add_patches,glew,\ + external/glew/glew-macosx-install-name.patch.1 \ +)) +endif # vim: set noet sw=4 ts=4: diff --git a/external/glew/glew-macosx-install-name.patch.1 b/external/glew/glew-macosx-install-name.patch.1 new file mode 100644 index 000..75e8e7f --- /dev/null +++ b/external/glew/glew-macosx-install-name.patch.1 @@ -0,0 +1,13 @@ +-*- Mode:Diff -*- +diff -ur glew.org/build/glew.rc glew/build/glew.rc +--- glew/config/Makefile.darwin glew/config/Makefile.darwin +@@ -20,7 +20,7 @@ + LIB.DEVLNK= lib$(NAME).dylib + LIB.SHARED= lib$(NAME).$(SO_VERSION).dylib + LIB.STATIC= lib$(NAME).a +-LDFLAGS.SO= -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) ++LDFLAGS.SO= -dynamiclib -install_name @__OOO/$(LIB.SHARED) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR) + LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib + LIB.DEVLNK.MX = lib$(NAME)mx.dylib + LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/gvfs/gvfs_content.hxx | 30 ++--- ucb/source/ucp/gvfs/gvfs_directory.hxx | 26 - ucb/source/ucp/gvfs/gvfs_provider.hxx | 18 - ucb/source/ucp/gvfs/gvfs_stream.hxx| 34 - 4 files changed, 54 insertions(+), 54 deletions(-) New commits: commit 411297a0ad63a3b7484005fd2ad27dd53b58c3d7 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 8 09:57:03 2014 +0200 loplugin:saloverride Change-Id: I6259c0676c2b365549a6f07a71427c2c167c22d5 diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx index 80abafd..133cb21 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.hxx +++ b/ucb/source/ucp/gvfs/gvfs_content.hxx @@ -98,15 +98,15 @@ private: // End Internal helpers // For ucbhelper -virtual OUString getParentURL(); +virtual OUString getParentURL() SAL_OVERRIDE; // For ucbhelper virtual com::sun::star::uno::Sequence com::sun::star::beans::Property getProperties( const com::sun::star::uno::Reference - com::sun::star::ucb::XCommandEnvironment xEnv ); + com::sun::star::ucb::XCommandEnvironment xEnv ) SAL_OVERRIDE; // For ucbhelper virtual com::sun::star::uno::Sequence com::sun::star::ucb::CommandInfo getCommands( const com::sun::star::uno::Reference - com::sun::star::ucb::XCommandEnvironment xEnv ); + com::sun::star::ucb::XCommandEnvironment xEnv ) SAL_OVERRIDE; public: // Command getPropertyValues @@ -201,29 +201,29 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type rType ) -throw( css::uno::RuntimeException, std::exception ); +throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL acquire() -throw(); +throw() SAL_OVERRIDE; virtual void SAL_CALL release() -throw(); +throw() SAL_OVERRIDE; // XTypeProvider virtual css::uno::Sequence sal_Int8 SAL_CALL getImplementationId() -throw( css::uno::RuntimeException, std::exception ); +throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence css::uno::Type SAL_CALL getTypes() -throw( css::uno::RuntimeException, std::exception ); +throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() -throw( ::com::sun::star::uno::RuntimeException ); +throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence OUString SAL_CALL getSupportedServiceNames() -throw( ::com::sun::star::uno::RuntimeException ); +throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; // XContent virtual OUString SAL_CALL getContentType() -throw( com::sun::star::uno::RuntimeException ); +throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -233,10 +233,10 @@ public: com::sun::star::ucb::XCommandEnvironment xEnv ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void SAL_CALL abort( sal_Int32 CommandId ) -throw( com::sun::star::uno::RuntimeException ); +throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; // Additional interfaces @@ -246,11 +246,11 @@ public: virtual com::sun::star::uno::Sequence com::sun::star::ucb::ContentInfo SAL_CALL queryCreatableContentsInfo() -throw( com::sun::star::uno::RuntimeException ); +throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference com::sun::star::ucb::XContent SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo Info ) -throw( com::sun::star::uno::RuntimeException ); +throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; com::sun::star::uno::Sequence com::sun::star::ucb::ContentInfo diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx index 1ea9fa7..4d296df 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.hxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx @@ -33,8 +33,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper com::sun::star::ucb::XCommandEnvironment m_xEnv; private: -virtual void initStatic(); -virtual void initDynamic(); +virtual void initStatic() SAL_OVERRIDE; +virtual void initDynamic() SAL_OVERRIDE; public: DynamicResultSet( const com::sun::star::uno::Reference @@
[Libreoffice-commits] core.git: cui/source i18npool/inc i18npool/Library_i18npool.mk i18npool/source i18npool/util include/svx include/unotools offapi/com officecfg/registry svl/source svx/source svx/
cui/source/options/optgdlg.cxx |1
i18npool/Library_i18npool.mk |1
i18npool/inc/transliteration_Ignore.hxx|4 +
i18npool/source/localedata/data/ar_EG.xml |1
i18npool/source/registerservices/registerservices.cxx |2
i18npool/source/transliteration/ignoreKashida_CTL.cxx | 35
++
i18npool/source/transliteration/transliterationImpl.cxx|4 +
i18npool/util/i18npool.component |3
include/svx/srchdlg.hxx|1
include/unotools/searchopt.hxx |2
offapi/com/sun/star/i18n/TransliterationModules.idl|1
offapi/com/sun/star/i18n/TransliterationModulesExtra.idl |2
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 ++
officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |6 +
svl/source/items/srchitem.cxx |5 +
svx/source/dialog/srchdlg.cxx | 13 +++
svx/uiconfig/ui/findreplacedialog.ui | 16
unotools/source/config/searchopt.cxx | 17
18 files changed, 118 insertions(+), 5 deletions(-)
New commits:
commit d2771b63b94a8aae3c25c83e9dae9f83242f46c1
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Tue Apr 8 09:42:20 2014 +0300
fdo#77123: Add option ignore kashida to the search
This patch will add new checkbox to ignore kashida in the
search and replace dialog.
Change-Id: I9e7179242751103b8418d922ade5b9145170ad15
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4453b50..f833d44 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1394,6 +1394,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet rSet )
{
SvtSearchOptions aOpt;
aOpt.SetIgnoreDiacritics_CTL (true);
+aOpt.SetIgnoreKashida_CTL (true);
pLangConfig-aLanguageOptions.SetCTLFontEnabled(
m_pCTLSupportCB-IsChecked() );
const sal_uInt16 STATE_COUNT = 1;
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index f8900bf..4f9e599 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/transliteration/ignoreWidth \
i18npool/source/transliteration/ignoreZiZu_ja_JP \
i18npool/source/transliteration/ignoreDiacritics_CTL \
+ i18npool/source/transliteration/ignoreKashida_CTL \
i18npool/source/transliteration/katakanaToHiragana \
i18npool/source/transliteration/largeToSmall_ja_JP \
i18npool/source/transliteration/numtochar \
diff --git a/i18npool/inc/transliteration_Ignore.hxx
b/i18npool/inc/transliteration_Ignore.hxx
index a1aa29e..691b867 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -118,6 +118,10 @@ TRANSLITERATION_IGNORE(ZiZu_ja_JP)
TRANSLITERATION_IGNORE(Diacritics_CTL)
#endif
+#if defined( TRANSLITERATION_Kashida_CTL ) || defined( TRANSLITERATION_ALL )
+TRANSLITERATION_IGNORE(Kashida_CTL)
+#endif
+
#undef TRANSLITERATION_IGNORE
#define TRANSLITERATION_IGNORE( name ) \
diff --git a/i18npool/source/localedata/data/ar_EG.xml
b/i18npool/source/localedata/data/ar_EG.xml
index 662a913..7e52d51 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -466,6 +466,7 @@
Transliteration unoid=TOGGLE_CASE/
Transliteration unoid=IGNORE_CASE/
Transliteration unoid=ignoreDiacritics_CTL/
+Transliteration unoid=ignoreKashida_CTL/
/LC_TRANSLITERATION
LC_MISC
ReservedWords
diff --git a/i18npool/source/registerservices/registerservices.cxx
b/i18npool/source/registerservices/registerservices.cxx
index 93b38d7..67c59e6 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -156,6 +156,7 @@ IMPL_CREATEINSTANCE( ignoreProlongedSoundMark_ja_JP)
IMPL_CREATEINSTANCE( ignoreMiddleDot_ja_JP)
IMPL_CREATEINSTANCE( ignoreSpace_ja_JP)
IMPL_CREATEINSTANCE( ignoreDiacritics_CTL)
+IMPL_CREATEINSTANCE( ignoreKashida_CTL)
IMPL_CREATEINSTANCE( TextToChuyin_zh_TW )
IMPL_CREATEINSTANCE( TextToPinyin_zh_CN )
@@ -381,6 +382,7 @@ static const struct InstancesArray {
IMPL_TRANSLITERATION_ITEM (TextToPinyin_zh_CN),
IMPL_TRANSLITERATION_ITEM (TextToChuyin_zh_TW),
IMPL_TRANSLITERATION_ITEM( ignoreDiacritics_CTL),
+IMPL_TRANSLITERATION_ITEM (ignoreKashida_CTL),
IMPL_TRANSLITERATION_ITEM (NumToCharUpper_zh_CN),
IMPL_TRANSLITERATION_ITEM (NumToCharLower_zh_CN),
diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx
[Libreoffice-commits] core.git: rsc/source
rsc/source/prj/gui.cxx |2 ++
rsc/source/prj/gui.hxx | 29 +
rsc/source/prj/start.cxx |3 ++-
3 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit b06a6bba31b15287383853b4d9b52575a92b914b
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 8 10:10:43 2014 +0200
Clean up function declaration
Change-Id: I3c38149f9c99b45170f44f48725087cbe5dba40e
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index a2d321e..f0801a8 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.cxx
@@ -20,6 +20,8 @@
#include stdlib.h
#include stdio.h
+
+#include gui.hxx
#include rscrsc.hxx
#include rscdb.hxx
diff --git a/rsc/source/prj/gui.hxx b/rsc/source/prj/gui.hxx
new file mode 100644
index 000..08a11e6
--- /dev/null
+++ b/rsc/source/prj/gui.hxx
@@ -0,0 +1,29 @@
+/* -*- 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 .
+ */
+
+#ifndef INCLUDED_RSC_SOURCE_PRJ_GUI_HXX
+#define INCLUDED_RSC_SOURCE_PRJ_GUI_HXX
+
+#include sal/config.h
+
+int rsc2_main(int, char**);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 3ad077f..0613982 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -33,6 +33,8 @@
#include dos.h
#endif // UNX
+
+#include gui.hxx
#include rsctools.hxx
#include rscerror.h
#include sal/main.h
@@ -44,7 +46,6 @@ extern C
{
int rscpp_main(int, char**);
}
-int rsc2_main(int, char**);
static bool CallPrePro( const OString rInput,
const OString rOutput, RscPtrPtr * pCmdLine,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 17 commits - cui/source download.lst external/libcdr reportdesign/source sc/source svtools/source svx/source sw/qa sw/source sw/uicon
cui/source/tabpages/chardlg.cxx | 20 +++
download.lst|4
external/libcdr/UnpackedTarball_libcdr.mk |4
external/libcdr/libcdr-wpx_seek_end.patch.1 | 14 --
reportdesign/source/ui/report/ViewsWindow.cxx | 13 ++
sc/source/filter/excel/xestream.cxx |2
svtools/source/control/ctrlbox.cxx |9 +
svx/source/dialog/langbox.cxx |4
svx/source/smarttags/SmartTagMgr.cxx|2
sw/qa/extras/rtfimport/data/fdo74823.rtf| 32 ++
sw/qa/extras/rtfimport/rtfimport.cxx| 10 +
sw/qa/extras/ww8import/data/bnc821208.doc |binary
sw/qa/extras/ww8import/ww8import.cxx|3
sw/source/core/ole/ndole.cxx| 17 +--
sw/source/core/text/inftxt.cxx |5
sw/source/core/text/inftxt.hxx |2
sw/source/core/text/itrform2.cxx| 48 -
sw/source/core/text/porfld.cxx |6 -
sw/source/core/text/porfld.hxx | 15 ++
sw/source/core/text/portxt.cxx | 82 ++--
sw/source/core/text/portxt.hxx |9 -
sw/source/core/txtnode/thints.cxx |2
sw/uiconfig/swriter/ui/outlinenumbering.ui |2
vcl/qa/cppunit/graphicfilter/data/wmf/pass/noheader.wmf |binary
vcl/source/gdi/dibtools.cxx |4
vcl/source/gdi/outdev3.cxx |3
vcl/source/gdi/pdfwriter_impl.cxx | 19 +--
vcl/source/gdi/pdfwriter_impl.hxx |4
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 53 --
writerfilter/source/rtftok/rtfdocumentimpl.hxx |8 +
xmloff/source/style/bordrhdl.cxx| 51 +++--
xmloff/source/style/xmlnumfi.cxx|9 +
32 files changed, 284 insertions(+), 172 deletions(-)
New commits:
commit 902a3b030adf899699fc46d1a857734886eaceb4
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Sun Apr 6 19:30:46 2014 +0200
fdo#75772 Correct name of Outline Numbering dialog
Change-Id: I14ffe5a9135f0fc37f839a386f4dc63c5831b9d4
Reviewed-on: https://gerrit.libreoffice.org/8875
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui
b/sw/uiconfig/swriter/ui/outlinenumbering.ui
index 60dbfe7..d90a99a 100644
--- a/sw/uiconfig/swriter/ui/outlinenumbering.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui
@@ -4,7 +4,7 @@
object class=GtkDialog id=OutlineNumberingDialog
property name=can_focusFalse/property
property name=border_width6/property
-property name=title translatable=yesCharacter/property
+property name=title translatable=yesOutline Numbering/property
property name=type_hintdialog/property
child internal-child=vbox
object class=GtkBox id=dialog-vbox1
commit 39d8fd7b2d1b3496354bab840b2da1c937a4c079
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sat Apr 5 15:38:18 2014 +0200
fdo#74823 RTF import: work around wrong table column width on invalid input
This scenario is not a valid one, Word doesn't handle it, either -- but
the old LO 3.4 parser did. So add minimal support for it to avoid
the regression.
(cherry picked from commit 0a215b9a980e68f899ad548f780bbe5a1fec8732)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Icc2e8d3bf314e9cadda57956668033aa6d092457
Reviewed-on: https://gerrit.libreoffice.org/8871
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo74823.rtf
b/sw/qa/extras/rtfimport/data/fdo74823.rtf
new file mode 100644
index 000..709e375
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo74823.rtf
@@ -0,0 +1,32 @@
+{\rtf1
+\cellx2500
+\cellx5000
+\cellx5500
+\cellx6000
+\cellx6500
+\cellx7000
+\cellx10200
+\intbl
+A1\cell
+B1\cell
+C1\cell
+D1\cell
+E1\cell
+F1\cell
+G1\cell
+\trowd
+\row
+\cellx2500
+\cellx5000
+\cellx5500
+\cellx6000
+\cellx6500
+\cellx7000
+\cellx10200
+\intbl
+A2\cell
+\trowd
+\intbl
+\cell C2\cell\cell\cell\cell\cell \par\row
+\pard\plain \par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8d24829..7961519 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1605,6 +1605,16 @@ DECLARE_RTFIMPORT_TEST(testDprectAnchor,
dprect-anchor.rtf)
CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source
l10ntools/inc/xrmlex.hxx | 40
l10ntools/source/xrmlex.l | 15 ++-
l10ntools/source/xrmmerge.cxx |4 ++--
3 files changed, 44 insertions(+), 15 deletions(-)
New commits:
commit 52e359d82dbf239e5fd72c5f20d31b206c72d3e7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 8 10:17:38 2014 +0200
Clean up function declarations
Change-Id: Ie1360857dc4ed3102c709c1ef5b5929e5d5d5d7b
diff --git a/l10ntools/inc/xrmlex.hxx b/l10ntools/inc/xrmlex.hxx
new file mode 100644
index 000..3711ca6
--- /dev/null
+++ b/l10ntools/inc/xrmlex.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/.
+ *
+ * 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 .
+ */
+
+#ifndef INCLUDED_L10NTOOLS_SOURCE_XRMLEX_HXX
+#define INCLUDED_L10NTOOLS_SOURCE_XRMLEX_HXX
+
+#include sal/config.h
+
+#include stdio.h
+
+extern C int WorkOnTokenSet( int, char* );
+extern C int Argument( char * );
+extern C int InitXrmExport( const char * );
+extern C int EndXrmExport();
+extern C int GetError();
+extern C int SetError();
+extern C char *GetOutputFile( int argc, char* argv[]);
+extern C FILE *GetXrmFile();
+extern C int isQuiet();
+extern C const char* getFilename();
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 3017a7f..f91405f 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -37,6 +37,7 @@
/* table of possible token ids */
#include tokens.h
+#include xrmlex.hxx
#include stdlib.h
#include stdio.h
@@ -53,18 +54,6 @@
#endif
#define YY_NO_UNISTD_H
-/* external functions (C++ code, declared as extern C */
-extern C int WorkOnTokenSet( int, char* );
-extern C int Argument( char * );
-extern C int InitXrmExport( char * , char * );
-extern C int EndXrmExport();
-extern C int GetError();
-extern C int SetError();
-extern C char *GetOutputFile( int argc, char* argv[]);
-extern C FILE *GetXrmFile();
-extern C int isQuiet();
-extern C char* getFilename();
-
/* forwards */
void YYWarning();
@@ -226,7 +215,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
return 1;
}
pFile = GetXrmFile();
- InitXrmExport( pOutput , getFilename() );
+ InitXrmExport( getFilename() );
if ( !pFile )
return 1;
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index deeccf7..f3705fa 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -26,6 +26,7 @@
#include common.hxx
#include export.hxx
#include po.hxx
+#include xrmlex.hxx
#include xrmmerge.hxx
#include tokens.h
#include helper.hxx
@@ -36,7 +37,6 @@
using namespace std;
void yyerror( const char * );
-void YYWarning( const char * );
// set of global variables
bool bMergeMode;
@@ -78,7 +78,7 @@ extern char *GetOutputFile( int argc, char* argv[])
}
}
-int InitXrmExport( char*, char* pFilename)
+int InitXrmExport( const char* pFilename)
{
// instanciate Export
OString sFilename( pFilename );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 15 commits - basctl/source cui/source dbaccess/source include/svtools include/svx sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/source
basctl/source/basicide/moduldlg.cxx| 14 +---
basctl/source/basicide/moduldlg.hxx|6 -
cui/source/customize/cfg.cxx | 26
cui/source/inc/cfg.hxx |8 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 -
include/svtools/editbrowsebox.hxx |6 +
include/svtools/svparser.hxx |9 ++
include/svtools/treelistbox.hxx|8 +-
include/svx/swframevalidation.hxx |5 +
sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |8 +-
sc/source/ui/inc/PivotLayoutTreeListBase.hxx |4 -
sd/source/ui/dlg/sdtreelb.cxx | 12 ---
sd/source/ui/inc/sdtreelb.hxx |2
sfx2/source/appl/imestatuswindow.cxx |2
sfx2/source/dialog/templdlg.cxx|8 --
sfx2/source/inc/templdgi.hxx |2
sfx2/source/view/sfxbasecontroller.cxx |3
svtools/source/contnr/treelistbox.cxx | 30 -
svx/source/svdraw/svdundo.cxx |7 --
svx/source/table/tableundo.cxx |1
sw/source/core/uibase/app/appopt.cxx | 66 +
sw/source/core/uibase/inc/conttree.hxx |8 +-
sw/source/core/uibase/inc/glossary.hxx |6 -
sw/source/core/uibase/utlui/content.cxx|8 +-
sw/source/core/uibase/utlui/glbltree.cxx |9 +-
sw/source/filter/ww8/ww8par6.cxx |2
sw/source/ui/dialog/docstdlg.cxx |3
sw/source/ui/fldui/fldedt.cxx |8 +-
sw/source/ui/misc/glossary.cxx |8 +-
vcl/source/gdi/pdfwriter_impl.cxx |1
30 files changed, 133 insertions(+), 151 deletions(-)
New commits:
commit ceb199692c42d86903bc4e7df11fa895c92e95c1
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 7 21:24:34 2014 +0100
coverity#708385 Uninitialized scalar field
Change-Id: I9150f0849099650f35611015e26754fd6b05ed79
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index c1cbe64..f7fca4d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1768,11 +1768,10 @@ OUString SdrUndoPageRemoveMasterPage::GetComment() const
return aStr;
}
-
-
SdrUndoPageChangeMasterPage::SdrUndoPageChangeMasterPage(SdrPage rChangedPage)
-: SdrUndoPageMasterPage(rChangedPage),
-mbNewHadMasterPage(false)
+: SdrUndoPageMasterPage(rChangedPage)
+, mbNewHadMasterPage(false)
+, maNewMasterPageNumber(0)
{
}
commit 409ebeb20d1ee4552ac21bd739ae4e25eaeb68d9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 7 21:22:18 2014 +0100
coverity#708388 Uninitialized scalar field
Change-Id: Idaa2ec4863beb6be790022c3c66bc4a72e9bf626
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index c406a48..358691c 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -511,6 +511,7 @@ void TableRowUndo::getData( Data rData )
TableStyleUndo::TableStyleUndo( const SdrTableObj rTableObj )
: SdrUndoAction( *rTableObj.GetModel() )
, mxObjRef( const_cast sdr::table::SdrTableObj*( rTableObj ) )
+, mbHasRedoData(false)
{
getData( maUndoData );
}
commit b19e943c50e5f9f436a2dc616c661e19c8152bb1
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 7 21:18:46 2014 +0100
coverity#708175 Uninitialized scalar field
Change-Id: I235f46bf9b0e672ddad16d9766a09f5c7c88a3e0
diff --git a/sfx2/source/view/sfxbasecontroller.cxx
b/sfx2/source/view/sfxbasecontroller.cxx
index 64ec9ea..d6ec618 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -198,6 +198,9 @@ public:
SfxStatusIndicator(SfxBaseController* pController,
SfxWorkWindow* pWork)
: xOwner( pController )
, pWorkWindow( pWork )
+, _nRange(0)
+, _nValue(0)
+, _nStartTime(0)
{
++m_refCount;
Reference lang::XComponent xComponent(
commit e1fcf731fdb8457c9c8b686d182e4b2dbb7ff1bb
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 7 21:17:01 2014 +0100
coverity#708193 Uninitialized scalar field
Change-Id: Ibf9f267acf3bef7aa0ce34660664f095453f4b82
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index 4ea02f9..b5157e9 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -452,7 +452,11 @@ namespace svt
bool bDown;
public:
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac external/coinmp RepositoryExternal.mk
RepositoryExternal.mk |2 +-
configure.ac |8 ++--
external/coinmp/ExternalPackage_coinmp.mk |2 +-
external/coinmp/ExternalProject_coinmp.mk |1 +
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Apr 7 09:28:06 2014 +0200
Find apr and serf libraries in --enable-dbgutil Windows build.
Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a
(cherry picked from commit 702d79a3f8fd3c5e4b433195908317075c87ad9d)
diff --git a/configure.ac b/configure.ac
index 69036cd..54fd9f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9283,14 +9283,18 @@ serf)
[-I${WORKDIR}/UnpackedTarball/apr/include
-I${WORKDIR}/UnpackedTarball/apr_util/include],
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
-APR_LIBS=${WORKDIR}/UnpackedTarball/apr/LibR/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/LibR/aprutil-1.lib
+APR_LIB_DIR=LibR
+test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
# Check for system serf
libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 =
1.1.0],[-I${WORKDIR}/UnpackedTarball/serf],
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
-SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/Release/serf-1.lib
+SERF_LIB_DIR=Release
+test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
neon)
commit bdf04730079523303a7c10c7af97ee5f67ad0a92
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date: Sat Apr 5 12:02:38 2014 +0900
Fix Windows build(external/coinmp)
This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.
Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
(cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a)
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 23bee81..c932194 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1891,7 +1891,7 @@ define gb_LinkTarget__use_coinmp
$(call gb_LinkTarget_use_package,$(1),coinmp)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+ $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk
b/external/coinmp/ExternalPackage_coinmp.mk
index de01822..bbea3dd 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,7 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
$(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
ifeq ($(OS),WNT)
-$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll))
+$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
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))
commit c06d624c81bafba1b61052aa5078d10f023e276b
Author: Michael Stahl mst...@redhat.com
Date: Fri Apr 4 18:12:16 2014 +0200
coinmp: actually link the libraries
Several people named Chris report failures in the solver unit test, and
apparently the CoinMP libraries have loads of unresolved symbols
because they don't have NEEDED entries, i.e. were not linked properly;
let's see if this fixes it.
Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0
Reviewed-on: https://gerrit.libreoffice.org/8850
Reviewed-by: Chris Laplante mostthings...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 6731f6c36faf64ab4522f0ffe2045c794849fabe)
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index b66e877..c18f2d5 100644
---
[Libreoffice-commits] core.git: include/oox oox/source sw/qa writerfilter/source
include/oox/vml/vmlshape.hxx |1 +
oox/source/vml/vmlshape.cxx | 14 ++
oox/source/vml/vmlshapecontext.cxx|1 +
sw/qa/extras/ooxmlexport/data/fdo76591.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 17 -
6 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit 69eebf8735973a05c931182d2ebfe35ce25f4b1a
Author: Sourav sourav.maha...@synerzip.com
Date: Fri Apr 4 18:06:44 2014 +0530
fdo76591:-Textbox property (order- send behind text) is not preserved.
Z-Index was not handledin LO for vml.
I have made the changes to handle that using aGrabBag.
Change-Id: I2af3b2974c8eb699bc6a7b743dc438584d6517ac
Reviewed-on: https://gerrit.libreoffice.org/8833
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index d38c58f..832d3be 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -64,6 +64,7 @@ struct OOX_DLLPUBLIC ShapeTypeModel
OptValue Int32Pair moCoordPos; /// Top-left position of
coordinate system for children scaling.
OptValue Int32Pair moCoordSize; /// Size of coordinate system
for children scaling.
OUString maPosition; /// Position type of the shape.
+OUString maZIndex;/// ZIndex of the shape
OUString maLeft; /// X position of the shape bounding
box (number with unit).
OUString maTop; /// Y position of the shape bounding
box (number with unit).
OUString maWidth;/// Width of the shape bounding box
(number with unit).
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e79c9b8..d4bdbcf 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -41,6 +41,7 @@
#include com/sun/star/text/XTextContent.hpp
#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/text/XTextFrame.hpp
+ #include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/text/TextContentAnchorType.hpp
#include rtl/math.hxx
#include rtl/ustrbuf.hxx
@@ -322,6 +323,19 @@ Reference XShape ShapeBase::convertAndInsert( const
Reference XShapes rxS
PropertySet aShapeProp( xShape );
if( aShapeProp.hasProperty( PROP_Name ) )
aShapeProp.setProperty( PROP_Name, getShapeName() );
+uno::Reference lang::XServiceInfo xSInfo( xShape,
uno::UNO_QUERY_THROW );
+if (xSInfo-supportsService(com.sun.star.text.TextFrame))
+{
+uno::Sequencebeans::PropertyValue aGrabBag;
+uno::Referencebeans::XPropertySet propertySet (xShape,
uno::UNO_QUERY);
+propertySet-getPropertyValue(FrameInteropGrabBag) =
aGrabBag;
+sal_Int32 length = aGrabBag.getLength();
+
+aGrabBag.realloc( length+1 );
+aGrabBag[length].Name = VML-Z-ORDER;
+aGrabBag[length].Value = uno::makeAny(
maTypeModel.maZIndex.toInt32() );
+propertySet-setPropertyValue( FrameInteropGrabBag,
uno::makeAny(aGrabBag) );
+}
Reference XControlShape xControlShape( xShape,
uno::UNO_QUERY );
if ( xControlShape.is() !getTypeModel().mbVisible )
{
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index fdeca32..146940e 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -399,6 +399,7 @@ void ShapeTypeContext::setStyle( const OUString rStyle )
if( ConversionHelper::separatePair( aName, aValue, rStyle.getToken( 0,
';', nIndex ), ':' ) )
{
if( aName == position ) mrTypeModel.maPosition =
aValue;
+else if( aName == z-index )mrTypeModel.maZIndex = aValue;
else if( aName == left ) mrTypeModel.maLeft = aValue;
else if( aName == top )mrTypeModel.maTop = aValue;
else if( aName == width ) mrTypeModel.maWidth = aValue;
diff --git a/sw/qa/extras/ooxmlexport/data/fdo76591.docx
b/sw/qa/extras/ooxmlexport/data/fdo76591.docx
new file mode 100644
index 000..8ca4387
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76591.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 68ef7ebb..aa48fda 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2989,6 +2989,14 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76163 , fdo76163.docx)
assertXPath ( pXmlDoc,
[Libreoffice-commits] core.git: unodevtools/source
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 27 - unodevtools/source/skeletonmaker/javatypemaker.cxx |8 -- unodevtools/source/skeletonmaker/skeletoncpp.hxx | 26 unodevtools/source/skeletonmaker/skeletonjava.hxx |4 +++ unodevtools/source/unodevtools/options.cxx |1 5 files changed, 31 insertions(+), 35 deletions(-) New commits: commit 80ce87724919fc61cd8dc4b053d0d25d33619159 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 8 10:22:01 2014 +0200 Clean up function declarations Change-Id: I18125ac6c58c89f76c3a6cfb3a7ee77b1059aeb1 diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 44a044e..89adc8b 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -413,33 +413,6 @@ void printSetPropertyMixinBody( o }\n\n; } -void generateXPropertySetBodies(std::ostream o, -const OString classname, -const OString interfaceName); -void generateXFastPropertySetBodies(std::ostream o, -const OString classname, -const OString interfaceName); -void generateXPropertyAccessBodies(std::ostream o, - const OString classname, - const OString interfaceName); - -void generateXAddInBodies(std::ostream o, const OString classname); - -void generateXLocalizable(std::ostream o, const OString classname); - -void generateXCompatibilityNamesBodies(std::ostream o, const OString classname); - -void generateXInitialization(std::ostream o, const OString classname); - -void generateXDispatch(std::ostream o, - const OString classname, - const ProtocolCmdMap protocolCmdMap); - -void generateXDispatchProvider(std::ostream o, - const OString classname, - const ProtocolCmdMap protocolCmdMap); - - void printMethods(std::ostream o, ProgramOptions const options, rtl::Reference TypeManager const manager, OUString const name, codemaker::GeneratedTypeSet generated, diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index e959e0c..71764de 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -410,10 +410,6 @@ void printSetPropertyMixinBody( o indentation }\n\n; } -void generateXPropertySetBodies(std::ostream o); -void generateXFastPropertySetBodies(std::ostream o); -void generateXPropertyAccessBodies(std::ostream o); - void printMethods(std::ostream o, ProgramOptions const options, rtl::Reference TypeManager const manager, OUString const name, @@ -626,10 +622,6 @@ void printConstructors( } } -void generateDocumentation(std::ostream o, -ProgramOptions const options, rtl::Reference TypeManager const manager, -OString const type); - void printServiceMembers( std::ostream o, ProgramOptions const options, rtl::Reference TypeManager const manager, diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx index 7f923c4..d8c3f93 100644 --- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx +++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx @@ -63,6 +63,32 @@ void generateCalcAddin(ProgramOptions const options, rtl::Reference TypeManager const manager, std::vector OString const types); +void generateXPropertySetBodies(std::ostream o, +const OString classname, +const OString interfaceName); +void generateXFastPropertySetBodies(std::ostream o, +const OString classname, +const OString interfaceName); +void generateXPropertyAccessBodies(std::ostream o, + const OString classname, + const OString interfaceName); + +void generateXAddInBodies(std::ostream o, const OString classname); + +void generateXLocalizable(std::ostream o, const OString classname); + +void generateXCompatibilityNamesBodies(std::ostream o, const OString classname); + +void generateXInitialization(std::ostream o, const OString classname); + +void generateXDispatch(std::ostream o, + const OString classname, + const ProtocolCmdMap protocolCmdMap); + +void generateXDispatchProvider(std::ostream o, + const OString classname, + const ProtocolCmdMap protocolCmdMap); + } } #endif //
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 4 commits - coinmp/ExternalPackage_coinmp.mk coinmp/ExternalProject_coinmp.mk configure.ac RepositoryExternal.mk
RepositoryExternal.mk|2 +-
coinmp/ExternalPackage_coinmp.mk |2 +-
coinmp/ExternalProject_coinmp.mk |1 +
configure.ac | 14 +-
4 files changed, 12 insertions(+), 7 deletions(-)
New commits:
commit e0a6759fd8b891e86ce0b35cfbfb11e7c3a2d0da
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Apr 8 10:32:27 2014 +0200
mpl-subset changes
Change-Id: Iebd435a40fb61ddb248d7bbb50f55b92b16f0141
diff --git a/configure.ac b/configure.ac
index e9e55e1..51d2f5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8517,7 +8517,7 @@ AC_MSG_CHECKING([whether to plug browser plugins into
LibreOffice documents])
# Obviously no such thing on iOS or Android. Also not possible when building
# 64-bit OS X code as the plugin code uses QuickTime and Carbon.
if test $_os != Android -a $_os != iOS -a \( $_os != Darwin -o
$BITNESS_OVERRIDE = \) -a \
-$enable_headless != yes
+$enable_headless != yes -a $enable_mpl_subset != yes
then
AC_MSG_RESULT([yes])
ENABLE_NPAPI_FROM_BROWSER=YES
@@ -8531,8 +8531,8 @@ dnl
===
dnl Check for NPAPI interface to plug LibreOffice into browser windows
dnl ===
AC_MSG_CHECKING([whether to plug LibreOffice into browser windows])
-if test $_os == WINNT -o $_os != Android -a $_os != Darwin -a $_os !=
iOS -a \
-$enable_headless != yes -a $enable_gtk != no
+if test $enable_mpl_subset != yes -a \( $_os = WINNT -o $_os != Android
-a $_os != Darwin -a $_os != iOS -a \
+$enable_headless != yes -a $enable_gtk != no \)
then
AC_MSG_RESULT([yes])
ENABLE_NPAPI_INTO_BROWSER=YES
commit b177b928b5dd0afcc51d8964086cc8a23b504d65
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Apr 7 09:28:06 2014 +0200
Find apr and serf libraries in --enable-dbgutil Windows build.
Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a
(cherry picked from commit 702d79a3f8fd3c5e4b433195908317075c87ad9d)
diff --git a/configure.ac b/configure.ac
index df9c949..e9e55e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8662,14 +8662,18 @@ serf)
[-I${WORKDIR}/UnpackedTarball/apr/include
-I${WORKDIR}/UnpackedTarball/apr_util/include],
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
-APR_LIBS=${WORKDIR}/UnpackedTarball/apr/LibR/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/LibR/aprutil-1.lib
+APR_LIB_DIR=LibR
+test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
# Check for system serf
libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 =
1.1.0],[-I${WORKDIR}/UnpackedTarball/serf],
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
-SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/Release/serf-1.lib
+SERF_LIB_DIR=Release
+test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
neon)
commit b61716b25da6fca2985f5216bdfd25b6c7335745
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date: Sat Apr 5 12:02:38 2014 +0900
Fix Windows build(external/coinmp)
This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
(cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a)
Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3571b2b..8e549b3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1747,7 +1747,7 @@ define gb_LinkTarget__use_coinmp
$(call gb_LinkTarget_use_package,$(1),coinmp)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+ $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/coinmp/ExternalPackage_coinmp.mk b/coinmp/ExternalPackage_coinmp.mk
index 6ce493b..9f6793a 100644
--- a/coinmp/ExternalPackage_coinmp.mk
+++ b/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,7 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
$(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
ifeq ($(OS),WNT)
-$(eval $(call
[Libreoffice-commits] core.git: 3 commits - configure.ac Library_merged.mk RepositoryExternal.mk solenv/gbuild
Library_merged.mk | 10 ++ RepositoryExternal.mk |2 +- configure.ac |5 + solenv/gbuild/extensions/pre_MergedLibsList.mk |1 + 4 files changed, 17 insertions(+), 1 deletion(-) New commits: commit 532e8ccd8b5fe7c2b7eee4ff167ac6c53b9ba87d Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Apr 8 10:30:47 2014 +0200 Better to use dependency on package here. Change-Id: I697a2bd24d80ac236f7336e318a338cde788c7d4 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2892a71..722e22f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -246,7 +246,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ )) define gb_LinkTarget__use_glew -$(call gb_LinkTarget_use_external_project,$(1),glew) +$(call gb_LinkTarget_use_package,$(1),glew) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,glew/include) \ $$(INCLUDE) \ commit e67f8ecfd5d3feba99fab28aa03a802bd49c8fbb Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Mar 21 16:26:50 2014 +0100 vclopengl needs to be in libmerged Change-Id: I7265aa6f79bcee99bf5c60dc21b61ea95ae85864 diff --git a/Library_merged.mk b/Library_merged.mk index 61075ab..2d7b0f2 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -31,8 +31,10 @@ $(eval $(call gb_Library_use_libraries,merged,\ )) $(eval $(call gb_Library_use_externals,merged,\ + icu_headers \ icui18n \ icuuc \ + boost_headers \ boostdatetime \ $(call gb_Helper_optional,DESKTOP,clucene) \ cups \ @@ -41,6 +43,7 @@ $(eval $(call gb_Library_use_externals,merged,\ expat \ gconf \ gio \ + glew \ graphite \ $(if $(ENABLE_GTK),gtk) \ harfbuzz \ @@ -52,6 +55,7 @@ $(eval $(call gb_Library_use_externals,merged,\ liblangtag \ libxml2 \ libxslt \ + mesa_headers \ mythes \ nss3 \ telepathy \ @@ -89,8 +93,11 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,merged,\ -lm \ -ldl \ + -lGL \ + -lGLU \ -lpthread \ -lrt \ + -lX11 \ )) endif @@ -99,12 +106,14 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\ advapi32 \ gdi32 \ gdiplus \ + glu32 \ imm32 \ mpr \ msimg32 \ oldnames \ ole32 \ oleaut32 \ + opengl32 \ shell32 \ shlwapi \ user32 \ @@ -133,6 +142,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ Cocoa \ CoreFoundation \ CoreServices \ + OpenGL \ QuickTime \ )) endif diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 0388d96..ad9b478 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -150,6 +150,7 @@ gb_MERGEDLIBS := \ utl \ uui \ vcl \ + $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \ xmlscript \ xo \ xstor \ commit 07e1f3c10ebcc395c6ecf484204338826d699120 Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Apr 8 00:41:47 2014 +0200 Revert Remove --disable-lpsolve configure option. This reverts commit 0737d4f6f9d5db5197ce4f35214a785250b8e848. Commit adding --with-lpsolver was reverted in 8dc394d5c573e5583760c7cc56c5c19062d3f062. Change-Id: I27598f25f05edafd6afae49d85f81b60f9a0e0a3 diff --git a/configure.ac b/configure.ac index c05271e..52fa3d8 100644 --- a/configure.ac +++ b/configure.ac @@ -783,6 +783,11 @@ AC_ARG_ENABLE(ext-wiki-publisher, [Enable the Wiki Publisher extension.]) ) +AC_ARG_ENABLE(lpsolve, +AS_HELP_STRING([--disable-lpsolve], +[Disable compilation of the lp solve solver ]) +) + AC_ARG_ENABLE(pdfimport, AS_HELP_STRING([--disable-pdfimport], [Disable building the PDF import feature.]) ___ 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/call.hxx| 34 +++
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |3 +
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx |4 +-
bridges/source/cpp_uno/shared/vtablefactory.cxx |8 ++--
4 files changed, 42 insertions(+), 7 deletions(-)
New commits:
commit f598a018f153d005887bc994f93719e2da37c9cf
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 8 10:35:57 2014 +0200
Clean up function declarations
Change-Id: I5d3ed0a266f327dbc8d506090221c43ef89fbcc0
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx
new file mode 100644
index 000..3e5d316
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.hxx
@@ -0,0 +1,34 @@
+/* -*- 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 .
+ */
+
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALL_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALL_HXX
+
+#include sal/config.h
+
+#include sal/types.h
+
+extern C typelib_TypeClass cpp_vtable_call(
+sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
+void ** gpreg, void ** fpreg, void ** ovrflw,
+sal_uInt64 * pRegisterReturn /* space for register return */ );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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 1756977..2373769 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -36,6 +36,7 @@
#include bridges/cpp_uno/shared/vtablefactory.hxx
#include abi.hxx
+#include call.hxx
#include share.hxx
using namespace ::osl;
@@ -252,7 +253,7 @@ static typelib_TypeClass cpp2uno_call(
}
-extern C typelib_TypeClass cpp_vtable_call(
+typelib_TypeClass cpp_vtable_call(
sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
void ** gpreg, void ** fpreg, void ** ovrflw,
sal_uInt64 * pRegisterReturn /* space for register return */ )
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index e511627..4488e74 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -39,8 +39,8 @@
static bridges::cpp_uno::shared::VtableFactory * pInstance;
#if defined(__GNUG__) !defined(__MINGW32__)
-void dso_init(void) __attribute__((constructor));
-void dso_exit(void) __attribute__((destructor));
+extern C void dso_init(void) __attribute__((constructor));
+extern C void dso_exit(void) __attribute__((destructor));
#endif
void dso_init(void) {
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 43a5c81..f6e9e7c 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -35,6 +35,7 @@
#include sal/types.h
#include typelib/typedescription.hxx
+#include boost/noncopyable.hpp
#include boost/unordered_map.hpp
#include new
#include vector
@@ -120,7 +121,9 @@ extern C void SAL_CALL freeExec(
}
-class VtableFactory::GuardedBlocks: public std::vector Block {
+class VtableFactory::GuardedBlocks:
+public std::vectorBlock, private boost::noncopyable
+{
public:
GuardedBlocks(VtableFactory const factory):
m_factory(factory), m_guarded(true) {}
@@ -130,9 +133,6 @@ public:
void unguard() { m_guarded = false; }
private:
-GuardedBlocks(GuardedBlocks ); // not implemented
-void operator =(GuardedBlocks); // not implemented
-
VtableFactory const m_factory;
bool m_guarded;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools
include/svtools/svparser.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 135828c0d2e6a3ab439be23a05ed5537ede556f0
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 11:35:13 2014 +0300
WaE: implicit conversion of literal of type 'int' to 'bool'
Change-Id: Ibab8e9e29886cdffce1cd1480f7c5d421537b2bb
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index c26a244..55a61df 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -86,7 +86,7 @@ protected:
TokenStackType()
: nTokenValue(0)
-, bTokenHasValue(0)
+, bTokenHasValue(false)
, nTokenId(0)
{
}
___
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/appl/imestatuswindow.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9660716fb93e195fe9a89cf44b488c3d84907443
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 11:38:52 2014 +0300
WaE: implicit conversion of literal of type 'int' to 'bool'
Change-Id: I501dcb0ca3465e5e07564a7156a0dfa3f2767af5
diff --git a/sfx2/source/appl/imestatuswindow.cxx
b/sfx2/source/appl/imestatuswindow.cxx
index 717298d..ffdcf4f 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -109,7 +109,7 @@ bool ImeStatusWindow::isShowing()
{
try
{
-bool bShow(0);
+bool bShow(false);
if (getConfig()-getPropertyValue(OUString(ShowStatusWindow)) =
bShow)
return bShow;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/openssl
external/openssl/CVE-2014-0160.patch| 108
external/openssl/UnpackedTarball_openssl.mk |1
2 files changed, 109 insertions(+)
New commits:
commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 09:40:05 2014 +0100
CVE-2014-0160 heartbeat
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8
diff --git a/external/openssl/CVE-2014-0160.patch
b/external/openssl/CVE-2014-0160.patch
new file mode 100644
index 000..ddf9d9c
--- /dev/null
+++ b/external/openssl/CVE-2014-0160.patch
@@ -0,0 +1,108 @@
+From: Dr. Stephen Henson st...@openssl.org
+Date: Sat, 5 Apr 2014 23:51:06 + (+0100)
+Subject: Add heartbeat extension bounds check.
+X-Git-Tag: OpenSSL_1_0_1g~3
+X-Git-Url:
http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=96db902
+
+Add heartbeat extension bounds check.
+
+A missing bounds check in the handling of the TLS heartbeat extension
+can be used to reveal up to 64k of memory to a connected client or
+server.
+
+Thanks for Neel Mehta of Google Security for discovering this bug and to
+Adam Langley a...@chromium.org and Bodo Moeller bmoel...@acm.org for
+preparing the fix (CVE-2014-0160)
+---
+
+diff --git a/a/ssl/d1_both.c b/ssl/d1_both.c
+index 7a5596a..2e8cf68 100644
+--- a/a/ssl/d1_both.c
a/b/ssl/d1_both.c
+@@ -1459,26 +1459,36 @@ dtls1_process_heartbeat(SSL *s)
+ unsigned int payload;
+ unsigned int padding = 16; /* Use minimum padding */
+
+- /* Read type and payload length first */
+- hbtype = *p++;
+- n2s(p, payload);
+- pl = p;
+-
+ if (s-msg_callback)
+ s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
+ s-s3-rrec.data[0], s-s3-rrec.length,
+ s, s-msg_callback_arg);
+
++ /* Read type and payload length first */
++ if (1 + 2 + 16 s-s3-rrec.length)
++ return 0; /* silently discard */
++ hbtype = *p++;
++ n2s(p, payload);
++ if (1 + 2 + payload + 16 s-s3-rrec.length)
++ return 0; /* silently discard per RFC 6520 sec. 4 */
++ pl = p;
++
+ if (hbtype == TLS1_HB_REQUEST)
+ {
+ unsigned char *buffer, *bp;
++ unsigned int write_length = 1 /* heartbeat type */ +
++ 2 /* heartbeat length */ +
++ payload + padding;
+ int r;
+
++ if (write_length SSL3_RT_MAX_PLAIN_LENGTH)
++ return 0;
++
+ /* Allocate memory for the response, size is 1 byte
+* message type, plus 2 bytes payload length, plus
+* payload, plus padding
+*/
+- buffer = OPENSSL_malloc(1 + 2 + payload + padding);
++ buffer = OPENSSL_malloc(write_length);
+ bp = buffer;
+
+ /* Enter response type, length and copy payload */
+@@ -1489,11 +1499,11 @@ dtls1_process_heartbeat(SSL *s)
+ /* Random padding */
+ RAND_pseudo_bytes(bp, padding);
+
+- r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload
+ padding);
++ r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
write_length);
+
+ if (r = 0 s-msg_callback)
+ s-msg_callback(1, s-version, TLS1_RT_HEARTBEAT,
+- buffer, 3 + payload + padding,
++ buffer, write_length,
+ s, s-msg_callback_arg);
+
+ OPENSSL_free(buffer);
+diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
+index b82fada..bddffd9 100644
+--- a/a/ssl/t1_lib.c
a/b/ssl/t1_lib.c
+@@ -2588,16 +2588,20 @@ tls1_process_heartbeat(SSL *s)
+ unsigned int payload;
+ unsigned int padding = 16; /* Use minimum padding */
+
+- /* Read type and payload length first */
+- hbtype = *p++;
+- n2s(p, payload);
+- pl = p;
+-
+ if (s-msg_callback)
+ s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
+ s-s3-rrec.data[0], s-s3-rrec.length,
+ s, s-msg_callback_arg);
+
++ /* Read type and payload length first */
++ if (1 + 2 + 16 s-s3-rrec.length)
++ return 0; /* silently discard */
++ hbtype = *p++;
++ n2s(p, payload);
++ if (1 + 2 + payload + 16 s-s3-rrec.length)
++ return 0; /* silently discard per RFC 6520 sec. 4 */
++ pl = p;
++
+ if (hbtype == TLS1_HB_REQUEST)
+ {
+ unsigned char *buffer, *bp;
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index cec09d2..869a74e 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/openssl
external/openssl/CVE-2014-0160.patch| 108
external/openssl/UnpackedTarball_openssl.mk |1
2 files changed, 109 insertions(+)
New commits:
commit cd121ab497c22470f5e99f9d3032edaccbbc00b1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 09:40:05 2014 +0100
CVE-2014-0160 heartbeat
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8
(cherry picked from commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619)
diff --git a/external/openssl/CVE-2014-0160.patch
b/external/openssl/CVE-2014-0160.patch
new file mode 100644
index 000..ddf9d9c
--- /dev/null
+++ b/external/openssl/CVE-2014-0160.patch
@@ -0,0 +1,108 @@
+From: Dr. Stephen Henson st...@openssl.org
+Date: Sat, 5 Apr 2014 23:51:06 + (+0100)
+Subject: Add heartbeat extension bounds check.
+X-Git-Tag: OpenSSL_1_0_1g~3
+X-Git-Url:
http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=96db902
+
+Add heartbeat extension bounds check.
+
+A missing bounds check in the handling of the TLS heartbeat extension
+can be used to reveal up to 64k of memory to a connected client or
+server.
+
+Thanks for Neel Mehta of Google Security for discovering this bug and to
+Adam Langley a...@chromium.org and Bodo Moeller bmoel...@acm.org for
+preparing the fix (CVE-2014-0160)
+---
+
+diff --git a/a/ssl/d1_both.c b/ssl/d1_both.c
+index 7a5596a..2e8cf68 100644
+--- a/a/ssl/d1_both.c
a/b/ssl/d1_both.c
+@@ -1459,26 +1459,36 @@ dtls1_process_heartbeat(SSL *s)
+ unsigned int payload;
+ unsigned int padding = 16; /* Use minimum padding */
+
+- /* Read type and payload length first */
+- hbtype = *p++;
+- n2s(p, payload);
+- pl = p;
+-
+ if (s-msg_callback)
+ s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
+ s-s3-rrec.data[0], s-s3-rrec.length,
+ s, s-msg_callback_arg);
+
++ /* Read type and payload length first */
++ if (1 + 2 + 16 s-s3-rrec.length)
++ return 0; /* silently discard */
++ hbtype = *p++;
++ n2s(p, payload);
++ if (1 + 2 + payload + 16 s-s3-rrec.length)
++ return 0; /* silently discard per RFC 6520 sec. 4 */
++ pl = p;
++
+ if (hbtype == TLS1_HB_REQUEST)
+ {
+ unsigned char *buffer, *bp;
++ unsigned int write_length = 1 /* heartbeat type */ +
++ 2 /* heartbeat length */ +
++ payload + padding;
+ int r;
+
++ if (write_length SSL3_RT_MAX_PLAIN_LENGTH)
++ return 0;
++
+ /* Allocate memory for the response, size is 1 byte
+* message type, plus 2 bytes payload length, plus
+* payload, plus padding
+*/
+- buffer = OPENSSL_malloc(1 + 2 + payload + padding);
++ buffer = OPENSSL_malloc(write_length);
+ bp = buffer;
+
+ /* Enter response type, length and copy payload */
+@@ -1489,11 +1499,11 @@ dtls1_process_heartbeat(SSL *s)
+ /* Random padding */
+ RAND_pseudo_bytes(bp, padding);
+
+- r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload
+ padding);
++ r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
write_length);
+
+ if (r = 0 s-msg_callback)
+ s-msg_callback(1, s-version, TLS1_RT_HEARTBEAT,
+- buffer, 3 + payload + padding,
++ buffer, write_length,
+ s, s-msg_callback_arg);
+
+ OPENSSL_free(buffer);
+diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
+index b82fada..bddffd9 100644
+--- a/a/ssl/t1_lib.c
a/b/ssl/t1_lib.c
+@@ -2588,16 +2588,20 @@ tls1_process_heartbeat(SSL *s)
+ unsigned int payload;
+ unsigned int padding = 16; /* Use minimum padding */
+
+- /* Read type and payload length first */
+- hbtype = *p++;
+- n2s(p, payload);
+- pl = p;
+-
+ if (s-msg_callback)
+ s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
+ s-s3-rrec.data[0], s-s3-rrec.length,
+ s, s-msg_callback_arg);
+
++ /* Read type and payload length first */
++ if (1 + 2 + 16 s-s3-rrec.length)
++ return 0; /* silently discard */
++ hbtype = *p++;
++ n2s(p, payload);
++ if (1 + 2 + payload + 16 s-s3-rrec.length)
++ return 0; /* silently discard per RFC 6520 sec. 4 */
++ pl = p;
++
+ if (hbtype == TLS1_HB_REQUEST)
+ {
+ unsigned char *buffer, *bp;
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index cec09d2..869a74e 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@
[Libreoffice-commits] core.git: 2 commits - chart2/Library_chartcore.mk drawinglayer/source
chart2/Library_chartcore.mk |3 ++- drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 8ce32af6b28bbdcc6772ccb79838087a5c1a3432 Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 8 11:43:57 2014 +0300 We build the vclopengl library only for FREEBSD LINUX MACOSX WNT Change-Id: I6d9f6a33f7f825196d8d2aeec658b9323577ac7c diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 709b6fa..dae64e9 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -58,7 +58,8 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ ucbhelper \ utl \ vcl \ -vclopengl \ +$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \ +vclopengl) \ $(gb_UWINAPI) \ )) commit 7190d6b04f2488ae39ab6b8e64971714212c Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 8 11:37:29 2014 +0300 Use same code for iOS and OS X here, too, not that it seems to help any Change-Id: I16d11447757680edb0ff786a5ee1e3d453b38910 diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 7fc6426..0f77658 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -175,7 +175,7 @@ namespace // create BitmapEx Bitmap aMainBitmap = aVirtualDevice.GetBitmap(Point(), aVirtualDevice.GetOutputSizePixel()); -#if defined(MACOSX) +#if defined(MACOSX) || defined(IOS) AlphaMask aMaskBitmap( aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel())); #else Bitmap aMaskBitmap = aVirtualDeviceMask.GetBitmap( Point(), aVirtualDeviceMask.GetOutputSizePixel()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/treeopt.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit d4d28a97106aaef125fb46808c5d992b0b3a59f8
Author: Ariel Constenla-Haile arie...@apache.org
Date: Mon Apr 7 23:53:55 2014 +
Resolves: #i124623# Dispose extension's Options page to avoid memory leaks
(cherry picked from commit 363c5553b7386da80abef818a196f5cf7d353ae0)
Change-Id: Ic04b523f5f9d4092889b3ad59569f02946091652
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index fa5d890..e5b1bf3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2298,6 +2298,22 @@ ExtensionsTabPage::~ExtensionsTabPage()
{
Hide();
DeactivatePage();
+
+if ( m_xPage.is() )
+{
+Reference XComponent xComponent( m_xPage, UNO_QUERY );
+if ( xComponent.is() )
+{
+try
+{
+xComponent-dispose();
+}
+catch ( const Exception )
+{
+}
+}
+m_xPage.clear();
+}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About using sdk
On 04/07/2014 10:01 PM, julien2412 wrote: But then I don't know how to launch the example of fdo#77028. I mean I don't know where I must put test.pptx from the fdo and what I should change to load pptx + ask pdf conversion. Indeed, if I run make DocumentLoader.run, it'll load test.ods not test.pptx. As https://bugs.freedesktop.org/show_bug.cgi?id=77028#c0 says, first modify the SDK's --- examples/cpp/DocumentLoader/Makefile~ 2013-04-19 14:02:18.769514698 +0200 +++ examples/cpp/DocumentLoader/Makefile2014-04-08 10:53:49.030078240 +0200 @@ -97,7 +97,7 @@ @echo %.run: $(OUT_BIN)/DocumentLoader$(EXE_EXT) - cd $(subst /,$(PS),$(OUT_BIN)) $(basename $@) $(ENV_OFFICE_TYPES) $(subst \\,/,$(subst /,$(PS),$(OO_SDK_HOME)/examples/cpp/DocumentLoader/test.odt)) + cd $(subst /,$(PS),$(OUT_BIN)) $(basename $@) $(ENV_OFFICE_TYPES) ~/Downloads/test.pptx .PHONY: clean clean : (or wherever you downloaded the test.pptx to). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 36/3c5553b7386da80abef818a196f5cf7d353ae0
36/3c5553b7386da80abef818a196f5cf7d353ae0 |1 + 1 file changed, 1 insertion(+) New commits: commit c5198c42f4d9ed49ef435038968e7760c8d5e7eb Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 8 10:01:51 2014 +0100 Notes added by 'git notes add' diff --git a/36/3c5553b7386da80abef818a196f5cf7d353ae0 b/36/3c5553b7386da80abef818a196f5cf7d353ae0 new file mode 100644 index 000..e367072 --- /dev/null +++ b/36/3c5553b7386da80abef818a196f5cf7d353ae0 @@ -0,0 +1 @@ +merged as: d4d28a97106aaef125fb46808c5d992b0b3a59f8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 81e7f75f472e7264750de8063b32f4348a40a628 Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Apr 8 11:00:38 2014 +0200 Use condition from Module_chart2.mk for external glew. I wonder what's best to use here. Change-Id: Icf641dcf640a12832ea86782414357fa9f71829c diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 722e22f..3738fde 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -228,7 +228,10 @@ endef endif # SYSTEM_CPPUNIT -ifneq ($(SYSTEM_GLEW),) +ifeq ($(filter FREEBSD LINUX MACOSX WNT,$(OS)),) +gb_LinkTarget__use_glew := + +else ifneq ($(SYSTEM_GLEW),) define gb_LinkTarget__use_glew $(call gb_LinkTarget_set_include,$(1),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: UNO: Possible to get printing progress?
Hi Fernand, thanks a lot for your reply. I was thinking more of a real progress indicator, like Printing page 50 of 3000 - similar to LibreOffice's own progress dialog when printing a document from within the GUI. I guess that's not possible? Regards, Ignaz Am 07.04.2014 18:36, schrieb Fernand Vanrie: Ignaz , in Basic we use this code as long the bIsBusy is false , the printing is not finished hope it helps greetz Fernand oDocument.setModified(false) Dim PrinterProps(1) As New com.sun.star.beans.PropertyValue PrinterProps(0).Name=wait PrinterProps(0).value=true PrinterProps(1).Name = IsBusy dim bIsBusy as boolean bIsBusy = True While bIsBusy dim aPrintConditions as object aPrintConditions = oDocument.getPrinter() dim i as integer For i = LBound( aPrintConditions ) To UBound( aPrintConditions ) If aPrintConditions(i).Name = IsBusy Then bIsBusy = aPrintConditions(i).Value EndIf Next Wait 10 ' Wait is a built in Basic statement WEnd oDocument.Print(array()) endif Hello, is it possible to get the printing progress of a document via UNO? This would make it possible to give the user some feedback when printing large documents. The closest thing I've found is the PrintJobEvent (http://api.libreoffice.org/docs/idl/ref/structcom_1_1sun_1_1star_1_1view_1_1PrintJobEvent.html), however the PrintableState seems to contain only very basic information (Started, Completed, Spooled)... Thanks a lot, Ignaz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/osl registry/test
include/osl/diagnose.h |6 --
registry/test/regdiagnose.h |4 ++--
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit df2c663fef3435a8c3d541b364780876229ccd29
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Mon Apr 7 16:10:57 2014 +0200
fdo#43157 [API CHANGE] Remove deprecated _OSL_GLOBAL
Signed-off-by: Stephan Bergmann sberg...@redhat.com
Conflicts:
include/osl/diagnose.h
Change-Id: Ie2e6b7a8546318bdd8b81261bef46bf92c0c125f
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index 4137d21..e64160c 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -114,12 +114,6 @@
#define OSL_POSTCOND(c, m) OSL_ENSURE(c, m)
-#ifdef __cplusplus
-#define _OSL_GLOBAL ::
-#else
-#define _OSL_GLOBAL
-#endif /* __cplusplus */
-
/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now
*/
/* copied from boost/current_function.hpp to make it usable from C
* sources as well
diff --git a/registry/test/regdiagnose.h b/registry/test/regdiagnose.h
index 721db1d..1ac6e92 100644
--- a/registry/test/regdiagnose.h
+++ b/registry/test/regdiagnose.h
@@ -28,8 +28,8 @@
#define _REG_ENSURE(c, f, l, m) \
do \
{ \
-if (!(c) _OSL_GLOBAL osl_assertFailedLine(f, l, m)) \
-_OSL_GLOBAL osl_breakDebug(); \
+if (!(c) :: osl_assertFailedLine(f, l, m)) \
+:: osl_breakDebug(); \
} while (0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #22 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michaël Lefèvre committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=df2c663fef3435a8c3d541b364780876229ccd29 fdo#43157 [API CHANGE] Remove deprecated _OSL_GLOBAL 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] mso-dumper.git: msodumper/xlsrecord.py
msodumper/xlsrecord.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f16ae8babbffcae3feb61246f416c8a15adecacb Author: Eike Rathke er...@redhat.com Date: Tue Apr 8 11:26:08 2014 +0200 bit 0 is bit 0 They say they use big-endian bit diagrams, but just to confuse you. diff --git a/msodumper/xlsrecord.py b/msodumper/xlsrecord.py index 59e748a..463e783 100644 --- a/msodumper/xlsrecord.py +++ b/msodumper/xlsrecord.py @@ -2743,7 +2743,7 @@ class FeatureData(BaseRecordHandler): self.appendLine(A and reserved: 0x%8.8X%Areserved) self.appendLine(wPassword: 0x%8.8X%wPassword) self.appendLine(stTitle: %s%stTitle) -if Areserved 0x8000 == 0x8000: +if Areserved 0x0001 == 0x0001: # SDContainer cbSD = self.readUnsignedInt(4) self.appendLine(cbSD: %d%cbSD) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Depends on||77174 --- Comment #125 from Laurent BP jumbo4...@yahoo.fr --- Add bug 77174 Crash in Writer with Stylist in sidebar -- 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: external/glew
external/glew/ExternalProject_glew.mk |2 +- external/glew/Module_glew.mk |4 external/glew/UnpackedTarball_glew.mk | 16 external/glew/glew-ios.patch.1 | 12 external/glew/glew-static-only.patch.1 | 12 5 files changed, 41 insertions(+), 5 deletions(-) New commits: commit d8ad7d5790d5770ae5c197f57bb26e414fdff07e Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 8 12:49:14 2014 +0300 Build GLEW for all platforms Whether it actually should be used or not on some particular platform is another thing that remains to be seen. But I think it should be buildable for all? Don't build the glew programs for non-desktop platforms. Build only static libraries when DISABLE_DYNLOADING. No AGL framework, and it's OpenGLES, not OpenGL, on iOS. Change-Id: Idf3aad341c4f270952db2039d5a5e421f39e728f diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index 3043630..96026a1 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -25,7 +25,7 @@ else $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,glew,\ $(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) LD=$(CC) \ - $(MAKE) glew.lib $(if $(filter TRUE,$(ENABLE_DEBUG)),debug) \ + $(MAKE) glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \ ) endif diff --git a/external/glew/Module_glew.mk b/external/glew/Module_glew.mk index 6fcc9ab..1d1b9a7 100644 --- a/external/glew/Module_glew.mk +++ b/external/glew/Module_glew.mk @@ -9,14 +9,10 @@ $(eval $(call gb_Module_Module,glew)) -ifeq ($(CROSS_COMPILING),) - $(eval $(call gb_Module_add_targets,glew,\ ExternalProject_glew \ UnpackedTarball_glew \ ExternalPackage_glew \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index 64544b9..c3124d8 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -13,6 +13,10 @@ $(eval $(call gb_UnpackedTarball_set_tarball,glew,$(GLEW_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,glew,0)) +$(eval $(call gb_UnpackedTarball_fix_end_of_line,glew,\ + Makefile \ +)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary)) $(eval $(call gb_UnpackedTarball_add_patches,glew,\ @@ -31,4 +35,16 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\ )) endif +ifeq ($(OS),IOS) +$(eval $(call gb_UnpackedTarball_add_patches,glew,\ + external/glew/glew-ios.patch.1 \ +)) +endif + +ifeq ($(DISABLE_DYNLOADING),TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,glew,\ + external/glew/glew-static-only.patch.1 \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/external/glew/glew-ios.patch.1 b/external/glew/glew-ios.patch.1 new file mode 100644 index 000..05814f6 --- /dev/null +++ b/external/glew/glew-ios.patch.1 @@ -0,0 +1,12 @@ +-*- Mode:Diff -*- +--- glew/config/Makefile.darwin glew/config/Makefile.darwin +@@ -8,7 +8,7 @@ + CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' + LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 + else +-LDFLAGS.GL = -framework AGL -framework OpenGL ++LDFLAGS.GL = -framework OpenGLES + endif + LDFLAGS.STATIC = + LDFLAGS.DYNAMIC = diff --git a/external/glew/glew-static-only.patch.1 b/external/glew/glew-static-only.patch.1 new file mode 100644 index 000..14ccff2 --- /dev/null +++ b/external/glew/glew-static-only.patch.1 @@ -0,0 +1,12 @@ +-*- Mode:Diff -*- +--- glew/Makefile glew/Makefile +@@ -93,7 +93,7 @@ + LIB.SOBJS.MX := $(addprefix tmp/$(SYSTEM)/mx/shared/,$(LIB.SRCS.NAMES)) + LIB.SOBJS.MX := $(LIB.SOBJS.MX:.c=.o) + +-glew.lib: lib lib/$(LIB.SHARED) lib/$(LIB.STATIC) glew.pc ++glew.lib: lib lib/$(LIB.STATIC) + + lib: + mkdir lib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/tabprotection.hxx |8 +++-
sc/source/core/data/tabprotection.cxx |6 +++---
sc/source/filter/excel/excimp8.cxx|7 ---
sc/source/filter/xcl97/xcl97rec.cxx |2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit d114939dabaf5cb0c14b619ef851be17c28e69e5
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 11:51:19 2014 +0200
resize vector in advance
Obtaining front() from an empty vector is disallowed, even if size was
reserved. So resize it.
Change-Id: Iae2aafd6b7b725ea36bf9c3fb0a2370c703f
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index fd8e221..24adc64 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -375,9 +375,10 @@ void ImportExcel8::Feat( void )
{
sal_uInt32 nCbSD = aIn.ReaduInt32();
// TODO: could here be some sanity check applied to not allocate 4GB?
-aProt.maSecurityDescriptor.reserve( nCbSD);
+aProt.maSecurityDescriptor.resize( nCbSD);
sal_Size nRead = aIn.Read( aProt.maSecurityDescriptor.front(), nCbSD);
-aProt.maSecurityDescriptor.resize( nRead);
+if (nRead nCbSD)
+aProt.maSecurityDescriptor.resize( nRead);
}
GetSheetProtectBuffer().AppendEnhancedProtection( aProt, GetCurrScTab() );
commit 5bce64e4759ee3bd98d34b70d02f9b54550a53ed
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 11:34:49 2014 +0200
bit 0 is bit 0
They say they use big-endian bit diagrams, but just to confuse you.
Change-Id: I7fd6bb58c721f1dca2f6ecbaae90d516746762f0
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index 8209a86..fd8e221 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -371,7 +371,7 @@ void ImportExcel8::Feat( void )
aProt.mnAreserved = aIn.ReaduInt32();
aProt.mnPasswordVerifier = aIn.ReaduInt32();
aProt.maTitle = aIn.ReadUniString();
-if ((aProt.mnAreserved 0x8000) == 0x8000)
+if ((aProt.mnAreserved 0x0001) == 0x0001)
{
sal_uInt32 nCbSD = aIn.ReaduInt32();
// TODO: could here be some sanity check applied to not allocate 4GB?
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx
b/sc/source/filter/xcl97/xcl97rec.cxx
index d6c39ce..285fc62 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1492,7 +1492,7 @@ void XclExpSheetEnhancedProtection::WriteBody(
XclExpStream rStrm )
rStrm maEnhancedProtection.mnAreserved; // 1 bit A and 31
bits reserved
rStrm maEnhancedProtection.mnPasswordVerifier; // wPassword
rStrm XclExpString( maEnhancedProtection.maTitle); // stTitle
-bool bSDContainer = ((maEnhancedProtection.mnAreserved 0x8000) ==
0x8000);
+bool bSDContainer = ((maEnhancedProtection.mnAreserved 0x0001) ==
0x0001);
sal_uInt32 nCbSD = maEnhancedProtection.maSecurityDescriptor.size();
SAL_WARN_IF( bSDContainer nCbSD 20, sc.filter,
XclExpSheetEnhancedProtection A flag indicates container but cbSD
20);
commit a65e9fd24d905d03cd77551f2d6c9b2efa18fff6
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 11:08:30 2014 +0200
hold security descriptors read from OOXML independently
If anyone knows how to interpret that stuff and convert between
BIFF/OOXML feel free to implement..
According to ISO/IEC 29000 the securityDescriptor is application
defined, but recommends that username@domain be used, which is addr-spec
of RFC 822. Well, what Excel2013 writes is something like this
'O:WDG:WDD:(A;;CC;;;S-1-5-21-2328606873-448790680-2149751550-1003)'
Change-Id: I138fa116b019f200c211272abf69831bc49127ab
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index a224dc8..2dc798c 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -119,9 +119,15 @@ struct ScEnhancedProtection
sal_uInt32 mnAreserved;
sal_uInt32 mnPasswordVerifier;
OUStringmaTitle;
-::std::vector sal_uInt8 maSecurityDescriptor; // raw data
+::std::vector sal_uInt8 maSecurityDescriptor; // imported as raw
BIFF data
+OUStringmaSecurityDescriptorXML;// imported from
OOXML
ScEnhancedProtection() : mnAreserved(0), mnPasswordVerifier(0) {}
+
+bool hasSecurityDescriptor() const
+{
+return !maSecurityDescriptor.empty() ||
!maSecurityDescriptorXML.isEmpty();
+}
};
/** sheet protection state container
diff --git a/sc/source/core/data/tabprotection.cxx
b/sc/source/core/data/tabprotection.cxx
index f8a6a12..a9bfd8f 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -396,7 +396,7 @@ bool ScTableProtectionImpl::isBlockEditable(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/table/tableundo.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 25d2ae2a90bb3af093323c7182e2e66f49c3bc8e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 7 21:22:18 2014 +0100
coverity#708388 Uninitialized scalar field
Change-Id: Idaa2ec4863beb6be790022c3c66bc4a72e9bf626
(cherry picked from commit 409ebeb20d1ee4552ac21bd739ae4e25eaeb68d9)
Reviewed-on: https://gerrit.libreoffice.org/8891
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index aee0012..2a8aebf 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -506,6 +506,7 @@ void TableRowUndo::getData( Data rData )
TableStyleUndo::TableStyleUndo( const SdrTableObj rTableObj )
: SdrUndoAction( *rTableObj.GetModel() )
, mxObjRef( const_cast sdr::table::SdrTableObj*( rTableObj ) )
+, mbHasRedoData(false)
{
getData( maUndoData );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glew
external/glew/UnpackedTarball_glew.mk |6 -- external/glew/glew-ios.patch.1| 12 2 files changed, 18 deletions(-) New commits: commit 1309c34ac02a9d120bdf2e74c904abef5bbcf611 Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 8 13:02:30 2014 +0300 We build a static libGLEW for iOS anyway So no need to bother with what framework(s) to link to. Change-Id: I7dac64357bc01221787ef7e393952d492e2d84c7 diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk index c3124d8..91ec240 100644 --- a/external/glew/UnpackedTarball_glew.mk +++ b/external/glew/UnpackedTarball_glew.mk @@ -35,12 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,glew,\ )) endif -ifeq ($(OS),IOS) -$(eval $(call gb_UnpackedTarball_add_patches,glew,\ - external/glew/glew-ios.patch.1 \ -)) -endif - ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,glew,\ external/glew/glew-static-only.patch.1 \ diff --git a/external/glew/glew-ios.patch.1 b/external/glew/glew-ios.patch.1 deleted file mode 100644 index 05814f6..000 --- a/external/glew/glew-ios.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ --*- Mode:Diff -*- glew/config/Makefile.darwin -+++ glew/config/Makefile.darwin -@@ -8,7 +8,7 @@ - CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' - LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 - else --LDFLAGS.GL = -framework AGL -framework OpenGL -+LDFLAGS.GL = -framework OpenGLES - endif - LDFLAGS.STATIC = - LDFLAGS.DYNAMIC = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: fdo#77123: Add option ignore kashida to the search
On 04/08/2014 09:59 AM, Faisal M. Al-Otaibi wrote: commit d2771b63b94a8aae3c25c83e9dae9f83242f46c1 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Apr 8 09:42:20 2014 +0300 fdo#77123: Add option ignore kashida to the search This patch will add new checkbox to ignore kashida in the search and replace dialog. Change-Id: I9e7179242751103b8418d922ade5b9145170ad15 diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl index 45f7ccb..d1f675f 100644 --- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl +++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl @@ -52,6 +52,8 @@ constants TransliterationModulesExtra /// because we cannot extend TransliterationModule we used TranslationModuleExtra and it will act the same way const long ignoreDiacritics_CTL = 0x4000; +const long ignoreKashida_CTL = 0x0800; + const long END_OF_MODULE= 0; }; There is a restriction on UNOIDL entity names that a name must not contain both underscores and lower case letters at the same time (see http://www.openoffice.org/udk/common/man/typesystem.html for details). We unfortunately cannot enforce that at build time due to many legacy violations that cannot be fixed for compatibility reasons. But please fix this newly introduced name to follow the rules, best by making it use all uppercase and underscores, like IGNORE_KASHIDA_CTL. The similar case of ignoreDiacritics_CTL introduced with http://cgit.freedesktop.org/libreoffice/core/commit/?id=448fa131b2dafac305d88480e469cc4bc0515d68 Fix fdo#52204 add new feature ignore diacritics in search for CTL unfortunately slipped through into LO 4.2. But if chances are low that it is used by third party code, it would still be possible to change that now, esp. given com.sun.star.i18n.TransliterationModulesExtra is not published. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - linguistic/source sw/inc sw/qa sw/source
linguistic/source/gciterator.cxx | 26 -
sw/inc/modeltoviewhelper.hxx | 12 ++
sw/inc/swscanner.hxx |2
sw/qa/core/uwriter.cxx | 120 ---
sw/source/core/inc/unoflatpara.hxx | 71 +--
sw/source/core/inc/unotextmarkup.hxx |3
sw/source/core/ole/ndole.cxx |1
sw/source/core/txtnode/modeltoviewhelper.cxx | 33 +--
sw/source/core/txtnode/txtedt.cxx| 14 +--
sw/source/core/unocore/unoflatpara.cxx | 97 +
sw/source/core/unocore/unotextmarkup.cxx |6 -
11 files changed, 316 insertions(+), 69 deletions(-)
New commits:
commit 44569082041d921e8eeb954efac082a02fa7a5a9
Author: Michael Stahl mst...@redhat.com
Date: Mon Apr 7 23:43:33 2014 +0200
SwXFlatParagraph: use ::cppu::ImplInheritanceHelper
... instead of manually overriding XInterface/XTypeInfo methods.
Requires replacing a non-const reference parameter by a pointer in
base class ctor.
Change-Id: I5847524752cc0bdb595f6ce675a856479f3f8507
diff --git a/sw/source/core/inc/unoflatpara.hxx
b/sw/source/core/inc/unoflatpara.hxx
index ceeff51..9d8b2a5 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -48,26 +48,20 @@ class SwDoc;
* SwXFlatParagraph
**/
-class SwXFlatParagraph:
-public ::cppu::WeakImplHelper3
-
-css::beans::XPropertySet,
-css::text::XFlatParagraph,
-css::lang::XUnoTunnel
-,
-public SwXTextMarkup
+typedef ::cppu::ImplInheritanceHelper3
+ SwXTextMarkup
+, css::beans::XPropertySet
+, css::text::XFlatParagraph
+, css::lang::XUnoTunnel
+ SwXFlatParagraph_Base;
+
+class SwXFlatParagraph
+: public SwXFlatParagraph_Base
{
public:
SwXFlatParagraph( SwTxtNode rTxtNode, const OUString aExpandText, const
ModelToViewHelper rConversionMap );
virtual ~SwXFlatParagraph();
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type aType )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
-virtual void SAL_CALL release( ) throw() SAL_OVERRIDE;
-
-virtual ::com::sun::star::uno::Sequence ::com::sun::star::uno::Type
SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
-virtual ::com::sun::star::uno::Sequence sal_Int8 SAL_CALL
getImplementationId( ) throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
-
// XPropertySet
virtual ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySetInfo SAL_CALL
diff --git a/sw/source/core/inc/unotextmarkup.hxx
b/sw/source/core/inc/unotextmarkup.hxx
index 59b1c36..2b22a95 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -51,7 +51,8 @@ class SwXTextMarkup:
public SwClient
{
public:
-SwXTextMarkup( SwTxtNode rTxtNode, const ModelToViewHelper
rConversionMap );
+SwXTextMarkup(SwTxtNode *const rTxtNode,
+const ModelToViewHelper rConversionMap);
virtual ~SwXTextMarkup();
// ::com::sun::star::text::XTextMarkup:
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 8929b0b..5292369 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1459,8 +1459,8 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/,
sal_Int32 /*nActPos*/
OUString aExpandText = aConversionMap.getViewText();
// Ownership ov ConversionMap is passed to SwXTextMarkup object!
-com::sun::star::uno::Reference com::sun::star::text::XTextMarkup
xTextMarkup =
- new SwXTextMarkup( *pNode, aConversionMap );
+uno::Referencetext::XTextMarkup const xTextMarkup =
+ new SwXTextMarkup(pNode, aConversionMap);
com::sun::star::uno::Reference ::com::sun::star::frame::XController
xController = pNode-GetDoc()-GetDocShell()-GetController();
diff --git a/sw/source/core/unocore/unoflatpara.cxx
b/sw/source/core/unocore/unoflatpara.cxx
index 6976091..f495655 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -63,9 +63,9 @@ CreateFlatParagraphIterator(SwDoc rDoc, sal_Int32 const
nTextMarkupType,
* SwXFlatParagraph
**/
-SwXFlatParagraph::SwXFlatParagraph( SwTxtNode rTxtNode, const OUString
aExpandText, const ModelToViewHelper rMap ) :
-SwXTextMarkup( rTxtNode, rMap ),
-maExpandText( aExpandText )
+SwXFlatParagraph::SwXFlatParagraph( SwTxtNode rTxtNode, const OUString
aExpandText, const ModelToViewHelper rMap )
+:
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/inc/worksheetsettings.hxx |7 +
sc/source/filter/oox/worksheetfragment.cxx |8 +
sc/source/filter/oox/worksheetsettings.cxx | 39 +
3 files changed, 54 insertions(+)
New commits:
commit 477050b3c00038883d03c979a150fdb720809c1b
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 12:33:04 2014 +0200
read title/name first to easier spot and identify ranges
Change-Id: I62befc64e833c6b28688bac1548f7b56bd001402
diff --git a/sc/source/filter/oox/worksheetsettings.cxx
b/sc/source/filter/oox/worksheetsettings.cxx
index a5f8634..01804dc 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -137,6 +137,7 @@ void WorksheetSettings::importProtectedRanges( const
AttributeList rAttribs )
void WorksheetSettings::importProtectedRange( const AttributeList rAttribs )
{
ScEnhancedProtection aProt;
+aProt.maTitle = rAttribs.getString( XML_name, OUString());
/* XXX ECMA-376/OOXML XMLSchema and ISO/IEC 29500 say 'securityDescriptor'
* would be an element, but Excel2013 stores it as attribute. */
aProt.maSecurityDescriptorXML = rAttribs.getString(
XML_securityDescriptor, OUString());
@@ -145,7 +146,6 @@ void WorksheetSettings::importProtectedRange( const
AttributeList rAttribs )
* similar to BIFF. OOXML XMLschema and ISO/IEC 29500 instead define
* 'algorithmName', 'hashValue', 'saltValue' and 'spinCount'. */
aProt.mnPasswordVerifier = rAttribs.getIntegerHex( XML_password, 0);
-aProt.maTitle = rAttribs.getString( XML_name, OUString());
OUString aRefs( rAttribs.getString( XML_sqref, OUString()));
if (!aRefs.isEmpty())
{
commit 40a61d93ade494fa98c23a9fd8776c8dadf8f30f
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 12:27:15 2014 +0200
read protectedRanges and protectedRange elements from OOXML
Change-Id: I3f62deb1ee9adeda5afaf5dd13cbe1cabff0805c
diff --git a/sc/source/filter/inc/worksheetsettings.hxx
b/sc/source/filter/inc/worksheetsettings.hxx
index 02877c7..274f670 100644
--- a/sc/source/filter/inc/worksheetsettings.hxx
+++ b/sc/source/filter/inc/worksheetsettings.hxx
@@ -22,6 +22,7 @@
#include richstring.hxx
#include worksheethelper.hxx
+#include tabprotection.hxx
namespace oox {
namespace xls {
@@ -60,6 +61,8 @@ struct SheetProtectionModel
boolmbPivotTables; /// True = pivot tables locked.
boolmbSelectUnlocked; /// True = select unlocked
cells locked.
+::std::vector ScEnhancedProtectionmaEnhancedProtections;
+
explicitSheetProtectionModel();
};
@@ -78,6 +81,10 @@ public:
voidimportOutlinePr( const AttributeList rAttribs );
/** Imports protection settings from the sheetProtection element. */
voidimportSheetProtection( const AttributeList rAttribs );
+/** Imports enhanced protection settings from the protectedRanges element.
*/
+voidimportProtectedRanges( const AttributeList rAttribs );
+/** Imports enhanced protection settings from the protectedRange element.
*/
+voidimportProtectedRange( const AttributeList rAttribs );
/** Imports protection settings from the sheetProtection element of a
chart sheet. */
voidimportChartProtection( const AttributeList rAttribs );
/** Imports phonetic settings from the phoneticPr element. */
diff --git a/sc/source/filter/oox/worksheetfragment.cxx
b/sc/source/filter/oox/worksheetfragment.cxx
index 05f8b8c..6a37532 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -245,6 +245,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext(
sal_Int32 nElement, const
case XLS_TOKEN( dimension ):importDimension( rAttribs
);break;
case XLS_TOKEN( sheetFormatPr ):importSheetFormatPr(
rAttribs );break;
case XLS_TOKEN( sheetProtection ):
getWorksheetSettings().importSheetProtection( rAttribs ); break;
+case XLS_TOKEN( protectedRanges ):
getWorksheetSettings().importProtectedRanges( rAttribs ); return this;
case XLS_TOKEN( phoneticPr ):
getWorksheetSettings().importPhoneticPr( rAttribs );break;
case XLS_TOKEN( printOptions ):
getPageSettings().importPrintOptions( rAttribs ); break;
case XLS_TOKEN( pageMargins ):
getPageSettings().importPageMargins( rAttribs );break;
@@ -295,6 +296,13 @@ ContextHandlerRef WorksheetFragment::onCreateContext(
sal_Int32 nElement, const
if( nElement == XLS_TOKEN( brk ) ) importBrk( rAttribs, false );
break;
+case XLS_TOKEN( protectedRanges ):
+switch( nElement )
+
Short Downtime of Servers
Hi all, due to Heartbleed, all of our servers and VMs need an immediate reboot. The downtime should be rather short, but all our services are affected by the reboot. Alex -- Alexander Werner a...@documentfoundation.org Admin Team of The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 Berlin Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Message signed with OpenPGP using GPGMail ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/uwriter.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c65a70c4440a2e7c17f0c71a2875cc50f4f39fa9
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 8 12:40:41 2014 +0200
another workaround for C++'s lack of proper overloading
Change-Id: I83f39c12a26e8acfe9a60d2ce9bd1b4b1b7c8c02
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 3d5b010..d6fa423 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -410,7 +410,8 @@ void SwDocTest::testModelToViewHelper()
(*pFieldmark-GetParameters())[ODF_FORMDROPDOWN_RESULT] =
uno::makeAny(sal_Int32(0));
m_pDoc-InsertString(aPaM, OUString(C));
pTxtNode = aPaM.GetNode()-GetTxtNode();
-CPPUNIT_ASSERT_EQUAL(11, pTxtNode-GetTxt().getLength());
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(11),
+pTxtNode-GetTxt().getLength());
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS |
EXPANDFOOTNOTE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/helpmerge.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb5e5ae0bf029b7db9f254180a214dae648a207d Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 8 12:50:51 2014 +0200 Remove extra newline Change-Id: I192542c209a1b937672650d370d3f8e93d0bc9f5 diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 12a71c8..6d3c4dd 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -260,7 +260,7 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResDa SAL_WARN( l10ntools, Can't find GID= pResData-sGId.getStr() LID= - pResData-sId.getStr() TYP= pResData-sResTyp.getStr() \n); + pResData-sId.getStr() TYP= pResData-sResTyp.getStr()); } pXMLElement-ChangeLanguageTag(sCur); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck reports 'else if' condition matches previous condition (svx)
On Sat, 2014-04-05 at 15:51 -0700, julien2412 wrote:
Hello,
Cppcheck reported this
svx/source/unodraw/unomod.cxx
492 multiCondition style Expression is always false because 'else if'
condition matches previous condition at line 460.
Remark: It's a new kind of cppcheck detection and there are quite a lot of
false positives (at least for LO) for the moment.
Here's the code:
460 else if( aTypeName.startsWith( TableShape ) )
461 {
462 nType = OBJ_OLE2;
463 }
...
492 else if( aTypeName.startsWith( TableShape ) )
493 {
494 nType = OBJ_TABLE;
495 }
see
http://opengrok.libreoffice.org/xref/core/svx/source/unodraw/unomod.cxx#460
Which one of this block is ok?
I rather think the second one is the correct one, seeing as
svx/source/unodraw/unopage.cxx maps TableShape to OBJ_TABLE as well.
At one point tables in impress/draw were embedded calc spreadsheets, and
now they are real SdrObject things to that would also make sense.
On the other hand that will change the current situation and I have no
idea what makes the code enter that method so definitely a make check
case at least :-)
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 8 commits - desktop/inc desktop/source sw/inc sw/qa sw/source
desktop/inc/liblibreoffice.h| 27 +--
desktop/inc/liblibreoffice.hxx | 57 ---
desktop/source/lib/init.cxx | 257
sw/inc/shellio.hxx |2
sw/qa/extras/htmlexport/htmlexport.cxx | 63 ++-
sw/qa/extras/inc/swmodeltestbase.hxx| 80 -
sw/source/filter/html/htmlflywriter.cxx |3
sw/source/filter/html/wrthtml.cxx | 23 ++
sw/source/filter/html/wrthtml.hxx |4
sw/source/filter/writer/writer.cxx | 10 -
10 files changed, 342 insertions(+), 184 deletions(-)
New commits:
commit 011cd3926faf8216d3bcee4c79fd307d2e236e23
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Apr 8 09:06:05 2014 +0200
sw html: HTML export test - option with or without skipImages
Additionally add loading of HTML document and parsing the document
with libxml - to be able to assert with xpath expression.
Change-Id: I7c62082a124c3705626cd76c8a4cdabc16372399
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index ed264e2..18b2862 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -16,13 +16,37 @@
#include swmodule.hxx
#include usrpref.hxx
+#include libxml/HTMLparser.h
+#include libxml/HTMLtree.h
+
class Test : public SwModelTestBase
{
+private:
+FieldUnit m_eUnit;
+
public:
-Test()
-: SwModelTestBase(/sw/qa/extras/htmlexport/data/, HTML
(StarWriter)),
+Test() :
+SwModelTestBase(/sw/qa/extras/htmlexport/data/, HTML (StarWriter)),
m_eUnit(FUNIT_NONE)
+{}
+
+protected:
+htmlDocPtr parseHtml()
{
+SvFileStream aFileStream(m_aTempFile.GetURL(), STREAM_READ);
+aFileStream.Seek(STREAM_SEEK_TO_END);
+sal_Size nSize = aFileStream.Tell();
+aFileStream.Seek(STREAM_SEEK_TO_BEGIN);
+OStringBuffer aDocument(nSize);
+
+char cCharacter;
+for (sal_Size i = 0; inSize; ++i)
+{
+aFileStream.ReadChar(cCharacter);
+aDocument.append(cCharacter);
+}
+
+return htmlParseDoc((xmlChar*)aDocument.getStr(), NULL);
}
private:
@@ -38,6 +62,11 @@ private:
void preTest(const char* filename) SAL_OVERRIDE
{
+if (getTestName() == testExportOfImagesWithSkipImageEnabled)
+setFilterOptions(SkipImages);
+else
+setFilterOptions();
+
if (OString(filename) == charborder.odt SW_MOD())
{
// FIXME if padding-top gets exported as inches, not cms, we get
rounding errors.
@@ -55,19 +84,17 @@ private:
pPref-SetMetric(m_eUnit);
}
}
-
-FieldUnit m_eUnit;
};
-#define DECLARE_HTMLEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
+#define DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
-DECLARE_HTMLEXPORT_TEST(testFdo62336, fdo62336.docx)
+DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo62336, fdo62336.docx)
{
// The problem was essentially a crash during table export as docx/rtf/html
// If either of no-calc-layout or no-test-import is enabled, the crash
does not occur
}
-DECLARE_HTMLEXPORT_TEST(testCharacterBorder, charborder.odt)
+DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testCharacterBorder, charborder.odt)
{
uno::Referencebeans::XPropertySet xRun(getRun(getParagraph(1),1),
uno::UNO_QUERY);
@@ -90,6 +117,28 @@ DECLARE_HTMLEXPORT_TEST(testCharacterBorder,
charborder.odt)
// No shadow
}
+#define DECLARE_HTMLEXPORT_TEST(TestName, filename)
DECLARE_SW_EXPORT_TEST(TestName, filename, Test)
+
+DECLARE_HTMLEXPORT_TEST(testExportOfImages, textAndImage.docx)
+{
+htmlDocPtr pDoc = parseHtml();
+if (pDoc)
+{
+assertXPath(pDoc, /html/body, 1);
+assertXPath(pDoc, /html/body/p/img, 1);
+}
+}
+
+DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled,
textAndImage.docx)
+{
+htmlDocPtr pDoc = parseHtml();
+if (pDoc)
+{
+assertXPath(pDoc, /html/body, 1);
+assertXPath(pDoc, /html/body/p/img, 0);
+}
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit b2d6ca342cf98685390e4d7354dcb61de40ee8b7
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Apr 8 08:46:43 2014 +0200
sw test: add export test macro, remember test name
Added a new export only macro - this can be used to create tests
which import a document (in any format), and export it in a format
that is being tested. The exported document isn't loaded again, but
it must be asserted using xpath. The primary usage of this is to
test the HTML export.
Change-Id: I1ad300f6274a2181f7f29fed3903b99b68f37fd9
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 9b3faf8..d133d73 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0c0c84d78a72a1a691ad59fbefb44b696ac12819
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Apr 8 13:16:44 2014 +0200
typo from 702d79a3f8fd3c5e4b433195908317075c87ad9d
Change-Id: I48694c4fc4ee709d8ca8b3bba2207c098533cde3
diff --git a/configure.ac b/configure.ac
index 52fa3d8..be8f22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9161,7 +9161,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
APR_LIB_DIR=LibR
-test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+test -n ${MSVC_USE_DEBUG_RUNTIME} APR_LIB_DIR=LibD
APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
@@ -9170,7 +9170,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
SERF_LIB_DIR=Release
-test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+test -n ${MSVC_USE_DEBUG_RUNTIME} SERF_LIB_DIR=Debug
SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source download.lst external/openssl
cui/source/inc/cuitabarea.hxx |2
cui/source/tabpages/tpcolor.cxx | 132 ++--
download.lst|2
external/openssl/CVE-2014-0160.patch| 108 --
external/openssl/UnpackedTarball_openssl.mk |1
5 files changed, 50 insertions(+), 195 deletions(-)
New commits:
commit ccd048fa17a206d7ac57d3a888d0181ad2ea1e7c
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 12:17:09 2014 +0100
bump to openssl-1.0.1g
Change-Id: I1e0ee6aa3d136c75309c5c70011da787806efa1f
diff --git a/download.lst b/download.lst
index 09b64ac..62ea866 100644
--- a/download.lst
+++ b/download.lst
@@ -98,7 +98,7 @@ export MYTHES_TARBALL :=
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL :=
06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL :=
66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
+export OPENSSL_TARBALL :=
de62b43dfcd858e66a74bee1c834e959-openssl-1.0.1g.tar.gz
export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
diff --git a/external/openssl/CVE-2014-0160.patch
b/external/openssl/CVE-2014-0160.patch
deleted file mode 100644
index ddf9d9c..000
--- a/external/openssl/CVE-2014-0160.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Dr. Stephen Henson st...@openssl.org
-Date: Sat, 5 Apr 2014 23:51:06 + (+0100)
-Subject: Add heartbeat extension bounds check.
-X-Git-Tag: OpenSSL_1_0_1g~3
-X-Git-Url:
http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=96db902
-
-Add heartbeat extension bounds check.
-
-A missing bounds check in the handling of the TLS heartbeat extension
-can be used to reveal up to 64k of memory to a connected client or
-server.
-
-Thanks for Neel Mehta of Google Security for discovering this bug and to
-Adam Langley a...@chromium.org and Bodo Moeller bmoel...@acm.org for
-preparing the fix (CVE-2014-0160)
-
-diff --git a/a/ssl/d1_both.c b/ssl/d1_both.c
-index 7a5596a..2e8cf68 100644
a/a/ssl/d1_both.c
-+++ a/b/ssl/d1_both.c
-@@ -1459,26 +1459,36 @@ dtls1_process_heartbeat(SSL *s)
- unsigned int payload;
- unsigned int padding = 16; /* Use minimum padding */
-
-- /* Read type and payload length first */
-- hbtype = *p++;
-- n2s(p, payload);
-- pl = p;
--
- if (s-msg_callback)
- s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
- s-s3-rrec.data[0], s-s3-rrec.length,
- s, s-msg_callback_arg);
-
-+ /* Read type and payload length first */
-+ if (1 + 2 + 16 s-s3-rrec.length)
-+ return 0; /* silently discard */
-+ hbtype = *p++;
-+ n2s(p, payload);
-+ if (1 + 2 + payload + 16 s-s3-rrec.length)
-+ return 0; /* silently discard per RFC 6520 sec. 4 */
-+ pl = p;
-+
- if (hbtype == TLS1_HB_REQUEST)
- {
- unsigned char *buffer, *bp;
-+ unsigned int write_length = 1 /* heartbeat type */ +
-+ 2 /* heartbeat length */ +
-+ payload + padding;
- int r;
-
-+ if (write_length SSL3_RT_MAX_PLAIN_LENGTH)
-+ return 0;
-+
- /* Allocate memory for the response, size is 1 byte
-* message type, plus 2 bytes payload length, plus
-* payload, plus padding
-*/
-- buffer = OPENSSL_malloc(1 + 2 + payload + padding);
-+ buffer = OPENSSL_malloc(write_length);
- bp = buffer;
-
- /* Enter response type, length and copy payload */
-@@ -1489,11 +1499,11 @@ dtls1_process_heartbeat(SSL *s)
- /* Random padding */
- RAND_pseudo_bytes(bp, padding);
-
-- r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload
+ padding);
-+ r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
write_length);
-
- if (r = 0 s-msg_callback)
- s-msg_callback(1, s-version, TLS1_RT_HEARTBEAT,
-- buffer, 3 + payload + padding,
-+ buffer, write_length,
- s, s-msg_callback_arg);
-
- OPENSSL_free(buffer);
-diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
-index b82fada..bddffd9 100644
a/a/ssl/t1_lib.c
-+++ a/b/ssl/t1_lib.c
-@@ -2588,16 +2588,20 @@ tls1_process_heartbeat(SSL *s)
- unsigned int payload;
- unsigned int padding = 16; /* Use minimum padding */
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8bf7283ad8a1ad087d3ef72ec4fec00a9872f5c9
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Apr 8 13:16:44 2014 +0200
typo from b177b928b5dd0afcc51d8964086cc8a23b504d65
Change-Id: I48694c4fc4ee709d8ca8b3bba2207c098533cde3
diff --git a/configure.ac b/configure.ac
index 51d2f5c..42a67fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8663,7 +8663,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
APR_LIB_DIR=LibR
-test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+test -n ${MSVC_USE_DEBUG_RUNTIME} APR_LIB_DIR=LibD
APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
@@ -8672,7 +8672,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
SERF_LIB_DIR=Release
-test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+test -n ${MSVC_USE_DEBUG_RUNTIME} SERF_LIB_DIR=Debug
SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8575d575251eae2141d2bbc1bed33a9d52eed352 Author: Andras Timar andras.ti...@collabora.com Date: Tue Apr 8 13:14:18 2014 +0200 update DejaVu fonts to version 2.34 Change-Id: If0ef621927b0b1b1d26fb66a74a80bb3a02f41d9 diff --git a/download.lst b/download.lst index 62ea866..d6fea9a 100644 --- a/download.lst +++ b/download.lst @@ -55,7 +55,7 @@ export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz -export FONT_DEJAVU_TARBALL := f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip +export FONT_DEJAVU_TARBALL := a4e565e220b5de082c23995e256e3c12-dejavu-fonts-ttf-2.34.zip export FONT_GENTIUM_TARBALL := 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip export FONT_LIBERATION_NARROW_TARBALL := b3174b11c2b6a341f5c99b31088bd67b-liberation-fonts-ttf-1.07.3.tar.gz export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - include/unotools lotuswordpro/source sc/source sd/source svl/source svtools/source sw/source ucb/source unoxml/source vcl/source
include/unotools/itemholderbase.hxx |4 +-
lotuswordpro/source/filter/lwpoleobject.hxx |7 +++
sc/source/filter/oox/commentsbuffer.cxx | 15 ++--
sd/source/filter/eppt/text.hxx | 17 +
svl/source/numbers/zforscan.cxx |3 +
svtools/source/contnr/svlbitm.cxx |2 +
sw/source/core/crsr/crsrsh.cxx | 50 +---
sw/source/core/undo/unmove.cxx | 20 +++
ucb/source/ucp/ftp/ftpurl.cxx |2 -
ucb/source/ucp/ftp/ftpurl.hxx |2 -
unoxml/source/dom/attributesmap.cxx |8 ++--
unoxml/source/dom/attributesmap.hxx |8 ++--
vcl/source/filter/wmf/winmtf.hxx| 30 ++--
13 files changed, 116 insertions(+), 52 deletions(-)
New commits:
commit a5bcc75b9cfc4aa195782ca863c0ce3260bc89df
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 11:34:18 2014 +0100
coverity#708210 Uninitialized scalar field
Change-Id: I9bf4182d4c6e7a61b057f3541cc4c2a4b0316edd
diff --git a/include/unotools/itemholderbase.hxx
b/include/unotools/itemholderbase.hxx
index 01dee81..fe98e3d 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -90,7 +90,9 @@ struct TItemInfo
{
TItemInfo()
: pItem(0)
-{}
+, eItem(E_USEROPTIONS)
+{
+}
utl::detail::Options * pItem;
EItem eItem;
commit c5eddc903a7871e9a8eb1c5783266f200c026fe3
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 10:49:37 2014 +0100
coverity#707425 Uncaught exception
Change-Id: I9c9fb5ed321e857aec58b10c9f8d028c06327113
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 9ec0183..69693d6f 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -675,7 +675,7 @@ void FTPURL::insert(bool replaceExisting,void* stream) const
void FTPURL::mkdir(bool ReplaceExisting) const
-throw(curl_exception)
+throw (curl_exception, malformed_exception)
{
OString title;
if(!m_aPathSegmentVec.empty()) {
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 00f29a3..42d1415 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -131,7 +131,7 @@ namespace ftp {
throw(curl_exception);
void mkdir(bool ReplaceExisting) const
-throw(curl_exception);
+throw(curl_exception, malformed_exception);
OUString ren(const OUString NewTitle)
throw(curl_exception);
commit f193c1bdf17dba6d1c35b0d4d1456634a47d3974
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 10:44:35 2014 +0100
coverity#707456 Uncaught exception
also coverity#707455, coverity#707454, coverity#707453
Change-Id: Ife1c295900cf83762eccc559ed001f64b5c1
diff --git a/unoxml/source/dom/attributesmap.cxx
b/unoxml/source/dom/attributesmap.cxx
index 4514225..9652bc6 100644
--- a/unoxml/source/dom/attributesmap.cxx
+++ b/unoxml/source/dom/attributesmap.cxx
@@ -157,7 +157,7 @@ namespace DOM
*/
Reference XNode SAL_CALL
CAttributesMap::removeNamedItem(OUString const name)
-throw (RuntimeException, std::exception)
+throw (DOMException, RuntimeException, std::exception)
{
// no MutexGuard needed: m_pElement is const
Reference XAttr const xAttr(m_pElement-getAttributeNode(name));
@@ -178,7 +178,7 @@ namespace DOM
Reference XNode SAL_CALL
CAttributesMap::removeNamedItemNS(
OUString const namespaceURI, OUString const localName)
-throw (RuntimeException, std::exception)
+throw (DOMException, RuntimeException, std::exception)
{
// no MutexGuard needed: m_pElement is const
Reference XAttr const xAttr(
@@ -199,7 +199,7 @@ namespace DOM
*/
Reference XNode SAL_CALL
CAttributesMap::setNamedItem(Reference XNode const xNode)
-throw (RuntimeException, std::exception)
+throw (DOMException, RuntimeException, std::exception)
{
Reference XAttr const xAttr(xNode, UNO_QUERY);
if (!xNode.is()) {
@@ -219,7 +219,7 @@ namespace DOM
*/
Reference XNode SAL_CALL
CAttributesMap::setNamedItemNS(Reference XNode const xNode)
-throw (RuntimeException, std::exception)
+throw (DOMException, RuntimeException, std::exception)
{
Reference XAttr const xAttr(xNode, UNO_QUERY);
if (!xNode.is()) {
diff --git a/unoxml/source/dom/attributesmap.hxx
b/unoxml/source/dom/attributesmap.hxx
index 54537e9..94449df 100644
--- a/unoxml/source/dom/attributesmap.hxx
+++ b/unoxml/source/dom/attributesmap.hxx
@@ -77,28 +77,28 @@ namespace DOM
*/
virtual Reference XNode SAL_CALL
removeNamedItem(OUString const name)
-throw (RuntimeException, std::exception) SAL_OVERRIDE;
+throw (DOMException,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0d7cf25bfb2e3c4e085c619ce40b761f83a94d0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Apr 8 13:16:44 2014 +0200
typo from 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8
Change-Id: I48694c4fc4ee709d8ca8b3bba2207c098533cde3
diff --git a/configure.ac b/configure.ac
index 54fd9f6..6ae390c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9284,7 +9284,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
APR_LIB_DIR=LibR
-test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+test -n ${MSVC_USE_DEBUG_RUNTIME} APR_LIB_DIR=LibD
APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
@@ -9293,7 +9293,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
SERF_LIB_DIR=Release
-test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+test -n ${MSVC_USE_DEBUG_RUNTIME} SERF_LIB_DIR=Debug
SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.3.3-hotfix1'
Tag 'libreoffice-4.2.3.3-hotfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-08 12:47 -0700 Tag libreoffice-4.2.3.3-hotfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTQ+HKAAoJEPQ0oe+v7q6jedwP/3QY89CPKyweuKWtemGW5mA4 4ENcjPdzpOgQGCKCyMeP5UiigyK6tqCfqntsLcZAJtAFUCuh+tqpF/I8nvQVXFkU eYj0npJ294zpaMkAsOg23QK5i2VlL7R3KM5UXC+nb89iy0lVFw3HA6y4LZul5e31 pz5diLB8ybAf+lwwkhFRZVQSG8ntUzr+lP9KQcnRPHUDtXfTyONrtf4iHys43nMC hgvp2cv5L+oQQqVJ1Mp2zwdCAEaGuup88yaiUoMlQx0GjQ6PyzE0P4GeGPKTY7p3 q53ebB/1dUNyi8FYVWNbwJK1KsJs836Pp/YIE4MRABP0MrqzPYi9RYAfBrkva5uT DMxgplGCq6FO961qBb6hMAnu41Z/YKVy1Jeh5eeVS3KUSRplQ/T7Mfnr7cChvSkt 6yLWGb/R7uxV5K3kkgFg3HNDDSvruvoMIZgHBriDEBEusQ6r/LcGvwK5dYDHlWnN zygJy8LX+xuxr7nCAdnsyqd2oXZs5is3vOjrMi8Cv+ArNVrU5KdN249I8MyF5s/p zYJl7Z3abPmpoOu8FpmvI9ZFUxEzVY3XyMRaslA6o4C1kg4ZvJUiHKQ7MyEouuc5 S3u9z6UJzmSeqxeryJeFKL00Yl9M/HbINTrdQse39dfeAdutN1p/GGXYqdSS8iNR k8SVPtqnvKsfb4bBNWMX =f7ki -END PGP SIGNATURE- Changes since libreoffice-4.2.3.3: Christian Lohmaier (1): Version 4.2.3.3, tag libreoffice-4.2.3.3-hotfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - external/openssl
external/openssl/CVE-2014-0160.patch| 108
external/openssl/UnpackedTarball_openssl.mk |1
2 files changed, 109 insertions(+)
New commits:
commit 32680faf1f0f5bbc1f1235ba724a8cd6230c3d15
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 09:40:05 2014 +0100
CVE-2014-0160 heartbeat
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8
(cherry picked from commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619)
(cherry picked from commit cd121ab497c22470f5e99f9d3032edaccbbc00b1)
diff --git a/external/openssl/CVE-2014-0160.patch
b/external/openssl/CVE-2014-0160.patch
new file mode 100644
index 000..ddf9d9c
--- /dev/null
+++ b/external/openssl/CVE-2014-0160.patch
@@ -0,0 +1,108 @@
+From: Dr. Stephen Henson st...@openssl.org
+Date: Sat, 5 Apr 2014 23:51:06 + (+0100)
+Subject: Add heartbeat extension bounds check.
+X-Git-Tag: OpenSSL_1_0_1g~3
+X-Git-Url:
http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=96db902
+
+Add heartbeat extension bounds check.
+
+A missing bounds check in the handling of the TLS heartbeat extension
+can be used to reveal up to 64k of memory to a connected client or
+server.
+
+Thanks for Neel Mehta of Google Security for discovering this bug and to
+Adam Langley a...@chromium.org and Bodo Moeller bmoel...@acm.org for
+preparing the fix (CVE-2014-0160)
+---
+
+diff --git a/a/ssl/d1_both.c b/ssl/d1_both.c
+index 7a5596a..2e8cf68 100644
+--- a/a/ssl/d1_both.c
a/b/ssl/d1_both.c
+@@ -1459,26 +1459,36 @@ dtls1_process_heartbeat(SSL *s)
+ unsigned int payload;
+ unsigned int padding = 16; /* Use minimum padding */
+
+- /* Read type and payload length first */
+- hbtype = *p++;
+- n2s(p, payload);
+- pl = p;
+-
+ if (s-msg_callback)
+ s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
+ s-s3-rrec.data[0], s-s3-rrec.length,
+ s, s-msg_callback_arg);
+
++ /* Read type and payload length first */
++ if (1 + 2 + 16 s-s3-rrec.length)
++ return 0; /* silently discard */
++ hbtype = *p++;
++ n2s(p, payload);
++ if (1 + 2 + payload + 16 s-s3-rrec.length)
++ return 0; /* silently discard per RFC 6520 sec. 4 */
++ pl = p;
++
+ if (hbtype == TLS1_HB_REQUEST)
+ {
+ unsigned char *buffer, *bp;
++ unsigned int write_length = 1 /* heartbeat type */ +
++ 2 /* heartbeat length */ +
++ payload + padding;
+ int r;
+
++ if (write_length SSL3_RT_MAX_PLAIN_LENGTH)
++ return 0;
++
+ /* Allocate memory for the response, size is 1 byte
+* message type, plus 2 bytes payload length, plus
+* payload, plus padding
+*/
+- buffer = OPENSSL_malloc(1 + 2 + payload + padding);
++ buffer = OPENSSL_malloc(write_length);
+ bp = buffer;
+
+ /* Enter response type, length and copy payload */
+@@ -1489,11 +1499,11 @@ dtls1_process_heartbeat(SSL *s)
+ /* Random padding */
+ RAND_pseudo_bytes(bp, padding);
+
+- r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload
+ padding);
++ r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer,
write_length);
+
+ if (r = 0 s-msg_callback)
+ s-msg_callback(1, s-version, TLS1_RT_HEARTBEAT,
+- buffer, 3 + payload + padding,
++ buffer, write_length,
+ s, s-msg_callback_arg);
+
+ OPENSSL_free(buffer);
+diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
+index b82fada..bddffd9 100644
+--- a/a/ssl/t1_lib.c
a/b/ssl/t1_lib.c
+@@ -2588,16 +2588,20 @@ tls1_process_heartbeat(SSL *s)
+ unsigned int payload;
+ unsigned int padding = 16; /* Use minimum padding */
+
+- /* Read type and payload length first */
+- hbtype = *p++;
+- n2s(p, payload);
+- pl = p;
+-
+ if (s-msg_callback)
+ s-msg_callback(0, s-version, TLS1_RT_HEARTBEAT,
+ s-s3-rrec.data[0], s-s3-rrec.length,
+ s, s-msg_callback_arg);
+
++ /* Read type and payload length first */
++ if (1 + 2 + 16 s-s3-rrec.length)
++ return 0; /* silently discard */
++ hbtype = *p++;
++ n2s(p, payload);
++ if (1 + 2 + payload + 16 s-s3-rrec.length)
++ return 0; /* silently discard per RFC 6520 sec. 4 */
++ pl = p;
++
+ if (hbtype == TLS1_HB_REQUEST)
+ {
+ unsigned char *buffer, *bp;
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index cec09d2..869a74e 100644
---
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.3.3-hotfix1'
Tag 'libreoffice-4.2.3.3-hotfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-08 12:47 -0700 Tag libreoffice-4.2.3.3-hotfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTQ+HFAAoJEPQ0oe+v7q6jhS8QAJ6RAs6aVQDvNVrJDCZ0Gldv bZVCMg8crt/12Y8zoZjYCM62hAwuftnKRAvreDdnY4zpirwklaU61hi6XOJXCWX0 S+wZHdiXzLjpRnqY1b2hv9xSY6jFh8qZQGEAFGypTIV8SBF1rQ43i5joHVOOBFmW at7lvdqtXj5NTLdD+JNAsHV5DMnCDlHbNPMWR7sU+IMTsa76kvYBWr82CpMvaT/H ZNajpQBdcfet8UnUTekPkYmGNfamttMh84b24+CAuJXt/yhXY7A3zOm11yfE0Rki 0AipU8fk7l/q0hqbUy/m86Y2J5iN1ZbLs6P4w9cQVHz/HruE94Kp9S3LjcoTLtWb goxSdYIPUq1LYsskxrTuQ+edalNg4iT05iUbtCdmVW71sB6yOVt8REpLcwQUSUYx /vXaLG3uJ8eRhYStnJXzLWR98FckUqf3mTxG85o4MAECQSzizOdX72Fo/T8Uth7u 06PBuaAB/Ny8Q0ySAeA/Fk1YahUEnxMA04l+lzuo6wItwqu02QPoJDFiYheKuBj0 /+xfOd5Ydes1DGwrhi/7/uMxtYl4MjBcRkqWXPI+HdSSIbom8sHS19zcEFfo1lGY zdWjk45jjqBl2dKm/2S82lLfmnmdxlReqEKNcoxoPrnok5VvRNf3hu8MAf3DKlTb 0UIFzyOPl7EsFmwgQlTX =qAA5 -END PGP SIGNATURE- Changes since libreoffice-4.2.3.3: Christian Lohmaier (1): Version 4.2.3.3, tag libreoffice-4.2.3.3-hotfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.3.3-hotfix1'
Tag 'libreoffice-4.2.3.3-hotfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-08 12:47 -0700 Tag libreoffice-4.2.3.3-hotfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTQ+HAAAoJEPQ0oe+v7q6j3LoP/AovIc7+ak+gFxjwzvdGv93c 0fooLH6ddHp9Knwy25Mp+j2jDMxMQWNFqa2b4SMELN/R5vaKzt4TZXU+1wtwr9KU NmwfzVOdF+LVFUK2m/IKyJTiv59tJDGhhm5jTYXmxpLdJBqrb6ZW1xfCo0KFAC4m jMz4q8IANqeH9JrT49rqHtOd+NcHA75S3mL/iuxlH5FiAiVkcwDno4Nwy6y2WhjW 5gJSVChFUuJUtW3m8+wESljLvYVhSjRd48/qknfwIfEBVA73MhsSJAuKrqhzavo7 H+YPG2mry04k7Oqc17W5ToFPmY7q2AX3nwEyjHztdoD/OgsR1+uGhxccMJus8MiE +9GP6JdaOh1rDvxxvs4asFjKXXWz0jaEseFLtjfTTvdFDaMNbIEex3j3RjsX7AHJ cwUmXou0cfxreYdnJqCzSfetUZ9vDdoSOdwbS2GRRPc6G5KNmnwqGCRIUdte0S2l IOgDLWn6/hNyHDkgWFYQU9274s+Fe0VLH1SMvq6BA0cXxRTqocZWbl4ts/a8BraA pABMBWRmJAUzhctlmNsEGcS2VBcpcQZ7mLfvsTtuwPGpZwlFEbg76JwlehlRc5Z6 eahcfkIbc0wd3BI1HpnhfhW0xo6R7tflOaq+LuBQfmkOAgnAbVx4WPWzpM/dfccz Q56u6Ffh+vIWFcu6NYRT =dC5K -END PGP SIGNATURE- Changes since libreoffice-4.2.3.3: Christian Lohmaier (1): Version 4.2.3.3, tag libreoffice-4.2.3.3-hotfix1 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.3.3-hotfix1'
Tag 'libreoffice-4.2.3.3-hotfix1' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-08 12:47 -0700 Tag libreoffice-4.2.3.3-hotfix1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTQ+HQAAoJEPQ0oe+v7q6j3UcQAJ+btPp0K+DacE9+sJXfxdy7 9AdZ9bOB2wV9YxCM/ZbM6gRxF2SDMjCV7E/jU5VxRQ7wMwLePMvfYbzBtbRQvMEO uVFB8iUAs6xi9fHlGyEEu9nooedUgI1O7jXDrcGNnYt+P+AEn2/whkO8UdWQsJvb KTRT6cmvLthEts9KZcDmI7xdbN/PfC419uXtvZomsGwVEnqHp3EicRQzDuktrlm2 F/Mp5YQb6qQ6+ypw9d2PRD+1Lxam5sPZQdxdOYh9L+hAZPSkEWkue/OFdCGoE171 z/22kTHuh4BSujJ0gM2EHmUz+PzcOZxngpla2JWadOM6brpf0wdAdI2NsVwHs4AA nukBLqRgBmooBKaYMpBoSzTBKuafRb6AvIgVJkfS1uz0GLNcVIyWXdhbqv7JmnRZ r+f84avrBnL4l3/qGE63bWFNRjdx/NtfMORSIx68DoMOzYAJ6rgOvmbw7cpcWX0g RMJXoPQ+e+ZQGAHDQ/dtuUgGNhnZahRATMHUYisCq18rH37ksSOy9FNKErRaLjf4 Y5qSK/+uAH8O4OXeOdvweB1l1YCs6O5zIDdPwtxYDQjZsHp8DPiPccGAJDr/aDMj tNrxMylWRmYijdwb/uWgzf0mMlaNiYZMBHuNsXPxDS9zIBk8XKmOJkDXIadbEre0 Mz0u93QrYlgXkQXMY0cp =YAoN -END PGP SIGNATURE- Changes since libreoffice-4.2.3.3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - external/glew include/vcl RepositoryExternal.mk
RepositoryExternal.mk |5 ---
external/glew/UnpackedTarball_glew.mk |7
external/glew/glew-ios.patch.1| 19
include/vcl/OpenGLContext.hxx | 51 --
4 files changed, 76 insertions(+), 6 deletions(-)
New commits:
commit 486b47ae45727402317bed047c80a6ab7e134491
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 14:21:41 2014 +0300
Make it compile for iOS and maybe Android, too
Don't include X11 headers where there is no X.
Include a copy of gluCheckExtension as there is no glu on either iOS nor
Android.
Change-Id: Idf387a4eda5a8410d1511d6e0db78c0742af5a99
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx
index b62448a..220efb5 100644
--- a/include/vcl/OpenGLContext.hxx
+++ b/include/vcl/OpenGLContext.hxx
@@ -10,9 +10,13 @@
#ifndef VCL_OPENGL_CONTEXT_HXX
#define VCL_OPENGL_CONTEXT_HXX
+#include string.h
+
#include GL/glew.h
#if defined( MACOSX )
+#elif defined( IOS )
+#elif defined( ANDROID )
#elif defined( UNX )
# include prex.h
# include GL/glxew.h
@@ -27,6 +31,8 @@
#include GL/glext.h
#include GL/wglext.h
#elif defined( MACOSX )
+#elif defined( IOS )
+#elif defined( ANDROID )
#elif defined( UNX )
#include GL/glext.h
#define GLX_GLXEXT_PROTOTYPES 1
@@ -43,11 +49,50 @@
/// Holds the information of our new child window
struct GLWindow
{
+// Copy of gluCheckExtension(), from the Apache-licensed
+//
https://code.google.com/p/glues/source/browse/trunk/glues/source/glues_registry.c
+static GLboolean checkExtension(const GLubyte* extName, const GLubyte*
extString)
+{
+ GLboolean flag=GL_FALSE;
+ char* word;
+ char* lookHere;
+ char* deleteThis;
+
+ if (extString==NULL)
+ {
+ return GL_FALSE;
+ }
+
+ deleteThis=lookHere=(char*)malloc(strlen((const char*)extString)+1);
+ if (lookHere==NULL)
+ {
+ return GL_FALSE;
+ }
+
+ /* strtok() will modify string, so copy it somewhere */
+ strcpy(lookHere,(const char*)extString);
+
+ while ((word=strtok(lookHere, ))!=NULL)
+ {
+ if (strcmp(word,(const char*)extName)==0)
+ {
+flag=GL_TRUE;
+break;
+ }
+ lookHere=NULL; /* get next token */
+ }
+ free((void*)deleteThis);
+
+ return flag;
+}
+
#if defined( _WIN32 )
HWNDhWnd;
HDC hDC;
HGLRC hRC;
#elif defined( MACOSX )
+#elif defined( IOS )
+#elif defined( ANDROID )
#elif defined( UNX )
Display* dpy;
int screen;
@@ -58,7 +103,7 @@ struct GLWindow
XVisualInfo* vi;
GLXContext ctx;
-bool HasGLXExtension( const char* name ) { return gluCheckExtension(
(const GLubyte*) name, (const GLubyte*) GLXExtensions ); }
+bool HasGLXExtension( const char* name ) { return checkExtension( (const
GLubyte*) name, (const GLubyte*) GLXExtensions ); }
const char* GLXExtensions;
#endif
unsigned intbpp;
@@ -67,12 +112,14 @@ struct GLWindow
const GLubyte* GLExtensions;
bool bMultiSampleSupported;
-bool HasGLExtension( const char* name ) { return gluCheckExtension( (const
GLubyte*) name, GLExtensions ); }
+bool HasGLExtension( const char* name ) { return checkExtension( (const
GLubyte*) name, GLExtensions ); }
GLWindow()
:
#if defined( _WIN32 )
#elif defined( MACOSX )
+#elif defined( IOS )
+#elif defined( ANDROID )
#elif defined( UNX )
dpy(NULL),
screen(0),
commit 76c9cd64e03d16f5df0da35dba5bf7e1a91e0e9f
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 14:19:34 2014 +0300
Include Availability.h to get __IPHONE_OS_VERSION_MIN_REQUIRED
Change-Id: I0ef21ee7709cab05639935d70722973c9a18f93c
diff --git a/external/glew/glew-ios.patch.1 b/external/glew/glew-ios.patch.1
index 9253ed3..b29f75b 100644
--- a/external/glew/glew-ios.patch.1
+++ b/external/glew/glew-ios.patch.1
@@ -1,12 +1,17 @@
-*- Mode:Diff -*-
--- glew/include/GL/glew.h
+++ glew/include/GL/glew.h
-@@ -1180,6 +1180,10 @@
+@@ -1180,6 +1180,15 @@
/* -- GLU --
*/
-+#if !defined(GLEW_NO_GLU) defined(__APPLE__)
defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-+#define GLEW_NO_GLU
++#ifndef GLEW_NO_GLU
++# ifdef __APPLE__
++#include Availability.h
++#if defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
++# define GLEW_NO_GLU
++#endif
++# endif
+#endif
+
#ifndef GLEW_NO_GLU
commit d3f63d4b3d75d5e1b0df3281a1bdf7be1729288e
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 13:54:53 2014 +0300
No glu.h in OpenGL ES for iOS
Change-Id: Ie0eb1f68d997c4f2bd37c9d7c2ff6feccbc7b8ce
diff --git a/external/glew/UnpackedTarball_glew.mk
b/external/glew/UnpackedTarball_glew.mk
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/outdev4.cxx | 126 +++--
1 file changed, 66 insertions(+), 60 deletions(-)
New commits:
commit 954d7ad4ea7ec3746b0f0cd3f850a25e82b39c14
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Tue Apr 8 21:49:24 2014 +1000
Starting to bring DrawGradient functions into line with each other
OutputDevice's DrawGradient functions are remarkably similar - I've
reorganized them and brought them into line with some extra checks
that seem to be missing. This will allow for easier refactoring.
Change-Id: I6f83bb9fe73d34e3668d87b4a4ee91c49d8cea0f
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 7e3ff3f..16a211f 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -606,87 +606,93 @@ void OutputDevice::SetGrayscaleColors( Gradient
rGradient )
void OutputDevice::DrawGradient( const Rectangle rRect,
const Gradient rGradient )
{
-
if ( mnDrawMode DRAWMODE_NOGRADIENT )
-{
return; // nothing to draw!
-}
-else if ( mnDrawMode ( DRAWMODE_BLACKGRADIENT | DRAWMODE_WHITEGRADIENT |
DRAWMODE_SETTINGSGRADIENT) )
-{
-Color aColor = GetSingleColorGradientFill();
+if ( mbInitClipRegion )
+ImplInitClipRegion();
-Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
-SetLineColor( aColor );
-SetFillColor( aColor );
-DrawRect( rRect );
-Pop();
+if ( mbOutputClipped )
return;
-}
-Gradient aGradient( rGradient );
-
-if ( mnDrawMode ( DRAWMODE_GRAYGRADIENT | DRAWMODE_GHOSTEDGRADIENT ) )
+if ( !rRect.IsEmpty() )
{
-SetGrayscaleColors( aGradient );
-}
-
-if( mpMetaFile )
-mpMetaFile-AddAction( new MetaGradientAction( rRect, aGradient ) );
+if ( mnDrawMode ( DRAWMODE_BLACKGRADIENT | DRAWMODE_WHITEGRADIENT |
DRAWMODE_SETTINGSGRADIENT) )
+{
+Color aColor = GetSingleColorGradientFill();
-if( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
-return;
+Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+SetLineColor( aColor );
+SetFillColor( aColor );
+DrawRect( rRect );
+Pop();
+return;
+}
-// convert rectangle to pixels
-Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
-aRect.Justify();
+Gradient aGradient( rGradient );
-// do nothing if the rectangle is empty
-if ( !aRect.IsEmpty() )
-{
-// Clip Region sichern
-Push( PUSH_CLIPREGION );
-IntersectClipRegion( rRect );
+if( mpMetaFile )
+mpMetaFile-AddAction( new MetaGradientAction( rRect, aGradient )
);
-// because we draw with no border line, we have to expand gradient
-// rect to avoid missing lines on the right and bottom edge
-aRect.Left()--;
-aRect.Top()--;
-aRect.Right()++;
-aRect.Bottom()++;
+if( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
+return;
-// we need a graphics
-if ( !mpGraphics )
+if ( mnDrawMode ( DRAWMODE_GRAYGRADIENT | DRAWMODE_GHOSTEDGRADIENT )
)
{
-if ( !ImplGetGraphics() )
-return;
+SetGrayscaleColors( aGradient );
}
-if ( mbInitClipRegion )
-ImplInitClipRegion();
-
-if ( !mbOutputClipped )
+if ( !Rectangle( PixelToLogic( Point() ), GetOutputSize() ).IsEmpty() )
{
-// gradients are drawn without border
-if ( mbLineColor || mbInitLineColor )
+// convert rectangle to pixels
+Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
+aRect.Justify();
+
+// do nothing if the rectangle is empty
+if ( !aRect.IsEmpty() )
{
-mpGraphics-SetLineColor();
-mbInitLineColor = true;
-}
+// we need a graphics
+if ( !mpGraphics !ImplGetGraphics() )
+return;
-mbInitFillColor = true;
+// secure clip region
+Push( PUSH_CLIPREGION );
+IntersectClipRegion( rRect );
-// calculate step count if necessary
-if ( !aGradient.GetSteps() )
-aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT );
+// because we draw with no border line, we have to expand
gradient
+// rect to avoid missing lines on the right and bottom edge
+aRect.Left()--;
+aRect.Top()--;
+aRect.Right()++;
+aRect.Bottom()++;
-if( aGradient.GetStyle() == GradientStyle_LINEAR ||
aGradient.GetStyle() == GradientStyle_AXIAL )
-ImplDrawLinearGradient( aRect, rGradient, false, NULL );
-else
-
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlexport/data/textAndImage.docx |binary 1 file changed New commits: commit 5f7e661732414bc15650ff17539556f9489398d9 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Apr 8 13:59:58 2014 +0200 sw html: Add missing textAndImage.docx document.. Change-Id: I0dc99a17625101673281403c3000d3293782b05d diff --git a/sw/qa/extras/htmlexport/data/textAndImage.docx b/sw/qa/extras/htmlexport/data/textAndImage.docx new file mode 100644 index 000..adad462 Binary files /dev/null and b/sw/qa/extras/htmlexport/data/textAndImage.docx differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source vcl/source
chart2/source/view/inc/3DChartObjects.hxx |3 ++-
vcl/source/window/window.cxx | 30 --
2 files changed, 22 insertions(+), 11 deletions(-)
New commits:
commit d06269447f8de52fd35e4e97d127279cc3f84025
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Apr 8 12:58:51 2014 +0200
fdo#77059, hidpi: Increase the threshold of what DPI we consider hi-dpi.
Change-Id: I79802df4c11b3543140672419d78b697848b7c36
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0596e0c..ef6e2bb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -854,6 +854,23 @@ static bool ImplDoTiledRendering()
#endif
}
+static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI)
+{
+sal_Int32 nResult = 1;
+
+#ifndef MACOSX
+// Setting of HiDPI is unfortunately all only a heuristic; and to add
+// insult to an injury, the system is constantly lying to us about
+// the DPI and whatnot
+// eg. fdo#77059 - set the value from which we do consider the
+// screen hi-dpi to greater than 168
+if (nDPI 168)
+nResult = std::max(sal_Int32(1), (nDPI) / 96);
+#endif
+
+return nResult;
+}
+
void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData*
pSystemParentData )
{
DBG_ASSERT( mpWindowImpl-mbFrame || pParent, Window::Window(): pParent
== NULL );
@@ -1108,11 +1125,8 @@ void Window::ImplInit( Window* pParent, WinBits nStyle,
SystemParentData* pSyste
}
// setup the scale factor for Hi-DPI displays
-#ifdef MACOSX
-mnDPIScaleFactor = 1;
-#else
-mnDPIScaleFactor = std::max((sal_Int32)1,
(mpWindowImpl-mpFrameData-mnDPIY + 48) / 96);
-#endif
+mnDPIScaleFactor = CountDPIScaleFactor(mpWindowImpl-mpFrameData-mnDPIY);
+
const StyleSettings rStyleSettings = mxSettings-GetStyleSettings();
sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
mnDPIX = (mpWindowImpl-mpFrameData-mnDPIX*nScreenZoom)/100;
@@ -1810,11 +1824,7 @@ void Window::ImplInitResolutionSettings()
mnDPIY = (mpWindowImpl-mpFrameData-mnDPIY*nScreenZoom)/100;
// setup the scale factor for Hi-DPI displays
-#ifdef MACOSX
-mnDPIScaleFactor = 1;
-#else
-mnDPIScaleFactor = std::max((sal_Int32)1,
(mpWindowImpl-mpFrameData-mnDPIY + 48) / 96);
-#endif
+mnDPIScaleFactor =
CountDPIScaleFactor(mpWindowImpl-mpFrameData-mnDPIY);
SetPointFont( rStyleSettings.GetAppFont() );
}
else if ( mpWindowImpl-mpParent )
commit f6406c910a60c075ca3c4928c7f451eae3ab751f
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Apr 8 08:58:18 2014 +0200
Need 3 points to define a rectangle in 3D.
Change-Id: I47e212f922b67ced6c6cd63bf90133c024cf0af4
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index e4e3709..06121f4 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -49,6 +49,7 @@ class Text : public Renderable3DObject
private:
BitmapEx maText;
glm::vec3 maTopLeft;
+glm::vec3 maTopRight;
glm::vec3 maBottomRight;
};
@@ -56,6 +57,7 @@ class Rectangle : public Renderable3DObject
{
private:
glm::vec3 maTopLeft;
+glm::vec3 maTopRight;
glm::vec3 maBottomRight;
Color maColor; // RGBA fill color
Color maLineColor; // RGBA line color
@@ -66,7 +68,6 @@ class Camera : public Renderable3DObject
public:
Camera();
private:
-
glm::vec3 maPos;
glm::vec3 maDirection;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/openssl
external/openssl/opensslwnt.patch |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 1c772b16829364ce6a98f3b9584fe68f8f93f7d7
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 8 14:35:38 2014 +0200
openssl: fix WNT patch to apply
Change-Id: I31494d4314557672b7e3c2ff6846663fb9ed981a
diff --git a/external/openssl/opensslwnt.patch
b/external/openssl/opensslwnt.patch
index b68e037..5be9c95 100644
--- a/external/openssl/opensslwnt.patch
+++ b/external/openssl/opensslwnt.patch
@@ -96,7 +96,7 @@
--- misc/openssl-0.9.8v/util/pl/VC-32.pl 2010-02-04 02:10:24.0
+0100
+++ build/openssl-0.9.8v/util/pl/VC-32.pl 2010-03-26 12:04:20.977172300
+0100
@@ -32,7 +32,7 @@
- $l_flags =~ s/-L(\S+)/\/libpath:$1/g;
+ my $ff = ;
# C compiler stuff
-$cc='cl';
@@ -104,7 +104,7 @@
if ($FLAVOR =~ /WIN64/)
{
# Note that we currently don't have /WX on Win64! There is a lot of
-@@ -103,21 +103,21 @@
+@@ -103,22 +103,22 @@
}
$cc='$(CC)';
@@ -125,10 +125,11 @@
+$base_cflags= $mf_cflag;
-my $f = $shlib || $fips ?' /MD':' /MT';
-$lib_cflag='/Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
--$opt_cflags=$f.' /Ox /O2 /Ob2';
--$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+my $f = $shlib || $fips ? (($ENV{MSVC_USE_DEBUG_RUNTIME} eq TRUE) ? '
-MDd' : ' -MD' ):' -MT';
+$lib_cflag='-Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
+ $ff = /fixed;
+-$opt_cflags=$f.' /Ox /O2 /Ob2';
+-$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
+$opt_cflags=$f.' -Ox -O2 -Ob2';
+$dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
$lflags=/nologo /subsystem:console /opt:ref;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/tabprotection.hxx | 12 +++-
sc/source/core/data/tabprotection.cxx |8
sc/source/filter/oox/worksheetsettings.cxx | 10 --
3 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit f1ca1384707cb6c4fa240fdc4903bfb3ceaff889
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 14:41:10 2014 +0200
also check if a newly read password protection applies to a range
Change-Id: Ibbf4fee2b87c82cdbd565681690a231fb06da66f
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index b057ad0..9a4fef1 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -133,6 +133,11 @@ struct ScEnhancedProtection
{
return !maSecurityDescriptor.empty() ||
!maSecurityDescriptorXML.isEmpty();
}
+
+bool hasPassword() const
+{
+return mnPasswordVerifier != 0 || !maHashValue.isEmpty();
+}
};
/** sheet protection state container
diff --git a/sc/source/core/data/tabprotection.cxx
b/sc/source/core/data/tabprotection.cxx
index a9bfd8f..52bc0fe 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -379,7 +379,7 @@ bool ScTableProtectionImpl::updateReference( UpdateRefMode
eMode, ScDocument* pD
bool ScTableProtectionImpl::isBlockEditable( const ScRange rRange ) const
{
-/* TODO: ask for password (and remember) if mnPasswordVerifier was set for
+/* TODO: ask for password (and remember) if a password was set for
* a matching range and no matching range without password was encountered.
* Would need another return type than boolean to reflect
* password required for a specific protection. */
@@ -401,7 +401,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange
rRange ) const
if ((*it).maRangeList-In( rRange))
{
// Range is editable if no password is assigned.
-if (!(*it).mnPasswordVerifier)
+if (!(*it).hasPassword())
return true;
}
}
@@ -422,7 +422,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange
rRange ) const
if (aList.size() == 1 *aList[0] == rRange)
{
// Range is editable if no password is assigned.
-if (!(*it).mnPasswordVerifier)
+if (!(*it).hasPassword())
return true;
}
}
@@ -440,7 +440,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange
rRange ) const
if (!(*it).hasSecurityDescriptor() (*it).maRangeList.Is())
{
// Ranges are editable if no password is assigned.
-if (!(*it).mnPasswordVerifier)
+if (!(*it).hasPassword())
{
const ScRangeList rRanges = *(*it).maRangeList;
size_t nRanges = rRanges.size();
commit 3974d6a2d96ec3facf529a4e54a2db63783961dd
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 13:49:42 2014 +0200
read the defined password attributes
Change-Id: I67be85bdcfb5c03349daeff69fbb09291ce4a8e3
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 2dc798c..b057ad0 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -121,8 +121,13 @@ struct ScEnhancedProtection
OUStringmaTitle;
::std::vector sal_uInt8 maSecurityDescriptor; // imported as raw
BIFF data
OUStringmaSecurityDescriptorXML;// imported from
OOXML
+// OOXML password definitions
+OUStringmaAlgorithmName;
+OUStringmaHashValue;
+OUStringmaSaltValue;
+sal_uInt32 mnSpinCount;
-ScEnhancedProtection() : mnAreserved(0), mnPasswordVerifier(0) {}
+ScEnhancedProtection() : mnAreserved(0), mnPasswordVerifier(0),
mnSpinCount(0) {}
bool hasSecurityDescriptor() const
{
diff --git a/sc/source/filter/oox/worksheetsettings.cxx
b/sc/source/filter/oox/worksheetsettings.cxx
index 01804dc..18f3da5 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -143,9 +143,15 @@ void WorksheetSettings::importProtectedRange( const
AttributeList rAttribs )
aProt.maSecurityDescriptorXML = rAttribs.getString(
XML_securityDescriptor, OUString());
/* XXX ECMA-376/OOXML or ISO/IEC 29500 do not even mention a 'password'
* attribute here (or anywhere else), but this is what Excel2013 writes,
- * similar to BIFF. OOXML XMLschema and ISO/IEC 29500 instead define
- * 'algorithmName', 'hashValue', 'saltValue' and 'spinCount'. */
+ * similar to BIFF, if the original file was a BIFF file. OOXML XMLschema
+ * and ISO/IEC 29500 instead define 'algorithmName', 'hashValue',
+ * 'saltValue' and 'spinCount' that are written if the protection was newly
+ * created. */
[Libreoffice-commits] core.git: 2 commits - sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 51c2cbf539427dcee27fb5fd2678f94e684b616f
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 15:55:40 2014 +0300
WaE: passing OUString by value, rather pass by reference
Change-Id: I72a1617e54157129bdbfd10f39deaf280006b6c9
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 0f3905b..d5d02d0 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -124,7 +124,7 @@ public:
{
return maFilterOptions;
}
-void setFilterOptions(OUString rFilterOptions)
+void setFilterOptions(const OUString rFilterOptions)
{
maFilterOptions = rFilterOptions;
}
commit 009db0e3a77a9f0d501f35920dd36234a2491e9c
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 15:53:46 2014 +0300
WaE: overriding virtual function declaration not marked 'override'
Change-Id: Ie799cd4a2d9c4c9de70712dbfd5de57944d8ecbc
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index d133d73..0f3905b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -60,7 +60,7 @@ using namespace css;
#define DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, BaseClass) \
class TestName : public BaseClass { \
protected:\
-virtual OUString getTestName() { return
OUString::createFromAscii(#TestName); }\
+virtual OUString getTestName() SAL_OVERRIDE { return
OUString::createFromAscii(#TestName); } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import); \
@@ -81,7 +81,7 @@ using namespace css;
#define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \
class TestName : public BaseClass { \
protected:\
-virtual OUString getTestName() { return
OUString::createFromAscii(#TestName); }\
+virtual OUString getTestName() SAL_OVERRIDE { return
OUString::createFromAscii(#TestName); } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import); \
@@ -98,7 +98,7 @@ using namespace css;
#define DECLARE_SW_EXPORT_TEST(TestName, filename, BaseClass) \
class TestName : public BaseClass { \
protected:\
-virtual OUString getTestName() { return
OUString::createFromAscii(#TestName); }\
+virtual OUString getTestName() SAL_OVERRIDE { return
OUString::createFromAscii(#TestName); } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import_Export); \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: mbNoXORClipping - what's this needed for?
Tor Lillqvist wrote: Would it be possible and good then to bin the mbNoXORClipping and use the code path taken if it is true on all platforms? I would not mind, nope - would surely get us less obtuse code. Would be good though to check if not indeed e.g. X11 benefits. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: What does contact mean in svx?
Chris Sherlock wrote: Do you know what this means? Not quite. Does this mean that it is an way of allow svx to operate with VCL's OutputDevice? Well, svx for sure is a rather big client of the OutDev. ;) XOutDev is legacy, and written out of the code base mostly. If so, do you have any further comments you can give us as to how or what this is meant for? I would like to clarify the readme to avoid confusion. Dunno really. I don't think it would do much harm to simply drop it. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf
distro-configs/CPWin32-MPL.conf | 31 +++ distro-configs/CPWin32.conf |1 + 2 files changed, 32 insertions(+) New commits: commit 756dd983dd41b0f69bf46c979b9055815bb84f58 Author: Andras Timar andras.ti...@collabora.com Date: Tue Apr 8 05:19:41 2014 -0700 MPLv2 subset config Change-Id: I519dc6ef32f4ae3864816455cce0e9cd4246acfa diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf new file mode 100644 index 000..e303e7d --- /dev/null +++ b/distro-configs/CPWin32-MPL.conf @@ -0,0 +1,31 @@ +--enable-mpl-subset +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--with-theme=tango +--without-help +--with-myspell-dicts +--without-system-mesa-headers +--without-system-postgresql +--without-junit +--without-helppack-integration +--enable-extension-integration +--enable-activex +--disable-online-update +--disable-odk +--disable-gtk +--enable-ext-wiki-publisher +--disable-report-builder +--enable-ext-presenter-minimizer +--disable-ext-nlpsolver +--disable-ext-numbertext +--disable-ext-ct2n +--disable-ext-google-docs +--disable-ext-languagetool +--disable-postgresql-sdbc +--disable-lotuswordpro +--disable-lpsolve +--with-webdav=serf +--enable-release-build +--enable-win-mozab-driver +--with-lang=ar as ast bg bn-IN br ca ca-XV cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sh sk sl sr sv ta te tr uk vi zh-CN zh-TW +--enable-windows-build-signing diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf index 2b2971c..1f60a70 100644 --- a/distro-configs/CPWin32.conf +++ b/distro-configs/CPWin32.conf @@ -1,6 +1,7 @@ --with-vendor=Collabora --with-branding=icon-themes/galaxy/brand_cp --with-help +--with-myspell-dicts --without-system-mesa-headers --without-system-postgresql --without-junit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/uwriter.cxx |8 +---
sw/source/core/txtnode/modeltoviewhelper.cxx | 13 -
2 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 36532778a6307f9ebaf0c777224e4de568c74450
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 8 15:32:20 2014 +0200
sw: initialize FieldResult::m_eType
Change-Id: Ia41ceb42b360a17021a30b5ed420d36759116255
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index d6fa423..3d085e6 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -298,14 +298,8 @@ void SwDocTest::testModelToViewHelper()
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(OUString(A B C D),
sViewText);
-// ??? is it a problem that we get the positions without
-// EXPANDFOOTNOTE when it's completely removed?
-CPPUNIT_ASSERT_EQUAL(static_castsize_t(2),
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(0),
aModelToViewHelper.getFootnotePositions().size());
-CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(12),
-aModelToViewHelper.getFootnotePositions()[0]);
-CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(19),
-aModelToViewHelper.getFootnotePositions()[1]);
CPPUNIT_ASSERT_EQUAL(static_castsize_t(0),
aModelToViewHelper.getFieldPositions().size());
}
diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index 085d3c5..bd1a3ae 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -37,7 +37,10 @@ struct FieldResult
{
sal_Int32 m_nFieldPos;
OUString m_sExpand;
-enum { FIELD, FOOTNOTE } m_eType;
+enum { NONE, FIELD, FOOTNOTE } m_eType;
+explicit FieldResult(sal_Int32 const nPos)
+: m_nFieldPos(nPos), m_eType(NONE)
+{ }
};
class sortfieldresults :
@@ -137,8 +140,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode
rNode, sal_uInt16 eMode)
aBlocks.end(), containsPos(nDummyCharPos));
if (aFind != aBlocks.end())
{
-FieldResult aFieldResult;
-aFieldResult.m_nFieldPos = nDummyCharPos;
+FieldResult aFieldResult(nDummyCharPos);
switch (pAttr-Which())
{
case RES_TXTATR_FIELD:
@@ -190,8 +192,7 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode
rNode, sal_uInt16 eMode)
containsPos(nDummyCharPos));
if (aFind != aBlocks.end())
{
-FieldResult aFieldResult;
-aFieldResult.m_nFieldPos = nDummyCharPos;
+FieldResult aFieldResult(nDummyCharPos);
aFieldResult.m_sExpand = (eMode REPLACEMODE)
? OUString(CHAR_ZWSP)
: sw::mark::ExpandFieldmark(pMark);
@@ -229,6 +230,8 @@ ModelToViewHelper::ModelToViewHelper(const SwTxtNode
rNode, sal_uInt16 eMode)
case FieldResult::FOOTNOTE:
m_FootnotePositions.push_back(viewPos);
break;
+case FieldResult::NONE: /*ignore*/
+break;
}
nOffset += j-m_sExpand.getLength() - 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d356395ec37a9ba06e0a6f1ddc150245e2b3898d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 15:02:56 2014 +0100
WaE: -Werror=maybe-uninitialized
Change-Id: Idc72dde52280fd3dc1721ad9f4d8df38017e18f0
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d6c97ed..527a172 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1752,7 +1752,7 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference drawing::XShape
if (aGrabBag[i].Name == VML-Z-ORDER)
{
GraphicZOrderHelper* pZOrderHelper =
m_rDMapper.graphicZOrderHelper();
-sal_Int32 zOrder;
+sal_Int32 zOrder(0);
aGrabBag[i].Value = zOrder;
xShapePropertySet-setPropertyValue( ZOrder,
uno::makeAny(pZOrderHelper-findZOrder(zOrder)));
pZOrderHelper-addItem(xShapePropertySet, zOrder);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/lo-all-static-libs Repository.mk vcl/Module_vcl.mk vcl/source
Repository.mk |2 +-
bin/lo-all-static-libs |1 +
vcl/Module_vcl.mk |2 +-
vcl/source/opengl/OpenGLContext.cxx | 12 ++--
4 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit b5e1693fe70f6b90120d367c3a8b4c46fe874a69
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 16:59:56 2014 +0300
The GLEW lib, too
Change-Id: Ic0a9ed4aa95418fdc1a2e49419eb2a2482351232
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 1c9af5a..e1d6e0d 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -45,6 +45,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$foolibs \
$WORKDIR/LinkTarget/StaticLibrary/lib*.a \
$androidlibs \
+ $WORKDIR/UnpackedTarball/glew/lib/*.a \
$WORKDIR/UnpackedTarball/icu/source/lib/*.a \
$WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libabw/src/lib/.libs/*.a \
commit 7232a2d520100184d5ca8264551ec0bc352971e7
Author: Tor Lillqvist t...@collabora.com
Date: Tue Apr 8 16:50:48 2014 +0300
Make libvclopengl build for iOS
Change-Id: Id338d1fb8a1334fb4e984aff9494bab7f3c35dc1
diff --git a/Repository.mk b/Repository.mk
index e18ecc2..7d1da27 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -352,7 +352,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
vclcanvas \
- $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
+ $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)),vclopengl) \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
vclplug_gen \
$(if $(ENABLE_TDE),vclplug_tde) \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index fb5d04b..a5b0b32 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
Executable_ui-previewer) \
- $(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \
+ $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)), \
Library_vclopengl \
) \
))
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 29ac4d7..bd8065a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -308,7 +308,7 @@ debug_callback(GLenum source, GLenum type, GLuint id,
#endif
-#if defined UNX !defined MACOSX
+#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
namespace {
@@ -342,6 +342,10 @@ bool OpenGLContext::init( Window* pParent )
m_aGLWin.hDC = GetDC(m_aGLWin.hWnd);
#elif defined( MACOSX )
+#elif defined( IOS )
+
+#elif defined( ANDROID )
+
#elif defined( UNX )
m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy,
m_aGLWin.vi,
@@ -394,6 +398,10 @@ bool OpenGLContext::init( Window* pParent )
#elif defined( MACOSX )
+#elif defined( IOS )
+
+#elif defined( ANDROID )
+
#elif defined( UNX )
if( !glXMakeCurrent( m_aGLWin.dpy, m_aGLWin.win, m_aGLWin.ctx ) )
{
@@ -554,7 +562,7 @@ bool OpenGLContext::initWindow()
return true;
}
-#elif defined( MACOSX )
+#elif defined( MACOSX ) || defined( IOS) || defined( ANDROID )
bool OpenGLContext::initWindow()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source
filter/source/flash/swfexporter.cxx | 80 +++-
filter/source/flash/swfexporter.hxx | 22 +++--
filter/source/flash/swffilter.cxx | 88 +---
3 files changed, 167 insertions(+), 23 deletions(-)
New commits:
commit 9cfa6464411e39e1cbaef8f0c7c64bddbed4033b
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 8 12:24:24 2014 +
i56084 added support for export selection in swf export
diff --git a/filter/source/flash/swfexporter.cxx
b/filter/source/flash/swfexporter.cxx
index 2e7b8eb..25fd965 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -99,14 +99,33 @@ void PageInfo::addShape( ShapeInfo* pShapeInfo )
//
-
-FlashExporter::FlashExporter(const Reference XMultiServiceFactory rxMSF,
sal_Int32 nJPEGCompressMode, sal_Bool bExportOLEAsJPEG)
-: mxMSF( rxMSF ),
-mpWriter( NULL ),
+FlashExporter::FlashExporter(
+const Reference XMultiServiceFactory rxMSF,
+
+// #56084# variables for selection export
+const Reference XShapes rxSelectedShapes,
+const Reference XDrawPage rxSelectedDrawPage,
+
+sal_Int32 nJPEGCompressMode,
+sal_Bool bExportOLEAsJPEG)
+: mxMSF(rxMSF),
+
+// #56084# variables for selection export
+mxSelectedShapes(rxSelectedShapes),
+mxSelectedDrawPage(rxSelectedDrawPage),
+mbExportSelection(false),
+
+mpWriter(NULL),
mnJPEGcompressMode(nJPEGCompressMode),
mbExportOLEAsJPEG(bExportOLEAsJPEG),
mbPresentation(true),
-mnPageNumber( - 1 )
+mnPageNumber(-1)
{
+if(mxSelectedDrawPage.is() mxSelectedShapes.is()
mxSelectedShapes-getCount())
+{
+// #56084# determine export selection
+mbExportSelection = true;
+}
}
//
-
@@ -146,7 +165,16 @@ sal_Bool FlashExporter::exportAll( Reference XComponent
xDoc, Reference XOut
return sal_False;
Reference XDrawPage xDrawPage;
-xDrawPages-getByIndex(0) = xDrawPage;
+
+// #56084# set xDrawPage directly when exporting selection
+if(mbExportSelection)
+{
+xDrawPage = mxSelectedDrawPage;
+}
+else
+{
+xDrawPages-getByIndex(0) = xDrawPage;
+}
Reference XPropertySet xProp( xDrawPage, UNO_QUERY );
try
@@ -165,17 +193,29 @@ sal_Bool FlashExporter::exportAll( Reference XComponent
xDoc, Reference XOut
return false; // no writer, no cookies
}
-const sal_Int32 nPageCount = xDrawPages-getCount();
+// #56084# nPageCount is 1 when exporting selection
+const sal_Int32 nPageCount = mbExportSelection ? 1 :
xDrawPages-getCount();
sal_uInt16 nPage;
+
if ( xStatusIndicator.is() )
+{
xStatusIndicator-start(OUString( RTL_CONSTASCII_USTRINGPARAM(
Macromedia Flash (SWF) )), nPageCount);
+}
+
for( nPage = 0; nPage nPageCount; nPage++)
{
+// #56084# keep PageNumber? We could determine the PageNumber of the
single to-be-eported page
+// when exporting the selection, but this is only used for swf
internal, so no need to do so (AFAIK)
mnPageNumber = nPage + 1;
if ( xStatusIndicator.is() )
xStatusIndicator-setValue( nPage );
-xDrawPages-getByIndex(nPage) = xDrawPage;
+
+// #56084# get current xDrawPage when not exporting selection; else
alraedy set above
+if(!mbExportSelection)
+{
+xDrawPages-getByIndex(nPage) = xDrawPage;
+}
if( !xDrawPage.is())
continue;
@@ -189,11 +229,25 @@ sal_Bool FlashExporter::exportAll( Reference XComponent
xDoc, Reference XOut
continue;
}
-exportBackgrounds( xDrawPage, nPage, false );
-exportBackgrounds( xDrawPage, nPage, true );
+// #56084# no background when exporting selection
+if(!mbExportSelection)
+{
+exportBackgrounds( xDrawPage, nPage, false );
+exportBackgrounds( xDrawPage, nPage, true );
+}
maPagesMap[nPage].mnForegroundID = mpWriter-startSprite();
-exportDrawPageContents( xDrawPage, false, false );
+
+// #56084# directly export selection in export selection mode
+if(mbExportSelection)
+{
+exportShapes( mxSelectedShapes, false, false );
+}
+else
+{
+exportDrawPageContents( xDrawPage, false, false );
+}
+
mpWriter-endSprite();
// AS: If the background is different than the previous slide,
@@ -490,7 +544,7 @@ sal_uInt16
FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference X
/** export's the definition of the shapes inside this drawing page and adds the
shape infos to the current PageInfo */
-void FlashExporter::exportDrawPageContents( Reference XDrawPage xPage,
bool
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgexport.cxx | 33 ++---
filter/source/svg/svgfilter.cxx | 51 +++-
filter/source/svg/svgfilter.hxx |3 +-
3 files changed, 76 insertions(+), 11 deletions(-)
New commits:
commit de37aa18faf03da14dc453e843b1419edbedbfa9
Author: Armin Le Grand a...@apache.org
Date: Mon Apr 7 14:58:01 2014 +
Resolves: #i124608# functionality to export only selected objects...
in SVG export
(cherry picked from commit 42c2b0cecfae5845439e0392a399497062238b15)
Conflicts:
filter/source/svg/svgexport.cxx
filter/source/svg/svgfilter.cxx
filter/source/svg/svgfilter.hxx
Change-Id: Iac4fe6d93c95cc5ab25185245cf642703a02d0ed
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 9223bfe..5402ad4 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -816,7 +816,11 @@ sal_Bool SVGFilter::implExportDocument()
implEmbedBulletGlyphs();
implExportTextEmbeddedBitmaps();
}
-implExportMasterPages( mMasterPageTargets, 0,
mMasterPageTargets.getLength() - 1 );
+
+bool bSelection = mbSinglePage maShapeSelection.is()
maShapeSelection-getCount();
+// #i124608# export a given object selection, so no MasterPage
export at all
+if (!bSelection)
+implExportMasterPages( mMasterPageTargets, 0,
mMasterPageTargets.getLength() - 1 );
implExportDrawPages( mSelectedPages, 0, nLastPage );
if( !mbSinglePage )
@@ -1401,7 +1405,7 @@ sal_Bool SVGFilter::implExportMasterPages( const
SVGFilter::XDrawPageSequence
sal_Int32 nFirstPage, sal_Int32
nLastPage )
{
DBG_ASSERT( nFirstPage = nLastPage,
-SVGFilter::implExportPages: nFirstPage nLastPage );
+SVGFilter::implExportMasterPages: nFirstPage nLastPage );
// When the exported slides are more than one we wrap master page elements
// with a svg defs element.
@@ -1434,7 +1438,7 @@ sal_Bool SVGFilter::implExportDrawPages( const
SVGFilter::XDrawPageSequence rx
sal_Int32 nFirstPage, sal_Int32
nLastPage )
{
DBG_ASSERT( nFirstPage = nLastPage,
-SVGFilter::implExportPages: nFirstPage nLastPage );
+SVGFilter::implExportDrawPages: nFirstPage nLastPage );
// We wrap all slide in a group element with class name SlideGroup.
mpSVGExport-AddAttribute( XML_NAMESPACE_NONE, class, SlideGroup );
@@ -1443,7 +1447,17 @@ sal_Bool SVGFilter::implExportDrawPages( const
SVGFilter::XDrawPageSequence rx
sal_Bool bRet = sal_False;
for( sal_Int32 i = nFirstPage; i = nLastPage; ++i )
{
-Reference XShapes xShapes( rxPages[i], UNO_QUERY );
+Reference XShapes xShapes;
+
+if (maShapeSelection.is() maShapeSelection-getCount())
+{
+// #i124608# export a given object selection
+xShapes = maShapeSelection;
+}
+else
+{
+xShapes = Reference XShapes ( rxPages[i], UNO_QUERY );
+}
if( xShapes.is() )
{
@@ -1780,6 +1794,17 @@ sal_Bool SVGFilter::implExportShape( const Reference
XShape rxShape,
sal_Bool SVGFilter::implCreateObjects()
{
+if (maShapeSelection.is() maShapeSelection-getCount())
+{
+// #i124608# export a given object selection
+if (mSelectedPages.getLength() mSelectedPages[0].is())
+{
+implCreateObjectsFromShapes(mSelectedPages[0], maShapeSelection);
+return sal_True;
+}
+return sal_False;
+}
+
sal_Int32 i, nCount;
for( i = 0, nCount = mMasterPageTargets.getLength(); i nCount; ++i )
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index d8703da..fc70d83 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -66,7 +66,6 @@ SVGFilter::SVGFilter( const Reference XComponentContext
rxCtx ) :
mpDefaultSdrPage( NULL ),
mpSdrModel( NULL ),
mbPresentation( sal_False ),
-mbExportAll( sal_False ),
mbSinglePage( sal_False ),
mnVisiblePage( -1 ),
mpObjects( NULL )
@@ -97,13 +96,27 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence
PropertyValue rDescripto
#ifndef DISABLE_EXPORT
else if( mxSrcDoc.is() )
{
-if( !mbExportAll !mSelectedPages.hasElements() )
+// #i124608# detext selection
+sal_Bool bSelectionOnly = sal_False;
+bool bGotSelection(false);
+
+// #i124608# extract Single selection wanted from dialog return values
+for ( sal_Int32 nInd = 0; nInd rDescriptor.getLength(); nInd++ )
{
-uno::Reference frame::XDesktop2
xDesktop(frame::Desktop::create(mxContext));
-
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fuoaprms.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5a9124e405aa461aa8a46b662a9d9d810f0d7f5 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 8 15:23:40 2014 +0100 coverity#735386 Copy-paste error this has got to be wrong, surely Change-Id: Id23419f022c5db7daf887c3d3fc6e33bab3e8e5f diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 251e94d..805baed 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -442,7 +442,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest rReq ) if (nSecondPlayFullSet == ATTR_SET) aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, bSecondPlayFull)); -else if (nPlayFullSet == ATTR_MIXED) +else if (nSecondPlayFullSet == ATTR_MIXED) aSet.InvalidateItem(ATTR_ACTION_PLAYFULL); else aSet.Put(SfxBoolItem(ATTR_ACTION_PLAYFULL, false)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/window/window.cxx | 30 +++---
1 file changed, 19 insertions(+), 11 deletions(-)
New commits:
commit bcba071c0d583a0b3a62d6d718829b906ecc37f2
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Apr 8 12:58:51 2014 +0200
fdo#77059, hidpi: Increase the threshold of what DPI we consider hi-dpi.
Conflicts:
vcl/source/window/window.cxx
Change-Id: I79802df4c11b3543140672419d78b697848b7c36
Reviewed-on: https://gerrit.libreoffice.org/8892
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f477b5c..3fb1f00 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -732,6 +732,23 @@ void Window::ImplInitWindowData( WindowType nType )
// ---
+static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI)
+{
+sal_Int32 nResult = 1;
+
+#ifndef MACOSX
+// Setting of HiDPI is unfortunately all only a heuristic; and to add
+// insult to an injury, the system is constantly lying to us about
+// the DPI and whatnot
+// eg. fdo#77059 - set the value from which we do consider the
+// screen hi-dpi to greater than 168
+if (nDPI 168)
+nResult = std::max(sal_Int32(1), (nDPI) / 96);
+#endif
+
+return nResult;
+}
+
void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData*
pSystemParentData )
{
DBG_ASSERT( mpWindowImpl-mbFrame || pParent, Window::Window(): pParent
== NULL );
@@ -983,11 +1000,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle,
SystemParentData* pSyste
}
// setup the scale factor for Hi-DPI displays
-#ifdef MACOSX
-mnDPIScaleFactor = 1;
-#else
-mnDPIScaleFactor = std::max((sal_Int32)1,
(mpWindowImpl-mpFrameData-mnDPIY + 48) / 96);
-#endif
+mnDPIScaleFactor = CountDPIScaleFactor(mpWindowImpl-mpFrameData-mnDPIY);
const StyleSettings rStyleSettings = maSettings.GetStyleSettings();
sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
@@ -1727,12 +1740,7 @@ void Window::ImplInitResolutionSettings()
mnDPIY = (mpWindowImpl-mpFrameData-mnDPIY*nScreenZoom)/100;
// setup the scale factor for Hi-DPI displays
-#ifdef MACOSX
-mnDPIScaleFactor = 1;
-#else
-mnDPIScaleFactor = std::max((sal_Int32)1,
(mpWindowImpl-mpFrameData-mnDPIY + 48) / 96);
-#endif
-
+mnDPIScaleFactor =
CountDPIScaleFactor(mpWindowImpl-mpFrameData-mnDPIY);
SetPointFont( rStyleSettings.GetAppFont() );
}
else if ( mpWindowImpl-mpParent )
___
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/window/gtksalframe.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 508b91e33090e28db083a73bed37a66a1598eafa Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 8 16:41:14 2014 +0200 -Werror=uninitialized Change-Id: I9d29f91c1c7d87343e79f2b1b91fd4d8af83a9ab diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index f22b54e..e748bdc 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -2835,6 +2835,7 @@ SalFrame::SalIndicatorState GtkSalFrame::GetIndicatorState() aState.mnState = GetGtkSalData()-GetGtkDisplay()-GetIndicatorState(); #else g_warning (missing get indicator state); +aState.mnState = 0; #endif return aState; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/flash/swfexporter.cxx | 73
filter/source/flash/swfexporter.hxx | 22 +++-
filter/source/flash/swffilter.cxx | 92 +++-
3 files changed, 161 insertions(+), 26 deletions(-)
New commits:
commit 70ba557865d1d528fba0899732fc3e67e71d8f55
Author: Armin Le Grand a...@apache.org
Date: Tue Apr 8 12:24:24 2014 +
Resolves: #i56084# added support for export selection in swf export
(cherry picked from commit 9cfa6464411e39e1cbaef8f0c7c64bddbed4033b)
Conflicts:
filter/source/flash/swfexporter.cxx
filter/source/flash/swfexporter.hxx
filter/source/flash/swffilter.cxx
Change-Id: I987c43af54982daea532c8f4f915eb2bd91ea267
diff --git a/filter/source/flash/swfexporter.cxx
b/filter/source/flash/swfexporter.cxx
index 50ddc3b..26c8197 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -94,10 +94,21 @@ void PageInfo::addShape( ShapeInfo* pShapeInfo )
}
#endif
+FlashExporter::FlashExporter(
+const Reference XComponentContext rxContext,
+// #i56084# variables for selection export
+const Reference XShapes rxSelectedShapes,
+const Reference XDrawPage rxSelectedDrawPage,
-FlashExporter::FlashExporter(const Reference XComponentContext rxContext,
sal_Int32 nJPEGCompressMode, sal_Bool bExportOLEAsJPEG)
+sal_Int32 nJPEGCompressMode,
+sal_Bool bExportOLEAsJPEG)
: mxContext(rxContext)
+// #i56084# variables for selection export
+, mxSelectedShapes(rxSelectedShapes)
+, mxSelectedDrawPage(rxSelectedDrawPage)
+, mbExportSelection(false)
+
, mpWriter(NULL)
, mnDocWidth(0)
, mnDocHeight(0)
@@ -106,6 +117,11 @@ FlashExporter::FlashExporter(const Reference
XComponentContext rxContext, sa
, mbPresentation(true)
, mnPageNumber(-1)
{
+if(mxSelectedDrawPage.is() mxSelectedShapes.is()
mxSelectedShapes-getCount())
+{
+// #i56084# determine export selection
+mbExportSelection = true;
+}
}
@@ -145,7 +161,16 @@ sal_Bool FlashExporter::exportAll( Reference XComponent
xDoc, Reference XOut
return sal_False;
Reference XDrawPage xDrawPage;
-xDrawPages-getByIndex(0) = xDrawPage;
+
+// #i56084# set xDrawPage directly when exporting selection
+if(mbExportSelection)
+{
+xDrawPage = mxSelectedDrawPage;
+}
+else
+{
+xDrawPages-getByIndex(0) = xDrawPage;
+}
Reference XPropertySet xProp( xDrawPage, UNO_QUERY );
try
@@ -164,17 +189,29 @@ sal_Bool FlashExporter::exportAll( Reference XComponent
xDoc, Reference XOut
return false; // no writer, no cookies
}
-const sal_Int32 nPageCount = xDrawPages-getCount();
+// #i56084# nPageCount is 1 when exporting selection
+const sal_Int32 nPageCount = mbExportSelection ? 1 :
xDrawPages-getCount();
sal_uInt16 nPage;
+
if ( xStatusIndicator.is() )
-xStatusIndicator-start( Macromedia Flash (SWF), nPageCount);
+{
+xStatusIndicator-start(Macromedia Flash (SWF), nPageCount);
+}
+
for( nPage = 0; nPage nPageCount; nPage++)
{
+// #i56084# keep PageNumber? We could determine the PageNumber of the
single to-be-eported page
+// when exporting the selection, but this is only used for swf
internal, so no need to do so (AFAIK)
mnPageNumber = nPage + 1;
if ( xStatusIndicator.is() )
xStatusIndicator-setValue( nPage );
-xDrawPages-getByIndex(nPage) = xDrawPage;
+
+// #i56084# get current xDrawPage when not exporting selection; else
alraedy set above
+if(!mbExportSelection)
+{
+xDrawPages-getByIndex(nPage) = xDrawPage;
+}
if( !xDrawPage.is())
continue;
@@ -188,11 +225,25 @@ sal_Bool FlashExporter::exportAll( Reference XComponent
xDoc, Reference XOut
continue;
}
-exportBackgrounds( xDrawPage, nPage, false );
-exportBackgrounds( xDrawPage, nPage, true );
+// #i56084# no background when exporting selection
+if(!mbExportSelection)
+{
+exportBackgrounds( xDrawPage, nPage, false );
+exportBackgrounds( xDrawPage, nPage, true );
+}
maPagesMap[nPage].mnForegroundID = mpWriter-startSprite();
-exportDrawPageContents( xDrawPage, false, false );
+
+// #i56084# directly export selection in export selection mode
+if(mbExportSelection)
+{
+exportShapes( mxSelectedShapes, false, false );
+}
+else
+{
+exportDrawPageContents( xDrawPage, false, false );
+}
+
mpWriter-endSprite();
// AS: If the background is different than the previous slide,
@@ -467,7 +518,7 @@ sal_uInt16
FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference X
/** export's the
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9c/fa6464411e39e1cbaef8f0c7c64bddbed4033b
9c/fa6464411e39e1cbaef8f0c7c64bddbed4033b |1 + 1 file changed, 1 insertion(+) New commits: commit dc317395c837bc3839edd9e29ecacce6c7f7ef21 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 8 15:46:58 2014 +0100 Notes added by 'git notes add' diff --git a/9c/fa6464411e39e1cbaef8f0c7c64bddbed4033b b/9c/fa6464411e39e1cbaef8f0c7c64bddbed4033b new file mode 100644 index 000..96d1383 --- /dev/null +++ b/9c/fa6464411e39e1cbaef8f0c7c64bddbed4033b @@ -0,0 +1 @@ +merged as: 70ba557865d1d528fba0899732fc3e67e71d8f55 ___ 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' - 42/c2b0cecfae5845439e0392a399497062238b15
42/c2b0cecfae5845439e0392a399497062238b15 |1 + 1 file changed, 1 insertion(+) New commits: commit 2cd7e7bbec59f41496c952ba8fcf11f2a7ed4322 Author: Caolán McNamara caol...@redhat.com Date: Tue Apr 8 15:22:23 2014 +0100 Notes added by 'git notes add' diff --git a/42/c2b0cecfae5845439e0392a399497062238b15 b/42/c2b0cecfae5845439e0392a399497062238b15 new file mode 100644 index 000..9641f8a --- /dev/null +++ b/42/c2b0cecfae5845439e0392a399497062238b15 @@ -0,0 +1 @@ +merged as: de37aa18faf03da14dc453e843b1419edbedbfa9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fupage.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f704d5a579eaa3bed1b40f8bdf5e40084622c79d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 15:48:25 2014 +0100
coverity#704752 Dereference after null check
Change-Id: Iad6fa342d8d0daef1f07ed4f99add015ce3e4078
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 57513e7..9ed4ca4 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -314,7 +314,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
pTempSet.reset( new SfxItemSet(*pDlg-GetOutputItemSet()) );
}
-if( pTempSet.get() )
+if (pTempSet.get() pStyleSheet)
{
pStyleSheet-AdjustToFontHeight(*pTempSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/drawtreevisiting.cxx |9
sdext/source/pdfimport/tree/genericelements.hxx |3
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 164 ++
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 34 +--
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |7
5 files changed, 83 insertions(+), 134 deletions(-)
New commits:
commit a20e145cf901f6589ca96e3a4a5ded413eb20907
Author: Vort vv...@yandex.ru
Date: Tue Apr 8 08:39:02 2014 +0300
fdo#45001 fdo#77105 PDF Import: rotated text fixes
1. Fix 180 degrees text rotation;
2. Make rotated text fully editable.
Change-Id: Ie937f29031bbd0146207ce83678db351b65d2f8d
Reviewed-on: https://gerrit.libreoffice.org/8890
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 626480d..98a677e 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -222,6 +222,15 @@ void DrawXmlEmitter::fillFrameProps( DrawElement
rElem,
if( rElem.MirrorVertical )
fRotate += M_PI;
+// First check here is to skip image frame case
+if (rElem.IsForText
+(aScale.getX() 0)
+(aScale.getY() 0)
+(basegfx::fTools::equalZero(aScale.getX() + aScale.getY(),
0.0001)))
+{
+fRotate += M_PI;
+}
+
// build transformation string
if( fShearX != 0.0 )
{
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx
b/sdext/source/pdfimport/tree/genericelements.hxx
index 5593ecb..78f85df 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -127,11 +127,12 @@ namespace pdfi
{
protected:
GraphicalElement( Element* pParent, sal_Int32 nGCId )
-: Element( pParent ), GCId( nGCId ), MirrorVertical( false ) {}
+: Element( pParent ), GCId( nGCId ), MirrorVertical( false ),
IsForText (false) {}
public:
sal_Int32 GCId;
bool MirrorVertical;
+bool IsForText;
};
struct DrawElement : public GraphicalElement
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 581f052..5eb84db 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -56,9 +56,7 @@ namespace pdfi
com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext xContext) :
m_xContext(xContext),
-fYPrevTextPosition(-1.0),
-fXPrevTextPosition(0.0),
-fPrevTextWidth(0.0),
+prevCharWidth(0),
m_pElFactory( new ElementFactory() ),
m_pDocument( m_pElFactory-createDocumentElement() ),
m_pCurPage(0),
@@ -224,9 +222,7 @@ void PDFIProcessor::processGlyphLine()
if ((ch == 0x20) || (ch == 0xa0))
{
-double spaceWidth =
-m_GlyphsList[i].getRect().X2 -
-m_GlyphsList[i].getRect().X1;
+double spaceWidth = m_GlyphsList[i].getWidth();
spaceDetectBoundary = spaceWidth * 0.5;
break;
}
@@ -237,129 +233,89 @@ void PDFIProcessor::processGlyphLine()
{
double avgGlyphWidth = 0.0;
for (size_t i = 0; i m_GlyphsList.size(); i++)
-{
-avgGlyphWidth +=
-m_GlyphsList[i].getRect().X2 -
-m_GlyphsList[i].getRect().X1;
-}
+avgGlyphWidth += m_GlyphsList[i].getWidth();
avgGlyphWidth /= m_GlyphsList.size();
spaceDetectBoundary = avgGlyphWidth * 0.2;
}
-FrameElement* frame =
m_pElFactory-createFrameElement(m_GlyphsList[0].getCurElement(),
-getGCId(getTransformGlyphContext(m_GlyphsList[0])));
+FrameElement* frame = m_pElFactory-createFrameElement(
+m_GlyphsList[0].getCurElement(),
+getGCId(m_GlyphsList[0].getGC()));
frame-ZOrder = m_nNextZOrder++;
+frame-IsForText = true;
ParagraphElement* para = m_pElFactory-createParagraphElement(frame);
for (size_t i = 0; i m_GlyphsList.size(); i++)
{
bool prependSpace = false;
-if (i != 0)
+TextElement* text = m_pElFactory-createTextElement(
+para,
+getGCId(m_GlyphsList[i].getGC()),
+m_GlyphsList[i].getGC().FontId);
+if (i == 0)
{
-double spaceSize =
-m_GlyphsList[i].getRect().X1 -
-m_GlyphsList[i - 1].getRect().X2;
+text-x = m_GlyphsList[0].getGC().Transformation.get(0, 2);
+text-y = m_GlyphsList[0].getGC().Transformation.get(1, 2);
+text-w = 0;
+text-h = 0;
+para-updateGeometryWith(text);
+
[Libreoffice-commits] core.git: 9 commits - sd/source sfx2/source
sd/source/ui/func/fupage.cxx |3 +++
sd/source/ui/func/futempl.cxx|2 +-
sd/source/ui/view/drviews1.cxx |2 +-
sd/source/ui/view/outlnvsh.cxx |2 +-
sd/source/ui/view/sdview2.cxx|2 +-
sfx2/source/control/bindings.cxx |6 +++---
sfx2/source/dialog/dinfdlg.cxx | 12
sfx2/source/menu/mnumgr.cxx |9 +++--
8 files changed, 25 insertions(+), 13 deletions(-)
New commits:
commit 005976286b7b30905354d8b1b26fe3f84402d259
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 16:11:33 2014 +0100
coverity#704796 Dereference after null check
Change-Id: I9738620f162a3a4d08bb66690815beb7880e
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 379905b7..51536b7 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -219,11 +219,16 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
}
}
-if ( !aCommand.isEmpty() )
+if (!aCommand.isEmpty() pBindings)
{
pBindings-ExecuteCommand_Impl( aCommand );
+return sal_True;
}
-else if ( pBindings-IsBound(nId) )
+
+if (!pBindings)
+return sal_True;
+
+if ( pBindings-IsBound(nId) )
// normal function
pBindings-Execute( nId );
else
commit 53f03a3c83dd31c66c1577bba1bc03b47bf68d77
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 16:08:38 2014 +0100
coverity#704792 Dereference after null check
Change-Id: Ie6f3174266dfa42a1eff81df45fc408656d4fbd9
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 3a19ff5..970379e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2101,10 +2101,14 @@ bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet
rSet )
}
bModified = true; //!!!
-if ( bModified )
-rSet.Put( *pInfo );
-if ( bMustDelete )
-delete pInfo;
+
+if (pInfo)
+{
+if ( bModified )
+rSet.Put( *pInfo );
+if ( bMustDelete )
+delete pInfo;
+}
return bModified;
}
commit 7096a32e16019e693c3f5806d706572ed7e6a970
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 16:06:43 2014 +0100
coverity#704791 Dereference after null check
Change-Id: I7e973ac9b91ab112952f56ce290c07c9fc5670b2
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 2331cc3..0523bbb 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -481,7 +481,7 @@ void SfxBindings::Update
if ( bInternalUpdate )
{
// Query Status
-const SfxSlotServer* pMsgServer =
pCache-GetSlotServer(*pDispatcher, pImp-xProv);
+const SfxSlotServer* pMsgServer = pDispatcher ?
pCache-GetSlotServer(*pDispatcher, pImp-xProv) : NULL;
if ( !pCache-IsControllerDirty()
( !pMsgServer ||
!pMsgServer-GetSlot()-IsMode(SFX_SLOT_VOLATILE) ) )
commit ceebfc0436e878e1cf7e428f88567ec3cde2cc8b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 16:05:47 2014 +0100
coverity#704790 Dereference after null check
Change-Id: I276b404405b9717a03d43a24c6ffecd5c6553969
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index d42be95..2331cc3 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1509,12 +1509,12 @@ void SfxBindings::UpdateControllers_Impl
continue;
}
-if ( SFX_ITEM_DISABLED == eState || !pEnumItem-IsEnabled(
pSlave-GetSlotId()) )
+if ( SFX_ITEM_DISABLED == eState || (pEnumItem
!pEnumItem-IsEnabled( pSlave-GetSlotId())) )
{
// disabled
pEnumCache-SetState(SFX_ITEM_DISABLED, 0);
}
-else if ( SFX_ITEM_AVAILABLE == eState )
+else if ( SFX_ITEM_AVAILABLE == eState pEnumItem )
{
// Determine enum value
sal_uInt16 nValue = pEnumItem-GetEnumValue();
commit f36d55edf7cf2118184ff21db5f95291572b9d02
Author: Caolán McNamara caol...@redhat.com
Date: Tue Apr 8 16:00:55 2014 +0100
coverity#704785 Dereference after null check
Change-Id: I5ac5d5d693e8adfbeff4a60cf94c90f181986294
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index c65f7cb..8300a24 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -198,7 +198,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
if( pSdrOleObj )
SvEmbedTransferHelper::FillTransferableObjectDescriptor( aObjDesc,
pSdrOleObj-GetObjRef(), pSdrOleObj-GetGraphic(), pSdrOleObj-GetAspect() );
-else
+else if (mpDocSh)
mpDocSh-FillTransferableObjectDescriptor( aObjDesc );
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - formula/source include/formula sc/inc sc/source
formula/source/core/api/token.cxx | 13 ++
include/formula/tokenarray.hxx | 12 ++
sc/inc/column.hxx | 13 ++
sc/inc/document.hxx | 12 ++
sc/inc/formulacell.hxx |8 +
sc/inc/formulagroup.hxx | 18 +++
sc/inc/table.hxx|6 +
sc/source/core/data/column.cxx | 44 +++--
sc/source/core/data/column2.cxx | 21
sc/source/core/data/column4.cxx | 152
sc/source/core/data/documen4.cxx| 11 --
sc/source/core/data/document10.cxx | 26 +
sc/source/core/data/formulacell.cxx | 76 ++--
sc/source/core/data/table4.cxx |6 -
sc/source/core/data/table7.cxx | 13 ++
sc/source/core/tool/formulagroup.cxx|6 +
sc/source/filter/oox/workbookhelper.cxx |4
sc/source/ui/docshell/docfunc.cxx | 11 --
sc/source/ui/undo/undocell.cxx |4
sc/source/ui/undo/undorangename.cxx |6 -
sc/source/ui/unoobj/nameuno.cxx |4
sc/source/ui/view/viewfunc.cxx |5 -
22 files changed, 334 insertions(+), 137 deletions(-)
New commits:
commit 3a9b9a41c567c4e8f6c6bec0a4bb35dc581d577e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Apr 7 14:13:20 2014 -0400
fdo#75741: Re-implement CompileNameFormula for formula groups.
(cherry picked from commit 355baf573425165cbc1c789a6271eb29940e1f76)
(cherry picked from commit 615f6aa293a6da90da94e6e78828198ffbc0ca5e)
Conflicts:
sc/inc/document.hxx
sc/source/core/data/column4.cxx
sc/source/core/data/document10.cxx
sc/source/core/data/table7.cxx
sc/source/ui/docshell/docfunc.cxx
sc/source/ui/undo/undocell.cxx
sc/source/ui/unoobj/nameuno.cxx
Change-Id: I57e1e464ac5f7abc10ce5ea5752e036ddb6cf6d7
Reviewed-on: https://gerrit.libreoffice.org/8889
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index ae1655e..7499a2b 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -605,6 +605,19 @@ bool FormulaTokenArray::HasNameOrColRowName() const
return false;
}
+bool FormulaTokenArray::HasOpCodes( const boost::unordered_setOpCode
rOpCodes ) const
+{
+FormulaToken** p = pCode;
+FormulaToken** pEnd = p + static_castsize_t(nLen);
+for (; p != pEnd; ++p)
+{
+OpCode eOp = (*p)-GetOpCode();
+if (rOpCodes.count(eOp) 0)
+return true;
+}
+
+return false;
+}
FormulaTokenArray::FormulaTokenArray() :
pCode(NULL),
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 9f8fed0..a479c10 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -26,6 +26,8 @@
#include tools/solar.h
#include com/sun/star/sheet/FormulaToken.hpp
+#include boost/unordered_set.hpp
+
namespace formula
{
@@ -124,6 +126,16 @@ public:
/// Token of type svIndex or opcode ocColRowName
boolHasNameOrColRowName() const;
+/**
+ * Check if the token array contains any of specified opcode tokens.
+ *
+ * @param rOpCodes collection of opcodes to check against.
+ *
+ * @return true if the token array contains at least one of the specified
+ * opcode tokens, false otherwise.
+ */
+bool HasOpCodes( const boost::unordered_setOpCode rOpCodes ) const;
+
FormulaToken** GetArray() const { return pCode; }
FormulaToken** GetCode() const { return pRPN; }
sal_uInt16GetLen() const { return nLen; }
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 33a1bf7..edf6aca 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -40,6 +40,7 @@ namespace formula { struct VectorRefArray; }
namespace sc {
struct FormulaGroupContext;
+struct FormulaGroupEntry;
class StartListeningContext;
class EndListeningContext;
class CopyFromClipContext;
@@ -362,6 +363,11 @@ public:
voidSetTabNo(SCTAB nNewTab);
voidFindRangeNamesInUse(SCROW nRow1, SCROW nRow2,
std::setsal_uInt16 rIndexes) const;
+void PreprocessRangeNameUpdate(
+sc::EndListeningContext rEndListenCxt, sc::CompileFormulaContext
rCompileCxt );
+
+void PostprocessRangeNameUpdate( sc::CompileFormulaContext rCompileCxt );
+
const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 nWhich ) const;
const ScPatternAttr*GetPattern( SCROW nRow ) const;
const ScPatternAttr*GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow
) const;
@@ -463,7 +469,6 @@ public:
void CompileDBFormula( sc::CompileFormulaContext rCxt );
void CompileDBFormula( sc::CompileFormulaContext rCxt, bool
bCreateFormulaString );
-void CompileNameFormula(
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 75741, which changed state. Bug 75741 Summary: Calc crashes when modifying a named range https://bugs.freedesktop.org/show_bug.cgi?id=75741 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - desktop/inc desktop/source sw/source
desktop/inc/liblibreoffice.h|9 ++---
desktop/inc/liblibreoffice.hxx |9 +++--
desktop/source/lib/init.cxx | 12 ++--
sw/source/filter/html/htmlflywriter.cxx | 12 ++--
sw/source/filter/html/htmlplug.cxx | 19 ++-
5 files changed, 43 insertions(+), 18 deletions(-)
New commits:
commit 930f669be1100bfa1447f60cc379d51d18224dff
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Apr 8 17:50:04 2014 +0200
liblo: Return early everywhere where we potentially export images.
To avoid searching the node(s).
Change-Id: I1ddf962113ead192435c174ff3bf607596e4bfc3
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index 6060530..e7d5c4d 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -809,7 +809,7 @@ Writer OutHTML_Image( Writer rWrt, const SwFrmFmt
rFrmFmt,
const sal_Char *pMarkType,
const ImageMap *pAltImgMap )
{
-SwHTMLWriter rHTMLWrt = (SwHTMLWriter)rWrt;
+SwHTMLWriter rHTMLWrt = static_castSwHTMLWriter(rWrt);
if (rHTMLWrt.mbSkipImages)
return rHTMLWrt;
@@ -1439,6 +1439,11 @@ static Writer OutHTML_FrmFmtAsDivOrSpan( Writer rWrt,
static Writer OutHTML_FrmFmtAsImage( Writer rWrt, const SwFrmFmt rFrmFmt,
sal_Bool /*bInCntnr*/ )
{
+SwHTMLWriter rHTMLWrt = static_castSwHTMLWriter(rWrt);
+
+if (rHTMLWrt.mbSkipImages)
+return rWrt;
+
ImageMap aIMap;
Graphic aGraphic( ((SwFrmFmt )rFrmFmt).MakeGraphic( aIMap ) );
Size aSz( 0, 0 );
@@ -1452,7 +1457,10 @@ static Writer OutHTML_FrmFmtAsImage( Writer rWrt,
const SwFrmFmt rFrmFmt,
static Writer OutHTML_FrmFmtGrfNode( Writer rWrt, const SwFrmFmt rFrmFmt,
sal_Bool bInCntnr )
{
-SwHTMLWriter rHTMLWrt = (SwHTMLWriter)rWrt;
+SwHTMLWriter rHTMLWrt = static_castSwHTMLWriter(rWrt);
+
+if (rHTMLWrt.mbSkipImages)
+return rWrt;
const SwFmtCntnt rFlyCntnt = rFrmFmt.GetCntnt();
sal_uLong nStt = rFlyCntnt.GetCntntIdx()-GetIndex()+1;
diff --git a/sw/source/filter/html/htmlplug.cxx
b/sw/source/filter/html/htmlplug.cxx
index 421239b..f124b6b 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1247,7 +1247,10 @@ Writer OutHTML_FrmFmtOLENode( Writer rWrt, const
SwFrmFmt rFrmFmt,
Writer OutHTML_FrmFmtOLENodeGrf( Writer rWrt, const SwFrmFmt rFrmFmt,
sal_Bool bInCntnr )
{
-SwHTMLWriter rHTMLWrt = (SwHTMLWriter)rWrt;
+SwHTMLWriter rHTMLWrt = static_castSwHTMLWriter(rWrt);
+
+if (rHTMLWrt.mbSkipImages)
+return rWrt;
const SwFmtCntnt rFlyCntnt = rFrmFmt.GetCntnt();
sal_uLong nStt = rFlyCntnt.GetCntntIdx()-GetIndex()+1;
@@ -1257,14 +1260,12 @@ Writer OutHTML_FrmFmtOLENodeGrf( Writer rWrt, const
SwFrmFmt rFrmFmt,
if( !pOLENd )
return rWrt;
-{
-Graphic aGraphic( *pOLENd-GetGraphic() );
-sal_uLong nFlags = bInCntnr ? HTML_FRMOPTS_GENIMG_CNTNR
- : HTML_FRMOPTS_GENIMG;
-OutHTML_Image( rWrt, rFrmFmt, aGraphic,
- pOLENd-GetTitle(), pOLENd-GetTwipSize(),
- nFlags, ole );
-}
+Graphic aGraphic( *pOLENd-GetGraphic() );
+sal_uLong nFlags = bInCntnr ? HTML_FRMOPTS_GENIMG_CNTNR
+: HTML_FRMOPTS_GENIMG;
+OutHTML_Image( rWrt, rFrmFmt, aGraphic,
+pOLENd-GetTitle(), pOLENd-GetTwipSize(),
+nFlags, ole );
return rWrt;
}
commit 55e39c72d6ac462b201dc0ae0ab0c610a0f13056
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Apr 8 17:39:10 2014 +0200
liblo: new saveAsWithOptions function
To not break API compatibility of libLO, add a new saveAsWithOptions
function and revert the old saveAs to initial state.
Change-Id: If245c0261a932b6ed5d65e20cb1b6d8bd1c50ce6
diff --git a/desktop/inc/liblibreoffice.h b/desktop/inc/liblibreoffice.h
index e9df566..87111c4 100644
--- a/desktop/inc/liblibreoffice.h
+++ b/desktop/inc/liblibreoffice.h
@@ -35,14 +35,17 @@ struct _LibreOfficeDocument
void (*destroy) (LibreOfficeDocument* pThis);
int (*saveAs) (LibreOfficeDocument* pThis,
const char *pUrl,
- const char *pFormat,
- const char *pFilterOptions);
+ const char *pFormat);
+ int (*saveAsWithOptions) (LibreOfficeDocument* pThis,
+const char *pUrl,
+const char *pFormat,
+const char *pFilterOptions);
};
LibreOffice* lo_init (const char* pInstallPath);
#ifdef __cplusplus
- }
+}
#endif
#endif
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index ef01cb3..29d3f72
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a26036cbfd9a2815d805359d936bf2cabe37e40 Author: Jan Holesovsky ke...@collabora.com Date: Tue Apr 8 18:50:22 2014 +0200 hidpi: Forgotten rounding. Change-Id: Ie790b40ac86708768f52084538aa08f99df7def6 diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index ef6e2bb..7d6c3cd 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -865,7 +865,7 @@ static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI) // eg. fdo#77059 - set the value from which we do consider the // screen hi-dpi to greater than 168 if (nDPI 168) -nResult = std::max(sal_Int32(1), (nDPI) / 96); +nResult = std::max(sal_Int32(1), (nDPI + 48) / 96); #endif return nResult; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excrecds.cxx | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit 9a0ac1dd5154542f8cea0772c7c7c5d526cf5a2f
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 20:05:23 2014 +0200
write protectedRange elements to OOXML
Change-Id: I3b48d6adb3008856cc8ed8e9f0c8a3dbbccaed3f
diff --git a/sc/source/filter/excel/excrecds.cxx
b/sc/source/filter/excel/excrecds.cxx
index 4dc1243..f45ba18 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -520,6 +520,33 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream
rStrm )
XML_pivotTables, pTabProtect-isOptionEnabled(
ScTableProtection::PIVOT_TABLES ) ? XclXmlUtils::ToPsz( false ) : NULL,
XML_selectUnlockedCells, pTabProtect-isOptionEnabled(
ScTableProtection::SELECT_UNLOCKED_CELLS ) ? NULL : XclXmlUtils::ToPsz( true ),
FSEND );
+
+const ::std::vectorScEnhancedProtection rProts(
pTabProtect-getEnhancedProtection());
+if (!rProts.empty())
+{
+rWorksheet-startElement( XML_protectedRanges, FSEND);
+for (::std::vectorScEnhancedProtection::const_iterator it(
rProts.begin()), end( rProts.end());
+it != end; ++it)
+{
+SAL_WARN_IF( (*it).maSecurityDescriptorXML.isEmpty()
!(*it).maSecurityDescriptor.empty(),
+sc.filter, XclExpSheetProtection::SaveXml: loosing
BIFF security descriptor);
+rWorksheet-singleElement( XML_protectedRange,
+XML_name, (*it).maTitle.isEmpty() ? NULL :
XclXmlUtils::ToOString( (*it).maTitle).getStr(),
+XML_securityDescriptor,
(*it).maSecurityDescriptorXML.isEmpty() ? NULL : XclXmlUtils::ToOString(
(*it).maSecurityDescriptorXML).getStr(),
+/* XXX 'password' is not part of OOXML, but Excel2013
+ * writes it if loaded from BIFF, in which case
+ * 'algorithmName', 'hashValue', 'saltValue' and
+ * 'spinCount' are absent; so do we if it was present.
*/
+XML_password, (*it).mnPasswordVerifier ?
OString::number( (*it).mnPasswordVerifier, 16).getStr() : NULL,
+XML_algorithmName, (*it).maAlgorithmName.isEmpty() ?
NULL : XclXmlUtils::ToOString( (*it).maAlgorithmName).getStr(),
+XML_hashValue, (*it).maHashValue.isEmpty() ? NULL :
XclXmlUtils::ToOString( (*it).maHashValue).getStr(),
+XML_saltValue, (*it).maSaltValue.isEmpty() ? NULL :
XclXmlUtils::ToOString( (*it).maSaltValue).getStr(),
+XML_spinCount, (*it).mnSpinCount ? OString::number(
(*it).mnSpinCount).getStr() : NULL,
+XML_sqref, (*it).maRangeList.Is() ?
XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : NULL,
+FSEND);
+}
+rWorksheet-endElement( XML_protectedRanges);
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/inc
desktop/inc/liblibreoffice.hxx |4
1 file changed, 4 insertions(+)
New commits:
commit 874a9b46cb54e4c05e262e5d7490790a08ea0c55
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Apr 8 19:09:22 2014 +0200
liblo: Older versions do not have saveAsWithOptions yet.
Change-Id: I41b15e81f2e3c5c413b73382a1f55d79a4f7103a
diff --git a/desktop/inc/liblibreoffice.hxx b/desktop/inc/liblibreoffice.hxx
index 29d3f72..3afdc4b 100644
--- a/desktop/inc/liblibreoffice.hxx
+++ b/desktop/inc/liblibreoffice.hxx
@@ -42,6 +42,10 @@ public:
inline bool saveAsWithOptions(const char* pUrl, const char* pFormat =
NULL, const char* pFilterOptions = NULL)
{
+// available since LibreOffice 4.3
+if (!mpDoc-saveAsWithOptions)
+return false;
+
return mpDoc-saveAsWithOptions(mpDoc, pUrl, pFormat, pFilterOptions);
}
};
___
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/inc/namedlg.hxx |5 +++--
sc/source/ui/inc/namemgrtable.hxx | 12
sc/source/ui/namedlg/namedlg.cxx | 15 +++
sc/source/ui/namedlg/namemgrtable.cxx | 14 --
4 files changed, 34 insertions(+), 12 deletions(-)
New commits:
commit ffaaf35206b8f049bb9e9ffd7a85c8ebd758a21c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Apr 8 14:34:13 2014 -0400
fdo#71729: Fill the range edit boxes after the table is fully initialized.
Otherwise the range formula expression would not be available yet.
Change-Id: If9c5040366f9038e8094fd5448ca5e4ee2e73edd
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 8c9cb91..e85672c 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -41,7 +41,7 @@ class ScDocument;
//logic behind the manage names dialog
-class ScNameDlg : public ScAnyRefDlg
+class ScNameDlg : public ScAnyRefDlg, public ScRangeManagerTable::InitListener
{
private:
Edit* m_pEdName;
@@ -131,9 +131,10 @@ public:
virtual voidSetActive() SAL_OVERRIDE;
virtual boolClose() SAL_OVERRIDE;
+virtual void tableInitialized() SAL_OVERRIDE;
+
void GetRangeNames(boost::ptr_mapOUString, ScRangeName rRangeMap);
void SetEntry(const OUString rName, const OUString rScope);
-
};
#endif // SC_NAMEDLG_HXX
diff --git a/sc/source/ui/inc/namemgrtable.hxx
b/sc/source/ui/inc/namemgrtable.hxx
index ec8c305..4e31794 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -35,6 +35,14 @@ struct ScRangeNameLine
//Need some sort of a filter to handle several range names
class SC_DLLPUBLIC ScRangeManagerTable : public SvSimpleTable
{
+public:
+class InitListener
+{
+public:
+virtual ~InitListener();
+virtual void tableInitialized() = 0;
+};
+
private:
OUString maGlobalString;
@@ -46,6 +54,8 @@ private:
std::mapSvTreeListEntry*, bool maCalculatedFormulaEntries;
const ScAddress maPos;
+InitListener* mpInitListener;
+
void GetLine(ScRangeNameLine aLine, SvTreeListEntry* pEntry);
void Init();
void CheckForFormulaString();
@@ -60,6 +70,8 @@ public:
virtual void Resize() SAL_OVERRIDE;
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
+void setInitListener( InitListener* pListener );
+
void addEntry( const ScRangeNameLine rLine, bool bSetCurEntry = true );
void DeleteSelectedEntries();
void SetEntry( const ScRangeNameLine rLine );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 89ab319..ebddc78 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -118,6 +118,7 @@ void ScNameDlg::Init()
pCtrl-set_height_request(pCtrl-GetTextHeight()*12);
m_pRangeManagerTable = new ScRangeManagerTable(*pCtrl, maRangeMap,
maCursorPos);
+m_pRangeManagerTable-setInitListener(this);
m_pRangeManagerTable-SetSelectHdl( LINK( this, ScNameDlg,
SelectionChangedHdl_Impl ) );
m_pRangeManagerTable-SetDeselectHdl( LINK( this, ScNameDlg,
SelectionChangedHdl_Impl ) );
@@ -145,13 +146,7 @@ void ScNameDlg::Init()
m_pLbScope-InsertEntry(aTabName);
}
-if (m_pRangeManagerTable-GetSelectionCount())
-{
-SelectionChanged();
-}
-
CheckForEmptyTable();
-
}
bool ScNameDlg::IsRefInputMode() const
@@ -184,6 +179,12 @@ bool ScNameDlg::Close()
return DoClose( ScNameDlgWrapper::GetChildWindowId() );
}
+void ScNameDlg::tableInitialized()
+{
+if (m_pRangeManagerTable-GetSelectionCount())
+SelectionChanged();
+}
+
void ScNameDlg::CheckForEmptyTable()
{
if (!m_pRangeManagerTable-GetEntryCount())
@@ -415,8 +416,6 @@ void ScNameDlg::NameModified()
void ScNameDlg::SelectionChanged()
{
-
-
//don't update if we have just modified due to user input
if (!mbNeedUpdate)
{
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index f4a0a7a..89f72e7 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -33,11 +33,14 @@ static OUString createEntryString(const ScRangeNameLine
rLine)
return aRet;
}
+ScRangeManagerTable::InitListener::~InitListener() {}
+
ScRangeManagerTable::ScRangeManagerTable( SvSimpleTableContainer rParent,
boost::ptr_mapOUString, ScRangeName rRangeMap, const ScAddress rPos ):
SvSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN |
WB_TABSTOP ),
maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)),
mrRangeMap( rRangeMap ),
-maPos( rPos )
+maPos( rPos ),
+mpInitListener(NULL)
{
static long aStaticTabs[] = {3, 0, 0, 0 };
SetTabs( aStaticTabs[0], MAP_PIXEL );
@@ -80,6 +83,9 @@ void ScRangeManagerTable::StateChanged( StateChangedType
nStateChange )
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 385e6e508af0f2a5c2bd72209ba94f58e8c92f70 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 8 20:53:08 2014 +0200 -Werror,-Wunused-parameter Change-Id: I85fbbb3aa9e8f124fddfdc46655e59e12d761f71 diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 7d6c3cd..0f98332 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -866,6 +866,8 @@ static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI) // screen hi-dpi to greater than 168 if (nDPI 168) nResult = std::max(sal_Int32(1), (nDPI + 48) / 96); +#else +(void)nDPI; #endif return nResult; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/unodraw/unomod.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit e7d646b46e152131b1d51f0d0719afd72c41c744
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Apr 8 20:46:56 2014 +0200
cppcheck: multiCondition
style Expression is always false because 'else if' condition matches
previous condition
See
http://nabble.documentfoundation.org/Cppcheck-reports-else-if-condition-matches-previous-condition-svx-td4104268.html
Change-Id: I00a41a3ffc6aafd9aee6da09ab2372f155529263
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 073719b..223b73a 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -457,10 +457,6 @@ uno::Reference uno::XInterface SAL_CALL
SvxUnoDrawingModel::createInstance( c
{
nType = OBJ_OLE2;
}
-else if( aTypeName.startsWith( TableShape ) )
-{
-nType = OBJ_OLE2;
-}
else if( aTypeName.startsWith( OrgChartShape ) )
{
nType = OBJ_OLE2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck reports 'else if' condition matches previous condition (svx)
On 08/04/2014 13:10, Caolán McNamara wrote:
On Sat, 2014-04-05 at 15:51 -0700, julien2412 wrote:
Hello,
Cppcheck reported this
svx/source/unodraw/unomod.cxx
492 multiCondition style Expression is always false because 'else if'
condition matches previous condition at line 460.
Remark: It's a new kind of cppcheck detection and there are quite a lot of
false positives (at least for LO) for the moment.
Here's the code:
460 else if( aTypeName.startsWith( TableShape ) )
461 {
462 nType = OBJ_OLE2;
463 }
...
492 else if( aTypeName.startsWith( TableShape ) )
493 {
494 nType = OBJ_TABLE;
495 }
see
http://opengrok.libreoffice.org/xref/core/svx/source/unodraw/unomod.cxx#460
Which one of this block is ok?
I rather think the second one is the correct one, seeing as
svx/source/unodraw/unopage.cxx maps TableShape to OBJ_TABLE as well.
At one point tables in impress/draw were embedded calc spreadsheets, and
now they are real SdrObject things to that would also make sense.
On the other hand that will change the current situation and I have no
idea what makes the code enter that method so definitely a make check
case at least :-)
I've just pushed the fix on master. make check on top level was ok.
Searching in git history during make check, I found this commit from 2008:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d20a47c3d50d0a88543b2355ec7340fc7455984
which references OBJ_TABLE
whereas OBJ_OLE2 was in 2001 (see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e24bc241b69da6789351d9bf82eab5119f09c16c)
I submitted a gerrit review 4.2:
https://gerrit.libreoffice.org/8897
Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/filedlghelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 54f2d50360e596914deb80370e9d4671e16ba388 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Apr 8 21:10:55 2014 +0200 loplugin:literaltoboolconversion Change-Id: I7a312fb31774e198b71e5f733a2932d6b9607f57 diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index bfd215f..8e1eb0c 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1224,7 +1224,7 @@ void FileDialogHelper_Impl::preExecute() #else // However, the Mac OS X implementation's pickers run modally in execute and so the event doesn't // get through in time... so we call the methods directly -enablePasswordBox( sal_True ); +enablePasswordBox( true ); updateFilterOptionsBox( ); updateSelectionBox( ); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa
sc/qa/unit/data/xls/enhanced-protection.xls |binary
sc/qa/unit/data/xlsx/enhanced-protection.xlsx |binary
sc/qa/unit/filters-test.cxx | 30 +-
3 files changed, 25 insertions(+), 5 deletions(-)
New commits:
commit b0a6b164951c692cf5940d0c6e0c102603738f95
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 21:14:21 2014 +0200
add .xlsx unit test for enhanced protection
Change-Id: I8a6c6295998c6545318f6b490d1f617d6178013b
diff --git a/sc/qa/unit/data/xlsx/enhanced-protection.xlsx
b/sc/qa/unit/data/xlsx/enhanced-protection.xlsx
new file mode 100644
index 000..d9225a2
Binary files /dev/null and b/sc/qa/unit/data/xlsx/enhanced-protection.xlsx
differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 0072412..43692b5 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -71,6 +71,7 @@ public:
void testSharedFormulaXLSX();
void testLegacyCellAnchoredRotatedShape();
void testEnhancedProtectionXLS();
+void testEnhancedProtectionXLSX();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testCVEs);
@@ -85,6 +86,7 @@ public:
CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
CPPUNIT_TEST(testEnhancedProtectionXLS);
+CPPUNIT_TEST(testEnhancedProtectionXLSX);
CPPUNIT_TEST_SUITE_END();
@@ -499,12 +501,8 @@ void ScFiltersTest::testLegacyCellAnchoredRotatedShape()
}
}
-void ScFiltersTest::testEnhancedProtectionXLS()
+void testEnhancedProtectionImpl( ScDocument* pDoc )
{
-ScDocShellRef xDocSh = loadDoc(enhanced-protection., XLS);
-CPPUNIT_ASSERT(xDocSh.Is());
-ScDocument* pDoc = xDocSh-GetDocument();
-
const ScTableProtection* pProt = pDoc-GetTabProtection(0);
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 0, 0, 0, 0, 0))); //
locked
@@ -516,6 +514,26 @@ void ScFiltersTest::testEnhancedProtectionXLS()
CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 1, 0, 0, 2, 0))); //
union of two different editables
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 0, 0, 0, 1, 0))); //
union of locked and editable
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 2, 0, 0, 3, 0))); //
union of editable and password editable
+}
+
+void ScFiltersTest::testEnhancedProtectionXLS()
+{
+ScDocShellRef xDocSh = loadDoc(enhanced-protection., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+
+testEnhancedProtectionImpl( pDoc);
+
+xDocSh-DoClose();
+}
+
+void ScFiltersTest::testEnhancedProtectionXLSX()
+{
+ScDocShellRef xDocSh = loadDoc(enhanced-protection., XLSX);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+
+testEnhancedProtectionImpl( pDoc);
xDocSh-DoClose();
}
commit 6d658afd403d40071206f7e83cd7bd68d826a65b
Author: Eike Rathke er...@redhat.com
Date: Tue Apr 8 21:09:13 2014 +0200
add non-editable test for descriptor
Change-Id: I0a40e9e26e09e970023a749b7fd0a67ac29d1bc1
diff --git a/sc/qa/unit/data/xls/enhanced-protection.xls
b/sc/qa/unit/data/xls/enhanced-protection.xls
index 00cc6e6..26e2327 100644
Binary files a/sc/qa/unit/data/xls/enhanced-protection.xls and
b/sc/qa/unit/data/xls/enhanced-protection.xls differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index b6d7d76..0072412 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -511,6 +511,8 @@ void ScFiltersTest::testEnhancedProtectionXLS()
CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 1, 0, 0, 1, 0))); //
editable without password
CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 2, 0, 0, 2, 0))); //
editable without password
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 3, 0, 0, 3, 0))); //
editable with password foo
+CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 4, 0, 0, 4, 0))); //
editable with descriptor
+CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 5, 0, 0, 5, 0))); //
editable with descriptor and password foo
CPPUNIT_ASSERT( pProt-isBlockEditable( ScRange( 0, 1, 0, 0, 2, 0))); //
union of two different editables
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 0, 0, 0, 1, 0))); //
union of locked and editable
CPPUNIT_ASSERT( !pProt-isBlockEditable( ScRange( 0, 2, 0, 0, 3, 0))); //
union of editable and password editable
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgfilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 09eacfbd913f682821d7ef74e5c073d11d493c47
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Apr 8 21:38:49 2014 +0200
loplugin:implicitboolconversion
Change-Id: I82ec1212b29d1e5b0e56e81952fb1b514b5798d0
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index fc70d83..c47ce43 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -236,7 +236,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence
PropertyValue rDescripto
if (xSelection-getSelection() = aSelection)
{
-bGotSelection = (sal_True == ( aSelection =
maShapeSelection ));
+bGotSelection = ( aSelection = maShapeSelection );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About using sdk
Ok I finally gave a new try and I put result here: https://bugs.freedesktop.org/show_bug.cgi?id=77028#c2 I could open the pptx then export to PDF manually but not open pptx + export pdf automatically, ie without opening LO With soffice --nofirststartwizard --nologo --headless --norestore --invisible --accept=socket,host=localhost,port=2083,tcpNoDelay=1;urp; I got: warn:binaryurp:30232:6:binaryurp/source/reader.cxx:126: caught UNO exception 'acc_socket.cxx:SocketConnection::read: error - Succￃﾨs' warn:binaryurp:30232:6:binaryurp/source/bridge.cxx:866: undisposed bridge, potential deadlock ahead Julien -- View this message in context: http://nabble.documentfoundation.org/About-using-sdk-tp4104178p4104556.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source unotools/source
sw/source/ui/index/cnttab.cxx |1 -
unotools/source/config/pathoptions.cxx |3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d2a73cf32375608a93175a221c769d667140d073
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 8 21:23:29 2014 +0200
SwMultiTOXTabDialog: fortunately the bogus SetTemplatePath call
... fails with exception and does not modify the configuration.
(regression from 1b0f7ee1e04d7b0fe81f7458ae2116615e0f6889)
Change-Id: I0e12cf0b531bc68147cf2be22c28c75c0f05f3ff
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index a296eeb..8737774 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -476,7 +476,6 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl )
OUString sTemplate(internal/idxexample.odt);
SvtPathOptions aOpt;
-aOpt.SetTemplatePath(OUString(LIBO_SHARE_FOLDER
/template/common));
bool bExist = aOpt.SearchFile( sTemplate,
SvtPathOptions::PATH_TEMPLATE );
if(!bExist)
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index 63a3fbc..1900531 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -287,8 +287,9 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths
ePath, const OUString
{
m_xPathSettings-setFastPropertyValue( m_aMapEnumToPropHandle[
(sal_Int32)ePath], a );
}
-catch (const Exception)
+catch (const Exception e)
{
+SAL_WARN(unotools.config, SetPath: exception: e.Message);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/inc
writerfilter/inc/WriterFilterDllApi.hxx | 18 --
writerfilter/inc/rtftok/RTFDocument.hxx |4 ++--
2 files changed, 2 insertions(+), 20 deletions(-)
New commits:
commit 07f7a26e2f293c11570beb3a4c0c8c15e96fa1f6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Apr 8 21:53:05 2014 +0200
writerfilter: remove no longer needed WRITERFILTER_*TOK_DLLPUBLIC
Change-Id: I1dc7a935e3004b0ce0b0f943405b2a79992fa982
diff --git a/writerfilter/inc/WriterFilterDllApi.hxx
b/writerfilter/inc/WriterFilterDllApi.hxx
index df89c70..a02d47a 100644
--- a/writerfilter/inc/WriterFilterDllApi.hxx
+++ b/writerfilter/inc/WriterFilterDllApi.hxx
@@ -22,30 +22,12 @@
#include sal/types.h
-#if defined(WRITERFILTER_DOCTOK_DLLIMPLEMENTATION)
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_DOCTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
-#if defined(WRITERFILTER_RTFTOK_DLLIMPLEMENTATION)
-#define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_RTFTOK_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION)
#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#if defined(WRITERFILTER_WRITERFILTER_UNO_DLLIMPLEMENTATION)
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define WRITERFILTER_WRITERFILTER_UNO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#endif /* INCLUDED_WRITERFILTERDLLAPI_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx
b/writerfilter/inc/rtftok/RTFDocument.hxx
index 2515e4a..76f749c 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/writerfilter/inc/rtftok/RTFDocument.hxx
@@ -21,7 +21,7 @@ namespace writerfilter
namespace rtftok
{
/// The RTFDocument opens and resolves the RTF document.
-class WRITERFILTER_RTFTOK_DLLPUBLIC RTFDocument
+class RTFDocument
: public writerfilter::ReferenceStream
{
public:
@@ -38,7 +38,7 @@ public:
};
/// Interface to create an RTFDocument instance.
-class WRITERFILTER_RTFTOK_DLLPUBLIC RTFDocumentFactory
+class RTFDocumentFactory
{
public:
static RTFDocument::Pointer_t
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67712, which changed state. Bug 67712 Summary: FORMCONTROLS: anchored to cell but changes position after reopening https://bugs.freedesktop.org/show_bug.cgi?id=67712 What|Removed |Added Status|REOPENED|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
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67712, which changed state. Bug 67712 Summary: FORMCONTROLS: anchored to cell but changes position after reopening https://bugs.freedesktop.org/show_bug.cgi?id=67712 What|Removed |Added Status|RESOLVED|REOPENED 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: 2 commits - sc/source
sc/source/filter/orcus/interface.cxx | 16 ++--
sc/source/ui/drawfunc/fuins2.cxx | 10 +++---
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 34669e634d7cb18099e8d27eed10e5b816237411
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Apr 9 04:55:48 2014 +0200
preserve selection if chart creation is cancelled, cp#152
Change-Id: Ia8edb3e4c55e1a52515a761a60c4b1a59c990e1c
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index a369d39..75ab416 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -443,6 +443,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
// get range
OUString aRangeString;
ScRange aPositionRange; // cell range for chart positioning
+ScMarkData aMark = pViewSh-GetViewData()-GetMarkData();
if( pReqArgs )
{
const SfxPoolItem* pItem;
@@ -453,15 +454,14 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
}
else
{
-ScMarkData rMark = pViewSh-GetViewData()-GetMarkData();
bool bAutomaticMark = false;
-if ( !rMark.IsMarked() !rMark.IsMultiMarked() )
+if ( !aMark.IsMarked() !aMark.IsMultiMarked() )
{
pViewSh-GetViewData()-GetView()-MarkDataArea( true );
bAutomaticMark = true;
}
-ScMarkData aMultiMark( rMark );
+ScMarkData aMultiMark( aMark );
aMultiMark.MarkToMulti();
ScRangeList aRanges;
@@ -730,6 +730,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
// leave the draw shell
pViewShell-SetDrawShell( false );
+
+// reset marked cell area
+
+
pViewSh-GetViewData()-GetViewShell()-SetMarkData(aMark);
}
else
{
commit d9cde132b5a98dee61e0d0ce228e5008e699f37d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Apr 8 02:56:13 2014 +0200
add array cell import to orcus import
Change-Id: I4f6dab039389e6b07486162df8bf939b557e7ed8
diff --git a/sc/source/filter/orcus/interface.cxx
b/sc/source/filter/orcus/interface.cxx
index 7a89b62..085a2d6 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -358,9 +358,21 @@ void ScOrcusSheet::set_shared_formula(os::row_t row,
os::col_t col, size_t sinde
}
void ScOrcusSheet::set_array_formula(
-os::row_t /*row*/, os::col_t /*col*/, os::formula_grammar_t /*grammar*/,
-const char* /*p*/, size_t /*n*/, os::row_t /*array_rows*/, os::col_t
/*array_cols*/)
+os::row_t row, os::col_t col, os::formula_grammar_t grammar,
+const char* p, size_t n, os::row_t array_rows, os::col_t array_cols)
{
+formula::FormulaGrammar::Grammar eGrammar = getCalcGrammarFromOrcus(
grammar );
+OUString aFormula(p, n, RTL_TEXTENCODING_UTF8);
+
+ScRange aRange(col, row, mnTab, col+array_cols, row + array_rows, mnTab);
+
+ScCompiler aComp(mrDoc.getDoc(), aRange.aStart);
+aComp.SetGrammar(eGrammar);
+boost::scoped_ptrScTokenArray pArray(aComp.CompileString(aFormula));
+if (!pArray)
+return;
+
+mrDoc.setMatrixCells(aRange, *pArray, eGrammar);
}
void ScOrcusSheet::set_array_formula(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source
sc/source/ui/drawfunc/fuins2.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit a7e2b6069862ff0f5f37ccdc22ec87f9328ecc5d
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Apr 9 04:55:48 2014 +0200
preserve selection if chart creation is cancelled, cp#152
Change-Id: Ia8edb3e4c55e1a52515a761a60c4b1a59c990e1c
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 9db9ac9..3060fda 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -445,6 +445,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
// get range
OUString aRangeString;
ScRange aPositionRange; // cell range for chart positioning
+ScMarkData aMark = pViewSh-GetViewData()-GetMarkData();
if( pReqArgs )
{
const SfxPoolItem* pItem;
@@ -455,15 +456,14 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
}
else
{
-ScMarkData rMark = pViewSh-GetViewData()-GetMarkData();
bool bAutomaticMark = false;
-if ( !rMark.IsMarked() !rMark.IsMultiMarked() )
+if ( !aMark.IsMarked() !aMark.IsMultiMarked() )
{
pViewSh-GetViewData()-GetView()-MarkDataArea( sal_True );
bAutomaticMark = true;
}
-ScMarkData aMultiMark( rMark );
+ScMarkData aMultiMark( aMark );
aMultiMark.MarkToMulti();
ScRangeList aRanges;
@@ -732,6 +732,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
// leave the draw shell
pViewShell-SetDrawShell( false );
+
+// reset marked cell area
+
+
pViewSh-GetViewData()-GetViewShell()-SetMarkData(aMark);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sc/source
sc/source/ui/drawfunc/fuins2.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 9c5a8f4c959265a87be67cc9f01e6c73fb556abb
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Wed Apr 9 04:55:48 2014 +0200
preserve selection if chart creation is cancelled, cp#152
Change-Id: Ia8edb3e4c55e1a52515a761a60c4b1a59c990e1c
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 3faea47..6e9f32f 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -453,6 +453,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
// get range
OUString aRangeString;
ScRange aPositionRange; // cell range for chart positioning
+ScMarkData aMark = pViewSh-GetViewData()-GetMarkData();
if( pReqArgs )
{
const SfxPoolItem* pItem;
@@ -463,15 +464,14 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
}
else
{
-ScMarkData rMark = pViewSh-GetViewData()-GetMarkData();
bool bAutomaticMark = false;
-if ( !rMark.IsMarked() !rMark.IsMultiMarked() )
+if ( !aMark.IsMarked() !aMark.IsMultiMarked() )
{
pViewSh-GetViewData()-GetView()-MarkDataArea( sal_True );
bAutomaticMark = true;
}
-ScMarkData aMultiMark( rMark );
+ScMarkData aMultiMark( aMark );
aMultiMark.MarkToMulti();
ScRangeList aRanges;
@@ -741,6 +741,10 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh,
Window* pWin, ScDrawView*
// leave the draw shell
pViewShell-SetDrawShell( false );
+
+// reset marked cell area
+
+
pViewSh-GetViewData()-GetViewShell()-SetMarkData(aMark);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||77206 -- 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
