LibreOffice Gerrit News for core on 2013-10-21
Moin! * Open changes on master for project core changed in the last 25 hours: + remove RTL_CONSTASCII_(U)STRINGPARAM in https://gerrit.libreoffice.org/6352 from Christina Roßmanith + fdo#44134 adding Excel 2010 functions STDEV.P and STDEV.S in https://gerrit.libreoffice.org/6354 from Winfried Donkers * Merged changes on master for project core changed in the last 25 hours: + Bin pointless #ifdef'd code in https://gerrit.libreoffice.org/6256 from Khaled Hosny + fdo#70285 cleanup generated C++ code in https://gerrit.libreoffice.org/6315 from Noel Grandin + Fix breakpoint support for Xcode in https://gerrit.libreoffice.org/6358 from Roi Illouz + fdo#52622 - Reduce copy and paste code in https://gerrit.libreoffice.org/6356 from José Guilherme Vanz + L10n of SWF export options dialog in https://gerrit.libreoffice.org/6324 from Laurent BP + fix save several file on by reseting the xstorable on close in https://gerrit.libreoffice.org/6355 from Ptyl * 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: + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk Repository.mk
Repository.mk |1 + RepositoryExternal.mk | 17 ++--- 2 files changed, 15 insertions(+), 3 deletions(-) New commits: commit 670690e200e82be6a087ab57599e23a320dd5dde Author: David Tardon dtar...@redhat.com Date: Sun Oct 20 21:06:59 2013 +0200 fix registration path for ucpp Change-Id: I1a4d8f38dc0279bb427e07f97b96547c9d7d350f diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3877dc2..c23d894 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3033,7 +3033,7 @@ gb_ExternalExecutable__register_ucpp := else # ! SYSTEM_UCPP define gb_ExternalExecutable__register_ucpp -$(call gb_ExternalExecutable_set_internal,ucpp) +$(call gb_ExternalExecutable_set_internal,ucpp,$(INSTROOT_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build)) endef commit ce038cf8d75dde575643042e57addf559eb57059 Author: David Tardon dtar...@redhat.com Date: Sun Oct 20 20:43:46 2013 +0200 Revert ucpp is not an ExternalExecutable Wrong! It is. This reverts commit 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec. diff --git a/Repository.mk b/Repository.mk index cb876cb..5a92fd6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -728,6 +728,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\ genccode \ gencmn \ python \ + ucpp \ xmllint \ xsltproc \ )) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 20a4881..3877dc2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2953,13 +2953,11 @@ endef endif -ifeq (,$(SYSTEM_UCPP)) define gb_Executable__register_idlc $(call gb_Executable_add_runtime_dependencies,idlc,\ - $(call gb_Executable_get_target_for_build,ucpp) \ + $(call gb_ExternalExecutable_get_dependencies,ucpp) \ ) endef -endif define gb_Executable__register_localize $(call gb_Executable_add_runtime_dependencies,localize,\ @@ -3028,6 +3026,19 @@ endef endif # SYSTEM_LIBXSLT_FOR_BUILD +ifneq (,$(SYSTEM_UCPP)) + +gb_ExternalExecutable__register_ucpp := + +else # ! SYSTEM_UCPP + +define gb_ExternalExecutable__register_ucpp +$(call gb_ExternalExecutable_set_internal,ucpp) + +endef + +endif # SYSTEM_UCPP + ifeq (,$(PYTHON_FOR_BUILD)) define gb_ExternalExecutable__register_python ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Location for chart tests
Hi Markus, On Sat, Oct 19, 2013 at 10:03:42AM +0200, Markus Mohrhard markus.mohrh...@googlemail.com wrote: do you have any objections against having all chart tests in chart2? In my opinion the tests belong as close to the source code they test as possible and I would never look for a chart test in sw, sd or sc. It makes it hopefully a little bit easier for people working on chart code as they only need to execute the tests in chart2. No objection at all, makes sense. Maybe add a note about this in sw/qa/extras/README (no idea if something equivalent is there for sc/sd), so next time this is asked, we'll have it written down somewhere. :-) Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2d061fe93c077c3946376bdb2c63da943b4b0b1 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 21 09:13:43 2013 +0300 WaE: unreferenced local variable Change-Id: I9783f03e656049b4f3b7f0a26a7ae626db5a13f6 diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index fa8990d..7ddfcff 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -74,7 +74,7 @@ private: { mpParser-parse(); } -catch (const SAXParseException e) +catch (const SAXParseException) { mpParser-getEntity().getEvent( EXCEPTION ); mpParser-produce( EXCEPTION ); ___ 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 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 489d2eafa9c900ec3e4bcdc0340eb1f53656fd0c Author: David Tardon dtar...@redhat.com Date: Mon Oct 21 08:17:32 2013 +0200 bah, wrong dir Change-Id: I2789e457160912e5509102b68780947d2edbe424 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c23d894..d1aea96 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3033,7 +3033,7 @@ gb_ExternalExecutable__register_ucpp := else # ! SYSTEM_UCPP define gb_ExternalExecutable__register_ucpp -$(call gb_ExternalExecutable_set_internal,ucpp,$(INSTROOT_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,ucpp,$(INSTDIR_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build)) endef ___ 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 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Depends on||70664 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #13 from Alex Thurgood ipla...@yahoo.co.uk --- Adding 70664 - can not display images inserted into Firebird embedded db -- 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: vcl/generic vcl/inc
vcl/generic/glyphs/gcach_ftyp.cxx | 109 +- vcl/generic/glyphs/gcach_ftyp.hxx |2 vcl/inc/generic/glyphcache.hxx|1 3 files changed, 5 insertions(+), 107 deletions(-) New commits: commit 23e50c361b6a2dc6ff549a430449c152ec80f500 Author: Khaled Hosny khaledho...@eglug.org Date: Mon May 13 21:06:18 2013 +0200 Drop support for non-Unicode fonts They fell out of use before I had my first computer. This has no relation to the input text encoding being used. Change-Id: Ie1fde3c3578c80d77ebd63531e74c13931d46bbc Reviewed-on: https://gerrit.libreoffice.org/6258 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 25818d4..c1f2640 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -552,7 +552,6 @@ ServerFont::ServerFont( const FontSelectPattern rFSD, FtFontInfo* pFI ) maFaceFT( NULL ), maSizeFT( NULL ), mbFaceOk( false ), -maRecodeConverter( NULL ), mpLayoutEngine( NULL ) { // TODO: move update of mpFontEntry into FontEntry class when @@ -586,84 +585,15 @@ ServerFont::ServerFont( const FontSelectPattern rFSD, FtFontInfo* pFI ) if( rc != FT_Err_Ok ) return; -// prepare for font encodings other than unicode or symbol -FT_Encoding eEncoding = FT_ENCODING_UNICODE; +FT_Select_Charmap(maFaceFT, FT_ENCODING_UNICODE); + if( mpFontInfo-IsSymbolFont() ) { -if( FT_IS_SFNT( maFaceFT ) ) -eEncoding = ft_encoding_symbol; -else +FT_Encoding eEncoding = FT_ENCODING_MS_SYMBOL; +if (!FT_IS_SFNT(maFaceFT)) eEncoding = FT_ENCODING_ADOBE_CUSTOM; // freetype wants this for PS symbol fonts -} -rc = FT_Select_Charmap( maFaceFT, eEncoding ); -// no standard encoding applies = we need an encoding converter -if( rc != FT_Err_Ok ) -{ -rtl_TextEncoding eRecodeFrom = RTL_TEXTENCODING_UNICODE; -for( int i = maFaceFT-num_charmaps; --i = 0; ) -{ -const FT_CharMap aCM = maFaceFT-charmaps[i]; -if( aCM-platform_id == TT_PLATFORM_MICROSOFT ) -{ -switch( aCM-encoding_id ) -{ -case TT_MS_ID_SJIS: -eEncoding = FT_ENCODING_SJIS; -eRecodeFrom = RTL_TEXTENCODING_SHIFT_JIS; -break; -case TT_MS_ID_GB2312: -eEncoding = FT_ENCODING_GB2312; -eRecodeFrom = RTL_TEXTENCODING_GB_2312; -break; -case TT_MS_ID_BIG_5: -eEncoding = FT_ENCODING_BIG5; -eRecodeFrom = RTL_TEXTENCODING_BIG5; -break; -case TT_MS_ID_WANSUNG: -eEncoding = FT_ENCODING_WANSUNG; -eRecodeFrom = RTL_TEXTENCODING_MS_949; -break; -case TT_MS_ID_JOHAB: -eEncoding = FT_ENCODING_JOHAB; -eRecodeFrom = RTL_TEXTENCODING_MS_1361; -break; -} -} -else if( aCM-platform_id == TT_PLATFORM_MACINTOSH ) -{ -switch( aCM-encoding_id ) -{ -case TT_MAC_ID_ROMAN: -eEncoding = FT_ENCODING_APPLE_ROMAN; -eRecodeFrom = RTL_TEXTENCODING_UNICODE; // TODO: use better match -break; -// TODO: add other encodings when Mac-only -// non-unicode fonts show up -} -} -else if( aCM-platform_id == TT_PLATFORM_ADOBE ) -{ -switch( aCM-encoding_id ) -{ -#ifdef TT_ADOBE_ID_LATIN1 -case TT_ADOBE_ID_LATIN1: // better unicode than nothing -eEncoding = FT_ENCODING_ADOBE_LATIN_1; -eRecodeFrom = RTL_TEXTENCODING_ISO_8859_1; -break; -#endif // TT_ADOBE_ID_LATIN1 -case TT_ADOBE_ID_STANDARD: // better unicode than nothing -eEncoding = FT_ENCODING_ADOBE_STANDARD; -eRecodeFrom = RTL_TEXTENCODING_UNICODE; // TODO: use better match -break; -} -} -} - -if( FT_Err_Ok != FT_Select_Charmap( maFaceFT, eEncoding ) ) -return; -if( eRecodeFrom != RTL_TEXTENCODING_UNICODE ) -maRecodeConverter = rtl_createUnicodeToTextConverter( eRecodeFrom ); +FT_Select_Charmap(maFaceFT, eEncoding); } mbFaceOk = true; @@ -774,9 +704,6 @@
[Libreoffice-commits] core.git: include/vcl vcl/generic vcl/headless vcl/inc vcl/unx
include/vcl/fontmanager.hxx | 17 - vcl/generic/fontmanager/fontmanager.cxx | 291 --- vcl/generic/glyphs/gcach_ftyp.cxx | 298 vcl/generic/glyphs/gcach_ftyp.hxx | 11 - vcl/generic/glyphs/gcach_layout.cxx |6 vcl/generic/glyphs/glyphcache.cxx | 35 --- vcl/generic/print/genpspgraphics.cxx| 44 vcl/generic/print/text_gfx.cxx | 22 -- vcl/headless/svptext.cxx| 54 - vcl/inc/generic/glyphcache.hxx | 35 --- vcl/inc/generic/printergfx.hxx |3 vcl/unx/generic/gdi/salgdi3.cxx | 53 - 12 files changed, 19 insertions(+), 850 deletions(-) New commits: commit 70d74e2ab1b08b3f21cbaff5e60c091694863b59 Author: Khaled Hosny khaledho...@eglug.org Date: Thu May 16 19:06:26 2013 +0200 Removed unused kerning stuff Kerning is just another font feature and is already handled by the layout engine, there is nothing special about it. Non of this seems to be used anywhere, anyway. Change-Id: Ia40c66ec186d11ab46d5d5256b09307a319318c0 Reviewed-on: https://gerrit.libreoffice.org/6259 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/include/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx index 2cc0ac9..a0196d1 100644 --- a/include/vcl/fontmanager.hxx +++ b/include/vcl/fontmanager.hxx @@ -129,14 +129,6 @@ struct CharacterMetric { return rOther.width != width || rOther.height != height; } }; -struct KernPair -{ -sal_Unicode first, second; -short int kern_x, kern_y; - -KernPair() : first( 0 ), second( 0 ), kern_x( 0 ), kern_y( 0 ) {} -}; - class FontCache; // a class to manage printable fonts @@ -175,12 +167,9 @@ class VCL_PLUGIN_PUBLIC PrintFontManager // a single pass, then all bits should be set charm_aPages[32]; -boolm_bKernPairsQueried; -std::list KernPair m_aXKernPairs; -std::list KernPair m_aYKernPairs; boost::unordered_map sal_Unicode, bool m_bVerticalSubstitutions; -PrintFontMetrics() : m_bKernPairsQueried( false ) {} +PrintFontMetrics() {} bool isEmpty() const { return m_aMetrics.empty(); } }; @@ -471,10 +460,6 @@ public: // the encoding vector contains -1 for non encoded glyphs const std::map sal_Unicode, sal_Int32 * getEncodingMap( fontID nFontID, const std::map sal_Unicode, OString ** ppNonEncoded ) const; -// to get font substitution transparently use the -// getKernPairs method of PrinterGfx -const std::list KernPair getKernPairs( fontID nFontID, bool bVertical = false ) const; - // evaluates copyright flags for TrueType fonts for printing/viewing // type1 fonts do not have such a feature, so return for them is true // returns true for builtin fonts (surprise!) diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 6d47ed5..7d2710f 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -225,7 +225,7 @@ bool PrintFontManager::BuiltinFont::queryMetricPage( int /*nPage*/, MultiAtomPro // - -bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* pProvider ) +bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ ) { bool bSuccess = false; @@ -284,236 +284,6 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr } free( pMetrics ); } - -if( ! m_pMetrics-m_bKernPairsQueried ) -{ -m_pMetrics-m_bKernPairsQueried = true; -// this is really a hack -// in future MapString/KernGlyphs should be used -// but vcl is not in a state where that could be used -// so currently we get kernpairs by accessing the raw data -struct _TrueTypeFont* pImplTTFont = (struct _TrueTypeFont*)pTTFont; - -//- -// Kerning: KT_MICROSOFT -//- -if( pImplTTFont-nkern pImplTTFont-kerntype == KT_MICROSOFT ) -{ -// create a glyph - character mapping -::boost::unordered_map sal_uInt16, sal_Unicode aGlyphMap; -::boost::unordered_map sal_uInt16, sal_Unicode ::iterator left, right; -for( i = 21; i 0xfffd; i++ ) -{ -sal_uInt16 nGlyph = MapChar( pTTFont, (sal_Unicode)i, 0 ); // kerning for horz only -
[Libreoffice-commits] core.git: vcl/aqua vcl/coretext vcl/generic vcl/headless vcl/inc vcl/unx
vcl/aqua/source/gdi/atsui/salgdi.cxx |7 --- vcl/coretext/salgdi2.cxx |7 --- vcl/generic/print/genpspgraphics.cxx |5 - vcl/headless/svptext.cxx |6 -- vcl/inc/aqua/atsui/salgdi.h |3 --- vcl/inc/coretext/salgdi2.h |3 --- vcl/inc/generic/genpspgraphics.h |1 - vcl/inc/headless/svpgdi.hxx |1 - vcl/inc/salgdi.hxx |4 vcl/inc/unx/salgdi.h |1 - vcl/unx/generic/gdi/salgdi3.cxx |8 11 files changed, 46 deletions(-) New commits: commit 8a65399e3d079ce9d4214cbced7840da6f0ab5be Author: Khaled Hosny khaledho...@eglug.org Date: Wed Oct 16 12:47:02 2013 +0200 Remove GetKernPairs() with no implementation I left only the Windows one because it being called (as GetKernPairs(0, NULL), but may be it does something, who knows). Change-Id: Iec05d61c8f0cd311a1158bb1cb07e4ee977f32fe Reviewed-on: https://gerrit.libreoffice.org/6260 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index 0fc22dc..13fdd50 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -392,13 +392,6 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL // --- -sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) -{ -return 0; -} - -// --- - static bool AddTempFontDir( const char* pDir ) { FSRef aPathFSRef; diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx index caf4b77..c0ae17a 100644 --- a/vcl/coretext/salgdi2.cxx +++ b/vcl/coretext/salgdi2.cxx @@ -341,13 +341,6 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbac // --- -sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) -{ -return 0; -} - -// --- - static bool AddTempDevFont(const OUString rFontFileURL) { OUString aUSytemPath; diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index d6e6bd6..04b41fe 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -950,11 +950,6 @@ void GenPspGraphics::GetFontMetric( ImplFontMetricData *pMetric, int ) } } -sal_uLong GenPspGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) -{ -return 0; -} - sal_Bool GenPspGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphIndex, Rectangle rRect ) { int nLevel = nGlyphIndex GF_FONTSHIFT; diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index ce90850..0a4bbd1 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -237,12 +237,6 @@ void SvpSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe } -sal_uLong SvpSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) -{ -return 0; -} - - const ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const { if( !m_pServerFont[0] ) diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h index ea404d1..6d6d532 100644 --- a/vcl/inc/aqua/atsui/salgdi.h +++ b/vcl/inc/aqua/atsui/salgdi.h @@ -261,9 +261,6 @@ public: virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); // get the current font's metrics virtual voidGetFontMetric( ImplFontMetricData*, int nFallbackLevel ); -// get kernign pairs of the current font -// return only PairCount if (pKernPairs == NULL) -virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual bool GetImplFontCapabilities(vcl::FontCapabilities rFontCapabilities) const; diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h index df66c9d..1c055e9 100644 --- a/vcl/inc/coretext/salgdi2.h +++ b/vcl/inc/coretext/salgdi2.h @@ -317,9 +317,6 @@ public: virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); // get the current font's metrics virtual voidGetFontMetric( ImplFontMetricData*, int nFallbackLevel ); -// get kernign pairs of the current font -// return only PairCount if (pKernPairs == NULL) -virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual bool GetImplFontCapabilities(vcl::FontCapabilities rFontCapabilities) const; diff --git
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/win/salgdi.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8831afd5d7a0a7177df00929c9bed6a05d721851 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 21 10:35:30 2013 +0300 No need for this to be virtual then Change-Id: I70ed11c576b75bc21ca1c9a021f0d3bf33073679 diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 9f7ee7b0..013d704 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -305,7 +305,7 @@ public: virtual voidGetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) -virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); +sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; // get the layout capabilities of the current font ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo70221.rtf |binary sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++ writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 3 files changed, 11 insertions(+) New commits: commit a35fa8d8b127cb23ebff3952291742bf28477c74 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 21 09:31:55 2013 +0200 fdo#70221 fix RTF import of multi-group pictures Pictures typically have a single RTF group, so we imported them at the end of that group. Though multiple inner groups are also allowed, so make sure we only do the import at the very end, instead of at the end of all inner groups as well, resulting in multiple (fake) pictures. Regression from 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (Enable the writerfilter-based RTF import in non-experimental mode, 2011-08-18). Change-Id: Id895b2c6d3b824d09d89bfa01ce59aba76c55d42 diff --git a/sw/qa/extras/rtfimport/data/fdo70221.rtf b/sw/qa/extras/rtfimport/data/fdo70221.rtf new file mode 100644 index 000..1ca7939 Binary files /dev/null and b/sw/qa/extras/rtfimport/data/fdo70221.rtf differ diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 8622d40..45d6c39 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -167,6 +167,7 @@ public: void testFdo68076(); void testFdo68291(); void testFdo69384(); +void testFdo70221(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -319,6 +320,7 @@ void Test::run() {fdo68076.rtf, Test::testFdo68076}, {fdo68291.odt, Test::testFdo68291}, {hello.rtf, Test::testFdo69384}, +{fdo70221.rtf, Test::testFdo70221}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1539,6 +1541,14 @@ void Test::testFdo69384() getStyles(ParagraphStyles)-getByName(Text body justified); } +void Test::testFdo70221() +{ +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +// The picture was imported twice. +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d3614b9..cedf5ce 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3779,6 +3779,7 @@ int RTFDocumentImpl::pushState() case DESTINATION_SHAPETEXT: case DESTINATION_FORMFIELD: case DESTINATION_FIELDINSTRUCTION: +case DESTINATION_PICT: m_aStates.top().nDestinationState = DESTINATION_NORMAL; break; case DESTINATION_MNUM: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/win/salgdi.h |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 116a85bf7a25c7f8d90b99ba0a713e477a0dd57d Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 21 10:45:22 2013 +0300 GetKernPairs() can even be private now Change-Id: I721266ee242704eb9bfef0d4ef0bbde255ab2020 diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 013d704..ccbee18 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -269,6 +269,10 @@ private: // local helpers bool tryDrawBitmapGdiPlus(const SalTwoRect rTR, const SalBitmap rSrcBitmap); +// get kernign pairs of the current font +// return only PairCount if (pKernPairs == NULL) +sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); + public: // public SalGraphics methods, the interface to the independent vcl part @@ -303,9 +307,6 @@ public: virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ); // get the current font's metrics virtual voidGetFontMetric( ImplFontMetricData*, int nFallbackLevel ); -// get kernign pairs of the current font -// return only PairCount if (pKernPairs == NULL) -sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; // get the layout capabilities of the current font ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70285] cleanup generated C++ code ...
https://bugs.freedesktop.org/show_bug.cgi?id=70285 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |noelgran...@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlinehelp.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 0980948795a77fcbb19a464a533e31d6529526a1 Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 21 00:51:10 2013 -0700 fdo#51639 soffice.exe --version displays a dialog box with the version number Change-Id: I3656c005a23d291bc7cde2bc461e584df342babf diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index ab46302..6709741 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -184,6 +184,9 @@ namespace desktop // Just re-use the help dialog for now. CmdlineHelpDialog aDlg; aDlg.m_pftHead-SetText(aVersionMsg); +aDlg.m_pftLeft-SetText(); +aDlg.m_pftRight-SetText(); +aDlg.m_pftBottom-SetText(); aDlg.Execute(); #endif } ___ 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' - desktop/source
desktop/source/app/cmdlinehelp.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit afc03fb026d6cbb85d7d8bae0d3bd47d3143869e Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 21 00:51:10 2013 -0700 fdo#51639 soffice.exe --version displays a dialog box with the version number Change-Id: I3656c005a23d291bc7cde2bc461e584df342babf Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 41a9f30..a9ed3df 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -187,6 +187,9 @@ namespace desktop // Just re-use the help dialog for now. CmdlineHelpDialog aDlg; aDlg.m_pftHead-SetText(aVersionMsg); +aDlg.m_pftLeft-SetText(); +aDlg.m_pftRight-SetText(); +aDlg.m_pftBottom-SetText(); aDlg.Execute(); #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - include/tools tools/inc tools/source vcl/win
include/tools/string.hxx | 40 ++- tools/inc/impstrg.hxx |4 - tools/source/string/strimp.cxx | 77 - tools/source/string/strucvt.cxx|8 --- tools/source/string/tustring.cxx | 56 -- vcl/win/source/window/salframe.cxx | 14 +++--- 6 files changed, 13 insertions(+), 186 deletions(-) New commits: commit 48bb54aa7eafa85c5b0a2574fb3fa167614ddcbc Author: Caolán McNamara caol...@redhat.com Date: Sun Oct 20 20:12:08 2013 +0100 Related: fdo#38838 remove String::Insert Change-Id: I37e35b5a16d37b1fccc6aa47f5027ff406c67d98 diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 87b268d..f32d668 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -136,8 +136,6 @@ private: TOOLS_DLLPRIVATE UniString Append( const sal_Unicode* pCharStr ); TOOLS_DLLPRIVATE UniString Append( const sal_Unicode* pCharStr, xub_StrLen nLen ); TOOLS_DLLPRIVATE UniString Expand( xub_StrLen nCount, sal_Unicode cExpandChar ); -TOOLS_DLLPRIVATE UniString Insert( const UniString rStr, xub_StrLen nPos, xub_StrLen nLen, -xub_StrLen nIndex = STRING_LEN ); TOOLS_DLLPRIVATE UniString operator +=( const sal_Unicode* pCharStr ); @@ -192,8 +190,6 @@ public: xub_StrLen Len() const { return (xub_StrLen)mpData-mnLen; } -UniString Insert( const UniString rStr, xub_StrLen nIndex = STRING_LEN ); -UniString Insert( sal_Unicode c, xub_StrLen nIndex = STRING_LEN ); UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const { return UniString( *this, nIndex, nCount ); } diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index e62f5ed..a3e44fa 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -167,32 +167,4 @@ STRING STRING::Append( const STRING rStr ) return *this; } -STRING STRING::Insert( const STRING rStr, xub_StrLen nIndex ) -{ -// detect overflow -sal_Int32 nCopyLen = ImplGetCopyLen( mpData-mnLen, rStr.mpData-mnLen ); - -if ( !nCopyLen ) -return *this; - -// adjust index if necessary -if ( nIndex mpData-mnLen ) -nIndex = static_cast xub_StrLen (mpData-mnLen); - -// allocate string of new size -STRINGDATA* pNewData = ImplAllocData( mpData-mnLen+nCopyLen ); - -// copy string -memcpy( pNewData-maStr, mpData-maStr, nIndex*sizeof( STRCODE ) ); -memcpy( pNewData-maStr+nIndex, rStr.mpData-maStr, nCopyLen*sizeof( STRCODE ) ); -memcpy( pNewData-maStr+nIndex+nCopyLen, mpData-maStr+nIndex, -(mpData-mnLen-nIndex)*sizeof( STRCODE ) ); - -// free old string -STRING_RELEASE((STRING_TYPE *)mpData); -mpData = pNewData; - -return *this; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index d386c6a..42c6947 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -47,32 +47,6 @@ DBG_NAME( UniString ) UniString::UniString(char c): mpData(ImplAllocData(1)) { mpData-maStr[0] = c; } -STRING STRING::Insert( STRCODE c, xub_StrLen nIndex ) -{ -// Don't insert 0 char or string size is maximum -if ( !c || (mpData-mnLen == STRING_MAXLEN) ) -return *this; - -// Adjust string index -if ( nIndex mpData-mnLen ) -nIndex = static_cast xub_StrLen (mpData-mnLen); - -// allocate string of new size -STRINGDATA* pNewData = ImplAllocData( mpData-mnLen+1 ); - -// copy string -memcpy( pNewData-maStr, mpData-maStr, nIndex*sizeof( STRCODE ) ); -pNewData-maStr[nIndex] = c; -memcpy( pNewData-maStr+nIndex+1, mpData-maStr+nIndex, -(mpData-mnLen-nIndex)*sizeof( STRCODE ) ); - -// free old data -STRING_RELEASE((STRING_TYPE *)mpData); -mpData = pNewData; - -return *this; -} - StringCompare STRING::CompareTo( const STRING rStr, xub_StrLen nLen ) const { if ( mpData == rStr.mpData ) commit 9e6917c21e8a2fa5c40adeddafdaf704a67aef4a Author: Caolán McNamara caol...@redhat.com Date: Sun Oct 20 20:09:26 2013 +0100 Related: fdo#38838 remove String::ToInt32 Change-Id: I6f90e9a06acaa5af88cd011015938dba2059ee0e diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 5df5f23..87b268d 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -174,8 +174,6 @@ public: { return Append( UniString( concat ) ); } #endif -sal_Int32 ToInt32() const; - UniString operator =( const OUString rStr ) { return Assign( rStr ); } diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 1476dff..d386c6a 100644 --- a/tools/source/string/tustring.cxx +++
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/win
include/vcl/outdev.hxx |1 - vcl/inc/generic/glyphcache.hxx |1 - vcl/inc/outfont.hxx | 12 vcl/inc/salgdi.hxx |1 - vcl/inc/win/salgdi.h |3 +-- vcl/win/source/gdi/salgdi3.cxx | 18 ++ vcl/win/source/gdi/winlayout.cxx |2 +- 7 files changed, 4 insertions(+), 34 deletions(-) New commits: commit fdeb14e4ee73ca1e1213f0dcde61600d9baac657 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 21 10:59:38 2013 +0300 Simplify further after the kerning pair changes The ImplKernPairData struct was used now only by the VCL Windows code, and was apparently supposed to be identical to the Win32 KERNINGPAIR struct anyway. GetKernPairs() was called just once with zero and NULL parameters anyway, so it can be simplified. Change-Id: Iaa288868d1e590e0385377abc5b9d9d331d39d97 diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 696a928..7c5dbb8 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -43,7 +43,6 @@ struct ImplOutDevData; class ImplFontEntry; struct ImplObjStack; -struct ImplKernPairData; struct SystemGraphicsData; struct SystemFontData; struct SystemTextLayoutData; diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 179c2b2..7e1acaf 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -29,7 +29,6 @@ class ServerFont; class GlyphCachePeer; class ServerFontLayoutEngine; class ServerFontLayout; -struct ImplKernPairData; class ImplFontOptions; #include tools/gen.hxx diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index f88a88b..6e3210b 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -268,18 +268,6 @@ private: mutable int mnFallbackCount; }; -// -// - ImplKernPairData - -// - -struct ImplKernPairData -{ -sal_uInt16 mnChar1; -sal_uInt16 mnChar2; -longmnKern; -}; - - // --- // - ImplFontMetricData - // --- diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 442a5a9..d4a219d 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -35,7 +35,6 @@ class ImplDevFontList; class SalBitmap; class FontSelectPattern; class ImplFontMetricData; -struct ImplKernPairData; class PhysicalFontFace; class ImplFontCharMap; class SalLayout; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index ccbee18..b54c876 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -270,8 +270,7 @@ private: bool tryDrawBitmapGdiPlus(const SalTwoRect rTR, const SalBitmap rSrcBitmap); // get kernign pairs of the current font -// return only PairCount if (pKernPairs == NULL) -sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); +sal_uLong GetKernPairs(); public: // public SalGraphics methods, the interface to the independent vcl part diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 9a4779a..a9efe50 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1738,11 +1738,8 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe // --- -sal_uLong WinSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) +sal_uLong WinSalGraphics::GetKernPairs() { -DBG_ASSERT( sizeof( KERNINGPAIR ) == sizeof( ImplKernPairData ), -WinSalGraphics::GetKernPairs(): KERNINGPAIR != ImplKernPairData ); - if ( mbFontKernInit ) { if( mpFontKernPairs ) @@ -1767,18 +1764,7 @@ sal_uLong WinSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKer std::sort( mpFontKernPairs, mpFontKernPairs + mnFontKernPairCount, ImplCmpKernData ); } -if( !pKernPairs ) -return mnFontKernPairCount; -else if( mpFontKernPairs ) -{ -if ( nPairs mnFontKernPairCount ) -nPairs = mnFontKernPairCount; -memcpy( pKernPairs, mpFontKernPairs, -nPairs*sizeof( ImplKernPairData ) ); -return nPairs; -} - -return 0; +return mnFontKernPairCount; } // --- diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 78a2d2d..f240f17 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -2928,7 +2928,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs rArgs, int nFallbackLe { // TODO: directly cache kerning info in the rFontInstance // TODO: get rid of kerning methods+data in WinSalGraphics object -GetKernPairs( 0, NULL ); +GetKernPairs();
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/sidebaralignment.ui | 122 +-- 1 file changed, 86 insertions(+), 36 deletions(-) New commits: commit aa02102fe9d338eb7d0774bd54feeac2142506ac Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Oct 21 10:58:33 2013 +0300 Add writedirections buttons to calc sidebar fdo#67746 Change-Id: I5377f643f2ea6712724fdbf619f0b60bf78d619d diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui index cff8cca..228a25e 100644 --- a/sc/uiconfig/scalc/ui/sidebaralignment.ui +++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkGrid id=AlignmentPropertyPanel property name=visibleTrue/property property name=can_focusFalse/property @@ -19,58 +20,107 @@ property name=can_focusFalse/property property name=spacing12/property child - object class=GtkToolbar id=horizontalalignment + object class=GtkBox id=box8 property name=visibleTrue/property property name=can_focusFalse/property -property name=tooltip_text translatable=yesHorizontal Alignment/property -property name=show_arrowFalse/property child - object class=GtkToolButton id=substleft + object class=GtkToolbar id=horizontalalignment property name=visibleTrue/property property name=can_focusFalse/property -property name=valignstart/property -property name=action_name.uno:AlignLeft/property -property name=use_underlineTrue/property +property name=tooltip_text translatable=yesHorizontal Alignment/property +property name=show_arrowFalse/property +child + object class=GtkToolButton id=substleft +property name=visibleTrue/property +property name=can_focusFalse/property +property name=valignstart/property +property name=action_name.uno:AlignLeft/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=substcenter +property name=visibleTrue/property +property name=can_focusFalse/property +property name=action_name.uno:AlignHorizontalCenter/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=substright +property name=visibleTrue/property +property name=can_focusFalse/property +property name=action_name.uno:AlignRight/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=substjustify +property name=visibleTrue/property +property name=can_focusFalse/property +property name=action_name.uno:AlignBlock/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child /object packing property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=substcenter -property name=visibleTrue/property -property name=can_focusFalse/property -property name=action_name.uno:AlignHorizontalCenter/property -
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #89 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9be876cd067cf95338e719645c7f3025757d5563 Related: fdo#38838 remove non OUString ::Append The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #90 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3714051f1495791095cce885918d48dce7b339f7 Related: fdo#38838 remove String::[G|S]etChar The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #91 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e6917c21e8a2fa5c40adeddafdaf704a67aef4a Related: fdo#38838 remove String::ToInt32 The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #92 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=48bb54aa7eafa85c5b0a2574fb3fa167614ddcbc Related: fdo#38838 remove String::Insert The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo70221.rtf |binary sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++ writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 3 files changed, 11 insertions(+) New commits: commit 10ef70fc85370028b6da35c9772931702226fc5a Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 21 09:31:55 2013 +0200 fdo#70221 fix RTF import of multi-group pictures Pictures typically have a single RTF group, so we imported them at the end of that group. Though multiple inner groups are also allowed, so make sure we only do the import at the very end, instead of at the end of all inner groups as well, resulting in multiple (fake) pictures. Regression from 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (Enable the writerfilter-based RTF import in non-experimental mode, 2011-08-18). Change-Id: Id895b2c6d3b824d09d89bfa01ce59aba76c55d42 (cherry picked from commit a35fa8d8b127cb23ebff3952291742bf28477c74) diff --git a/sw/qa/extras/rtfimport/data/fdo70221.rtf b/sw/qa/extras/rtfimport/data/fdo70221.rtf new file mode 100644 index 000..1ca7939 Binary files /dev/null and b/sw/qa/extras/rtfimport/data/fdo70221.rtf differ diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index e79d282..687baac 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -160,6 +160,7 @@ public: void testFdo68076(); void testFdo68291(); void testFdo69384(); +void testFdo70221(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -304,6 +305,7 @@ void Test::run() {fdo68076.rtf, Test::testFdo68076}, {fdo68291.odt, Test::testFdo68291}, {hello.rtf, Test::testFdo69384}, +{fdo70221.rtf, Test::testFdo70221}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1478,6 +1480,14 @@ void Test::testFdo69384() getStyles(ParagraphStyles)-getByName(Text body justified); } +void Test::testFdo70221() +{ +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +// The picture was imported twice. +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 59e138b..5e7ea2a 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3727,6 +3727,7 @@ int RTFDocumentImpl::pushState() case DESTINATION_SHAPETEXT: case DESTINATION_FORMFIELD: case DESTINATION_FIELDINSTRUCTION: +case DESTINATION_PICT: m_aStates.top().nDestinationState = DESTINATION_NORMAL; break; case DESTINATION_MNUM: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70682] Highlight first time contributors in gerrit daily digest
https://bugs.freedesktop.org/show_bug.cgi?id=70682 --- Comment #2 from Björn Michaelsen bjoern.michael...@canonical.com --- (In reply to comment #1) So basically, in the list returned by the query Open changes on master for project core changed in the last 25 hours:, you want to have 2 parts, the first one with first-time contribs, the 2nd one with not-first-time ones ? That sounds nice to me, yes. -- 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 70667] Notify libreoffice user list of API changes and motivate user to test extensions on dailies/beta
https://bugs.freedesktop.org/show_bug.cgi?id=70667 --- Comment #5 from Björn Michaelsen bjoern.michael...@canonical.com --- FWIW, an alternative would be to have the notification in regular intervalls (e.g. two weeks) and than collect what API changes have been done since the last notification (a bit like the gerrit digest mailer with a longer intervall). But TBH, I would like to leave the details to the implementer ... -- 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: animations/source avmedia/source basic/source connectivity/source cppu/source cui/source desktop/source sc/inc sc/source sfx2/inc sfx2/source sw/source
animations/source/animcore/factreg.hxx|5 + avmedia/source/inc/mediamisc.hxx |5 + avmedia/source/win/interface.hxx |5 + basic/source/inc/basiccharclass.hxx |5 + basic/source/runtime/rtlproto.hxx |5 + connectivity/source/inc/ParameterSubstitution.hxx |6 ++ cppu/source/threadpool/current.hxx|5 + cui/source/inc/treeopt.hxx|5 + desktop/source/app/cmdlinehelp.hxx|5 + sc/inc/stylehelper.hxx|5 + sc/source/filter/inc/extlstcontext.hxx|5 + sc/source/filter/xml/xmlcondformat.hxx|5 + sc/source/ui/inc/colorformat.hxx |5 + sc/source/ui/inc/condformatdlg.hxx|5 + sc/source/ui/inc/condformatdlgentry.hxx |5 + sc/source/ui/inc/condformathelper.hxx |5 + sc/source/ui/inc/condformatmgr.hxx|5 + sc/source/ui/inc/namedefdlg.hxx |5 + sc/source/ui/inc/namemgrtable.hxx |5 + sc/source/ui/vba/helperdecl.hxx |6 ++ sfx2/inc/fwkhelper.hxx|5 + sfx2/source/appl/panelist.hxx |1 + sfx2/source/doc/graphhelp.hxx |5 + sfx2/source/doc/oleprops.hxx |4 sfx2/source/doc/printhelper.hxx |5 + sw/source/core/inc/textapi.hxx|5 + 26 files changed, 127 insertions(+) New commits: commit 8fc6905674142c226a117a97a08cf0b24c9d4fc1 Author: Thomas Arnhold tho...@arnhold.org Date: Mon Oct 21 05:42:51 2013 +0200 fdo#68849 add some header guards Change-Id: I9d25a58f22095689eccc0ac444c163d1e9bee69f Reviewed-on: https://gerrit.libreoffice.org/6364 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx index c95ef38..a6ede62 100644 --- a/animations/source/animcore/factreg.hxx +++ b/animations/source/animcore/factreg.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef _INCLUDED_ANIMCORE_FACTREG_HXX_ +#define _INCLUDED_ANIMCORE_FACTREG_HXX_ + namespace animcore { #define DECL_NODE_FACTORY(N)\ @@ -39,4 +42,6 @@ DECL_NODE_FACTORY( TargetPropertiesCreator ); } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index f460161..9d04cd6 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef _AVMEDIA_MEDIAMISC_HXX +#define _AVMEDIA_MEDIAMISC_HXX + class ResMgr; #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() ) @@ -39,4 +42,6 @@ namespace avmedia ResMgr* GetResMgr(); } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx index 09fb792..0a713fb 100644 --- a/avmedia/source/win/interface.hxx +++ b/avmedia/source/win/interface.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef _AVMEDIA_INTERFACE_HXX +#define _AVMEDIA_INTERFACE_HXX + extern C const CLSID CLSID_MediaDet; extern C const IID IID_IMediaDet; struct ISampleGrabber; @@ -113,4 +116,6 @@ public: }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/basiccharclass.hxx b/basic/source/inc/basiccharclass.hxx index 03801dc..6923d22 100644 --- a/basic/source/inc/basiccharclass.hxx +++ b/basic/source/inc/basiccharclass.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef _BASIC_BASICCHARCLASS_HXX +#define _BASIC_BASICCHARCLASS_HXX + #include unotools/charclass.hxx #include rtl/instance.hxx @@ -39,4 +42,6 @@ public: class theBasicCharClass: public rtl::StaticBasicCharClass, theBasicCharClass {}; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/runtime/rtlproto.hxx index 7a6a9d8..ffd0b47 100644 --- a/basic/source/runtime/rtlproto.hxx +++ b/basic/source/runtime/rtlproto.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef _INCLUDED_BASIC_RTLPROTO_HXX_ +#define _INCLUDED_BASIC_RTLPROTO_HXX_ + #include basic/sbstar.hxx #include sbtrace.hxx @@ -368,4 +371,6 @@ extern RTLFUNC(TraceCommand); extern double Now_Impl(); extern void Wait_Impl( bool bDurationBased, SbxArray rPar ); +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab:
[Bug 68849] Other: Add header guards to all include files
https://bugs.freedesktop.org/show_bug.cgi?id=68849 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|BSA EasyHack|BSA EasyHack |DifficultyBeginner |DifficultyBeginner |TopicCleanup|TopicCleanup target:4.2.0 --- Comment #4 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Thomas Arnhold committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8fc6905674142c226a117a97a08cf0b24c9d4fc1 fdo#68849 add some header guards The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: UNO API doesn't work as expected when ATT enabled
On 10/19/2013 11:55 PM, Efe Gürkan YALAMAN wrote: I was trying to find the reason of the fdo#70465 https://bugs.freedesktop.org/show_bug.cgi?id=70465. Reproduced the bug and debugged that. During the load page traverses the options recursively with CuiAboutConfigTabPage::FillItems method. Exit condition of this method is an exception thrown from this line: Reference XHierarchicalNameAccess xNextHierarchicalNameAccess( aNode, uno::UNO_QUERY_THROW ); ...you mean exit condition from the FillItems recursion, I assume. In any event, it would arguably be better to not rely on an exception there to break the recursion. Rather, stop once aNode does not reference an object implementing XHierarchicalNameAccess, by doing ReferenceXHierarchicalNameAccess xNextHierarchicalNameAccess(aNode, uno::UNO_QUERY); bIsLeafNode = !aNode.is(); However, I cannot reproduce the problem as you describe it below. Given your backtrace contains /home/efe/, I assume it is on Linux? (What I can reproduce is the UI being unresponsive and CPU load being high for a very long time, see https://bugs.freedesktop.org/show_bug.cgi?id=70465#c9.) It works if Assistive Technology Tools disabled. But if it is enabled interestingly it jumps another declaration which has same type. Couldn't figure out what may cause the problem is because of this interesting behavior and how it is related to ATT. Any kind of help is appreciated. Here is some info: Exception is thrown from cui/source/options/optaboutconfig.cxx#n228 http://cgit.freedesktop.org/libreoffice/core/tree/cui/source/options/optaboutconfig.cxx#n228 normally, after exception thrown program jumps here and it try-catch block handles it. But instead, program jumps here cui/source/options/optaboutconfig.cxx::216 http://cgit.freedesktop.org/libreoffice/core/tree/cui/source/options/optaboutconfig.cxx#n216 which breaks program flow. And causes infinite recursion and lock's page. It explains reported 1.5 GB memory usage before crash. bt just before exception thrown from reference. #0 com::sun::star::uno::BaseReference::iquery_throw (pInterface=0x0, rType=...) at /home/efe/libreoffice/include/com/sun/star/uno/Reference.hxx:72 #1 0x2aaacaeb62e6 in com::sun::star::uno::Referencecom::sun::star::container::XHierarchicalNameAccess::iquery_throw (pInterface=0x0) at /home/efe/libreoffice/include/com/sun/star/uno/Reference.hxx:84 #2 0x2aaacaeb56bf in com::sun::star::uno::Referencecom::sun::star::container::XHierarchicalNameAccess::Reference (this=0x7fff0db0, rAny=...) at /home/efe/libreoffice/include/com/sun/star/uno/Reference.hxx:189 #3 0x2aaacaeb0804 in CuiAboutConfigTabPage::FillItems (this=0x18b6350, xNameAccess=..., sPath=...) at /home/efe/libreoffice/cui/source/options/optaboutconfig.cxx:228 #4 0x2aaacaeb0937 in CuiAboutConfigTabPage::FillItems (this=0x18b6350, xNameAccess=..., sPath=...) at /home/efe/libreoffice/cui/source/options/optaboutconfig.cxx:230 #5 0x2aaacaeb0937 in CuiAboutConfigTabPage::FillItems (this=0x18b6350, xNameAccess=..., sPath=...) at /home/efe/libreoffice/cui/source/options/optaboutconfig.cxx:230 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 Marcos Souza marcos.souza@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |marcos.souza@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - cui/source include/tools tools/source vcl/source
cui/source/options/optdict.cxx |4 ++-- include/tools/string.hxx | 19 +-- tools/source/string/tustring.cxx | 21 - vcl/source/control/ilstbox.cxx | 18 -- 4 files changed, 11 insertions(+), 51 deletions(-) New commits: commit 28977ea778cc7c8c16c16f1c8b2b6bb6a53b48f7 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 09:56:41 2013 +0100 drop StringCompare from cui Change-Id: Iec7a797581ab899e93ad6cebb06c3622ca2360b9 diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 722a483..bde7de1 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -371,9 +371,9 @@ sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const OUString rDicWord) SvTreeListEntry* pEntry = pWordsLB-GetEntry(j); DBG_ASSERT( pEntry, NULL pointer); OUString aNormEntry( getNormDicEntry_Impl( rDicWord ) ); -StringCompare eCmpRes = (StringCompare)pCollator- +sal_Int32 nCmpRes = pCollator- compareString( aNormEntry, getNormDicEntry_Impl( pWordsLB-GetEntryText(pEntry, 0) ) ); -if( COMPARE_LESS == eCmpRes ) +if (nCmpRes 0) break; } if (j pWordsLB-GetEntryCount()) // entry found? commit df29825ec68c7cdba90a85fff49ac969522a43f7 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 09:53:30 2013 +0100 drop StringCompare from vcl Change-Id: If41503f382115affb42068d9a441241543197147 diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index a5bc8bf..fa9c277 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -184,12 +184,10 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry try { -// XXX even though XCollator::compareString returns a sal_Int32 the only -// defined values are {-1, 0, 1} which is compatible with StringCompare -StringCompare eComp = (StringCompare)rSorter.compare(rStr, pTemp-maStr); +sal_Int32 nComp = rSorter.compare(rStr, pTemp-maStr); // fast insert for sorted data -if ( eComp != COMPARE_LESS ) +if ( nComp = 0 ) { insPos = maEntries.size(); maEntries.push_back(pNewEntry); @@ -199,8 +197,8 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry nLow = mnMRUCount; pTemp = (ImplEntryType*)GetEntry( (sal_uInt16)nLow ); -eComp = (StringCompare)rSorter.compare(rStr, pTemp-maStr); -if ( eComp != COMPARE_GREATER ) +nComp = rSorter.compare(rStr, pTemp-maStr); +if ( nComp = 0 ) { insPos = 0; maEntries.insert(maEntries.begin(),pNewEntry); @@ -214,13 +212,13 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry nMid = (nLow + nHigh) / 2; pTemp = (ImplEntryType*)GetEntry( nMid ); -eComp = (StringCompare)rSorter.compare(rStr, pTemp-maStr); +nComp = rSorter.compare(rStr, pTemp-maStr); -if ( eComp == COMPARE_LESS ) +if ( nComp 0 ) nHigh = nMid-1; else { -if ( eComp == COMPARE_GREATER ) +if ( nComp 0 ) nLow = nMid + 1; else break; @@ -228,7 +226,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry } while ( nLow = nHigh ); -if ( eComp != COMPARE_LESS ) +if ( nComp = 0 ) nMid++; insPos = nMid; commit d486b2b324364dd99bea686b6969f7a796f5e329 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 09:30:09 2013 +0100 Related: fdo#38838 remove/privatize String::Append Change-Id: I5ae90b02e7ae5ddd19495fd0847b7e9dfc4419e8 diff --git a/include/tools/string.hxx b/include/tools/string.hxx index f32d668..21eb3c5 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -107,6 +107,7 @@ private: xub_StrLen nLen = STRING_LEN ) const; UniString Assign( const OUString rStr ); +UniString Append( const UniString rStr ); UniString( const int* pDummy );// not implemented: to prevent UniString( NULL ) UniString(int); // not implemented; to detect misuses of @@ -115,8 +116,6 @@ private: // of
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e5/2d79b8f536aee6e5c7f7137c483c55052dd7b6
e5/2d79b8f536aee6e5c7f7137c483c55052dd7b6 |1 + 1 file changed, 1 insertion(+) New commits: commit 69b2912d1c5abcce31e2cfcd2ed2db59f81d Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 11:30:07 2013 +0100 Notes added by 'git notes add' diff --git a/e5/2d79b8f536aee6e5c7f7137c483c55052dd7b6 b/e5/2d79b8f536aee6e5c7f7137c483c55052dd7b6 new file mode 100644 index 000..8c77544 --- /dev/null +++ b/e5/2d79b8f536aee6e5c7f7137c483c55052dd7b6 @@ -0,0 +1 @@ +prefer: ae4f2c72b7a93085025859cbf1698651831e1b44 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #93 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=d486b2b324364dd99bea686b6969f7a796f5e329 Related: fdo#38838 remove/privatize String::Append The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nutil/source
i18nutil/source/utility/unicode.cxx | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) New commits: commit 0c6a5d99ff82e4420f9f1c68152f89b7b5511517 Author: Thomas Arnhold tho...@arnhold.org Date: Mon Oct 21 06:10:34 2013 +0200 i18nutil: Add new enumeration values from ICU 52 WaE: enumeration values 'USCRIPT_CAUCASIAN_ALBANIAN' and 'USCRIPT_MAHAJANI' not handled in switch [-Wswitch] With ICU 4.9 there is no major/minor anymore, it's only ICU 49 or ICU 52. So adapt the previous check, too. Change-Id: Id938937b305165d407ced473ea1725e97efe9124 See: http://icu-project.org/apiref/icu4c-latest/uscript_8h.html Reviewed-on: https://gerrit.libreoffice.org/6365 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index cda8c1a..872efc4 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -911,7 +911,7 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) sRet = woe; break; #endif -#if (U_ICU_VERSION_MAJOR_NUM 4) +#if (U_ICU_VERSION_MAJOR_NUM = 49) case USCRIPT_ANATOLIAN_HIEROGLYPHS: sRet = hlu; break; @@ -922,6 +922,14 @@ OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) sRet = mai; break; #endif +#if (U_ICU_VERSION_MAJOR_NUM = 52) +case USCRIPT_CAUCASIAN_ALBANIAN: +sRet = xag; +break; +case USCRIPT_MAHAJANI: +sRet = mwr; +break; +#endif } return sRet; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nutil/source include/i18nutil vcl/generic
i18nutil/source/utility/unicode.cxx|2 +- include/i18nutil/unicode.hxx |2 +- vcl/generic/fontmanager/fontconfig.cxx |8 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 8dc0573920a4a3c831704eb509ffc85ac39f6068 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 11:37:19 2013 +0100 Exempler-Exemplar Change-Id: Id7e67d7e7bd4be6600a296a846512e9076c9df23 diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 872efc4..59a1e1a 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -446,7 +446,7 @@ sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript) return nRet; } -OString SAL_CALL unicode::getExemplerLanguageForUScriptCode(UScriptCode eScript) +OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript) { OString sRet; switch (eScript) diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index 77b7681..e14cc8c 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -53,7 +53,7 @@ public: static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript); //Return a language that can be written in a given ISO 15924 script code -static OString SAL_CALL getExemplerLanguageForUScriptCode(UScriptCode eScript); +static OString SAL_CALL getExemplarLanguageForUScriptCode(UScriptCode eScript); }; #endif diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 769826d..e88745c 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -900,11 +900,11 @@ namespace return bIsImpossible; } -LanguageTag getExemplerLangTagForCodePoint(sal_uInt32 currentChar) +LanguageTag getExemplarLangTagForCodePoint(sal_uInt32 currentChar) { int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT); UScriptCode eScript = static_castUScriptCode(script); -OStringBuffer aBuf(unicode::getExemplerLanguageForUScriptCode(eScript)); +OStringBuffer aBuf(unicode::getExemplarLanguageForUScriptCode(eScript)); const char* pScriptCode = uscript_getShortName(eScript); if (pScriptCode) aBuf.append('-').append(pScriptCode); @@ -1014,7 +1014,7 @@ bool PrintFontManager::Substitute( FontSelectPattern rPattern, OUString rMissi //#i105784#/rhbz#527719 improve selection of fallback font if (aLangAttrib.isEmpty()) { -aLangTag = getExemplerLangTagForCodePoint(nCode); +aLangTag = getExemplarLangTagForCodePoint(nCode); aLangAttrib = mapToFontConfigLangTag(aLangTag); } } @@ -1144,7 +1144,7 @@ bool PrintFontManager::Substitute( FontSelectPattern rPattern, OUString rMissi //scripts to default to a given language. for (sal_Int32 i = 0; i nRemainingLen; ++i) { -LanguageTag aOurTag = getExemplerLangTagForCodePoint(pRemainingCodes[i]); +LanguageTag aOurTag = getExemplarLangTagForCodePoint(pRemainingCodes[i]); OString sTag = OUStringToOString(aOurTag.getBcp47(), RTL_TEXTENCODING_UTF8); if (m_aPreviousLangSupportRequests.find(sTag) != m_aPreviousLangSupportRequests.end()) continue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68849] Other: Add header guards to all include files
https://bugs.freedesktop.org/show_bug.cgi?id=68849 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #5 from Stephan Bergmann sberg...@redhat.com --- see comment at https://gerrit.libreoffice.org/#/c/6364/: Note that identifiers starting with an underscore followed by an uppercase letter (_INCLUDED_ANIMCORE_FACTREG_HXX_ etc.) must not be used in C/C++ code (even if lots of our legacy code violates that). In the future, please use just INLCUDED_ANIMCORE_FACTREG_HXX etc. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sw/source writerfilter/source
sw/source/core/text/xmldump.cxx |2 ++ writerfilter/source/dmapper/StyleSheetTable.cxx |3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit eaab389113f45b298428b4285e76555ccedec48a Author: Cédric Bosdonnat cedric.bosdonnat@free.fr Date: Thu Sep 20 09:59:48 2012 +0200 n#779627: forgot to remove a debug fprintf Change-Id: Idba155358166db358b0ef36b71a0bcf5abf77ce9 (cherry picked from commit 823512d12d268e45c4ff6b13b6ed9e0db49d1d8a) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index edbc393..d8e327c 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -454,7 +454,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value val) case NS_ooxml::LN_CT_Style_styleId: m_pImpl-m_pCurrentEntry-sStyleIdentifierI = sValue; m_pImpl-m_pCurrentEntry-sStyleIdentifierD = sValue; -fprintf( stderr, sStyleIdentifierI: %s\n, OUStringToOString( m_pImpl-m_pCurrentEntry-sStyleIdentifierI, RTL_TEXTENCODING_UTF8 ).getStr( ) ); break; case NS_ooxml::LN_CT_TblWidth_w: dynamic_cast StyleSheetPropertyMap* ( m_pImpl-m_pCurrentEntry-pProperties.get() )-SetCT_TblWidth_w( nIntValue ); commit 61821a5aec6d42b54cb3b5e37bf742a402d08d72 Author: Cédric Bosdonnat cedric.bosdonnat@free.fr Date: Wed Sep 19 17:51:19 2012 +0200 n779627: docx import of table styles, why not copy the ids? Change-Id: I72188eef689c656b56e2c19e60e0104a1e6d87bf (cherry picked from commit c091b8fc526bed051295870b8b28f73f3ac908ae) diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 61ff0ba..edbc393 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -73,7 +73,8 @@ TableStyleSheetEntry::TableStyleSheetEntry( StyleSheetEntry rEntry, StyleSheetT StyleSheetEntry( ), m_pStyleSheet( pStyles ) { - +sStyleIdentifierI = rEntry.sStyleIdentifierI; +sStyleIdentifierD = rEntry.sStyleIdentifierD; bIsDefaultStyle = rEntry.bIsDefaultStyle; bInvalidHeight = rEntry.bInvalidHeight; bHasUPE = rEntry.bHasUPE; @@ -453,6 +454,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value val) case NS_ooxml::LN_CT_Style_styleId: m_pImpl-m_pCurrentEntry-sStyleIdentifierI = sValue; m_pImpl-m_pCurrentEntry-sStyleIdentifierD = sValue; +fprintf( stderr, sStyleIdentifierI: %s\n, OUStringToOString( m_pImpl-m_pCurrentEntry-sStyleIdentifierI, RTL_TEXTENCODING_UTF8 ).getStr( ) ); break; case NS_ooxml::LN_CT_TblWidth_w: dynamic_cast StyleSheetPropertyMap* ( m_pImpl-m_pCurrentEntry-pProperties.get() )-SetCT_TblWidth_w( nIntValue ); commit b4f489b3144829c53800fcf4aa59bad5e82fbaed Author: Cédric Bosdonnat cedric.bosdonnat@free.fr Date: Fri Aug 31 11:08:08 2012 +0200 Output typeid().name( ) in layout dump for easier debugging Change-Id: I12c0583b73200fa9fa4d4d56be464b1467149630 (cherry picked from commit ba71c346d6ac60b2c49caed81673d4ca498a6f1e) diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 79edaed..431022f 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -306,6 +306,8 @@ void SwFrm::dumpAsXml( xmlTextWriterPtr writer ) xmlTextWriterEndElement( writer ); } +xmlTextWriterWriteElement( writer, BAD_CAST( typeid ), BAD_CAST( typeid( *this ).name() ) ); + // Dump the children if ( IsTxtFrm( ) ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/win
vcl/win/source/gdi/salbmp.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit dd1cb9aa9ea24b6c89de05e6c5deae7951b78feb Author: Armin Le Grand a...@apache.org Date: Mon Oct 21 10:33:16 2013 + i123478 Secure mem freeing for BitmapBuffer class diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 8040ab4..005f822 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -333,6 +333,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() if(pExtraRGB) { +// #123478# shockingly, BitmapBuffer does not free the memory it is controlling +// in it's destructor, this *has to be done handish*. Doing it here now +delete[] pExtraRGB-mpBits; delete pExtraRGB; } else @@ -471,6 +474,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap rAlph if(pExtraA) { +// #123478# shockingly, BitmapBuffer does not free the memory it is controlling +// in it's destructor, this *has to be done handish*. Doing it here now +delete[] pExtraA-mpBits; delete pExtraA; } else @@ -485,6 +491,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap rAlph if(pExtraRGB) { +// #123478# shockingly, BitmapBuffer does not free the memory it is controlling +// in it's destructor, this *has to be done handish*. Doing it here now +delete[] pExtraRGB-mpBits; delete pExtraRGB; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk sw/Executable_tiledrendering.mk sw/Module_sw.mk sw/qa
Repository.mk |1 sw/Executable_tiledrendering.mk | 38 sw/Module_sw.mk |1 sw/qa/tiledrendering/tiledrendering.cxx | 101 4 files changed, 141 insertions(+) New commits: commit 504ceee46b31e7234bc7c70fdf933c0432f5a5a1 Author: Jan Holesovsky ke...@collabora.com Date: Mon Oct 21 14:31:17 2013 +0200 Tiled rendering: VCL test app skeleton. Change-Id: I465dcadf14935bce4f610376b41b9a66963e2cf8 diff --git a/Repository.mk b/Repository.mk index 5a92fd6..666a534 100644 --- a/Repository.mk +++ b/Repository.mk @@ -99,6 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ kdefilepicker \ ) \ ui-previewer \ + tiledrendering \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ xpdfimport \ $(if $(filter WNT,$(OS)), \ diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk new file mode 100644 index 000..c39b88b --- /dev/null +++ b/sw/Executable_tiledrendering.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,tiledrendering)) + +$(eval $(call gb_Executable_use_external,tiledrendering,boost_headers)) + +$(eval $(call gb_Executable_use_api,tiledrendering,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_Executable_use_static_libraries,tiledrendering,\ +vclmain \ +)) + +$(eval $(call gb_Executable_use_libraries,tiledrendering,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ +tl \ +ucbhelper \ +vcl \ + sw \ +)) + +$(eval $(call gb_Executable_add_exception_objects,tiledrendering,\ +sw/qa/tiledrendering/tiledrendering \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index fe83466..59f16b5 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ AllLangResTarget_sw \ +Executable_tiledrendering \ Library_msword \ Library_sw \ Library_swd \ diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx new file mode 100644 index 000..923c79d --- /dev/null +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -0,0 +1,101 @@ +/* -*- 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/. + */ + +#include com/sun/star/lang/XComponent.hpp +#include com/sun/star/lang/XMultiComponentFactory.hpp +#include com/sun/star/lang/XMultiServiceFactory.hpp +#include com/sun/star/ucb/UniversalContentBroker.hpp +#include comphelper/processfactory.hxx +#include cppuhelper/bootstrap.hxx +#include osl/file.hxx +#include vcl/builder.hxx +#include vcl/dialog.hxx +#include vcl/help.hxx +#include vcl/svapp.hxx +#include vcl/vclmain.hxx + +class UIPreviewApp : public Application +{ +public: +virtual void Init(); +virtual int Main(); +}; + +using namespace com::sun::star; + +void UIPreviewApp::Init() +{ +uno::Referenceuno::XComponentContext xContext = +cppu::defaultBootstrap_InitialComponentContext(); +uno::Referencelang::XMultiComponentFactory xFactory = +xContext-getServiceManager(); +uno::Referencelang::XMultiServiceFactory xSFactory = +uno::Referencelang::XMultiServiceFactory (xFactory, uno::UNO_QUERY_THROW); +comphelper::setProcessServiceFactory(xSFactory); + +// Create UCB (for backwards compatibility, in case some code still uses +// plain createInstance w/o args directly to obtain an instance): +::ucb::UniversalContentBroker::create( +comphelper::getProcessComponentContext() ); +} + +int UIPreviewApp::Main() +{ +std::vectorOUString uifiles; +for (sal_uInt16 i = 0; i GetCommandLineParamCount(); ++i) +{ +OUString aFileUrl; +osl::File::getFileURLFromSystemPath(GetCommandLineParam(i), aFileUrl); +uifiles.push_back(aFileUrl); +} + +if (uifiles.empty()) +{ +fprintf(stderr, Usage: ui-previewer file.ui\n); +return EXIT_FAILURE; +} + +// turn on tooltips +Help::EnableQuickHelp(); + +try +{ +Dialog *pDialog = new Dialog(DIALOG_NO_PARENT, WB_STDDIALOG); + +{ +VclBuilder aBuilder(pDialog, OUString(), uifiles[0]); +Dialog *pRealDialog = dynamic_castDialog*(aBuilder.get_widget_root()); + +if
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/qa connectivity/source
connectivity/qa/connectivity/commontools/FValue_test.cxx | 24 +++ connectivity/source/commontools/FValue.cxx |9 + 2 files changed, 32 insertions(+), 1 deletion(-) New commits: commit 1129d2bfa825a73dc0a619fa3e45a277eaffcb86 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Oct 14 17:59:10 2013 +0200 fdo#68657 bool-string conversion to 1/0, not true/false This matches what OO.org / older versions of LibreOffice did, and which was inadvertently changed in 2bd856e6 Change-Id: I1d45ea975a096c599a996caafc41e4aa06d35fcd Reviewed-on: https://gerrit.libreoffice.org/6274 Reviewed-by: David Ostrovsky david.ostrov...@gmx.de Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/connectivity/qa/connectivity/commontools/FValue_test.cxx b/connectivity/qa/connectivity/commontools/FValue_test.cxx index b460f64..73b8af5 100644 --- a/connectivity/qa/connectivity/commontools/FValue_test.cxx +++ b/connectivity/qa/connectivity/commontools/FValue_test.cxx @@ -46,6 +46,8 @@ public: void test_float(); void test_double(); +void test_getString(); + CPPUNIT_TEST_SUITE(FValueTest); CPPUNIT_TEST(test_Bool); @@ -65,6 +67,7 @@ public: CPPUNIT_TEST(test_float); CPPUNIT_TEST(test_double); +CPPUNIT_TEST(test_getString); CPPUNIT_TEST_SUITE_END(); }; @@ -283,6 +286,27 @@ void FValueTest::test_double() CPPUNIT_ASSERT_MESSAGE(double conversion from Any didn't work, src_double == trg_double); } +void FValueTest::test_getString() +{ +bool src_bool_1 = true; +ORowSetValue v_1(src_bool_1); +OUString trg_bool_1 = v_1.getString(); + +std::cerr src_bool_1 src_bool_1 std::endl; +std::cerr trg_bool_1: trg_bool_1 std::endl; + +CPPUNIT_ASSERT_MESSAGE(bool to string conversion to ORowSetValue didn't work, trg_bool_1 == 1); + +bool src_bool_0 = false; +ORowSetValue v_0(src_bool_0); +OUString trg_bool_0 = v_0.getString(); + +std::cerr src_bool_0 src_bool_0 std::endl; +std::cerr trg_bool_0: trg_bool_0 std::endl; + +CPPUNIT_ASSERT_MESSAGE(bool to string conversion to ORowSetValue didn't work, trg_bool_0 == 0); +} + CPPUNIT_TEST_SUITE_REGISTRATION(FValueTest); }} diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 770b34e..0dd208c 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -27,6 +27,8 @@ #include com/sun/star/io/XInputStream.hpp #include rtl/ustrbuf.hxx #include rtl/logfile.hxx +#include boost/type_traits.hpp +#include boost/static_assert.hpp using namespace ::dbtools; using namespace ::com::sun::star::sdbc; @@ -1007,7 +1009,12 @@ OUString ORowSetValue::getString( ) const break; case DataType::BIT: case DataType::BOOLEAN: -aRet = OUString::boolean(static_castbool(*this)); +// This would be the natural choice, +// but historically it was converted to 0 or 1. +// For backwards compatibility, continue doing that. +// aRet = OUString::boolean(static_castbool(*this)); +BOOST_STATIC_ASSERT((boost::is_same sal_Bool, sal_uInt8 ::value)); +aRet = OUString::number(static_castsal_Bool(*this)); break; case DataType::TINYINT: case DataType::SMALLINT: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo70221.rtf |binary sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++ writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 + 3 files changed, 11 insertions(+) New commits: commit 11726693c3d57e86e391f60370f1b42030ef69ea Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Oct 21 09:31:55 2013 +0200 fdo#70221 fix RTF import of multi-group pictures Pictures typically have a single RTF group, so we imported them at the end of that group. Though multiple inner groups are also allowed, so make sure we only do the import at the very end, instead of at the end of all inner groups as well, resulting in multiple (fake) pictures. Regression from 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (Enable the writerfilter-based RTF import in non-experimental mode, 2011-08-18). Change-Id: Id895b2c6d3b824d09d89bfa01ce59aba76c55d42 (cherry picked from commit a35fa8d8b127cb23ebff3952291742bf28477c74) Reviewed-on: https://gerrit.libreoffice.org/6361 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/qa/extras/rtfimport/data/fdo70221.rtf b/sw/qa/extras/rtfimport/data/fdo70221.rtf new file mode 100644 index 000..1ca7939 Binary files /dev/null and b/sw/qa/extras/rtfimport/data/fdo70221.rtf differ diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index e79d282..687baac 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -160,6 +160,7 @@ public: void testFdo68076(); void testFdo68291(); void testFdo69384(); +void testFdo70221(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -304,6 +305,7 @@ void Test::run() {fdo68076.rtf, Test::testFdo68076}, {fdo68291.odt, Test::testFdo68291}, {hello.rtf, Test::testFdo69384}, +{fdo70221.rtf, Test::testFdo70221}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1478,6 +1480,14 @@ void Test::testFdo69384() getStyles(ParagraphStyles)-getByName(Text body justified); } +void Test::testFdo70221() +{ +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +// The picture was imported twice. +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 59e138b..5e7ea2a 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3727,6 +3727,7 @@ int RTFDocumentImpl::pushState() case DESTINATION_SHAPETEXT: case DESTINATION_FORMFIELD: case DESTINATION_FIELDINSTRUCTION: +case DESTINATION_PICT: m_aStates.top().nDestinationState = DESTINATION_NORMAL; break; case DESTINATION_MNUM: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/source
desktop/source/app/cmdlinehelp.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 29ef37395884c72898c77185e5e00898ad98f2c7 Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 21 00:51:10 2013 -0700 fdo#51639 soffice.exe --version displays a dialog box with the version number Change-Id: I3656c005a23d291bc7cde2bc461e584df342babf Reviewed-on: https://gerrit.libreoffice.org/6362 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 41a9f30..a9ed3df 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -187,6 +187,9 @@ namespace desktop // Just re-use the help dialog for now. CmdlineHelpDialog aDlg; aDlg.m_pftHead-SetText(aVersionMsg); +aDlg.m_pftLeft-SetText(); +aDlg.m_pftRight-SetText(); +aDlg.m_pftBottom-SetText(); aDlg.Execute(); #endif } ___ 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' - dd/1cb9aa9ea24b6c89de05e6c5deae7951b78feb
dd/1cb9aa9ea24b6c89de05e6c5deae7951b78feb |1 + 1 file changed, 1 insertion(+) New commits: commit bc5f4f01a14735b015a6785a7827769b2cd5ba2a Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 14:29:23 2013 +0100 Notes added by 'git notes add' diff --git a/dd/1cb9aa9ea24b6c89de05e6c5deae7951b78feb b/dd/1cb9aa9ea24b6c89de05e6c5deae7951b78feb new file mode 100644 index 000..3a667ea --- /dev/null +++ b/dd/1cb9aa9ea24b6c89de05e6c5deae7951b78feb @@ -0,0 +1 @@ +merged as: 1ba10fb55a854d1eb8541a6866eb5250abf21f67 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salbmp.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit 1ba10fb55a854d1eb8541a6866eb5250abf21f67 Author: Armin Le Grand a...@apache.org Date: Mon Oct 21 10:33:16 2013 + Resolves: #i123478# Secure mem freeing for BitmapBuffer class (cherry picked from commit dd1cb9aa9ea24b6c89de05e6c5deae7951b78feb) Change-Id: I7a63835d1e93f4cebc0f908d01873ea3ff91fe66 diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 1977be0..3850d84 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -354,6 +354,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() if(pExtraRGB) { +// #i123478# shockingly, BitmapBuffer does not free the memory it is controlling +// in it's destructor, this *has to be done handish*. Doing it here now +delete[] pExtraRGB-mpBits; delete pExtraRGB; } else @@ -492,6 +495,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap rAlph if(pExtraA) { +// #i123478# shockingly, BitmapBuffer does not free the memory it is controlling +// in it's destructor, this *has to be done handish*. Doing it here now +delete[] pExtraA-mpBits; delete pExtraA; } else @@ -506,6 +512,9 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap rAlph if(pExtraRGB) { +// #i123478# shockingly, BitmapBuffer does not free the memory it is controlling +// in it's destructor, this *has to be done handish*. Doing it here now +delete[] pExtraRGB-mpBits; delete pExtraRGB; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #94 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=6e03e292e5e887053dfd7746d6f9df12abc0bab7 Related: fdo#38838 remove a pile of ctors The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) New commits: commit 678b260c30ffd06d6c5ae94d81e5d9f738c2b8a7 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 14:38:42 2013 +0100 some windows only Strings Change-Id: I264bdfc3453e2b6a17397ffb27154a29394c8c1b diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index a9efe50..7bbb009 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -613,7 +613,7 @@ struct ImplEnumInfo // === -static CharSet ImplCharSetToSal( BYTE nCharSet ) +static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) { rtl_TextEncoding eTextEncoding; @@ -2060,8 +2060,10 @@ static bool ImplGetFontAttrFromFile( const String rFontFileURL, return false; // convert byte strings to unicode -rDFA.SetFamilyName(String( aBuffer + nNameOfs, osl_getThreadTextEncoding() )); -rDFA.SetStyleName(String( aBuffer + nStyleOfs, osl_getThreadTextEncoding() )); +char *pName = aBuffer + nNameOfs; +rDFA.SetFamilyName(OUString(pName, strlen(pName), osl_getThreadTextEncoding())); +char *pStyle = aBuffer + nStyleOfs; +rDFA.SetStyleName(OUString(pStyle, strlen(pStyle), osl_getThreadTextEncoding() )); // byte offset 0x4C7: OS2_fsSelection const char nFSS = aBuffer[ 0x4C7 ]; @@ -2181,12 +2183,12 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) String aEmptyString; OUString aBootStrap; -rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( BRAND_BASE_DIR ) ), aBootStrap ); -aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( / LIBO_ETC_FOLDER / SAL_CONFIGFILE( bootstrap ) ) ); +rtl::Bootstrap::get( OUString(BRAND_BASE_DIR), aBootStrap ); +aBootStrap += OUString(/ LIBO_ETC_FOLDER / SAL_CONFIGFILE( bootstrap ) ); rtl::Bootstrap aBootstrap( aBootStrap ); OUString aUserPath; aBootstrap.getFrom( OUString( UserInstallation ), aUserPath ); -aUserPath += String( RTL_CONSTASCII_USTRINGPARAM(/user/config/fontnames.dat) ); +aUserPath += /user/config/fontnames.dat; String aBaseURL = aPath.copy( 0, aPath.lastIndexOf('/')+1 ); mpFontAttrCache = new ImplFontAttrCache( aUserPath, aBaseURL ); ___ 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/simptabl.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 67a3da958a9a441be9cd4b04f6f3691beb7a3e73 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 15:09:53 2013 +0100 tweak header trivially Change-Id: I43ab83e478deb417fef679c236d885180eb71bbd diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 5b970fe..e3d94e3 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -20,7 +20,7 @@ #ifndef _SV_SIMPTABL_HXX #define _SV_SIMPTABL_HXX -#include svtools/svtdllapi.h +#include svtools/svtdllapi.h #include svtools/headbar.hxx #include svtools/svtabbx.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/Module_sw.mk
sw/Module_sw.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d3850d770ed3a5db8045d5ab7030c8b01fb3 Author: Jan Holesovsky ke...@collabora.com Date: Mon Oct 21 16:18:29 2013 +0200 Tiled rendering: This is a desktop test app. Change-Id: I022ca7c6bc7a9efd874bd04eaf78836afcee21c6 diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 59f16b5..c53dd15 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -21,7 +21,8 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ AllLangResTarget_sw \ -Executable_tiledrendering \ +$(if $(filter DESKTOP,$(BUILD_TYPE)), \ +Executable_tiledrendering) \ Library_msword \ Library_sw \ Library_swd \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68849] Other: Add header guards to all include files
https://bugs.freedesktop.org/show_bug.cgi?id=68849 --- Comment #6 from Thomas Arnhold tho...@arnhold.org --- Thanks Stephan, I'll take care of it. -- 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: bin/benchmark-document-loading
bin/benchmark-document-loading |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8494d22dc5ae18e986623b68219e51359af595a1 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 21 18:08:33 2013 +0300 Edit comment: Running in a loop is not the relevant thing It was just somethinbg I did while I was working on the LIBO_ONEWAY_STABLE_ODF_EXPORT code, to afterwards then compare the output from several conversions. Change-Id: I23ec42520b9802a520160d5c8cb01d46712c9183 diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading index 5bba53e..f59ad7e 100644 --- a/bin/benchmark-document-loading +++ b/bin/benchmark-document-loading @@ -28,8 +28,8 @@ # Simple script to load a bunch of documents and export them as Flat ODF # -# Personally I run it using a loop like this: -# while :; do ~/lo/master-suse/instdir/unxlngx6/program/python ~/lo/master-suse/bin/benchmark-document-loading --soffice=path:/home/tml/lo/master-suse/instdir/unxlngx6/program/soffice --outdir=file://$PWD/out --userdir=file:///tmp/test $PWD/docs; sleep 10; done +# Personally I run it like this: +# ~/lo/master-suse/instdir/unxlngx6/program/python ~/lo/master-suse/bin/benchmark-document-loading --soffice=path:/home/tml/lo/master-suse/instdir/unxlngx6/program/soffice --outdir=file://$PWD/out --userdir=file:///tmp/test $PWD/docs # import datetime ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/editeng include/sfx2
include/editeng/unotext.hxx |4 ++-- include/sfx2/objface.hxx|1 - 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit be42330ae276219dee5b7ed3c7625f8da6121d1d Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 21 15:35:24 2013 +0200 Base class ctors/dtors can be protected Change-Id: I8b68b78042a980850d71a0f67ec520986d6085e4 diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index dd56df8..90f5845 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -278,12 +278,12 @@ protected: virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any rAny, const SfxItemSet rSet ) throw(::com::sun::star::beans::UnknownPropertyException ); virtual void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any rValue, const ESelection rSelection, const SfxItemSet rOldSet, SfxItemSet rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException ); -public: SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw(); SvxUnoTextRangeBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet ) throw(); SvxUnoTextRangeBase( const SvxUnoTextRangeBase rRange ) throw(); virtual ~SvxUnoTextRangeBase() throw(); +public: // Internal const ESelection GetSelection() const throw() { CheckSelection( ((SvxUnoTextRangeBase*)this)-maSelection, mpEditSource-GetTextForwarder() ); return maSelection; }; voidSetSelection( const ESelection rSelection ) throw(); @@ -394,13 +394,13 @@ class EDITENG_DLLPUBLIC SvxUnoTextBase : public SvxUnoTextRangeBase, protected: ::com::sun::star::uno::Reference ::com::sun::star::text::XText xParentText; -public: SvxUnoTextBase( ) throw(); SvxUnoTextBase( const SvxItemPropertySet* _pSet ) throw(); SvxUnoTextBase( const SvxEditSource* pSource, const SvxItemPropertySet* _pSet, ::com::sun::star::uno::Reference ::com::sun::star::text::XText xParent ) throw(); SvxUnoTextBase( const SvxUnoTextBase rText ) throw(); virtual ~SvxUnoTextBase() throw(); +public: UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextBase ) ESelection InsertField( const SvxFieldItem rField ) throw(); commit 9775a3715498183ae6f5118fbaee1c5d488b6dc6 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 21 14:37:44 2013 +0200 Remove unused forward declaration Change-Id: I2b725ad476cbd9552a7e57a550945a1f227fc823 diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index f852a00..34ca4ba 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -26,7 +26,6 @@ #include sfx2/msg.hxx #include tools/resid.hxx -struct SfxFormalArgument; struct SfxInterface_Impl; class SfxConfigItem; class SfxModule; ___ 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/gallery2/galtheme.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 5e18e8c597722f78ef8416dff2295dc08c110ceb Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 21 17:22:47 2013 +0200 Check for OUString::copy out-of-bounds arguments regression introduced with 1287804a89c73e072d57a11ca18988c3e73a77b8 convert svx/source/gallery/*.cxx from String to OUString Change-Id: Ia8171f2215253b6db8f7eb1f623a6e0c68dc7b94 diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index e8dbea5..bab0d02 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -19,6 +19,8 @@ #include sal/config.h +#include algorithm + #include comphelper/processfactory.hxx #include tools/urlobj.hxx #include tools/vcompat.hxx @@ -1310,24 +1312,24 @@ SvStream GalleryTheme::WriteData( SvStream rOStm ) const else { aPath = pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ); -aPath = aPath.copy( 0, aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength() ); +aPath = aPath.copy( 0, std::min(aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength(), aPath.getLength()) ); bRel = aPath == aRelURL1.GetMainURL( INetURLObject::NO_DECODE ); if( bRel ( pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength() + 1 ) ) ) { aPath = pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ); -aPath = aPath.copy( aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength() ); +aPath = aPath.copy( std::min(aRelURL1.GetMainURL( INetURLObject::NO_DECODE ).getLength(), aPath.getLength()) ); } else { aPath = pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ); -aPath = aPath.copy( 0, aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength() ); +aPath = aPath.copy( 0, std::min(aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength(), aPath.getLength()) ); bRel = aPath == aRelURL2.GetMainURL( INetURLObject::NO_DECODE ); if( bRel ( pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength() + 1 ) ) ) { aPath = pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ); -aPath = aPath.copy( aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength() ); +aPath = aPath.copy( std::min(aRelURL2.GetMainURL( INetURLObject::NO_DECODE ).getLength(), aPath.getLength()) ); } else aPath = pObj-aURL.GetMainURL( INetURLObject::NO_DECODE ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 68849] Other: Add header guards to all include files
https://bugs.freedesktop.org/show_bug.cgi?id=68849 --- Comment #7 from Thomas Arnhold tho...@arnhold.org --- I'll use the following scheme for all new or changed header guards: All uppercase: INCLUDED_%modulename_%filename_%extension Examples: basic/source/runtime/rtlproto.hxx - INCLUDED_BASIC_RTLPROTO_HXX embeddedobj/source/inc/closepreventer.hxx - INCLUDED_EMBEDDEDOBJ_CLOSEPREVENTER_HXX sd/source/ui/inc/dlgass.hxx - INCLUDED_SD_DLGASS_HXX With this INCLUDED prefix we will always be able to identify this as include guard. This will be an advantage for future scripting efforts. -- 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 68849] Other: Add header guards to all include files
https://bugs.freedesktop.org/show_bug.cgi?id=68849 --- Comment #8 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #7) I'll use the following scheme for all new or changed header guards: All uppercase: INCLUDED_%modulename_%filename_%extension Examples: basic/source/runtime/rtlproto.hxx - INCLUDED_BASIC_RTLPROTO_HXX embeddedobj/source/inc/closepreventer.hxx - INCLUDED_EMBEDDEDOBJ_CLOSEPREVENTER_HXX sd/source/ui/inc/dlgass.hxx - INCLUDED_SD_DLGASS_HXX With this INCLUDED prefix we will always be able to identify this as include guard. This will be an advantage for future scripting efforts. FYI, the convention that I use is to use INCLUDED_FOO_BAR_HXX for a global header include/foo/bar.hxx under include/ and the longer INCLUDED_FOO_SOURCE_BAR_BAZ_HXX for anything else like foo/source/bar/baz.hxx, in an attempt to minimize the chance of clashes. -- 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: vcl/aqua
vcl/aqua/source/gdi/salgdicommon.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 3391f02e1a4c19101a08a1061bfb6ef47100f281 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 21 17:39:29 2013 +0200 String - OUString Change-Id: Iabb80c72f9e6aab3b58590299ce9f22e0ae1a5fa diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx index d9c54d9..eedf607 100644 --- a/vcl/aqua/source/gdi/salgdicommon.cxx +++ b/vcl/aqua/source/gdi/salgdicommon.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include sal/config.h + +#include cstring + #include sal/types.h #include osl/endian.h #include osl/file.hxx @@ -195,7 +199,8 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const OUString rToFile, TTGlobalFontInfo aTTInfo; ::GetTTGlobalFontInfo( pSftFont, aTTInfo ); rInfo.m_nFontType = FontSubsetInfo::SFNT_TTF; -rInfo.m_aPSName = String( aTTInfo.psname, RTL_TEXTENCODING_UTF8 ); +rInfo.m_aPSName = OUString( +aTTInfo.psname, std::strlen(aTTInfo.psname), RTL_TEXTENCODING_UTF8 ); rInfo.m_aFontBBox = Rectangle( Point( aTTInfo.xMin, aTTInfo.yMin ), Point( aTTInfo.xMax, aTTInfo.yMax ) ); rInfo.m_nCapHeight = aTTInfo.yMax; // Well ... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - linguistic/source sc/source vcl/source
linguistic/source/dlistimp.cxx | 11 +-- sc/source/filter/dif/difimp.cxx|2 -- vcl/source/gdi/cvtsvm.cxx |2 +- vcl/source/gdi/pdfwriter_impl2.cxx |2 +- 4 files changed, 7 insertions(+), 10 deletions(-) New commits: commit e03e9bfda7c1f5496879587ce1488faf94e6104b Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 16:49:24 2013 +0100 Resolves: fdo#70725 calc export to pdf broken Change-Id: Ibfe1d3a319fc82223f340ebd705a1966b8250089 diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index a58b719..bcff262 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -1705,7 +1705,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream rOStm, GDIMetaFile rMtf, MetaTextArrayAction*pAct = (MetaTextArrayAction*)pAction; OString aText(OUStringToOString(pAct-GetText(), rActualCharSet)); -OUStringaUniText = pAct-GetText().copy( pAct-GetIndex(), pAct-GetLen() ); +OUStringaUniText = pAct-GetText().copy( pAct-GetIndex(), std::minsal_Int32(pAct-GetText().getLength() - pAct-GetIndex(), pAct-GetLen()) ); sal_uLong nAryLen; sal_uLong nLen = pAct-GetLen(); const sal_uLong nTextLen = aText.getLength(); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 9484df2..97d92ba 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -842,7 +842,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile i_rMtf, vcl::PDFExtOutDevDa case( META_TEXT_ACTION ): { const MetaTextAction* pA = (const MetaTextAction*) pAction; -m_rOuterFace.DrawText( pA-GetPoint(), pA-GetText().copy( pA-GetIndex(), pA-GetLen() ) ); +m_rOuterFace.DrawText( pA-GetPoint(), pA-GetText().copy( pA-GetIndex(), std::minsal_Int32(pA-GetText().getLength() - pA-GetIndex(), pA-GetLen()) ) ); } break; commit d4b20d5c99adf2f32d782453387caef2439d9fa1 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 15:36:33 2013 +0100 convert lcl_GetToken from xub_StrLen to sal_Int32 Change-Id: I72e98f1059280ed05b6cf77a6d69e522b4b8c075 diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index f90a6b0..05f514e 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -22,7 +22,6 @@ #include i18nlangtag/mslangid.hxx #include osl/file.hxx #include tools/stream.hxx -#include tools/string.hxx #include tools/urlobj.hxx #include unotools/pathoptions.hxx #include unotools/useroptions.hxx @@ -781,10 +780,10 @@ void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, } -xub_StrLen lcl_GetToken( OUString rToken, +static sal_Int32 lcl_GetToken( OUString rToken, const OUString rText, xub_StrLen nPos, const OUString rDelim ) { -xub_StrLen nRes = STRING_LEN; +sal_Int32 nRes = -1; if (rText.isEmpty() || nPos = rText.getLength()) rToken = ; @@ -796,7 +795,7 @@ xub_StrLen lcl_GetToken( OUString rToken, } else { -xub_StrLen i; +sal_Int32 i; for (i = nPos; i rText.getLength(); ++i) { if (-1 != rDelim.indexOf( rText[i] )) @@ -828,8 +827,8 @@ static void AddInternal( ensure no '.'); OUString aToken; -xub_StrLen nPos = 0; -while (STRING_LEN != +sal_Int32 nPos = 0; +while (-1 != (nPos = lcl_GetToken( aToken, rNew, nPos, aDelim ))) { if( !aToken.isEmpty()!IsNumeric( aToken ) ) commit 4af59f9dea4c57ac5ebc8c43ff3b934a5498d164 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 15:33:52 2013 +0100 drop OSL_ENSURE about STRING_MAXLEN Change-Id: I945bcf3af5f8b2228c8c8c5958ff3aa60dfae2c2 diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 53c1a6c..1c0adc9 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -21,7 +21,6 @@ #include math.h #include svl/zforlist.hxx -#include tools/string.hxx #include attrib.hxx #include dif.hxx #include docpool.hxx @@ -371,7 +370,6 @@ TOPIC DifParser::GetNextTopic( void ) case S_Data: OSL_ENSURE( aLine.getLength() = 2, +GetNextTopic(): String ist zu kurz! ); -OSL_ENSURE( aLine.getLength() - 2 = STRING_MAXLEN, GetNextTopic(): line doesn't fit into data); if( aLine.getLength() 2 ) aData = aLine.copy( 1, aLine.getLength() - 2 ); else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - io/source
io/source/TextOutputStream/TextOutputStream.cxx | 15 +++ 1 file changed, 15 insertions(+) New commits: commit cf17f922f01bd75643749a7fd01a03f8167bccee Author: Jürgen Schmidt j...@apache.org Date: Mon Oct 21 15:55:06 2013 + #75731# check output stream and throw IOExceptioin if it is not intiliazed diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index 878a185..e2ac57e 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -74,6 +74,7 @@ class OTextOutputStream : public TextOutputStreamHelper rtl_UnicodeToTextContextmContextUnicode2Text; Sequencesal_Int8 implConvert( const OUString rSource ); +void checkOutputStream() throw(IOException); public: OTextOutputStream(); @@ -174,6 +175,7 @@ Sequencesal_Int8 OTextOutputStream::implConvert( const OUString rSource ) void OTextOutputStream::writeString( const OUString aString ) throw(IOException, RuntimeException) { +checkOutputStream(); if( !mbEncodingInitialized ) { OUString aUtf8Str( RTL_CONSTASCII_USTRINGPARAM(utf8) ); @@ -205,22 +207,35 @@ void OTextOutputStream::setEncoding( const OUString Encoding ) void OTextOutputStream::writeBytes( const Sequence sal_Int8 aData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { +checkOutputStream(); mxStream-writeBytes( aData ); } void OTextOutputStream::flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { +checkOutputStream(); mxStream-flush(); } void OTextOutputStream::closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { +checkOutputStream(); mxStream-closeOutput(); } +void OTextOutputStream::checkOutputStream() +throw(IOException) +{ +if (! mxStream.is() ) +throw IOException( +OUString(RTL_CONSTASCII_USTRINGPARAM(output stream is not initialized, you have to use setOutputStream first)), +ReferenceXInterface()); +} + + //=== // XActiveDataSource ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70285] cleanup generated C++ code ...
https://bugs.freedesktop.org/show_bug.cgi?id=70285 --- Comment #3 from Michael Meeks michael.me...@collabora.com --- Thanks Noel - looks prettier :-) Of course - it's really best to leave the easiest EasyHacks for people who are just getting into the project - they are difficult to create and serve a much more useful purpose than the issues they are fixes for as easy hacks :-) ie. if an expert developer spent a week they could fix some big proportion of our easy-hacks, but ... the real trouble is then creating / finding annotating new ones (along with restraining ourselves from doing them ;-) Anyhow - good to see it cleaned up :-) -- 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 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #5 from Marcos Souza marcos.souza@gmail.com --- In reportdesign, I saw a lot of uses of comhelper::existsValue: ::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString ServiceName ) throw (uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } We want to remove this too and use cppuhelper::supportsService? -- 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 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #6 from Marcos Souza marcos.souza@gmail.com --- Inside chart2, I saw some uses of: sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString ServiceName ) throw (RuntimeException) { return comphelper::ServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } And inside comphelper I found this declaration: /** the base implementation iterates over the service names from codegetSupportedServiceNames/code */ sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return supportsService( ServiceName, getSupportedServiceNames() ); } sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString ServiceName, const ::com::sun::star::uno::Sequence OUString SupportedServices ) throw() { const OUString * pArray = SupportedServices.getConstArray(); for( sal_Int32 i = 0; i SupportedServices.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; return sal_False; } Maybe we want to remove this too? -- 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] help.git: source/text
source/text/shared/01/0211.xhp |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit f81edbd66fc4d0b6cf03949bb2339c9be9ee989c Author: Michael Stahl mst...@redhat.com Date: Mon Oct 21 20:03:21 2013 +0200 fdo#64495: help: regex \x is no longer supported ... so document ICU's syntax \u and \U instead. Change-Id: Ib79a0684932dc9b3a8da45f1296f4dc27980464a diff --git a/source/text/shared/01/0211.xhp b/source/text/shared/01/0211.xhp index cd5e5c8..d6c2271 100644 --- a/source/text/shared/01/0211.xhp +++ b/source/text/shared/01/0211.xhp @@ -199,11 +199,13 @@ /tablerow tablerow tablecell - paragraph xml-lang=en-US id=par_id3156543 role=tablecontent l10n=U oldref=180\x/paragraph + paragraph xml-lang=en-US id=par_id3156543 role=tablecontent l10n=U oldref=180\u/paragraph + paragraph xml-lang=en-US id=par_id3156544 role=tablecontent l10n=U oldref=180\U/paragraph /tablecell tablecell - paragraph xml-lang=en-US id=par_id3153768 role=tablecontent l10n=U oldref=181Represents a special character based on its four-digit hexadecimal code ()./paragraph - paragraph xml-lang=en-US id=par_id3159252 role=tablecontent l10n=U oldref=208The code for the special character depends on the font used. You can view the codes by choosing emphInsert - Special Character/emph./paragraph + paragraph xml-lang=en-US id=par_id3153768 role=tablecontent l10n=U oldref=181Represents a character based on its four-digit hexadecimal Unicode code ()./paragraph + paragraph xml-lang=en-US id=par_id3153769 role=tablecontent l10n=U oldref=181For obscure characters there is a separate variant with capital U and eight hexadecimal digits ()./paragraph + paragraph xml-lang=en-US id=par_id3159252 role=tablecontent l10n=U oldref=208For certain symbol fonts the code for special characters may depend on the used font. You can view the codes by choosing emphInsert - Special Character/emph./paragraph /tablecell /tablerow tablerow ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f291812d3579768fa2ae753cae49c6723f25f7e Author: Michael Stahl mst...@redhat.com Date: Mon Oct 21 20:03:21 2013 +0200 Updated core Project: help f81edbd66fc4d0b6cf03949bb2339c9be9ee989c diff --git a/helpcontent2 b/helpcontent2 index b84ad6a..f81edbd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b84ad6a5bf1076093ef74da9f8a53ed870629818 +Subproject commit f81edbd66fc4d0b6cf03949bb2339c9be9ee989c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - comphelper/source include/comphelper
comphelper/source/misc/accessibleeventnotifier.cxx | 153 ++--- include/comphelper/accessibleeventnotifier.hxx | 32 2 files changed, 107 insertions(+), 78 deletions(-) New commits: commit ffd0e2911023e684ca1e206d18b45ef5aa6179f9 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 21 18:54:42 2013 +0200 fdo#70465: speed up AccessibleEventNotifier::generateId() Iterating over all entries of a std::map is rather slow, so add a interval map to manage the free entries. A first attempt to use boost::icl::interval_set for this was abandoned; while the releaseId() function would be just 1 line, GCC 4.8.2 at least is unhappy about boost icl headers for non-obvious reasons: UnpackedTarball/boost/boost/icl/discrete_interval.hpp:45:225: error: default argument for template parameter for class enclosing âvoid boost::icl::boost_concept_check_dummy45(boost_concept_check45*)â Change-Id: I7b767aefee57df7743dc13a694b6a61abdd536c7 diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index b938aa5..c46d54a 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -24,6 +24,7 @@ #include comphelper/guarding.hxx #include map +#include limits using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -43,46 +44,71 @@ namespace ::cppu::OInterfaceContainerHelper*, ::std::less AccessibleEventNotifier::TClientId ClientMap; +/// key is the end of the interval, value is the start of the interval +typedef ::std::mapAccessibleEventNotifier::TClientId, +AccessibleEventNotifier::TClientId IntervalMap; + struct lclMutex : public rtl::Static ::osl::Mutex, lclMutex {}; struct Clients : public rtl::Static ClientMap, Clients {}; +struct FreeIntervals +: public rtl::StaticWithInitIntervalMap, FreeIntervals { +IntervalMap operator() () { +IntervalMap map; +map.insert(::std::make_pair( + ::std::numeric_limitsAccessibleEventNotifier::TClientId::max(), 1)); +return map; +} +}; -/// generates a new client id -static AccessibleEventNotifier::TClientId generateId() +static void releaseId(AccessibleEventNotifier::TClientId const nId) { -AccessibleEventNotifier::TClientId nBiggestUsedId = 0; -AccessibleEventNotifier::TClientId nFreeId = 0; - -// look through all registered clients until we find a gap in the ids - -// Note that the following relies on the fact the elements in the map -// are traveled with ascending keys (aka client ids) -ClientMap rClients = Clients::get(); -for ( ClientMap::const_iterator aLookup = rClients.begin(); -aLookup != rClients.end(); -++aLookup -) +IntervalMap rFreeIntervals(FreeIntervals::get()); +IntervalMap::iterator const upper(rFreeIntervals.upper_bound(nId)); +assert(upper != rFreeIntervals.end()); +assert(nId upper-second); // second is start of the interval! +if (nId + 1 == upper-second) +{ +--upper-second; // add nId to existing interval +} +else { -AccessibleEventNotifier::TClientId nCurrent = aLookup-first; -OSL_ENSURE( nCurrent nBiggestUsedId, -AccessibleEventNotifier::generateId: -map is expected to be sorted ascending! ); - -if ( nCurrent - nBiggestUsedId 1 ) -{ // found a gap -nFreeId = nBiggestUsedId + 1; -break; +IntervalMap::iterator const lower(rFreeIntervals.lower_bound(nId)); +if (lower != rFreeIntervals.end() lower-first == nId - 1) +{ +// add nId by replacing lower with new merged entry +rFreeIntervals.insert(::std::make_pair(nId, lower-second)); +rFreeIntervals.erase(lower); +} +else // otherwise just add new 1-element interval +{ +rFreeIntervals.insert(::std::make_pair(nId, nId)); } - -nBiggestUsedId = nCurrent; } +// currently it's not checked whether intervals can be merged now +// hopefully that won't be a problem in practice +} -if ( !nFreeId ) -nFreeId = nBiggestUsedId + 1; +/// generates a new client id +static AccessibleEventNotifier::TClientId generateId() +{ +IntervalMap rFreeIntervals(FreeIntervals::get()); +assert(!rFreeIntervals.empty()); +IntervalMap::iterator const iter(rFreeIntervals.begin()); +AccessibleEventNotifier::TClientId const nFirst = iter-first;
[Libreoffice-commits] core.git: download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aeac64441c4525f7a16f29bf6081ffb86f437478 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Oct 21 16:05:40 2013 -0400 Re-packaged mdds 0.9.1. Change-Id: I50e0a31020f022bded7a97349560c0ed9bdb988d diff --git a/download.lst b/download.lst index d4d0057..56c8d0f 100644 --- a/download.lst +++ b/download.lst @@ -69,7 +69,7 @@ export LIBXML_TARBALL := 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz export LIBXSLT_TARBALL := e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := 450728fc82e0aa2b588c1e79d5694595-mdds_0.9.1.tar.bz2 +export MDDS_TARBALL := 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools tools/source
include/tools/string.hxx |4 tools/source/string/strimp.cxx | 34 -- 2 files changed, 38 deletions(-) New commits: commit cfda947d7c0476b9c402c84f9d8515c76ec87bac Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 21 14:32:36 2013 +0100 Related: fdo#38838 remove UniString::Copy Change-Id: I566e3ade54962bbc6ace9b757f79c1b8ed9ffd00 diff --git a/include/tools/string.hxx b/include/tools/string.hxx index 9560220..3933595 100644 --- a/include/tools/string.hxx +++ b/include/tools/string.hxx @@ -103,7 +103,6 @@ public: UniString(); UniString( const ResId rResId ); UniString( const UniString rStr ); -UniString( const UniString rStr, xub_StrLen nPos, xub_StrLen nLen ); UniString( const OUString rStr ); ~UniString(); @@ -133,9 +132,6 @@ public: xub_StrLen Len() const { return (xub_StrLen)mpData-mnLen; } -UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const -{ return UniString( *this, nIndex, nCount ); } - const sal_Unicode* GetBuffer() const { return mpData-maStr; } friend sal_Bool operator == ( const UniString rStr1, const UniString rStr2 ); diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index a3e44fa..de479e4 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -94,40 +94,6 @@ STRING::STRING( const STRING rStr ) mpData = rStr.mpData; } -STRING::STRING( const STRING rStr, xub_StrLen nPos, xub_StrLen nLen ) -: mpData( NULL ) -{ -if ( nPos rStr.mpData-mnLen ) -nLen = 0; -else -{ -// correct length if necessary -sal_Int32 nMaxLen = rStr.mpData-mnLen-nPos; -if ( nLen nMaxLen ) -nLen = static_cast xub_StrLen (nMaxLen); -} - -if ( nLen ) -{ -// Increase reference counter if it suffices -if ( (nPos == 0) (nLen == rStr.mpData-mnLen) ) -{ -STRING_ACQUIRE((STRING_TYPE *)rStr.mpData); -mpData = rStr.mpData; -} -else -{ -// otherwise, copy string -mpData = ImplAllocData( nLen ); -memcpy( mpData-maStr, rStr.mpData-maStr+nPos, nLen*sizeof( STRCODE ) ); -} -} -else -{ -STRING_NEW((STRING_TYPE **)mpData); -} -} - STRING::~STRING() { // free string data ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/touch ios/experimental sw/source vcl/inc vcl/ios
include/touch/touch-impl.h | 33 include/touch/touch.h | 23 - ios/experimental/LibreOffice/LibreOffice/AppDelegate.m |8 - ios/experimental/LibreOffice/LibreOffice/View.m| 69 +++-- sw/source/core/crsr/viscrs.cxx | 22 +++-- sw/source/ui/docvw/edtwin.cxx | 32 +++ vcl/inc/ios/iosinst.hxx|7 + vcl/ios/iosinst.cxx| 27 ++ 8 files changed, 163 insertions(+), 58 deletions(-) New commits: commit 657a3a81828216240b6ff31377d62ca17e656368 Author: Tor Lillqvist t...@collabora.com Date: Tue Oct 22 01:06:56 2013 +0300 Try to handle selection resizing in a more correct way Faking mouse clicks is a stupid way to do it of course. Try to do it right. For now just worked on moving the end handle, but once that works, similar code should be used for the start handle, too. Does not work yet. It is hard to extract out from SwEditWin::MouseButtonDown() exactly what all is relevant, and what isn't, for this use case. Change-Id: I76a226f787facbac645aaff8b4852d693bcf4ccb diff --git a/include/touch/touch-impl.h b/include/touch/touch-impl.h new file mode 100644 index 000..a2550b1 --- /dev/null +++ b/include/touch/touch-impl.h @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2013 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_TOUCH_TOUCH_IMPL_H +#define INCLUDED_TOUCH_TOUCH_IMPL_H + +#ifdef __cplusplus +extern C { +#if 0 +} // To avoid an editor indenting all inside the extern C +#endif +#endif + +// Implementation of touch_lo_* functions, called on the LO thread through +// the PostUserEvent mechanism. Not called by UI thread code. + +void touch_lo_selection_end_move_impl(const void *documentHandle, + int x, + int y); + +#ifdef __cplusplus +} +#endif + +#endif // INCLUDED_TOUCH_TOUCH_IMPL_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/touch/touch.h b/include/touch/touch.h index 9e5c011..f999eca 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -82,12 +82,14 @@ void touch_ui_selection_resize_done(bool success, void touch_ui_selection_none(); -// 2) Those implmented in the lower layers to be called by the upper +// 2) Those implemented in the lower layers to be called by the upper // layer, in cases where we don't want to include a bunch of the // normal LibreOffice C++ headers in an otherwise purely Objective-C // CocoaTouch-based source file. Of course it depends on the case // where that is wanted, and this all is work in progress. Prefixed by -// touch_lo_. +// touch_lo_. All these are called on the UI thread and except for +// those so marked schedule work to be done asynchronously on the LO +// thread. typedef enum { DOWN, MOVE, UP} MLOMouseButtonState; typedef enum { NONE, SHIFT, META } MLOModifiers; @@ -95,9 +97,7 @@ typedef int MLOModifierMask; void touch_lo_keyboard_did_hide(); -void touch_lo_runMain(); void touch_lo_set_view_size(int width, int height); -void touch_lo_render_windows(void *context, int minX, int minY, int width, int height); void touch_lo_tap(int x, int y); void touch_lo_mouse(int x, int y, MLOMouseButtonState state, MLOModifierMask modifiers); void touch_lo_pan(int deltaX, int deltaY); @@ -113,10 +113,25 @@ void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, int void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state); +// Move the end of the selection to (x,y) +// (work in progress, of course there should be a corresponding function +// to move the start of the selection, too.) +void touch_lo_selection_end_move(const void *documentHandle, + int x, + int y); + void touch_lo_selection_attempt_resize(const void *documentHandle, MLORect *selectedRectangles, int numberOfRectangles); +// Special case: synchronous: waits for the rendering to complete +void touch_lo_render_windows(void *context, int minX, int minY, int width, int height); + +// Special case: This is the function that is called in the newly +// created LO thread to run the LO code. +void touch_lo_runMain(); + + #ifdef __cplusplus } #endif diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m b/ios/experimental/LibreOffice/LibreOffice/View.m index c908595..cb96e48 100644 --- a/ios/experimental/LibreOffice/LibreOffice/View.m +++
[Bug 70667] Notify libreoffice user list of API changes and motivate user to test extensions on dailies/beta
https://bugs.freedesktop.org/show_bug.cgi?id=70667 --- Comment #6 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #4) shows its far less: around 2 per week on average, although some will come in bursts of 3-4 Fine. Incidental 'bursts' of that size won't be a problem of course. -- 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 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #95 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=cfda947d7c0476b9c402c84f9d8515c76ec87bac Related: fdo#38838 remove UniString::Copy The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/kohei/xlsx-import-speedup'
New branch 'private/kohei/xlsx-import-speedup' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: error in unit test
Hi Marcos, Marcos Souza wrote (17-10-13 00:23) Now it worked for me... I don't know why. I pulled this afternoon(in Brazil) and it worked. I did a make clean and compiled this again. Thanks a lot for helping me in this issue. @Cor, can you try this now? Do a pull and try to build again? Maybe do a make clean. I always do a make clean since I only do a build now and then... I'll tray again soon .. -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: error in unit test
Hi Thorsten, Thorsten Behrens wrote (17-10-13 00:09) Cor Nouws wrote: - Sixth pixel is not green Interesting - are you per chance running under some reduced color depth mode? It is possible that the bitmaps generated are not truecolor then. I'm not aware that I ever tweaked the color depth of my installation (and to be honest, can't even find it because Ubuntu does something different then /etc/X11/xorg.conf nowadays ;) Forum does give answer yet. ) But I'll try further .. -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - comphelper/Library_comphelper.mk comphelper/source include/comphelper offapi/com sax/qa sax/source sfx2/source svx/source writerperfect/source
comphelper/Library_comphelper.mk|1 comphelper/source/misc/componentcontext.cxx | 115 --- include/comphelper/componentcontext.hxx | 235 offapi/com/sun/star/xml/sax/FastTokenHandler.idl|4 sax/qa/cppunit/parser.cxx | 16 - sax/source/tools/fshelper.cxx |5 sfx2/source/sidebar/SidebarPanel.cxx|9 svx/source/form/fmundo.cxx |9 writerperfect/source/draw/CDRImportFilter.cxx |7 writerperfect/source/draw/CMXImportFilter.cxx |7 writerperfect/source/draw/MSPUBImportFilter.cxx |7 writerperfect/source/draw/VisioImportFilter.cxx |7 writerperfect/source/draw/WPGImportFilter.cxx |7 writerperfect/source/writer/MSWorksImportFilter.cxx |7 writerperfect/source/writer/MWAWImportFilter.cxx|7 writerperfect/source/writer/WordPerfectImportFilter.cxx |7 16 files changed, 52 insertions(+), 398 deletions(-) New commits: commit 6cc508aec4e30c72c00eac9e77fb6dd10cc093e9 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 21 22:56:59 2013 +0200 Remove comphelper::ComponentContext Change-Id: Idc5974e5a2ec68e8f1b2312a88fab15092c82788 diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 4b30338..4fdada8 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/comphelper_module \ comphelper/source/misc/comphelper_services \ comphelper/source/misc/componentbase \ -comphelper/source/misc/componentcontext \ comphelper/source/misc/componentmodule \ comphelper/source/misc/configuration \ comphelper/source/misc/configurationhelper \ diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx deleted file mode 100644 index ac9194c..000 --- a/comphelper/source/misc/componentcontext.cxx +++ /dev/null @@ -1,115 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include comphelper/componentcontext.hxx -#include comphelper/processfactory.hxx -#include com/sun/star/lang/NullPointerException.hpp -#include com/sun/star/lang/ServiceNotRegisteredException.hpp -#include com/sun/star/beans/XPropertySet.hpp - -// -namespace comphelper -{ -// - -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::XComponentContext; -using ::com::sun::star::lang::NullPointerException; -using ::com::sun::star::lang::ServiceNotRegisteredException; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::XInterface; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::RuntimeException; -using ::com::sun::star::uno::Sequence; - -// -//= ComponentContext -// -// -ComponentContext::ComponentContext( const Reference XComponentContext _rxContext ) -:m_xContext( _rxContext ) -{ -if ( m_xContext.is() ) -m_xORB = m_xContext-getServiceManager(); -} - -// -ComponentContext::ComponentContext( const Reference XMultiServiceFactory _rxLegacyFactory ) -{ -if ( !_rxLegacyFactory.is() ) -throw NullPointerException(); - -m_xContext = comphelper::getComponentContext(
Reminder - QA Call Public Time Poll
Hi All, Just a reminder that we are discussing changing our QA public call time. If you're at all interested in joining and the current time does not work, please take a few minutes to look at the options and add your desired time. http://doodle.com/z5xic72ng9q3hz8v7aqhxbgt/admin?#table All the best, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 66968] daily digest for all gerrit projects
https://bugs.freedesktop.org/show_bug.cgi?id=66968 Mat M m...@gmx.fr changed: 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
[Bug 70682] Highlight first time contributors in gerrit daily digest
https://bugs.freedesktop.org/show_bug.cgi?id=70682 --- Comment #3 from Mat M m...@gmx.fr --- where should I put the repo ? /tmp /var/tmp ~/tmp Another better location I do not know about ? -- 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: desktop/source embeddedobj/source include/cppcanvas sd/source
desktop/source/inc/desktopdllapi.h|1 + embeddedobj/source/inc/closepreventer.hxx |5 + embeddedobj/source/inc/targetstatecontrol.hxx |4 embeddedobj/source/inc/xcreator.hxx |5 ++--- embeddedobj/source/msole/advisesink.hxx |5 + embeddedobj/source/msole/mtnotification.hxx |4 embeddedobj/source/msole/olewrapclient.hxx|5 + embeddedobj/source/msole/xdialogcreator.hxx |5 ++--- embeddedobj/source/msole/xolefactory.hxx |5 ++--- include/cppcanvas/cppcanvasdllapi.h |5 +++-- sd/source/ui/inc/assclass.hxx |4 ++-- sd/source/ui/inc/dlgass.hxx |4 ++-- 12 files changed, 37 insertions(+), 15 deletions(-) New commits: commit d6b80337fb76e31b2e6a11c18c3ae989767c8118 Author: Thomas Arnhold tho...@arnhold.org Date: Tue Oct 22 05:32:12 2013 +0200 fdo#68849 add some header guards Change-Id: I1cd598fba94e337c2ccad68a4a888743aeb292f0 diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h index 98ca434..ebc75f1 100644 --- a/desktop/source/inc/desktopdllapi.h +++ b/desktop/source/inc/desktopdllapi.h @@ -8,6 +8,7 @@ */ #ifndef INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H +#define INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H #include sal/config.h #include sal/types.h diff --git a/embeddedobj/source/inc/closepreventer.hxx b/embeddedobj/source/inc/closepreventer.hxx index 55e4999..9310cdc 100644 --- a/embeddedobj/source/inc/closepreventer.hxx +++ b/embeddedobj/source/inc/closepreventer.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX +#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX + #include com/sun/star/util/XCloseListener.hpp #include cppuhelper/implbase1.hxx @@ -28,4 +31,6 @@ class OClosePreventer : public ::cppu::WeakImplHelper1 ::com::sun::star::util: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject Source ) throw (::com::sun::star::uno::RuntimeException); }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/inc/targetstatecontrol.hxx b/embeddedobj/source/inc/targetstatecontrol.hxx index b0b3b5e..6cc999a 100644 --- a/embeddedobj/source/inc/targetstatecontrol.hxx +++ b/embeddedobj/source/inc/targetstatecontrol.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_TARGETSTATECONTROL_HXX +#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_TARGETSTATECONTROL_HXX + #include sal/types.h #include osl/diagnose.h @@ -37,5 +40,6 @@ public: } }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 7a90121..a282c41 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -17,13 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __XCREATOR_HXX_ -#define __XCREATOR_HXX_ +#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_INC_XCREATOR_HXX +#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_XCREATOR_HXX #include com/sun/star/embed/XEmbeddedObjectCreator.hpp #include com/sun/star/lang/XServiceInfo.hpp - #include cppuhelper/implbase2.hxx #include comphelper/mimeconfighelper.hxx diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx index d178e48..d8d0da7 100644 --- a/embeddedobj/source/msole/advisesink.hxx +++ b/embeddedobj/source/msole/advisesink.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_ADVISESINK_HXX +#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_ADVISESINK_HXX + #include osl/interlck.h #include osl/mutex.hxx #include platform.h @@ -46,4 +49,6 @@ public: STDMETHODIMP_(void) OnClose(void); }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/msole/mtnotification.hxx b/embeddedobj/source/msole/mtnotification.hxx index d4f69a4..9b45e5f 100644 --- a/embeddedobj/source/msole/mtnotification.hxx +++ b/embeddedobj/source/msole/mtnotification.hxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_MTNOTIFICATION_HXX +#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_MTNOTIFICATION_HXX + #include com/sun/star/uno/Reference.hxx #include com/sun/star/embed/XEmbeddedObject.hpp #include com/sun/star/awt/XCallback.hpp @@ -44,5 +47,6 @@ public: ~MainThreadNotificationRequest(); }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx index 4ee..52ebca2 100644 --- a/embeddedobj/source/msole/olewrapclient.hxx
Re: [Libreoffice-qa] [libreoffice-website] [Bug 70636] New: bug reporter pages are just plain fucked
Rob Snelders-3 wrote Hi Tollef, We have a problem with a aggressive user on bugzilla. Can you remove the bug he made as well as the user? The bug is 70636 and the user is Fuck Registration Hi! ...and you think it is over? Looking at https://bugs.freedesktop.org/show_bug.cgi?id=70651 he just started. I do not see deleting bug and account of the reporter listed at https://wiki.documentfoundation.org/QA/FreeDesktop_Rules_Procedures Best regards. -- View this message in context: http://nabble.documentfoundation.org/Re-libreoffice-website-Bug-70636-New-bug-reporter-pages-are-just-plain-fucked-tp4078876p4079073.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [libreoffice-website] [Bug 70636] New: bug reporter pages are just plain fucked
Hi, He has had more then 4 warning within a day. So the 4th vialation is done as should. He is still attacking bjoern and joel on their blogs agter a permanent ban on his IP. So I think it isn't to severe. No it doesn't stop him. But hopefully it will deter him. As for removing the bug. I don't accept the ascii-art or language he uses. As far as I see any comment with that should be removed. -- Greetings, Rob Snelders On 21-10-13 18:12, bfoman wrote: Rob Snelders-3 wrote Hi Tollef, We have a problem with a aggressive user on bugzilla. Can you remove the bug he made as well as the user? The bug is 70636 and the user is Fuck Registration Hi! ...and you think it is over? Looking at https://bugs.freedesktop.org/show_bug.cgi?id=70651 he just started. I do not see deleting bug and account of the reporter listed at https://wiki.documentfoundation.org/QA/FreeDesktop_Rules_Procedures Best regards. -- View this message in context: http://nabble.documentfoundation.org/Re-libreoffice-website-Bug-70636-New-bug-reporter-pages-are-just-plain-fucked-tp4078876p4079073.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [libreoffice-website] [Bug 70636] New: bug reporter pages are just plain fucked
Hi guys, On Mon, Oct 21, 2013 at 09:12:52AM -0700, bfoman wrote: ... this is being dealt with and the comments will be removed, even if it might take some time. We can play this game for a whole year or more, if needed, so no need to get excited about this right now. So: Keep Calm and Carry On ;) Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Reminder - QA Call Public Time Poll
Hi All, Just a reminder that we are discussing changing our QA public call time. If you're at all interested in joining and the current time does not work, please take a few minutes to look at the options and add your desired time. http://doodle.com/z5xic72ng9q3hz8v7aqhxbgt/admin?#table All the best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 52025] PRINTING: Can't print COM-10 (#10) size envelopes
https://bugs.freedesktop.org/show_bug.cgi?id=52025 Joel Madero jmadero@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||jmadero@gmail.com Ever confirmed|0 |1 --- Comment #6 from Joel Madero jmadero@gmail.com --- Seems like we need some information here so marking as such. Once attachment is made, mark as UNCONFIRMED and we'll try to address it faster than we did this time. Apologies for the long delay -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69858] FILEOPEN: Firebird crash when trying to create a DB
https://bugs.freedesktop.org/show_bug.cgi?id=69858 --- Comment #9 from Alex Thurgood ipla...@yahoo.co.uk --- Hi Julien, I can't reproduce this on Linux Ubuntu 32bit with master build from 19/10/2013 Version: 4.2.0.0.alpha0+ Build ID: 6dd844917205a051c880ff7609c28e09698770c8 Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69858] FILEOPEN: Firebird crash when trying to create a DB
https://bugs.freedesktop.org/show_bug.cgi?id=69858 --- Comment #10 from Alex Thurgood ipla...@yahoo.co.uk --- Sorry, that should be my build from 20/10/2013. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70664] EDITING: Embedded Firebird - Fieldtype BLOB in table-creating-module doesn't save pictures
https://bugs.freedesktop.org/show_bug.cgi?id=70664 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Severity|normal |blocker Priority|medium |highest -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70664] EDITING: Embedded Firebird - Fieldtype BLOB in table-creating-module doesn't save pictures
https://bugs.freedesktop.org/show_bug.cgi?id=70664 --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- Confirming on Linux 32 bit Ubuntu 13.04 Version: 4.2.0.0.alpha0+ Build ID: 6dd844917205a051c880ff7609c28e09698770c8 As this is functionality which currently works in HSQLDB via the UI, I don't think we should be releasing Firebird integration if this doesn't work. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70664] EDITING: Embedded Firebird - Fieldtype BLOB in table-creating-module doesn't save pictures
https://bugs.freedesktop.org/show_bug.cgi?id=70664 --- Comment #3 from Alex Thurgood ipla...@yahoo.co.uk --- In the GUI, the user isn't given a choice as to the type of BLOB subtype when in Table edit/creation mode. If a form is built based on a table containing id INT NOT NULL PRIMARY KEY pic BLOB which is all that the GUI provides for, then a form can be built on that and by default, double-clicking on the control that maps to the image field will open the file manager and allow a user to insert an image, with a preview. The image then gets displayed in the control on the form. However, saving the record, or moving to a new record and then back again, removes the image from the display, even though the data is referenced as an OBJECT in the underlying table. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69925] Other: Wiki Publisher Extension is not working
https://bugs.freedesktop.org/show_bug.cgi?id=69925 --- Comment #2 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- Correction: The option is still available, but the structure/naming has changed. So the naming should be updated in Wiki Publisher as well. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70664] EDITING: Embedded Firebird - Fieldtype BLOB in table-creating-module doesn't save pictures
https://bugs.freedesktop.org/show_bug.cgi?id=70664 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Blocks||65675 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Depends on||70664 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #13 from Alex Thurgood ipla...@yahoo.co.uk --- Adding 70664 - can not display images inserted into Firebird embedded db -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42692] SVG export ignores Selection option
https://bugs.freedesktop.org/show_bug.cgi?id=42692 Ulrich Windl ulrich.wi...@rz.uni-regensburg.de changed: What|Removed |Added CC||ulrich.wi...@rz.uni-regensb ||urg.de --- Comment #10 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- Still present in 4.0.5.2. Close to celebrate the two years anniversary of this bug ;-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70710] New: filled areas are not filled for WMF images
https://bugs.freedesktop.org/show_bug.cgi?id=70710 Priority: medium Bug ID: 70710 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: filled areas are not filled for WMF images Severity: major Classification: Unclassified OS: Windows (All) Reporter: ulrich.wi...@rz.uni-regensburg.de Hardware: Other Status: UNCONFIRMED Version: 4.0.5.2 release Component: Writer Product: LibreOffice Created attachment 87908 -- https://bugs.freedesktop.org/attachment.cgi?id=87908action=edit Example WMF This is new as compared to LibreOffice 3.6: When creating filles rectangles in Draw, exporting them as WMF, and importing them in Writer, the filled areas are not filled. Did not see this in LibreOffice 3. I'll attach an example. I found the problem with Windows/XP (32-bit)... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70710] filled areas are not filled for WMF images
https://bugs.freedesktop.org/show_bug.cgi?id=70710 Ulrich Windl ulrich.wi...@rz.uni-regensburg.de changed: What|Removed |Added Attachment #87908|text/plain |application/x-msmetafile mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68357] MAILMERGE: Drag-and-Drop With the Data Source View
https://bugs.freedesktop.org/show_bug.cgi?id=68357 --- Comment #9 from Alex Thurgood ipla...@yahoo.co.uk --- Why put a video up when it has already been stated this works in current master and future 4.2 ? At some stage, whatever piece of code got fixed will make it into the stable release. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70710] filled areas are not filled for WMF images
https://bugs.freedesktop.org/show_bug.cgi?id=70710 Ulrich Windl ulrich.wi...@rz.uni-regensburg.de changed: What|Removed |Added CC||ulrich.wi...@rz.uni-regensb ||urg.de --- Comment #1 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- When double-clicking the WMF file in Windows, the filled areas are displayed, so I guess it's a bug in Writer, and not in Draw. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70703] Base is crashing frequently when EDITING data and switching Forms
https://bugs.freedesktop.org/show_bug.cgi?id=70703 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Hi Tim, The native mysql connector has been announced recently as known to cause crashes when working with MariaDB databases, at least on Windows, due to a problem in one of the MariaDB libraries that were used in the builds of the connectors. This might also be the cause of your problem. At present, people will either need to rebuild their native connectors (if they build themselves) or wait until updated connectors are made available. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70711] New: calling edit with external tool: linked images disappear, Writer crashes
https://bugs.freedesktop.org/show_bug.cgi?id=70711 Priority: medium Bug ID: 70711 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: calling edit with external tool: linked images disappear, Writer crashes Severity: critical Classification: Unclassified OS: Windows (All) Reporter: ulrich.wi...@rz.uni-regensburg.de Hardware: Other Status: UNCONFIRMED Version: 4.0.5.2 release Component: Writer Product: LibreOffice When selecting Edit with external tool for a linked image in Windows/XP, some popup about some temporary file that cannot be opened appears. After clicking OK, the image AND ALL OTHER images signal a read error. If you select Reload (revert changes), Writer crashes. I could reproduce this. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70433] EDITING: Embedded Firebird - List doesn't work in queries, works in external Firebird
https://bugs.freedesktop.org/show_bug.cgi?id=70433 --- Comment #1 from Alex Thurgood ipla...@yahoo.co.uk --- Robert, If I open your file in GUI Query Design mode, I see the following as the Field Name : LIST( [Vorname], ' and ' ) shouldn't the function appear in the Function are of the UI ? Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70433] EDITING: Embedded Firebird - List doesn't work in queries, works in external Firebird
https://bugs.freedesktop.org/show_bug.cgi?id=70433 --- Comment #2 from Alex Thurgood ipla...@yahoo.co.uk --- LIST doesn't appear in the dropdown list of supported functions, so I'm guessing that it is one that hasn't been implemented, or is a missing feature ? In which case, this would be a RFE ? Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs