LibreOffice Gerrit News for core on 2014-09-18
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Fix for CONC-104: mysql_options doesn't support MYSQL_SECURE_AUTH option in https://gerrit.libreoffice.org/11492 from Robert Antoni Buj i Gelonch about module build, external + fdo#81356: compiler plugin for rewrite Fraction in https://gerrit.libreoffice.org/11405 from Juan Picca about module build, compilerplugins, include, testcompilerplugins, tools + fdo#39468: Translated German comments in https://gerrit.libreoffice.org/11485 from Jennifer Liebel about module include + fdo#39468 Translated German to English in https://gerrit.libreoffice.org/11461 from Tobias Madl about module forms End of freshness + Properly handle the hash-style linker check when cross-compiling in https://gerrit.libreoffice.org/11496 from Peter Foley about module build + Remove ActionBarSherlock from android in https://gerrit.libreoffice.org/11421 from Peter Foley about module android + Add support for external hamcrest when using junit 4.11+ in https://gerrit.libreoffice.org/11383 from Peter Foley about module build, solenv + fdo#63483: support for modify passwd in Impress and Draw in https://gerrit.libreoffice.org/11495 from Katarina Behrens about module filter, sd + .ui tweaks to PDF export tab pages in https://gerrit.libreoffice.org/11408 from Adolfo Jayme Barrientos about module filter + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot about module svx + Android browser: open documents with the new viewer in https://gerrit.libreoffice.org/11488 from Jacobo Aragunde Pérez about module android + Android: merge LibreOffice4Android into LOAndroid3 in https://gerrit.libreoffice.org/11487 from Jacobo Aragunde Pérez about module android + fdo#82502 Ctrl-F should select the text in the search bar, not close it in https://gerrit.libreoffice.org/0 from Samuel Mehrbrodt about module svx + Remove the term “Persona” from visible UI strings in https://gerrit.libreoffice.org/11483 from Adolfo Jayme Barrientos about module cui + Stop using unnecessary std::auto_ptr in https://gerrit.libreoffice.org/11484 from Takeshi Abe about module sd + fdo#82577: Handle Font in https://gerrit.libreoffice.org/11481 from Noel Grandin about module accessibility, basctl, basic, canvas, chart2, cppcanvas, cui, dbaccess, desktop, drawinglayer, editeng, extensions, filter, forms, formula, framework, include, reportdesign, sc, sd, sdext, sfx2, slideshow, starmath, svtools, svx, sw, test, toolkit, uui, vcl, writerfilter, xmlsecurity + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11482 from Takeshi Abe about module svl + LO doesn't start: Turn assert to warn statement to fix it in https://gerrit.libreoffice.org/11479 from David Ostrovsky about module vcl * Merged changes on master for project core changed in the last 25 hours: + sw: html import test: local images shouldn't be file links (bnc#580834) in https://gerrit.libreoffice.org/11490 from Matúš Kukan + bnc#580834: HTML import: Embed images if source URL is a local file. in https://gerrit.libreoffice.org/11489 from Matúš Kukan + Move the scrollbar and layer tabs in a separate row in Draw in https://gerrit.libreoffice.org/11480 from Samuel Mehrbrodt + fdo#60712 - Inherits cell styles in inserting rows/columns in https://gerrit.libreoffice.org/10373 from Hideki Ikeda + bean: unchecked call to getMethod() as a member of the raw type Class in https://gerrit.libreoffice.org/11477 from Robert Antoni Buj i Gelonch + bean: Array concatenated with a String in https://gerrit.libreoffice.org/11478 from Robert Antoni Buj i Gelonch + bean: encode(String) in URLEncoder has been deprecated in https://gerrit.libreoffice.org/11476 from Robert Antoni Buj i Gelonch + jni_uno: string comparison in https://gerrit.libreoffice.org/11470 from Robert Antoni Buj i Gelonch + cppu and cppuhelper: loplugin: cstylecast in https://gerrit.libreoffice.org/11411 from Noel Grandin * 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: + l10ntools/source/export.cxx: be more std:: in https://gerrit.libreoffice.org/11320 from Douglas Mencken + l10ntools-transex3: convert 'int' to 'bool' where it's logical in https://gerrit.libreoffice.org/11317 from Douglas Mencken + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#63154: Use OSL_* macros to manage endianess... in https://gerrit.libreoffice.org/11082 from Marcos Paulo de Souza + fdo#63154: Rearrange some solar.h includes in https://gerrit.libreoffice.org/10892 from Marcos
[Libreoffice-commits] core.git: 2 commits - extras/source svx/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |7 ++- svx/uiconfig/ui/colorwindow.ui |4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) New commits: commit 9c818268767d6a1c1bc731ae30c45883bab987e7 Author: Maxim Monastirsky momonas...@gmail.com Date: Thu Sep 18 09:50:00 2014 +0300 Use svxcorelo-SvxColorValueSet instead Change-Id: Ib2ad71326d0ff45eae01a16d675c3d40e1ba1f2c diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index d15eb42..8daa9b2 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -55,7 +55,7 @@ /packing /child child - object class=svxlo-SvxColorValueSet id=colorset + object class=svxcorelo-SvxColorValueSet id=colorset property name=width_request200/property property name=height_request150/property property name=visibleTrue/property @@ -93,7 +93,7 @@ /packing /child child - object class=svxlo-SvxColorValueSet id=recent_colorset + object class=svxcorelo-SvxColorValueSet id=recent_colorset property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property commit dca88d025f28cb1b438bc34c32d048d940025063 Author: Maxim Monastirsky momonas...@gmail.com Date: Thu Sep 18 09:51:55 2014 +0300 Revert Add svxlo-SvxColorValueSet to the glade catalog This reverts commit 9df22b4ac0f97346701d0284abc74499310e660f. diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 31dd5ee..12ff8b4 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -364,10 +364,7 @@ glade-widget-class title=Document Info Preview name=svtlo-ODocumentInfoPreview generic-name=Document Info Preview parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ -glade-widget-class title=SvxCoreColorValueSet name=svxcorelo-SvxColorValueSet -generic-name=Set of Value Options parent=GtkDrawingArea -icon-name=widget-gtk-drawingarea/ -glade-widget-class title=SvxColorValueSet name=svxlo-SvxColorValueSet +glade-widget-class title=SvxColorValueSet name=svxcorelo-SvxColorValueSet generic-name=Set of Value Options parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ glade-widget-class title=SwColumnValueSet name=swuilo-ColumnValueSet @@ -694,7 +691,7 @@ glade-widget-class title=Open Document ListBox name=dbulo-OpenDocumentListBox generic-name=Open Document ListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ - + glade-widget-class title=Fade Effect ListBox name=sdlo-FadeEffectLB generic-name=Fade Effect ListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/source basic/source canvas/source chart2/source cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/so
accessibility/inc/accessibility/helper/characterattributeshelper.hxx |2 accessibility/source/extended/AccessibleBrowseBoxBase.cxx|2 accessibility/source/extended/AccessibleGridControlBase.cxx |2 accessibility/source/extended/accessibletabbar.cxx |4 accessibility/source/extended/textwindowaccessibility.cxx|2 accessibility/source/helper/characterattributeshelper.cxx|2 accessibility/source/standard/vclxaccessiblemenuitem.cxx |2 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx|2 accessibility/source/standard/vclxaccessibletabpage.cxx |2 accessibility/source/standard/vclxaccessibletextcomponent.cxx|2 basctl/source/accessibility/accessibledialogcontrolshape.cxx |4 basctl/source/accessibility/accessibledialogwindow.cxx |4 basctl/source/basicide/baside2.cxx |8 - basctl/source/basicide/baside2b.cxx |6 basctl/source/basicide/baside3.cxx |2 basctl/source/basicide/layout.cxx|4 basctl/source/dlged/dlged.cxx|6 basic/source/runtime/inputbox.cxx|2 canvas/source/cairo/cairo_canvasfont.cxx |4 canvas/source/cairo/cairo_canvasfont.hxx |4 canvas/source/cairo/cairo_canvashelper_text.cxx |4 canvas/source/cairo/cairo_textlayout.cxx |2 canvas/source/directx/dx_textlayout_drawhelper.cxx |2 canvas/source/opengl/ogl_canvashelper.cxx|2 canvas/source/vcl/canvasfont.cxx |4 canvas/source/vcl/canvasfont.hxx |4 canvas/source/vcl/canvashelper.cxx |2 canvas/source/vcl/impltools.cxx |2 canvas/source/vcl/impltools.hxx |6 canvas/source/vcl/spritecanvashelper.cxx |2 canvas/source/vcl/spritehelper.cxx |2 chart2/source/controller/dialogs/tp_DataSource.cxx |2 chart2/source/controller/main/ChartController_TextEdit.cxx |2 chart2/source/tools/CharacterProperties.cxx |6 chart2/source/view/main/3DChartObjects.cxx |2 chart2/source/view/main/DummyXShape.cxx |6 chart2/source/view/main/OpenGLRender.cxx |2 chart2/source/view/main/OpenGLRender.hxx |2 cppcanvas/source/inc/implrenderer.hxx|4 cppcanvas/source/mtfrenderer/implrenderer.cxx|8 - cppcanvas/source/mtfrenderer/textaction.cxx |4 cui/source/dialogs/SpellAttrib.cxx |6 cui/source/dialogs/SpellAttrib.hxx |6 cui/source/dialogs/about.cxx |4 cui/source/dialogs/cuicharmap.cxx| 20 +- cui/source/dialogs/hangulhanjadlg.cxx|6 cui/source/dialogs/postdlg.cxx |2 cui/source/dialogs/thesdlg.cxx |4 cui/source/factory/init.cxx |2 cui/source/inc/autocdlg.hxx |6 cui/source/inc/cuicharmap.hxx| 10 - cui/source/inc/numpages.hxx |4 cui/source/options/optHeaderTabListbox.cxx |4 cui/source/options/optlingu.cxx |8 - cui/source/tabpages/autocdlg.cxx | 10 - cui/source/tabpages/numfmt.cxx | 14 - cui/source/tabpages/numpages.cxx | 24 +-- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 43 ++--- dbaccess/source/ui/app/AppDetailView.cxx |8 - dbaccess/source/ui/app/AppDetailView.hxx |4 dbaccess/source/ui/app/AppSwapWindow.cxx |2 dbaccess/source/ui/app/AppTitleWindow.cxx|4 dbaccess/source/ui/app/AppView.cxx |4 dbaccess/source/ui/control/VertSplitView.cxx
[Bug 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=60e78fbb806bb45e635ba1de45ceffe187938ac0 fdo#82577: Handle Font 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: .gitignore
.gitignore |1 - 1 file changed, 1 deletion(-) New commits: commit 68c99344ffaab2a3870b933082596e7858bfe122 Author: Tor Lillqvist t...@collabora.com Date: Wed Sep 17 17:47:53 2014 +0300 Had /ure/source/unorc twice in here Change-Id: Ia54dd005d7d3fb71eac646e1e24bc7c6b43410f5 diff --git a/.gitignore b/.gitignore index b7ebd03..f5df364 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,6 @@ /solenv/gdb/libreoffice/util/*.pyo /moz/zipped/*.zip __pycache__ -/ure/source/unorc # OSX specific .DS_Store ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: help from Windows developer sought: use system ODBC headers
On 2014-09-17 09:00 PM, Noel Grandin wrote: I have figured out a hacky solution to this. I'll tidy it up and post an RFC patch to gerrit tomorrow. It's bedtime for me now and I'm tired of debugging over a horribly laggy connection :-) RFC patch posted as : https://gerrit.libreoffice.org/11499 Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_textlayout_drawhelper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1ba582605e30a0d99c4e461205f49805ad37f80 Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 09:34:13 2014 +0200 fix windows build after my commit 60e78fbb806bb fdo#82577: Handle Font Author: Noel Grandin n...@peralex.com Date: Tue Sep 16 10:09:58 2014 +0200 fdo#82577: Handle Font be ignored, and an empty message aborts the commit. Change-Id: Id87e9ac86b457962fa156fdb1607dfe779b8564d diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 23f5ab6..19345b6 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -246,7 +246,7 @@ namespace dxcanvas // create the font const ::com::sun::star::rendering::FontRequest rFontRequest = rCanvasFont-getFontRequest(); -Font aFont( +vcl::Font aFont( rFontRequest.FontDescription.FamilyName, rFontRequest.FontDescription.StyleName, Size( 0, ::basegfx::fround(rFontRequest.CellSize))); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/documentation writerfilter/source
writerfilter/documentation/ooxml/model.rng |3 writerfilter/source/ooxml/factoryimpl_ns.py |3 writerfilter/source/ooxml/model.xml | 103 +++- 3 files changed, 45 insertions(+), 64 deletions(-) New commits: commit 0666542efbb023f364c4d7f3fc347bc36eeeb5d6 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Sep 18 09:37:30 2014 +0200 Remove not needed file attribute It was typically the same as the name one, just with a .rng suffix, i.e. redundant. Change-Id: I8abb296b2ee963e214971ff748fd5b079320dfa9 diff --git a/writerfilter/documentation/ooxml/model.rng b/writerfilter/documentation/ooxml/model.rng index 3c9c402..33e7b4e 100644 --- a/writerfilter/documentation/ooxml/model.rng +++ b/writerfilter/documentation/ooxml/model.rng @@ -256,9 +256,6 @@ documentation for that file. The schema has two parts: define name=namespace-element element name=namespace attribute name=name/ - optional -attribute name=file/ - /optional zeroOrMore ref name=start-element/ /zeroOrMore diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py index b1fee58..610fac0 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.py +++ b/writerfilter/source/ooxml/factoryimpl_ns.py @@ -714,8 +714,7 @@ using namespace com::sun::star; files = {} for nsNode in getChildrenByName(modelNode, namespace): -if nsNode.hasAttribute(file): -files[nsNode.getAttribute(file)] = nsNode +files[nsNode.getAttribute(name)] = nsNode for nsNode in [i for i in getChildrenByName(modelNode, namespace) if i.getAttribute(name) == nsName]: nsLabel = nsToLabel(nsNode) diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index a302a0c..0ae1df8 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -66,8 +66,7 @@ start name=themeManager/ start name=hlinkClick/ grammar xmlns=http://relaxng.org/ns/structure/1.0; ns=http://schemas.openxmlformats.org/drawingml/2006/main; - !-- ISO RELAX NG Schema -- - include href=dml-baseStylesheet.rng/ + include href=dml-baseStylesheet/ !-- start = theme | themeOverride | themeManager | hlinkClick -- define name=CT_EmptyElement /define @@ -215,8 +214,7 @@ /namespace namespace name=dml-styleDefaults grammar xmlns=http://relaxng.org/ns/structure/1.0; ns=http://schemas.openxmlformats.org/drawingml/2006/main; - !-- ISO RELAX NG Schema -- - include href=dml-shapeProperties.rng/ + include href=dml-shapeProperties/ define name=CT_DefaultShapeDefinition element name=spPr ref name=CT_ShapeProperties/ @@ -241,7 +239,7 @@ /define /grammar /namespace - namespace name=dml-shape3DLighting file=dml-shape3DLighting.rng + namespace name=dml-shape3DLighting grammar xmlns=http://relaxng.org/ns/structure/1.0; ns=http://schemas.openxmlformats.org/drawingml/2006/main; define name=ST_LightRigDirection choice @@ -373,11 +371,10 @@ value tokenid=ooxml:Value_drawingml_ST_LightRigType_brightRoombrightRoom/value /resource /namespace - namespace name=dml-shape3DScene file=dml-shape3DScene.rng + namespace name=dml-shape3DScene grammar xmlns=http://relaxng.org/ns/structure/1.0; ns=http://schemas.openxmlformats.org/drawingml/2006/main; - !-- ISO RELAX NG Schema -- - include href=dml-shape3DCamera.rng/ - include href=dml-shape3DLighting.rng/ + include href=dml-shape3DCamera/ + include href=dml-shape3DLighting/ define name=CT_Scene3D element name=camera ref name=CT_Camera/ @@ -391,10 +388,9 @@ /define /grammar /namespace - namespace name=dml-shape3DStyles file=dml-shape3DStyles.rng + namespace name=dml-shape3DStyles grammar xmlns=http://relaxng.org/ns/structure/1.0; ns=http://schemas.openxmlformats.org/drawingml/2006/main; - !-- ISO RELAX NG Schema -- - include href=dml-shapeGeometry.rng/ + include href=dml-shapeGeometry/ define name=ST_BevelPresetType choice !-- Relaxed Inset -- @@ -545,7 +541,7 @@ value tokenid=ooxml:Value_drawingml_ST_PresetMaterialType_softmetalsoftmetal/value /resource /namespace - namespace name=dml-shape3DCamera file=dml-shape3DCamera.rng + namespace name=dml-shape3DCamera grammar xmlns=http://relaxng.org/ns/structure/1.0; ns=http://schemas.openxmlformats.org/drawingml/2006/main; define name=ST_PresetCameraType choice @@ -757,7 +753,7 @@ value tokenid=ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRelaxedModeratelyperspectiveRelaxedModerately/value /resource /namespace - namespace name=dml-baseStylesheet file=dml-baseStylesheet.rng + namespace name=dml-baseStylesheet grammar
[Bug 38884] Improve Up/Down movement in writer
https://bugs.freedesktop.org/show_bug.cgi?id=38884 --- Comment #8 from Juergen Funk juergen.funk...@cib.de --- Checkin in Master https://gerrit.libreoffice.org/#/c/11500/ My first checkin i hope it is okay. The main problem is after the cursor down get a event from i don't know but in the stack i see - swlo.dll!SwCrsrShell::UpdateCrsr . . - sfxlo.dll!SfxObjectShell::FlushDocInfo . . - swlo.dll!SfxStubSwViewStateStatusLine . . - sfxlo.dll!SfxBindings::LinkStubNextJob_Impl i am not sure is that needed to update the cursor, without this event my fix is not necessary? The next i have see is ActionPend() BasicActionPend() when ActionPend = TRUE the BasicActionPend is TRUE too when ActionPend = FALSE the BasicActionPend is FALSE too The BasicActionPend is not needed!? The change in crstrvl.cxx is only for the consistency -- 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 38884] Improve Up/Down movement in writer
https://bugs.freedesktop.org/show_bug.cgi?id=38884 Juergen Funk juergen.funk...@cib.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b5297255bd9830c04dc7b7e3d47660809992aec6 Author: Tor Lillqvist t...@collabora.com Date: Thu Sep 18 11:30:04 2014 +0300 Use vcl::Font Change-Id: I8efc1570c63e7de8699222497ec3e8172329319e diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 2a1f4e7..66d0ddd 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1334,7 +1334,7 @@ void GtkSalGraphics::updateSettings( AllSettings rSettings ) else*/ nPointHeight = nPangoHeight/PANGO_SCALE; -Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); +vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); if( aInfo.m_eWeight != WEIGHT_DONTKNOW ) aFont.SetWeight( aInfo.m_eWeight ); if( aInfo.m_eWidth != WIDTH_DONTKNOW ) ___ 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/window/salframe.cxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit f4dc53cb33c7f6b10bb6709dea5f8195bf95d4b5 Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 10:36:13 2014 +0200 Use vcl::Font Change-Id: Ic1b66c43697e342bebdf8b5cd6f0bb419f4a4fa7 diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 8c129eb..63a5dc1 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2586,7 +2586,7 @@ inline Color ImplWinColorToSal( COLORREF nColor ) return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) ); } -static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW rLogFont, Font rFont ) +static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW rLogFont, vcl::Font rFont ) { ImplSalLogFontToFontW( hDC, rLogFont, rFont ); @@ -2761,12 +2761,12 @@ void WinSalFrame::UpdateSettings( AllSettings rSettings ) aStyleSettings.SetHighContrastMode( false ); // Query Fonts -FontaMenuFont = aStyleSettings.GetMenuFont(); -FontaTitleFont = aStyleSettings.GetTitleFont(); -FontaFloatTitleFont = aStyleSettings.GetFloatTitleFont(); -FontaHelpFont = aStyleSettings.GetHelpFont(); -FontaAppFont = aStyleSettings.GetAppFont(); -FontaIconFont = aStyleSettings.GetIconFont(); +vcl::FontaMenuFont = aStyleSettings.GetMenuFont(); +vcl::FontaTitleFont = aStyleSettings.GetTitleFont(); +vcl::FontaFloatTitleFont = aStyleSettings.GetFloatTitleFont(); +vcl::FontaHelpFont = aStyleSettings.GetHelpFont(); +vcl::FontaAppFont = aStyleSettings.GetAppFont(); +vcl::FontaIconFont = aStyleSettings.GetIconFont(); HDC hDC = GetDC( 0 ); NONCLIENTMETRICSW aNonClientMetrics; aNonClientMetrics.cbSize = sizeof( aNonClientMetrics ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/android
vcl/android/androidinst.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac24f3fdbb83e91df2c51b9e174d2c5ce3236723 Author: Tor Lillqvist t...@collabora.com Date: Thu Sep 18 11:53:19 2014 +0300 Use vcl::Font Change-Id: I25b1ce4396a8e125b23e088310b970ef746cbaf0 diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 8305059..262a7c1 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -264,7 +264,7 @@ public: #endif // FIXME: is 14 point enough ? -Font aFont( OUString( Roboto ), Size( 0, 14 ) ); +vcl::Font aFont( OUString( Roboto ), Size( 0, 14 ) ); StyleSettings aStyleSet = rSettings.GetStyleSettings(); aStyleSet.SetAppFont( aFont ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde/salnativewidgets-kde.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 83ef257f0a32f23d84dcdec77186d02650a5773d Author: Tor Lillqvist t...@collabora.com Date: Thu Sep 18 11:57:07 2014 +0300 Use vcl::Font Change-Id: I3ffc8beea76e6df00607330203d567e152b13611 diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 847bfc1..8162926 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1755,7 +1755,7 @@ static Color readColor( KConfig *pConfig, const char *pKey ) Mostly grabbed from the Gtk+ vclplug (salnativewidgets-gtk.cxx). */ -static Font toFont( const QFont rQFont, const ::com::sun::star::lang::Locale rLocale ) +static vcl::Font toFont( const QFont rQFont, const ::com::sun::star::lang::Locale rLocale ) { psp::FastPrintFontInfo aInfo; QFontInfo qFontInfo( rQFont ); @@ -1815,7 +1815,7 @@ static Font toFont( const QFont rQFont, const ::com::sun::star::lang::Locale r nPointHeight = rQFont.pointSize(); // Create the font -Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); +vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); if( aInfo.m_eWeight != WEIGHT_DONTKNOW ) aFont.SetWeight( aInfo.m_eWeight ); if( aInfo.m_eWidth != WIDTH_DONTKNOW ) @@ -1871,7 +1871,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) pKey = titleFont; if ( pConfig-hasKey( pKey ) ) { -Font aFont = toFont( pConfig-readFontEntry( pKey ), rSettings.GetUILanguageTag().getLocale() ); +vcl::Font aFont = toFont( pConfig-readFontEntry( pKey ), rSettings.GetUILanguageTag().getLocale() ); aStyleSettings.SetTitleFont( aFont ); bSetTitleFont = true; } @@ -1932,7 +1932,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) aStyleSettings.SetHighlightTextColor( toColor( qColorGroup.highlightedText() ) ); // Font -Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); +vcl::Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); aStyleSettings.SetAppFont( aFont ); aStyleSettings.SetHelpFont( aFont ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit f5496edf47684403ba7463249f76eab94f3da501 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue Sep 16 20:51:36 2014 +0200 Don't use gnu++03 alias of gnu++98 for ODK builds gnu++03 is just an alias for gnu++98 and was introduced in gcc 4.8. This prevents older compilers from building the code. Change-Id: I7e09338f26376c08c476561cdcddde39c7e62b09 Reviewed-on: https://gerrit.libreoffice.org/11501 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 9ee1fd2..647aa8b 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -99,11 +99,10 @@ gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror) # This is the default in non-C++11 mode ifeq ($(COM_GCC_IS_CLANG),TRUE) -# doesn't know gnu++03 and this seems to be the same anyway gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \ -Wno-deprecated-declarations else -gb_CXX03FLAGS := -std=gnu++03 -pedantic-errors -Wno-long-long \ +gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors -Wno-long-long \ -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/primitive2d/textlayoutdevice.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d7510f79edd0b97839ebffc4c4284650452b4d00 Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 11:59:42 2014 +0200 use vcl::Font Change-Id: Ia6ac8d9fca94c6140f5df39932d0cd62ba4c229e diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index c472d19..df8617c 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -461,7 +461,7 @@ namespace drawinglayer // the height if(rFont.GetSize().getWidth() 0) { -Font aUnscaledFont(rFont); +vcl::Font aUnscaledFont(rFont); aUnscaledFont.SetWidth(0); const FontMetric aUnscaledFontMetric(Application::GetDefaultDevice()-GetFontMetric(aUnscaledFont)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/printdlg.cxx |8 1 file changed, 8 insertions(+) New commits: commit 93c47f3f0310135c5d6216de9b4d25fd7c06e7dd Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 18 11:32:39 2014 +0100 default n-up printing of notes to sensible 2 x 1 not 1 x 2 i.e. throw away the maFirstPageSize cache based on the initial slide view which is typically in landscape mode So that if we change to notes which are usually in portrait mode, and then visit n-up print, we get a default layout based on the notes orientation and not the slides orientation. I hate printing Change-Id: I8b7b81ce1eec0f9c5ecd7509b311cf4026958c2c diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index cf9642e..d9ebf7c 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1787,6 +1787,14 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox*, i_pBox ) sal_Int32 nVal( i_pBox-GetSelectEntryPos() ); pVal-Value = nVal; +//If we are in impress we start in print slides mode and get a +//maFirstPageSize for slides which are usually landscape mode, if we +//change to notes which are usually in portrait mode, and then visit +//n-up print, we will assume notes are in landscape unless we throw +//away maFirstPageSize when we change page content type +if (pVal-Name == PageContentType) +maFirstPageSize = Size(); + checkOptionalControlDependencies(); // update preview and page settings ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LiMux student kick-off
On 17/09/14 13:45, Ptyl Dragon wrote: ok, then we'll use GL2.1. we'll make sure we use only API used in ES 2 too. We need simple thing. after all, we are not making a First Person Shooter. For starters we are just making a 2d rendering engine Just bear in mind, iirc you can't get hardware 2d rendering any more. I seem to remember, from quite a while back too, that all modern video cards render 3d by default, and 2d is now a software layer on top. So basically, what I'm saying is don't choose 2d over 3d because you think it will be faster/more efficient. Because actually, it's the other way round. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/uiconfig
filter/uiconfig/ui/pdfgeneralpage.ui | 19 --- filter/uiconfig/ui/pdfsecuritypage.ui |7 +-- filter/uiconfig/ui/pdfsignpage.ui | 11 --- 3 files changed, 17 insertions(+), 20 deletions(-) New commits: commit d311d85a4d501a0bfef20e610169f20de896a167 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Fri Sep 12 00:20:00 2014 -0500 .ui tweaks to PDF export tab pages Added missing colons, use sentence case for check boxes [1], allow descriptive security labels to wrap, add 6 px padding for the Sign page. Change-Id: Iafc0788e367ab74aa0ec740b06892926b0b00390 Reviewed-on: https://gerrit.libreoffice.org/11408 Reviewed-by: Katarina Behrens bu...@bubli.org Tested-by: Katarina Behrens bu...@bubli.org diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 91ecdee..879bc08 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkAdjustment id=adjustment1 property name=lower1/property property name=upper100/property @@ -184,7 +185,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=invisible_charâ/property -property name=invisible_char_setTrue/property property name=adjustmentadjustment1/property /object packing @@ -204,7 +204,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yes_Quality/property +property name=label translatable=yes_Quality:/property property name=use_underlineTrue/property /object /child @@ -254,8 +254,6 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=has_entryTrue/property -property name=entry_text_column0/property -property name=id_column1/property items item translatable=yes75 DPI/item item translatable=yes150 DPI/item @@ -373,7 +371,7 @@ property name=column_spacing12/property child object class=GtkCheckButton id=watermark -property name=label translatable=yesSign _with Watermark/property +property name=label translatable=yesSign with _watermark/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -392,8 +390,9 @@ object class=GtkLabel id=watermarklabel property name=visibleTrue/property property name=can_focusFalse/property +property name=margin_left12/property property name=xalign0/property -property name=label translatable=yesWatermark Text/property +property name=label translatable=yesText:/property property name=use_underlineTrue/property property name=mnemonic_widgetwatermarkentry/property /object @@ -550,7 +549,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesSubmit _format/property +property name=label translatable=yesSubmit _format:/property property name=use_underlineTrue/property property name=mnemonic_widgetformat/property /object @@ -565,8 +564,6 @@ object class=GtkComboBoxText id=format property name=visibleTrue/property property name=can_focusFalse/property -property name=entry_text_column0/property -property
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 Szymon Kłos eszka...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |eszka...@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: 2 commits - cppu/source extensions/source filter/source idlc/inc include/codemaker include/toolkit include/xmloff scripting/source sfx2/source stoc/source ucbhelper/sou
cppu/source/uno/lbenv.cxx | 14 + cppu/source/uno/lbmap.cxx |9 --- extensions/source/ole/ole2uno.hxx | 17 --- filter/source/svg/svgfilter.hxx|7 -- filter/source/svg/svgwriter.hxx| 11 idlc/inc/idlc/idlctypes.hxx| 18 --- idlc/inc/idlc/options.hxx |3 - include/codemaker/global.hxx | 16 -- include/codemaker/options.hxx |3 - include/toolkit/controls/eventcontainer.hxx| 19 --- include/xmloff/nmspmap.hxx | 10 scripting/source/stringresource/stringresource.hxx | 22 - sfx2/source/appl/newhelp.cxx | 19 --- stoc/source/corereflection/base.hxx|4 - stoc/source/corereflection/lrucache.hxx| 41 +++- stoc/source/inspect/introspection.cxx | 22 - stoc/source/namingservice/namingservice.cxx| 15 -- stoc/source/servicemanager/servicemanager.cxx | 21 +--- ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 20 ucb/source/ucp/package/pkgprovider.cxx | 20 ucb/source/ucp/webdav-neon/ContentProperties.hxx | 19 --- ucb/source/ucp/webdav/ContentProperties.hxx| 19 --- ucbhelper/source/provider/providerhelper.cxx | 20 vcl/unx/kde4/KDESalFrame.cxx | 10 ++-- xmlhelp/source/cxxhelp/provider/databases.hxx | 51 +++-- xmlhelp/source/cxxhelp/provider/db.hxx | 16 -- xmloff/source/draw/ximpcustomshape.cxx |2 27 files changed, 61 insertions(+), 387 deletions(-) New commits: commit 5aa24b83fca3a507f1c2dc03e3ec52f063029522 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 18 13:12:26 2014 +0200 Font - vcl::Font in vcl/unx/kde4 Change-Id: Iaa0c71e6d4f2b142821a6546772a3364b5eb7e29 diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 9306439..b67b3ed 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -85,7 +85,7 @@ static OUString readEntryUntranslated( KConfigGroup *pGroup, const char *pKey ) Mostly grabbed from the Gtk+ vclplug (salnativewidgets-gtk.cxx). */ -static Font toFont( const QFont rQFont, const ::com::sun::star::lang::Locale rLocale ) +static vcl::Font toFont( const QFont rQFont, const ::com::sun::star::lang::Locale rLocale ) { psp::FastPrintFontInfo aInfo; QFontInfo qFontInfo( rQFont ); @@ -145,7 +145,7 @@ static Font toFont( const QFont rQFont, const ::com::sun::star::lang::Locale r nPointHeight = rQFont.pointSize(); // Create the font -Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); +vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); if( aInfo.m_eWeight != WEIGHT_DONTKNOW ) aFont.SetWeight( aInfo.m_eWeight ); if( aInfo.m_eWidth != WIDTH_DONTKNOW ) @@ -189,7 +189,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) pKey = titleFont; if ( aGroup.hasKey( pKey ) ) { -Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); +vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); style.SetTitleFont( aFont ); bSetTitleFont = true; } @@ -204,7 +204,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) pKey = toolbarFont; if ( aGroup.hasKey( pKey ) ) { -Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); +vcl::Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() ); style.SetToolFont( aFont ); } } @@ -260,7 +260,7 @@ void KDESalFrame::UpdateSettings( AllSettings rSettings ) style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText ))); // Font -Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); +vcl::Font aFont = toFont( QApplication::font(), rSettings.GetUILanguageTag().getLocale() ); style.SetAppFont( aFont ); commit 32d6415617b5815bb5d18719f6d2df74becc0997 Author: Daniel Sikeler d.sikele...@gmail.com Date: Fri Sep 12 06:17:03 2014 + fdo#83512 Make use of OUStringHash and OStringHash Change-Id: I33cafe68c798e3d54943ea1790fa4e73f85e525d Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 96069a0..0d2bc0a 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -47,6 +47,7 @@ using
Re: Daniel Sikeler license statement
On 08/28/2014 02:08 PM, Daniel Sikeler wrote: all my current and past contributions made to the LibreOffice project may be licensed under the MPLv2/LGPLv3+ dual license. Until further notice, all my future contributions to the LibreOffice project are available under the MPLv2/LGPLv3+ dual license. on file now at https://wiki.documentfoundation.org/index.php?title=Development/Developersoldid=100872 Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LiMux student kick-off
On Sep 18, 2014 8:42 PM, Wols Lists antli...@youngman.org.uk wrote: On 17/09/14 13:45, Ptyl Dragon wrote: ok, then we'll use GL2.1. we'll make sure we use only API used in ES 2 too. We need simple thing. after all, we are not making a First Person Shooter. For starters we are just making a 2d rendering engine Just bear in mind, iirc you can't get hardware 2d rendering any more. I seem to remember, from quite a while back too, that all modern video cards render 3d by default, and 2d is now a software layer on top. So basically, what I'm saying is don't choose 2d over 3d because you think it will be faster/more efficient. Because actually, it's the other way round. That is not true at least not in the sense that we are going to US 2D rendering. 2D rendering is just a special case of 3D rendering in out case and fully hardware accelerated. Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Windows daily build broken on Windows 8.1
Hi all, When I tried to install latest daily build from 17th and 16th of September (from TB 42). In both cases it installs successfully but when I try to run it, I get this fatal message: *LibreOfficeDev 4.4 - Fatal Error* *---* *The program cannot be started.* *The service manager is not available.* *(Cannot open uno ini file:///C:/Program%20Files%20(x86)/LibreOfficeDev%204/URE/bin/uno.ini)* *Start setup application to repair the installation from CD, or the folder containing the installation packages.* Anyone touched the installation process ? Any ideas here? Best, Adam Fyne ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows daily build broken on Windows 8.1
Windows build also broken on Windows 7. On Thu, Sep 18, 2014 at 3:13 PM, Adam Fyne adam.f...@cloudon.com wrote: Hi all, When I tried to install latest daily build from 17th and 16th of September (from TB 42). In both cases it installs successfully but when I try to run it, I get this fatal message: *LibreOfficeDev 4.4 - Fatal Error* *---* *The program cannot be started.* *The service manager is not available.* *(Cannot open uno ini file:///C:/Program%20Files%20(x86)/LibreOfficeDev%204/URE/bin/uno.ini)* *Start setup application to repair the installation from CD, or the folder containing the installation packages.* Anyone touched the installation process ? Any ideas here? Best, Adam Fyne -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows daily build broken on Windows 8.1
More info: Currently these versions exist in daily-build (TB 42) http://dev-builds.libreoffice.org/daily/master/Win-x86@42/: ... [DIR] 2014-09-14_07.05.33/14-Sep-2014 10:25- WORKS FINE [DIR] 2014-09-15_06.06.46/15-Sep-2014 09:32- WORKS FINE [DIR] 2014-09-16_04.58.45/16-Sep-2014 08:23- WORKS FINE [DIR] 2014-09-16_23.39.39/17-Sep-2014 03:05- *BROKEN* [DIR] 2014-09-17_22.52.14/18-Sep-2014 02:17- *BROKEN* So seems like something broke between 15th and 16th of September. On Thu, Sep 18, 2014 at 3:20 PM, Adam Fyne adam.f...@cloudon.com wrote: Windows build also broken on Windows 7. On Thu, Sep 18, 2014 at 3:13 PM, Adam Fyne adam.f...@cloudon.com wrote: Hi all, When I tried to install latest daily build from 17th and 16th of September (from TB 42). In both cases it installs successfully but when I try to run it, I get this fatal message: *LibreOfficeDev 4.4 - Fatal Error* *---* *The program cannot be started.* *The service manager is not available.* *(Cannot open uno ini file:///C:/Program%20Files%20(x86)/LibreOfficeDev%204/URE/bin/uno.ini)* *Start setup application to repair the installation from CD, or the folder containing the installation packages.* Anyone touched the installation process ? Any ideas here? Best, Adam Fyne -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - svx/source svx/uiconfig
svx/source/tbxctrls/colorwindow.hxx |1 svx/source/tbxctrls/tbcontrl.cxx| 40 ++-- svx/uiconfig/ui/colorwindow.ui |1 3 files changed, 17 insertions(+), 25 deletions(-) New commits: commit 746b51de3d3bb267e02df5712cadfcf03654b587 Author: Maxim Monastirsky momonas...@gmail.com Date: Thu Sep 18 15:20:33 2014 +0300 Update the status only after colors load This is required to get the current color selection on the palette upon opening. Change-Id: I1660b9d17a76bf6c7ae4b6b860c7ee75c5fc857e diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 0c3c227..9562072 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1081,11 +1081,11 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUStringrCommand, SetHelpId( HID_POPUP_COLOR ); mpColorSet-SetHelpId( HID_POPUP_COLOR_CTRL ); SetText( rWndTitle ); -AddStatusListener( OUString( .uno:ColorTableState )); -AddStatusListener( maCommand ); mrPaletteManager.ReloadColorSet(*mpColorSet); mrPaletteManager.ReloadRecentColorSet(*mpRecentColorSet); +AddStatusListener( .uno:ColorTableState ); +AddStatusListener( maCommand ); } SvxColorWindow_Impl::~SvxColorWindow_Impl() commit 05ed3a5da62b1c552f24d559f4a35c314f23a4f0 Author: Maxim Monastirsky momonas...@gmail.com Date: Thu Sep 18 15:17:40 2014 +0300 Adapt the code for the new automatic button It's now used instead of the 0 item of the ValueSet, but part of the code wasn't adapted: * Set the correct text (Automatic/No Fill) depending on the command. * Hide the button for frame/line colors, since there is no such thing as Automatic color. * Remove the selection and the status update code of the 0 item. Change-Id: Ib7d3d97a16368f2a59373efd6b81a220151881d5 diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index faffc67..2d25c7e 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -41,6 +41,7 @@ private: ListBox*mpPaletteListBox; PushButton* mpButtonAutoColor; PushButton* mpButtonPicker; +FixedLine* mpAutomaticSeparator; OUStringmaCommand; LinkmaSelectedLink; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index f6f189c..0c3c227 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1014,11 +1014,12 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUStringrCommand, mnColorSetCols( 10 ) { -get(mpPaletteListBox, palette_listbox); -get(mpButtonAutoColor, auto_color_button); -get(mpButtonPicker, color_picker_button); -get(mpColorSet, colorset); -get(mpRecentColorSet, recent_colorset); +get(mpPaletteListBox, palette_listbox); +get(mpButtonAutoColor,auto_color_button); +get(mpButtonPicker, color_picker_button); +get(mpColorSet, colorset); +get(mpRecentColorSet, recent_colorset); +get(mpAutomaticSeparator, separator4); mpColorSet-SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT) ); mpRecentColorSet-SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT) ); @@ -1031,7 +1032,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString rCommand, if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId ) { -mpColorSet-SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); +mpButtonAutoColor-SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); mpColorSet-SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) ); } else if ( SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId ) @@ -1045,16 +1046,20 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUStringrCommand, SfxItemState eState = aQueryStatus.QueryState( pDummy ); if( (SfxItemState::DEFAULT eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) ) { -mpColorSet-SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) ); +mpButtonAutoColor-SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) ); mpColorSet-SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) ); } } else if ( SID_FRAME_LINECOLOR == theSlotId ) { +mpButtonAutoColor-Hide(); +mpAutomaticSeparator-Hide(); mpColorSet-SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) ); } else { +mpButtonAutoColor-Hide(); +mpAutomaticSeparator-Hide(); mpColorSet-SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) ); } @@ -1099,15 +1104,7 @@ SfxPopupWindow*
vs2012-ide-integration
Hi, I built in Visual Studio, using native compilers.modules sc and cui and all of their dependencies. This build is separate from libreoffice make files and cygwin. It doesn't require references to make files or cygwin. I used in autogen.input (1)-enable-dbgutil, (2)compiled boost, independently and gave a path to its libs, using the -with-boost-libdir If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? From: nicholas ferguson [mailto:nicholasfergu...@wingarch.com] Sent: Thursday, September 04, 2014 7:08 AM To: 'havlicek.ho...@gmail.com' Subject: Did you ever try to create a 2012 Visual Studio Solution for scalc only? Can you email me a sample? Regards Nick ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/ios
vcl/ios/iosinst.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1740a682a6c46c57dc6a356299f6c9a92eb4af6 Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 14:44:39 2014 +0200 use vcl::Font Change-Id: I22fd5c1340ca0c646725d9fce77304c10d9eb5d5 diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index f2df460..f1d87b8 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -149,7 +149,7 @@ public: virtual void UpdateSettings( AllSettings rSettings ) SAL_OVERRIDE { // Clobber the UI fonts -Font aFont( OUString( Helvetica ), Size( 0, 14 ) ); +vcl::Font aFont( OUString( Helvetica ), Size( 0, 14 ) ); StyleSettings aStyleSet = rSettings.GetStyleSettings(); aStyleSet.SetAppFont( aFont ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
vs2012-ide-integration ( with examples)
Hi, I built in Visual Studio, using native compilers.modules sc and cui and all of their dependencies. This build is separate from libreoffice make files and cygwin. It doesn't require references to make files or cygwin. I used in autogen.input (1)-enable-dbgutil, (2)compiled boost, independently and gave a path to its libs, using the -with-boost-libdir If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? basegfx_t.vcxproj.filters Description: XML document basegfx_t.vcxproj Description: XML document ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/window/gtksalmenu.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 7fc08970894aea2b771bf7be409b72845c96d10a Author: Matthew J. Francis mjay.fran...@gmail.com Date: Thu Sep 18 18:33:00 2014 +0800 fdo#69090 Avoid using a string after free Change-Id: I9020b595e434b4de8aa6a14c20d6c98fa619b96a Reviewed-on: https://gerrit.libreoffice.org/11502 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 05563a1..6622545 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -702,7 +702,11 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSub GtkSalMenuItem *pSalItem = maItems[ nPos ]; OUString aItemCommand = mpVCLMenu-GetItemCommand( pSalItem-mnId ); -gchar* aItemCommandStr = (gchar*) OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr(); +// Do not join the following two lines, or the OString will be destroyed +// immediately, and the gchar* pointed to by aItemCommandStr will be +// freed before it can be used - fdo#69090 +OString aItemCommandOStr = OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ); +gchar* aItemCommandStr = (gchar*) aItemCommandOStr.getStr(); if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svtools include/svx sd/source svtools/source svx/source unusedcode.easy
include/svtools/roadmapwizard.hxx|6 - include/svx/PaletteManager.hxx |1 sd/source/ui/view/DocumentRenderer.cxx |5 ++-- svtools/source/dialogs/roadmapwizard.cxx | 35 --- svx/source/tbxctrls/PaletteManager.cxx | 10 unusedcode.easy |1 6 files changed, 4 insertions(+), 54 deletions(-) New commits: commit f1f89f0202232635e7fbbd7ca47de51755b2bce0 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 18 11:40:26 2014 +0100 IsDraw doesn't mean the app/page is Draw it means a slide in impress. commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c Date: Mon Jun 23 20:55:21 2014 +0100 Make Draw use paper size when printing - fdo#63905 Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. suggests the intent is for this to not affect Impress and to only affect Draw, so this does that Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 5880a69..723aa02e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1360,8 +1360,9 @@ private: PrintInfo rInfo) { SdDrawDocument* pDocument = mrBase.GetMainViewShell()-GetDoc(); +bool bIsDraw = pDocument-GetDocumentType() == DOCUMENT_TYPE_DRAW; rInfo.meOrientation = ORIENTATION_PORTRAIT; -bool bDoDodgyHeightWidthFit = !mpOptions-IsDraw() !mpOptions-IsNotes(); +bool bDoDodgyHeightWidthFit = !bIsDraw !mpOptions-IsNotes(); if( ! mpOptions-IsBooklet()) { @@ -1448,7 +1449,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()-getTime( Time( Time::SYSTEM ), false, false ); // Draw should use specified paper size when printing -if (mpOptions-IsDraw()) +if (mrBase.GetDocShell()-GetDocumentType() == DOCUMENT_TYPE_DRAW) { aInfo.maPrintSize = mrBase.GetDocument()-GetSdPage(0, PK_STANDARD)-GetSize(); maPrintSize = awt::Size(aInfo.maPrintSize.Width(), commit efcdf9004de2c406774f7a1ed207d24c0dbe36cc Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 18 11:38:43 2014 +0100 callcatcher: update unused code Change-Id: I3010bdd736c15a086f3ce61cacbb34159f0b2abf diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 876b199..7abcd48 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -214,12 +214,6 @@ protected: */ voidupdateRoadmapItemLabel( WizardState _nState ); -protected: -#ifdef DBG_UTIL -const sal_Char* checkInvariants() const; -friend const char* CheckInvariants( const void* pVoid ); -#endif - private: DECL_DLLPRIVATE_LINK( OnRoadmapItemSelected, void* ); diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index 7070bc1..bde6a77 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -60,7 +60,6 @@ public: longGetColorCount(); longGetRecentColorCount(); -OUStringGetPaletteName(); const Color GetLastColor(); voidSetLastColor(const Color rLastColor); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 6e83474..bb28814 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -118,41 +118,6 @@ namespace svt } //= RoadmapWizard -#ifdef DBG_UTIL -const sal_Char* RoadmapWizard::checkInvariants() const -{ -// all paths have to start with the same state -WizardState nSharedFirstState = WZS_INVALID_STATE; -for ( Paths::const_iterator aPath = m_pImpl-aPaths.begin(); - aPath != m_pImpl-aPaths.end(); - ++aPath -) -{ -if ( aPath-second.empty() ) -return RoadmapWizard::checkInvariants: paths should not be empty!; - -if ( nSharedFirstState == WZS_INVALID_STATE ) -// first path -nSharedFirstState = aPath-second[ 0 ]; -else -if ( nSharedFirstState != aPath-second[ 0 ] ) -return RoadmapWizard::checkInvariants: alls paths must start with the same state!; -} - -if ( !m_pImpl-aPaths.empty() ) -{ -Paths::const_iterator aCurrentPathPos = m_pImpl-aPaths.find( m_pImpl-nActivePath ); -if ( aCurrentPathPos == m_pImpl-aPaths.end() ) -return
vs2012-ide-integration ( with better examples)
Hi, I built in Visual Studio, using native compilers.modules sc and cui and all of their dependencies. This build is separate from libreoffice make files and cygwin. It doesn't require references to make files or cygwin. I also was able to build a debug mode in cygwin using this in autogen.input (1)-enable-dbgutil, (2)compiled boost, independently and gave a path to its libs, using the -with-boost-libdir If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? The early examples.were initial attempts. This example uses more data from Library.mk and the output from your vs2012-ide-integration My names for built libraries are different.. I did that to prove that my builds were not traversing over into cygwin builds. I'm rushing off.sorry I had to send three separate emails. = for (built).. notes to collect data for visual studio projects collected from both Library make file and output from vs2012-ide-integration = C:/cygwin64/home/lo/master/workdir/UnpackedTarball/boost;C:/cygwin64/home/lo/master/include;C:/PROGRA~2/Java/JDK18~1.0_2/include/win32;C:/PROGRA~2/Java/JDK18~1.0_2/include;C:/PROGRA~2/MIA713~1/Windows/v7.0A/include;C:/PROGRA~2/MICROS~1.0/VC/include;C:/PROGRA~2/MI0FC3~1/include;C:/cygwin64/home/lo/master/config_host;C:/cygwin64/home/lo/master/formula/source/core/inc;C:/cygwin64/home/lo/master/workdir/UnoApiHeadersTarget/udkapi/normal;C:/cygwin64/home/lo/master/workdir/UnoApiHeadersTarget/offapi/normal; C:\cygwin64\home\lo\master\formula\source\core\inc $(eval $(call gb_Library_set_componentfile,for,formula/util/for)) INTEL;OPTIMIZE;_X86_;_CRT_NONSTDC_NO_DEPRECATE;CPPU_ENV;WNT;NOMINMAX;NDEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;RTL_USING;BOOST_MEM_FN_ENABLE_CDECL;FORMULA_DLLIMPLEMENTATION;_WIN32_IE;_DLL;_REENTRANT;WINVER0x0400;OSL_DEBUG_LEVEL;_MT;_CRT_NON_CONFORMING_SWPRINTFS;SUPD;LIBO_INTERNAL_ONLY; comphelper \ (built) cppu \ built) cppuhelper \ built) sal \ built) i18nlangtag \ built) svl \ built) svt \ built) tl \ built) utl \ (built) vcl \ (built) $(gb_UWINAPI) \ built) Library.comphelper_t.lib Library.cppu_t.lib Library.cppuhelper_t.lib LIbrary.sal3_t.lib Library.i18nlangtag_t.lib Library.svl_t.lib Library.tl_t.lib Library.utl_t.lib Library.vcl_t.lib Library.uwinapi_t.lib for_t.vcxproj Description: XML document for_t.vcxproj.filters Description: XML document ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows daily build broken on Windows 8.1
Confirmed, looks to be Stephan B. and Tor L.'s recent work implementing an louno. I think the damage was done here: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=d1a734cef0ed5d655774c2f8ac7a2203f8c0a385 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=332f6a5f997677a3468c47a7b7d5b7c448809293 The TB42 build seems to otherwise work fine if an exiting uno.ini file is copied into the URE\bin directory. Version: 4.4.0.0.alpha0+ Build ID: ae4c836b49a8ac41312f855e24f20b0b050fcbd4 TinderBox: Win-x86@42, Branch:master, Time: 2014-09-17_22:52:14 -- View this message in context: http://nabble.documentfoundation.org/Windows-daily-build-broken-on-Windows-8-1-tp4122701p4122713.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - shell/source
shell/source/win32/zipfile/zipfile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6b2b496cc5d6009151ae6d38d5d39cc5f536794e Author: Andras Timar andras.ti...@collabora.com Date: Thu Sep 18 00:46:16 2014 +0200 bnc#887307 ODF files not showing up on Windows search Under Windows 7, ODF and OpenOffice.org 1.1 files were not found, when the folder containing them was not indexed, and full text search was switched on. The problem did not occur under Windows 8. Apparently there is a bug in Windows 7, reading beyond the end of a BufferStream resulted in 0 bytes read. So we take care not to read beyond the end of stream. Change-Id: Id01b08922121dabbb7b49c54f8ef11cb0e4ac413 (cherry picked from commit ae4c836b49a8ac41312f855e24f20b0b050fcbd4) Reviewed-on: https://gerrit.libreoffice.org/11497 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index 270fbe1..5dcc02a 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -304,7 +304,7 @@ static bool findCentralDirectoryEnd(StreamInterface *stream) try { -for (long nOffset = nLength - BLOCK_SIZE; +for (long nOffset = nLength - BLOCK_SIZE - 4; nOffset 0; nOffset -= BLOCK_SIZE) { if (findSignatureAtOffset(stream, nOffset)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/unoobjw.hxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 39b81563b218fd6d114275ecee95947d6b69c09d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 18 15:24:35 2014 +0200 Blind fix for Windows Change-Id: I186024f8a95ada752115750419a54a6231967f57 diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index c39bd23..87e2715 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.hxx @@ -80,16 +80,14 @@ typedef boost::unordered_map OUString, DISPID, -hashOUString_Impl, -equalOUString_Impl +OUStringHash NameToIdMap; typedef boost::unordered_map OUString, sal_Bool, -hashOUString_Impl, -equalOUString_Impl +OUStringHash BadNameMap; typedef boost::unordered_map ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - shell/source
shell/source/win32/zipfile/zipfile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2cb4974f1f4617a3cf6502d016cbfa46b9a6627b Author: Andras Timar andras.ti...@collabora.com Date: Thu Sep 18 00:46:16 2014 +0200 bnc#887307 ODF files not showing up on Windows search Under Windows 7, ODF and OpenOffice.org 1.1 files were not found, when the folder containing them was not indexed, and full text search was switched on. The problem did not occur under Windows 8. Apparently there is a bug in Windows 7, reading beyond the end of a BufferStream resulted in 0 bytes read. So we take care not to read beyond the end of stream. Change-Id: Id01b08922121dabbb7b49c54f8ef11cb0e4ac413 (cherry picked from commit ae4c836b49a8ac41312f855e24f20b0b050fcbd4) Reviewed-on: https://gerrit.libreoffice.org/11498 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index 270fbe1..5dcc02a 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -304,7 +304,7 @@ static bool findCentralDirectoryEnd(StreamInterface *stream) try { -for (long nOffset = nLength - BLOCK_SIZE; +for (long nOffset = nLength - BLOCK_SIZE - 4; nOffset 0; nOffset -= BLOCK_SIZE) { if (findSignatureAtOffset(stream, nOffset)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/oleobjw.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 04edcd8605bf21b3355ada86fe415ac4c1a0219a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 18 15:27:38 2014 +0200 Blind fix for Windows Change-Id: I1b923cba578b0acc2b9ce389c6c7d664fa00b268 diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 890a534..b9e55f9 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -53,9 +53,9 @@ namespace ole_adapter -typedef boost::unordered_mapOUString, pairDISPID, unsigned short, hashOUString_Impl, equalOUString_Impl DispIdMap; +typedef boost::unordered_mapOUString, pairDISPID, unsigned short, OUStringHash DispIdMap; -typedef boost::unordered_multimapOUString, unsigned int, hashOUString_Impl, equalOUString_Impl TLBFuncIndexMap; +typedef boost::unordered_multimapOUString, unsigned int, OUStringHash TLBFuncIndexMap; // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object. // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sax/CppunitTest_sax_parser.mk sax/qa sax/source sw/source
sax/CppunitTest_sax_parser.mk|2 - sax/qa/cppunit/parser.cxx| 39 --- sax/source/fastparser/fastparser.cxx |3 ++ sw/source/core/graphic/ndgrf.cxx |9 4 files changed, 41 insertions(+), 12 deletions(-) New commits: commit 6503be5311716cf520cf534ca1bb0fd595b93d72 Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Sep 18 10:03:50 2014 +0200 fastparser: Use dummy token handler in unit test instead of an oox one. Change-Id: I4562156858982857a17e8837106c4c946f175be7 diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index 3308428..d5ede46 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -16,6 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sax_parser, \ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ comphelper \ cppu \ + cppuhelper \ sal \ test \ $(gb_UWINAPI) \ @@ -34,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_components,sax_parser,\ configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ - oox/util/oox \ sax/source/expatwrap/expwrap \ sfx2/util/sfx \ ucb/source/core/ucb1 \ diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index 293ba5f..c6a32c5 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -11,10 +11,11 @@ #include com/sun/star/io/Pipe.hpp #include com/sun/star/xml/sax/FastParser.hpp -#include com/sun/star/xml/sax/FastTokenHandler.hpp +#include com/sun/star/xml/sax/FastToken.hpp #include com/sun/star/xml/sax/SAXParseException.hpp #include com/sun/star/xml/sax/XFastParser.hpp +#include cppuhelper/implbase1.hxx #include test/bootstrapfixture.hxx using namespace css; @@ -22,11 +23,43 @@ using namespace css::xml::sax; namespace { +class DummyTokenHandler : public cppu::WeakImplHelper1 xml::sax::XFastTokenHandler +{ +public: + DummyTokenHandler() {} +virtual ~DummyTokenHandler() {} + +virtual sal_Int32 SAL_CALL getToken( const OUString ) +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE +{ +CPPUNIT_ASSERT_MESSAGE( getToken: unexpected call, false ); +return FastToken::DONTKNOW; +} +virtual OUString SAL_CALL getIdentifier( sal_Int32 ) +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE +{ +CPPUNIT_ASSERT_MESSAGE( getIdentifier: unexpected call, false ); +return OUString(); +} +virtual sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequencesal_Int8 ) +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE +{ +return FastToken::DONTKNOW; +} +virtual uno::Sequence sal_Int8 SAL_CALL getUTF8Identifier( sal_Int32 ) +throw (uno::RuntimeException, std::exception) SAL_OVERRIDE +{ +CPPUNIT_ASSERT_MESSAGE( getUTF8Identifier: unexpected call, false ); +return uno::Sequencesal_Int8(); +} +}; + class ParserTest: public test::BootstrapFixture { InputSource maInput; uno::Reference XFastParser mxParser; uno::Reference XFastDocumentHandler mxDocumentHandler; +uno::Reference DummyTokenHandler mxTokenHandler; public: virtual void setUp() SAL_OVERRIDE; @@ -46,8 +79,8 @@ void ParserTest::setUp() { test::BootstrapFixture::setUp(); mxParser = css::xml::sax::FastParser::create(m_xContext); -mxParser-setTokenHandler( -css::xml::sax::FastTokenHandler::create(m_xContext)); +mxTokenHandler.set( new DummyTokenHandler() ); +mxParser-setTokenHandler( mxTokenHandler ); } void ParserTest::tearDown() commit d7350545ac6c54f07d59c66ccd3b889180e65f4d Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Sep 18 08:38:14 2014 +0200 Better to throw than crash, if token handler is not set. Change-Id: If6b2d39b487b5f673d5b6b2945a6e7d08777594e diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 37b5133..fcbb58d 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -781,6 +781,9 @@ void FastSaxParserImpl::parseStream(const InputSource maStructSource) Entity entity( maData ); entity.maStructSource = maStructSource; +if( !entity.mxTokenHandler.is() ) +throw SAXException(No token handler, use setTokenHandler(), Reference XInterface (), Any() ); + if( !entity.maStructSource.aInputStream.is() ) throw SAXException(No input source, Reference XInterface (), Any() ); commit 1ef778072763a539809c74804ef074c556efe501 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Sep 17 20:29:20 2014 +0200 Remove special case which is handled differently now Since 3914a711060341345f15b83656457f90095f32d6 rGrfName is empty. It was added in 363f1c1462963f6f032de07649dc9c4d02b4e446 Change-Id:
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlgrin.cxx | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) New commits: commit 72703173066a2db5c977d422ace59d60b998bbfc Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Sep 17 21:36:02 2014 +0200 HTML import: fix importing of inlined images (related: fdo#50763) Regression from 3914a711060341345f15b83656457f90095f32d6 Change-Id: I0523d2b07dc33c74caa711cf7aae274c935f8eed diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 5a08056..f4e1e44 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -694,21 +694,30 @@ IMAGE_SETEVENT: aFrmSize.SetHeightPercent( nPrcHeight ); aFrmSet.Put( aFrmSize ); -Graphic aEmptyGrf; +Graphic aGraphic; INetURLObject aGraphicURL( sGrfNm ); -if (aGraphicURL.GetProtocol() == INET_PROT_DATA || -aGraphicURL.GetProtocol() == INET_PROT_FILE) +if( aGraphicURL.GetProtocol() == INET_PROT_DATA ) { -if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aEmptyGrf, aGraphicURL)) +SvMemoryStream* aStream = aGraphicURL.getData(); +if( aStream ) +{ +if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, , *aStream)) +sGrfNm = ; +free( aStream ); +} +} +else if (aGraphicURL.GetProtocol() == INET_PROT_FILE) +{ +if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL)) sGrfNm = ; } if (!sGrfNm.isEmpty()) { -aEmptyGrf.SetDefaultType(); +aGraphic.SetDefaultType(); } // passing empty sGrfNm here, means we don't want the graphic to be linked -SwFrmFmt *pFlyFmt = pDoc-getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, aEmptyGrf, +SwFrmFmt *pFlyFmt = pDoc-getIDocumentContentOperations().Insert( *pPam, sGrfNm, aEmptyOUStr, aGraphic, aFrmSet, NULL, NULL ); SwGrfNode *pGrfNd = pDoc-GetNodes()[ pFlyFmt-GetCntnt().GetCntntIdx() -GetIndex()+1 ]-GetGrfNode(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - shell/source
shell/source/cmdmail/cmdmailsuppl.cxx | 90 -- 1 file changed, 65 insertions(+), 25 deletions(-) New commits: commit e31f7ff57ac77daee009c10161f824ef0ba5fc5c Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 10 11:20:12 2014 +0100 Properly encode cmd line for popen Change-Id: I1f7799920b6732a6cd128143dfa7ce282bad25c6 Signed-off-by: Michael Meeks michael.me...@collabora.com diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 5b1b403..7730f05 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -109,6 +109,47 @@ Reference XSimpleMailMessage SAL_CALL CmdMailSuppl::createSimpleMailMessage( // XSimpleMailClient // +namespace { + +void appendShellWord(OStringBuffer buffer, OUString const word, bool strict) +{ +OString sys; +if (!word.convertToString( +sys, osl_getThreadTextEncoding(), +(strict + ? (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR +| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR) + : OUSTRING_TO_OSTRING_CVTFLAGS))) +{ +throw css::uno::Exception( +(Could not convert \ + word + \ to encoding # + + OUString::number(osl_getThreadTextEncoding())), +css::uno::Referencecss::uno::XInterface()); +} +buffer.append('\''); +for (sal_Int32 i = 0; i != sys.getLength(); ++i) { +char c = sys[i]; +switch (c) { +case 0: +if (strict) { +throw css::uno::Exception( +Could not convert word containing NUL, \ + word + \, +css::uno::Referencecss::uno::XInterface()); +} +break; +case '\'': +buffer.append('\\''); +break; +default: +buffer.append(c); +break; +} +} +buffer.append('\''); +} + +} + void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailMessage xSimpleMailMessage, sal_Int32 /*aFlag*/ ) throw (IllegalArgumentException, Exception, RuntimeException) { @@ -135,7 +176,8 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM static_cast XSimpleMailClient * (this)); } -OStringBuffer aBuffer(\ + OUStringToOString(aProgram, osl_getThreadTextEncoding()) + \ ); +OStringBuffer aBuffer; +appendShellWord(aBuffer, aProgram, true); try { @@ -171,12 +213,12 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM // make sure we have a system path FileBase::getSystemPathFromFileURL( aMailer, aMailer ); -aBuffer.append(--mailclient + OUStringToOString( aMailer, osl_getThreadTextEncoding() ) + -); +aBuffer.append( --mailclient ); +appendShellWord(aBuffer, aMailer, true); } #ifdef MACOSX else -aBuffer.append(--mailclient Mail ); +aBuffer.append( --mailclient Mail); #endif } @@ -196,26 +238,28 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM rtl::OUString sBody = xMessage-getBody(); if ( sBody.getLength() 0 ) { -aBuffer.append(--body \); -aBuffer.append(OUStringToOString(sBody, osl_getThreadTextEncoding())); -aBuffer.append(\ ); +aBuffer.append( --body ); +appendShellWord(aBuffer, sBody, false); } } +// Convert from, to, etc. in a best-effort rather than a strict way to the +// system encoding, based on the assumption that the relevant address parts +// of those strings are ASCII anyway and any problematic characters are only +// in the human-readable, informational-only parts: + // Append originator if set in the message if ( !xSimpleMailMessage-getOriginator().isEmpty() ) { -aBuffer.append(--from \ + -OUStringToOString(xSimpleMailMessage-getOriginator(), osl_getThreadTextEncoding()) + - \ ); +aBuffer.append( --from ); +appendShellWord(aBuffer, xSimpleMailMessage-getOriginator(), false); } // Append receipient if set in the message if ( !xSimpleMailMessage-getRecipient().isEmpty() ) { -aBuffer.append(--to \ + - OUStringToOString(xSimpleMailMessage-getRecipient(), osl_getThreadTextEncoding()) + - \ ); +aBuffer.append( --to ); +appendShellWord(aBuffer, xSimpleMailMessage-getRecipient(), false); } // Append carbon copy receipients set in the message @@ -223,9 +267,8 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM
[Bug 50763] HTML Import doesnt parse inline base64 images correctly
https://bugs.freedesktop.org/show_bug.cgi?id=50763 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp target:4.3.0 |SkillCpp target:4.3.0 |target:4.2.2|target:4.2.2 target:4.4.0 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Matuš Kukan committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=72703173066a2db5c977d422ace59d60b998bbfc HTML import: fix importing of inlined images (related: fdo#50763) 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: Windows daily build broken on Windows 8.1
On 09/18/2014 02:13 PM, Adam Fyne wrote: */LibreOfficeDev 4.4 - Fatal Error/* */---/* */The program cannot be started./* */The service manager is not available./* */(Cannot open uno ini file:///C:/Program%20Files%20(x86)/LibreOfficeDev%204/URE/bin/uno.ini)/* */Start setup application to repair the installation from CD, or the folder containing the installation packages./* Is there a uno.ini file somewhere else in C:\Program Files (x86)\LibreOfficeDev 4\? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/CppunitTest_sw_htmlimport.mk sw/qa
sw/CppunitTest_sw_htmlimport.mk |1 sw/qa/extras/htmlimport/data/inlined_image.html | 21 sw/qa/extras/htmlimport/htmlimport.cxx | 42 3 files changed, 64 insertions(+) New commits: commit 1c1fe7afb77e0538cdc4081ee266a7bda80f7b05 Author: Matúš Kukan matus.ku...@collabora.com Date: Wed Sep 17 20:42:22 2014 +0200 HTML import test for image inlined in 'src' attribute (related: fdo#50763) Fixed in 72703173066a2db5c977d422ace59d60b998bbfc Unfortunately the test does not really ensure it works now :-/ but still probably better than nothing and can be fixed potentially. Change-Id: I563b46c62d256c58a63f36443a5431603169c3f6 diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk index 3036076..425674b 100644 --- a/sw/CppunitTest_sw_htmlimport.mk +++ b/sw/CppunitTest_sw_htmlimport.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_htmlimport,\ $(eval $(call gb_CppunitTest_set_include,sw_htmlimport,\ -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/uibase/inc \ -I$(SRCDIR)/sw/qa/extras/inc \ $$(INCLUDE) \ )) diff --git a/sw/qa/extras/htmlimport/data/inlined_image.html b/sw/qa/extras/htmlimport/data/inlined_image.html new file mode 100644 index 000..7ce2a29 --- /dev/null +++ b/sw/qa/extras/htmlimport/data/inlined_image.html @@ -0,0 +1,21 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN +html +head + meta http-equiv=content-type content=text/html; charset=utf-8/ + title/title + meta name=generator content=LibreOfficeDev 4.4.0.0.alpha0 (Linux)/ + meta name=created content=00:00:00/ + meta name=changed content=2014-09-17T20:11:43.278328686/ + style type=text/css + p { color: #00 } + /style +/head +body lang=en-US text=#00 dir=ltr +pSimple document with a picture./p +pfont color=#80a href=http://www.libreoffice.org/;font color=#80img src=data:image/png;base64,iVBORw0KGgoNSUhEUgAAAXkAAAB4CAYXKIIsAABQN0lEQVR4nO1dB4AU1fl/s/X6HVdogiJgUBFBwEYJKHbFrrFFY+wFSzR2Y0yiaGLsBTVqYjRW7F1jQAHlD1JVrAgqikc74I4ruzPz//1m3tt7t7e7t3vc7pHL/GBudsqr8+b3vve9730TEB48ePDgocsi0NkZ8ODBgwcP2YNH8h48ePDQheGRvAcPHjx0YXgk78GDBw9dGB7Je/DgwUMXhkfyHjx48NCF4ZG8Bw8ePHRheCTvwYMHD10YHsl78ODBQxeGR/IePHjw0IXhkbwHDx48dGF4JO/BgwcPXRgeyXvw4MFDF4ZH8h48ePDQheGRvAcPHjx0YXgk78GDBw9dGB7Je/DgwUMXhkfyHjx48NCF4ZG8Bw8ePHRheCTvwYMHD10YHsl78ODBQxeGR/IePHjw0IXhkbwHDx48dGF4JO/BgwcPXRgeyXvw4MFDF4ZH8h48eMgIe+65p/jggw9S3rPPPvuId955p13x77vvvuLtt99uV1gPreGRvId2oceF+eKnO+rbvK/vpaXiu1vW5yBHHnKBUaNGiVmzZjm/Bw0aFOzWrdvAYDBYicOmxsbGr//v//5vNa+R4PfYYw/x4YcfxsLqnUPfvn39W221VX+E7YFDKxKJfIN7f+Q1EvyYMWPEjBkzcly6romckPxuu+0m8PBzkVRCHH/88eKJJ56IHe+4447i008/3aw4DzzwQFFXVyfee++9zc3eFgf/SUKYj6W+hwQPoj+gpLjkprLSsia/3+9eMPDfNkTUjNTN+e0XE0DwVvZz/L+BESNGiI8++ijhtWy/Yxq59/r5z3/+63A4fCq2AdhEIBAQhmEI 27bF1ltvXQfCngHCP+6NN96oYYDRo0eLmTNn8mfV2LFjT0CYs7DtoML6fD4nLIi/AWHnIOwvX3/99eVZK8z/GHJC8rNnz3YaAXr2X4VCof4ghFy9+GZTU9PzIPiP9eEjCR6NrSca15loZEXMWyawLOtlNML3TzzxxGzkWVRNCotVdzW2ed+g3/USn//hxw5Lt8cFeeKnOxvaJHiFgvyCyq16bzV0wLYDRDgvLITdfK2+oaFujviiw/L2vwiS4OGHHy6eeuop51gRPISUiry8vFK0W19DQ8OGTz75pDqe4HfaaSfx8ccfd0g+FMFjf05hYeFVpaWlfbAJ/BZ4n0nStnyHjGg0WgjhZ49Nmzb5VVgSPKT44wsKCq5HuO3KyspiYcEFsbCmaeYh3G4IX9AhGffgICckz4eIh/yroqKi+zG8C7Dx5gpodOdVVFSMf+mllz7bb7/9xFtvvUWC9yNPtxQXF59YUlJiU5rIBJA2jj/qqKMOevzxxxdnI88k+G7n+Mrz8wsvQZ3lh4JBCsgxDoXUkw9p50oQfE1HpdkdHQsJHtL5doWFRX8uyM/fBS/henRo9y+4cum94+8bLqadM69FGAy1bdSf6NGzp8ALrDLnPO/autpoR+XtfxEcKUKQcAgewhGfxdGo732w9Ud7zQc5GpIc7YEDBzaBIL/F9h7a5lQIM9M7iuCpYiHBY38JnvUtPfGsy8vLBToZC3nw8R60EcOWzx35I3F/gfw2qrDI/8l41/6BsDbC2vn5+XznkoX9DtsGjBYEOrBO1QB0FeRMJw9i362ysjKIB23wYdp8slkEojfQkGw0/B7r1q2bd+yxxw57+umnHdGSbwcaaRnyI6qqqnifyk9KkV5J/CDYnhs3btwGP7NC8oTfF0B/WHbGNltvU1VYVOSmbTMPTsclatatvekrUV3TEWmNnjJEzDx7seh1ceFeZaVl72LIzXrBM8sTmzbV3dPr7732ev3pmcfiVnvX2waJO Rd/3hwYr6pt2M7G/Nk+nuJxR+Tsfwu6zrqmpqbHuHHjxqNt3gpS7I3O3ulIKSCxc4X0HCN5oBDtvBva5VAQ46RjjjmGKpMrcO5lwFF7cETwwgsvZJwn5gckvR8Jvnfv3hYEJh/eHUrfUaTxISTvKXgX5iK/jd27d++L/B6NdCMbNmxolGGHg+Af6NWrl4U25SPBI6yNNjwbYR+sra2duWrVqlrwwlYo18EoSx/Et4Fq0JEjRwbHjBmzPeLcHuX+EfHORwdWx1HE+vXePE+6yBnJU0WDxkEJQPTp06ceD9wir2aL66nnmzdvXggNJAAyz8duBhr/0c888wylnShemt/jthFocD3ZGRgZ6GzYSNHgsqty8hmUkpv69O0Dyakbj12Sxz/kX6z8MQ9HifWzmYIEX3ia6FZSUvzMwO0Gin7b9rOLCosMDqUhadk162uOPvLU/Buee+2dq3SCx9ODJGYK04o6m+omWTFRK9IheftfgiL40aNHnwdCnwRyHETVBtqqzfdG6q8Nbtp7Y0h9uCOnoF2KpqamQhDoXXV1dVcdffTRD3766aeTQfAN7ChAqmnnZ/fdd6dAUYy8XIN3yCbBg6Qd6bu+vv60W265JV6x9y22mepgxIgRIdx/GcKGEZadFPNoIG8XI+xdcWG/xzZbS5vC13mFhYV/BqkHKRgiL1Nx6WgIbOLBBx9Muxz/68gZybMhckMjtAcPHmygh87PcnoGXpamG2+8MYKXJYiXpRKnnkOj3/PZZ5/9ErfMhXTzcw4t0QANDC8d6Sjd+LM8EHGGFAay4/Mbwh/0ozw+V1+DC6ZtCsMd7XYYunUr+UVFZUVpz9497aLiQofgnSxAYCwtKxGWaR6J42uEy+ExWLYFQo86mwNZLZblaWvSxdChQ8XAgQPF8uXLwYMFU0Fq+4IYfdhTtUGyc4gc5Eqi24h3aA7a3zfYm2izfXBtVzyvKnYClPJJiJSYIST0AtFfiw7iUIzODnjjjT
[Bug 50763] HTML Import doesnt parse inline base64 images correctly
https://bugs.freedesktop.org/show_bug.cgi?id=50763 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Matuš Kukan committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=1c1fe7afb77e0538cdc4081ee266a7bda80f7b05 HTML import test for image inlined in 'src' attribute (related: fdo#50763) The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/dropdown-in-cell.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 17 + writerfilter/source/dmapper/DomainMapper.cxx| 13 ++--- writerfilter/source/ooxml/model.xml |5 - 4 files changed, 31 insertions(+), 4 deletions(-) New commits: commit 419054c0f19acb323a0e51c7ef49a1a2d9f42ac8 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Sep 18 15:47:59 2014 +0200 DOCX import: fix handling of dropdown SDT around cell There were two problems here: 1) The CT_SdtContentCell handlers didn't emit the usual NS_ooxml::LN_CT_SdtBlock_sdtContent / NS_ooxml::LN_CT_SdtBlock_sdtEndContent tokens, so the dropdown control was not created (and then was created with the wrong anchor). 2) In case the SDT was around the cell, the newline character was also added to the text of the currently selected entry, resulting in an invalid argument of SwXText::convertToTable(), so no table was created. Change-Id: I4806626181f40c6d26ff7b25f5dbb863967d8077 diff --git a/sw/qa/extras/ooxmlexport/data/dropdown-in-cell.docx b/sw/qa/extras/ooxmlexport/data/dropdown-in-cell.docx new file mode 100644 index 000..8abe25f Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/dropdown-in-cell.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 4dd7dfc..92965f0 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -25,6 +25,7 @@ #include com/sun/star/text/XTextFramesSupplier.hpp #include com/sun/star/text/XTextViewCursorSupplier.hpp #include com/sun/star/text/XTextSection.hpp +#include com/sun/star/text/XTextRangeCompare.hpp #include com/sun/star/style/CaseMap.hpp #include com/sun/star/style/ParagraphAdjust.hpp #include com/sun/star/style/LineSpacing.hpp @@ -253,6 +254,22 @@ DECLARE_OOXMLEXPORT_TEST(testEmptyAnnotationMark, empty-annotation-mark.docx) } } +DECLARE_OOXMLEXPORT_TEST(testDropdownInCell, dropdown-in-cell.docx) +{ +// First problem: table was missing from the document, this was 0. +uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables-getCount()); + +// Second problem: dropdown shape wasn't anchored inside the B1 cell. +uno::Referencetext::XTextContent xShape(getShape(1), uno::UNO_QUERY); +uno::Referencetext::XTextRange xAnchor = xShape-getAnchor(); +uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), uno::UNO_QUERY); +uno::Referencetext::XTextRange xCell(xTable-getCellByName(B1), uno::UNO_QUERY); +uno::Referencetext::XTextRangeCompare xTextRangeCompare(xCell, uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xTextRangeCompare-compareRegionStarts(xAnchor, xCell)); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 7c4fe8a..5fd818c 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2949,10 +2949,17 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) m_pImpl-setSdtEndDeferred(false); } +bool bNewLine = len == 1 (sText[0] == 0x0d || sText[0] == 0x07); if (!m_pImpl-m_pSdtHelper-getDropDownItems().empty()) { -m_pImpl-m_pSdtHelper-getSdtTexts().append(sText); -return; +if (bNewLine) +// Dropdown control has single-line texts, so in case of newline, create the control. +m_pImpl-m_pSdtHelper-createDropDownControl(); +else +{ +m_pImpl-m_pSdtHelper-getSdtTexts().append(sText); +return; +} } // Form controls are not allowed in headers / footers; see sw::DocumentContentOperationsManager::InsertDrawObj() else if (!m_pImpl-m_pSdtHelper-getDateFormat().isEmpty() !IsInHeaderFooter()) @@ -3005,7 +3012,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) { m_pImpl-getTableManager().utext(data_, len); -if(len == 1 (sText[0] == 0x0d || sText[0] == 0x07)) +if (bNewLine) { if (m_pImpl-m_bIgnoreNextPara) { diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 0ae1df8..f194a13 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -18030,7 +18030,10 @@ resource name=CT_SdtContentRun resource=Stream/ resource name=CT_SdtContentBlock resource=Stream/ resource name=CT_SdtContentRow resource=Stream/ -resource name=CT_SdtContentCell resource=Stream/ +resource
Re: vs2012-ide-integration ( with better examples)
On Thu, Sep 18, 2014 at 8:18 AM, nicholas ferguson nicholasfergu...@wingarch.com wrote: If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? In theory gbuild could be taught to generate this vxproj files... gbuild is kind of object oriented, so it should be possible to run make in a way that generate these files and then be able to call make to build the product using batch invocation of visual studio build... Ad Hoc construction of these files would not work because they would become out-of-sync with the build pretty quickly. Of course the 80/20 rule apply here.. dealing with straight c++ compile + link is relatively easy.. dealing with all the other corner case fo the build is the hard part that would require substantial hacking to create visual-studio custom build rules than can then be invoked in a 'sln'... As I said in theory it is doable, but it is much more work to do completely than it looks at first sight... of course an incremental approach may be possible.. dealing with low hanging fruit first (iow module that do not have 'fancy' build step.. iow only straight forward compile + link) so that at least one could have a 'sln' that can do partial rebuild and debugging...) It just happen that no-one has felt the urge to scratch that particular hitch... most dev avoid as much as possible that awful platform. competent, motivated hacker that enjoy windows is, unsurprisingly, a rare breed... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
GSoC wrap up
Hi mentors and students, I'll require each mentor/student team to provide me a blob about what they did. This will be used to write a wrap up blog post that Google can reblog later. Thanks for your help -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LiMux student kick-off
Hi Ptyl, On Wed, 2014-09-17 at 21:08 +0300, Ptyl Dragon wrote: Regarding this, from the little i've learned so far of OpenGL, the main thing would be to avoid use the OpenGL extensions and API calls that don't exist in ES ... In other words, whatever feature of OpenGL we use, we should first ensure it exists in the target OpenGL ES version we choose, on Android and iOS. Sounds sensible; there is a nice list of things to avoid here: chart2/opengl/README.deprecated. FWIW - I got some insight from Markus via some low bandwidth / Australian out-back telegraph which is perhaps helpful =) He says: Sadly OpenGL ES is not a pure subset of normal OpenGL, at least of the versions that we target, so we need to make sure in both directions that the used features are available on both the OpenGL target version as well as in the OpenGL ES target version. Extensions can be used conditionally but core features are a bigger problem there. Actually I hope this is mostly a non-issue if we develop and debug this on a rich-platform rather than Android. Hopefully that way we only have to check we're not using things not available in GLES as you suggest. To elaborate on that point - IMHO once we have the stack efficiently rendering to GL from VCL through drawinglayer etc. on the PC then it is ~trivial to adapt this to tiled-rendering; it's just a different context / frame-buffer-object to render a part of the same scene to. So - why develop for PC first not Android ? well Android is the Devil's Armpit of a development environment. It is extraordinarily hard, and unreliable to debug native code there - the development iteration is not 'compile,run' but 'compile,zip,sign,hope-up-load-works,run' with the middle phases being not only slow but also un-reliable ;-) And that is before we get to the horrible issues of trying to debug broken OpenGL shaders etc. which is bad enough in a well maintained development environment ;-) nevermind on a remote machine with a confused GPU ;-) Of course we'll still have to audit / port that work to Android (which should be easy) after we're done but ... when it works the set of bugs to nail should be mercifully smaller I hope. In my mind, what would have worked better is to avoid the quasi mode, do a pure OpenGL rendering, then integrating it in Desktop via a desktop tiled rendering mechanismthough i guess that's a waterfall in itself. I'd like to avoid that really; lets have the fewest moving parts at once - we may discover on desktop hardware that (if we can render much faster) there is no real need for tiling for desktop performance - though its always nice to be power efficient of course. I would think, the other platforms can wait since they are getting decent performance already. But i can see why you would disagree with me on this. For ease of development / debugging - it makes a huge amount of sense to develop this, at least initially on a PC platform I think. in our iOS implementation we solved the timer issues by considering them as damaged areas, similar to areas changed by editing. Viewer only functionality may not require this by default, but still, it can solve this without getting rid of the timers. Still, i agree that in the long run, the timer thing needs to go. Yep - it's a longer term thing; but I quite like the idea of binning immediate rendering via some just collect damage and re-render model =) it is IMHO a premature optimization on modern hardware. Perhaps to do some actual help, i should begin with doing some easy hacks on this front, just to get the taste of it. Would be good if someone could give me something to actually do. Heh =) I'll fwd some ideas Kendy sent out - that is assuming you have a Linux VM somewhere with GL ? (would be useful to have anyway) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 38 --- 1 file changed, 38 deletions(-) New commits: commit 5a794cddb2132c93f7ded74686c3aa57efaf48eb Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Sep 18 16:06:23 2014 +0200 CppunitTest_sw_ooxmlexport: unused includes Change-Id: I0b53dabffe355c9070660a3d4048bd1624216399 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 92965f0..15e0eae 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -11,45 +11,7 @@ #include com/sun/star/awt/XBitmap.hpp #include com/sun/star/graphic/XGraphic.hpp -#include com/sun/star/frame/XStorable.hpp -#include com/sun/star/drawing/FillStyle.hpp -#include com/sun/star/drawing/LineJoint.hpp -#include com/sun/star/drawing/LineStyle.hpp -#include com/sun/star/drawing/XControlShape.hpp -#include com/sun/star/awt/Gradient.hpp -#include com/sun/star/style/TabStop.hpp -#include com/sun/star/view/XViewSettingsSupplier.hpp -#include com/sun/star/text/RelOrientation.hpp -#include com/sun/star/text/XTextFrame.hpp -#include com/sun/star/text/XTextTable.hpp -#include com/sun/star/text/XTextFramesSupplier.hpp -#include com/sun/star/text/XTextViewCursorSupplier.hpp -#include com/sun/star/text/XTextSection.hpp #include com/sun/star/text/XTextRangeCompare.hpp -#include com/sun/star/style/CaseMap.hpp -#include com/sun/star/style/ParagraphAdjust.hpp -#include com/sun/star/style/LineSpacing.hpp -#include com/sun/star/style/LineSpacingMode.hpp -#include com/sun/star/view/XSelectionSupplier.hpp -#include com/sun/star/table/BorderLine2.hpp -#include com/sun/star/table/ShadowFormat.hpp -#include com/sun/star/text/GraphicCrop.hpp -#include com/sun/star/text/XPageCursor.hpp -#include com/sun/star/awt/FontWeight.hpp -#include com/sun/star/awt/FontUnderline.hpp -#include com/sun/star/awt/FontSlant.hpp -#include com/sun/star/text/WritingMode2.hpp -#include com/sun/star/text/WrapTextMode.hpp -#include com/sun/star/xml/dom/XDocument.hpp -#include com/sun/star/style/BreakType.hpp -#include unotools/tempfile.hxx -#include comphelper/sequenceashashmap.hxx -#include com/sun/star/text/XDocumentIndex.hpp -#include com/sun/star/drawing/EnhancedCustomShapeSegment.hpp -#include com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp -#include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp -#include com/sun/star/drawing/TextVerticalAdjust.hpp -#include com/sun/star/drawing/Hatch.hpp #include string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlimport/htmlimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5176e5b2e932a7123f389823f2b5174fe436a2cc Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Sep 18 16:27:04 2014 +0200 typo: wrong commit hash Change-Id: If2e81662c9d83d14dccda13fa66e87898757ce96 diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index 791c68f..03701c4 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -44,7 +44,7 @@ DECLARE_HTMLIMPORT_TEST(testInlinedImage, inlined_image.html) SwEditShell* pEditShell = pDoc-GetEditShell(); CPPUNIT_ASSERT(pEditShell); -// This was 1 before 1ef778072763a539809c74804ef074c556efe501 +// This was 1 before 3914a711060341345f15b83656457f90095f32d6 const sfx2::LinkManager rLinkManager = pEditShell-GetLinkManager(); CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Windows daily build broken on Windows 8.1
sberg wrote Is there a uno.ini file somewhere else in C:\Program Files Only a pythonloader.uno.ini -- no uno.ini present in the installed build. -- View this message in context: http://nabble.documentfoundation.org/Windows-daily-build-broken-on-Windows-8-1-tp4122701p4122726.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
minutes of ESC call ...
* Present: + Jacobo, Kendy, Michael M, Ptyl, Miklos, Stephan, Muthu, Jan-Marek Andras, Robinson, Norbert * Completed Action Items: + merge the web plugin patch after the conference (Stephan) [ done and in the 4.4 release notes ] + massage plan wrt. FOSDEM dev-rooms (Thorsten) [ working around a joint dev-room ] * Pending Action Items: + Ask Bjoern to do a survey on the wrench icons (Mirek) + blog about the sad realities of web plugins (Bjoern) + open-source newer Synezip tests (Umesh) [ Plan to run these on a server on the cloud service, announce the results in the ESC meeting. ] + provide wiki links for new processes for design interation (Mirek) + poke Alex wrt. off-site backup for TDF services (Cloph) * Release Engineering update (Robinson) + 4.3.2 RC1 - status + currently staged, and has been announced, pushing to mirrors + following the steps, but the builds worked. + 4.2.7 - due in week 40 - 29th Sept freeze. + Android Remote * Crashtest update (Miklos) + a run during the conference, detected some writerfilter issues, now mostly fixed. + run interrupted by security update / re-boot + VM state not preserved across re-boots + new-run ongoing - will be announced on list. * New baseline aka C++11 (Jan-Marek) + Thread start: http://lists.freedesktop.org/archives/libreoffice/2014-September/063326.html + Previous baseline: gcc 4.1.2 (2007-02-13) + Current baseline: at least gcc 4.8.1 (2013-05-31) + There was additional discussion on IRC (2014-09-18) + There had been previous discussions in May 2014 ESC calls + Tinderboxes (TBs) now based on RH 5 + RH Developer Toolset 2.x + Official baseline announced as gcc 4.7 + Official announcement - you'll need gcc 4.7+ to compile LO 4.4 + LOconf14 talks regarding C++11 - I didn't get the fact the introduction is due for LO 4.4 + And the TBs moved the compiler / build tool baseline actually to gcc 4.8[.0] (release: 2013-03-22) - TBs actually run 4.8.n (n 0) - Basically drops support for all distros 2 years old - Ubuntu 12.04 has gcc 4.6 - I know there are PPAs - https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/ppa Just contains offical release toolchains - no updates! - https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test Unsupported (@see Workarounds) and not up to date with any baseline - I know there is an unsupported 4.7.2 in precise-updates (universe) - Already had an incompatibility bug - https://gerrit.libreoffice.org/#/c/11501/ + Since last week master requires gcc-4.7 (Stephan) + still works with gcc-4.6 - for now. + a bug introduced recently, fixed already thanks to Jan Marek + these things happen whatever the tinderboxes uses + just a function of the diverse compiler set we have. + Building master on old Ubuntu (Stephan) + building on 12.whatever - we broke that + for the TDF baseline builds, CentOS 5 - we use a devtools toolchain with a related compiler binaries that run on the baseline - apparently not available for Ubuntu. + Old versions of distros / not compiling master (Stephan) + was not seen as an issue by the distro people. + master will only go into recent versions of distros. + so we have a 12.4 build problem, and need a solution for this. + If gcc-4.6 is needed - perhaps it works (Stephan) + we have to subset the C++11 features anyway (Kendy) + only feature missing in 4.6: delegating constructors (Stephan) + 'override' and 'final' - we have macros for them anyway. + possibly some std::library features not implemented in 4.7 + from the core-language, all that is missing is delegating constructors + happy with that (Jmux) + do we get enough new goodness then ? (Michael) + sure we get tons - lots of goodies. + clang use 4.7 as their bootstrap baseline + can we have a tinderbox running gcc-4.6 (Miklos) + without that, sooner or later someone will break it. AI: + setup a LiMux based tinderbox (Jmux) AI: + send Jmux some tinderbox pointers (Norbert) + some good slides from the conference on this (Jacobo) * Hackfests (Robinson) + Seattle 'Libre-Fest' (Robinson) https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest + October 26, 2014 + Bug-triaging/Intro-to-community event + Following SeaGL conference + definite interest, heard back from some professors from the security lab + want to meet Norbert and/or Kohei - why not go ? + Toulouse Hackfest ... + Confirmed for Nov. 15-16th
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - shell/source
shell/source/cmdmail/cmdmailsuppl.cxx | 90 -- 1 file changed, 65 insertions(+), 25 deletions(-) New commits: commit 2b52c8686dcd3fcb95146466e0a8703e8df3cbab Author: Stephan Bergmann sberg...@redhat.com Date: Mon Feb 10 11:20:12 2014 +0100 Properly encode cmd line for popen Change-Id: I1f7799920b6732a6cd128143dfa7ce282bad25c6 Signed-off-by: Michael Meeks michael.me...@collabora.com diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 5b1b403..7730f05 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -109,6 +109,47 @@ Reference XSimpleMailMessage SAL_CALL CmdMailSuppl::createSimpleMailMessage( // XSimpleMailClient // +namespace { + +void appendShellWord(OStringBuffer buffer, OUString const word, bool strict) +{ +OString sys; +if (!word.convertToString( +sys, osl_getThreadTextEncoding(), +(strict + ? (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR +| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR) + : OUSTRING_TO_OSTRING_CVTFLAGS))) +{ +throw css::uno::Exception( +(Could not convert \ + word + \ to encoding # + + OUString::number(osl_getThreadTextEncoding())), +css::uno::Referencecss::uno::XInterface()); +} +buffer.append('\''); +for (sal_Int32 i = 0; i != sys.getLength(); ++i) { +char c = sys[i]; +switch (c) { +case 0: +if (strict) { +throw css::uno::Exception( +Could not convert word containing NUL, \ + word + \, +css::uno::Referencecss::uno::XInterface()); +} +break; +case '\'': +buffer.append('\\''); +break; +default: +buffer.append(c); +break; +} +} +buffer.append('\''); +} + +} + void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailMessage xSimpleMailMessage, sal_Int32 /*aFlag*/ ) throw (IllegalArgumentException, Exception, RuntimeException) { @@ -135,7 +176,8 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM static_cast XSimpleMailClient * (this)); } -OStringBuffer aBuffer(\ + OUStringToOString(aProgram, osl_getThreadTextEncoding()) + \ ); +OStringBuffer aBuffer; +appendShellWord(aBuffer, aProgram, true); try { @@ -171,12 +213,12 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM // make sure we have a system path FileBase::getSystemPathFromFileURL( aMailer, aMailer ); -aBuffer.append(--mailclient + OUStringToOString( aMailer, osl_getThreadTextEncoding() ) + -); +aBuffer.append( --mailclient ); +appendShellWord(aBuffer, aMailer, true); } #ifdef MACOSX else -aBuffer.append(--mailclient Mail ); +aBuffer.append( --mailclient Mail); #endif } @@ -196,26 +238,28 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM rtl::OUString sBody = xMessage-getBody(); if ( sBody.getLength() 0 ) { -aBuffer.append(--body \); -aBuffer.append(OUStringToOString(sBody, osl_getThreadTextEncoding())); -aBuffer.append(\ ); +aBuffer.append( --body ); +appendShellWord(aBuffer, sBody, false); } } +// Convert from, to, etc. in a best-effort rather than a strict way to the +// system encoding, based on the assumption that the relevant address parts +// of those strings are ASCII anyway and any problematic characters are only +// in the human-readable, informational-only parts: + // Append originator if set in the message if ( !xSimpleMailMessage-getOriginator().isEmpty() ) { -aBuffer.append(--from \ + -OUStringToOString(xSimpleMailMessage-getOriginator(), osl_getThreadTextEncoding()) + - \ ); +aBuffer.append( --from ); +appendShellWord(aBuffer, xSimpleMailMessage-getOriginator(), false); } // Append receipient if set in the message if ( !xSimpleMailMessage-getRecipient().isEmpty() ) { -aBuffer.append(--to \ + - OUStringToOString(xSimpleMailMessage-getRecipient(), osl_getThreadTextEncoding()) + - \ ); +aBuffer.append( --to ); +appendShellWord(aBuffer, xSimpleMailMessage-getRecipient(), false); } // Append carbon copy receipients set in the message @@ -223,9 +267,8 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference XSimpleMailM
Yousuf Philips license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Regards, Jay Philips ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
Sorry I couldn't join today. On Thu, Sep 18, 2014 at 5:46 PM, Michael Meeks michael.me...@collabora.com wrote: * Present: + Jacobo, Kendy, Michael M, Ptyl, Miklos, Stephan, Muthu, Jan-Marek Andras, Robinson, Norbert * Completed Action Items: + merge the web plugin patch after the conference (Stephan) [ done and in the 4.4 release notes ] + massage plan wrt. FOSDEM dev-rooms (Thorsten) [ working around a joint dev-room ] * Pending Action Items: + Ask Bjoern to do a survey on the wrench icons (Mirek) + blog about the sad realities of web plugins (Bjoern) + open-source newer Synezip tests (Umesh) [ Plan to run these on a server on the cloud service, announce the results in the ESC meeting. ] + provide wiki links for new processes for design interation (Mirek) + poke Alex wrt. off-site backup for TDF services (Cloph) * Release Engineering update (Robinson) + 4.3.2 RC1 - status + currently staged, and has been announced, pushing to mirrors + following the steps, but the builds worked. + 4.2.7 - due in week 40 - 29th Sept freeze. + Android Remote * Crashtest update (Miklos) + a run during the conference, detected some writerfilter issues, now mostly fixed. + run interrupted by security update / re-boot + VM state not preserved across re-boots + new-run ongoing - will be announced on list. * New baseline aka C++11 (Jan-Marek) + Thread start: http://lists.freedesktop.org/archives/libreoffice/2014-September/063326.html + Previous baseline: gcc 4.1.2 (2007-02-13) + Current baseline: at least gcc 4.8.1 (2013-05-31) + There was additional discussion on IRC (2014-09-18) + There had been previous discussions in May 2014 ESC calls + Tinderboxes (TBs) now based on RH 5 + RH Developer Toolset 2.x + Official baseline announced as gcc 4.7 + Official announcement - you'll need gcc 4.7+ to compile LO 4.4 + LOconf14 talks regarding C++11 - I didn't get the fact the introduction is due for LO 4.4 + And the TBs moved the compiler / build tool baseline actually to gcc 4.8[.0] (release: 2013-03-22) - TBs actually run 4.8.n (n 0) - Basically drops support for all distros 2 years old - Ubuntu 12.04 has gcc 4.6 - I know there are PPAs - https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/ppa Just contains offical release toolchains - no updates! - https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test Unsupported (@see Workarounds) and not up to date with any baseline - I know there is an unsupported 4.7.2 in precise-updates (universe) - Already had an incompatibility bug - https://gerrit.libreoffice.org/#/c/11501/ + Since last week master requires gcc-4.7 (Stephan) + still works with gcc-4.6 - for now. + a bug introduced recently, fixed already thanks to Jan Marek + these things happen whatever the tinderboxes uses + just a function of the diverse compiler set we have. + Building master on old Ubuntu (Stephan) + building on 12.whatever - we broke that + for the TDF baseline builds, CentOS 5 - we use a devtools toolchain with a related compiler binaries that run on the baseline - apparently not available for Ubuntu. + Old versions of distros / not compiling master (Stephan) + was not seen as an issue by the distro people. + master will only go into recent versions of distros. + so we have a 12.4 build problem, and need a solution for this. + If gcc-4.6 is needed - perhaps it works (Stephan) + we have to subset the C++11 features anyway (Kendy) + only feature missing in 4.6: delegating constructors (Stephan) + 'override' and 'final' - we have macros for them anyway. + possibly some std::library features not implemented in 4.7 + from the core-language, all that is missing is delegating constructors + happy with that (Jmux) + do we get enough new goodness then ? (Michael) + sure we get tons - lots of goodies. + clang use 4.7 as their bootstrap baseline + can we have a tinderbox running gcc-4.6 (Miklos) + without that, sooner or later someone will break it. AI: + setup a LiMux based tinderbox (Jmux) AI: + send Jmux some tinderbox pointers (Norbert) + some good slides from the conference on this (Jacobo) * Hackfests (Robinson) + Seattle 'Libre-Fest' (Robinson) https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest + October 26, 2014 + Bug-triaging/Intro-to-community event + Following SeaGL conference + definite
Re: Yousuf Philips license statement
Yousuf or Jay ? You got me puzzled =) On Thu, Sep 18, 2014 at 6:28 PM, Jay Philips philip...@hotmail.com wrote: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Regards, Jay Philips ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Windows daily build broken on Windows 8.1
On 09/18/2014 04:41 PM, V Stuart Foote wrote: sberg wrote Is there a uno.ini file somewhere else in C:\Program Files Only a pythonloader.uno.ini -- no uno.ini present in the installed build. So Tor and I have an idea now of what's going on there. Stay tuned for a fix... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Yousuf Philips license statement
Hi Adam, Its Yousuf. Jay is my nickname. :D Regards, Jay Philips On 09/18/2014 07:43 PM, Adam Fyne wrote: Yousuf or Jay ? You got me puzzled =) On Thu, Sep 18, 2014 at 6:28 PM, Jay Philips philip...@hotmail.com mailto:philip...@hotmail.com wrote: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Regards, Jay Philips ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org mailto:LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d07549bc4cc74c71e2c85a4472fd605682faf494 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 18 16:50:59 2014 +0100 bump hyphen to 2.8.8 Change-Id: I1a3b360ac2f65b0ede1739363284666cd3662781 diff --git a/download.lst b/download.lst index e395c05..8793cb9 100644 --- a/download.lst +++ b/download.lst @@ -64,7 +64,7 @@ export HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz -export HYPHEN_TARBALL := ecaf645cb09bd7b6ad0497b8a91fbd22-hyphen-2.8.7.tar.gz +export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LiMux student kick-off
This could be a pretty big minefield on Windows. Look at Chrome and Firefox. They had to introduce ANGLE to do dynamic OpenGL-Direct3D translation, because there were too many OpenGL bugs and quirks, especially with Intel GPUs. Not to mention, that drivers installed from Windows update have often limited OpenGL support and not everyone installs drivers directly from GPU vendors. And yet they still have to use a driver/HW blacklist. I guess LO can get away with much simpler implementation, so it will not be as bad, but it's still something to consider. On Thu, Sep 18, 2014 at 3:25 PM, Michael Meeks michael.me...@collabora.com wrote: Hi Ptyl, On Wed, 2014-09-17 at 21:08 +0300, Ptyl Dragon wrote: Regarding this, from the little i've learned so far of OpenGL, the main thing would be to avoid use the OpenGL extensions and API calls that don't exist in ES ... In other words, whatever feature of OpenGL we use, we should first ensure it exists in the target OpenGL ES version we choose, on Android and iOS. Sounds sensible; there is a nice list of things to avoid here: chart2/opengl/README.deprecated. FWIW - I got some insight from Markus via some low bandwidth / Australian out-back telegraph which is perhaps helpful =) He says: Sadly OpenGL ES is not a pure subset of normal OpenGL, at least of the versions that we target, so we need to make sure in both directions that the used features are available on both the OpenGL target version as well as in the OpenGL ES target version. Extensions can be used conditionally but core features are a bigger problem there. Actually I hope this is mostly a non-issue if we develop and debug this on a rich-platform rather than Android. Hopefully that way we only have to check we're not using things not available in GLES as you suggest. To elaborate on that point - IMHO once we have the stack efficiently rendering to GL from VCL through drawinglayer etc. on the PC then it is ~trivial to adapt this to tiled-rendering; it's just a different context / frame-buffer-object to render a part of the same scene to. So - why develop for PC first not Android ? well Android is the Devil's Armpit of a development environment. It is extraordinarily hard, and unreliable to debug native code there - the development iteration is not 'compile,run' but 'compile,zip,sign,hope-up-load-works,run' with the middle phases being not only slow but also un-reliable ;-) And that is before we get to the horrible issues of trying to debug broken OpenGL shaders etc. which is bad enough in a well maintained development environment ;-) nevermind on a remote machine with a confused GPU ;-) Of course we'll still have to audit / port that work to Android (which should be easy) after we're done but ... when it works the set of bugs to nail should be mercifully smaller I hope. In my mind, what would have worked better is to avoid the quasi mode, do a pure OpenGL rendering, then integrating it in Desktop via a desktop tiled rendering mechanismthough i guess that's a waterfall in itself. I'd like to avoid that really; lets have the fewest moving parts at once - we may discover on desktop hardware that (if we can render much faster) there is no real need for tiling for desktop performance - though its always nice to be power efficient of course. I would think, the other platforms can wait since they are getting decent performance already. But i can see why you would disagree with me on this. For ease of development / debugging - it makes a huge amount of sense to develop this, at least initially on a PC platform I think. in our iOS implementation we solved the timer issues by considering them as damaged areas, similar to areas changed by editing. Viewer only functionality may not require this by default, but still, it can solve this without getting rid of the timers. Still, i agree that in the long run, the timer thing needs to go. Yep - it's a longer term thing; but I quite like the idea of binning immediate rendering via some just collect damage and re-render model =) it is IMHO a premature optimization on modern hardware. Perhaps to do some actual help, i should begin with doing some easy hacks on this front, just to get the taste of it. Would be good if someone could give me something to actually do. Heh =) I'll fwd some ideas Kendy sent out - that is assuming you have a Linux VM somewhere with GL ? (would be useful to have anyway) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit e72f00d2e96a68d6aacf3cf8eadc4189ec87aa05 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 18 11:40:26 2014 +0100 IsDraw doesn't mean the app/page is Draw it means a slide in impress. commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c Date: Mon Jun 23 20:55:21 2014 +0100 Make Draw use paper size when printing - fdo#63905 Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. suggests the intent is for this to not affect Impress and to only affect Draw, so this does that (cherry picked from commit f1f89f0202232635e7fbbd7ca47de51755b2bce0) Conflicts: sd/source/ui/view/DocumentRenderer.cxx Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b Reviewed-on: https://gerrit.libreoffice.org/11510 Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 7080e9d..b843f2e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1409,6 +1409,7 @@ private: PrintInfo rInfo) { SdDrawDocument* pDocument = mrBase.GetMainViewShell()-GetDoc(); +bool bIsDraw = pDocument-GetDocumentType() == DOCUMENT_TYPE_DRAW; rInfo.meOrientation = ORIENTATION_PORTRAIT; if( ! mpOptions-IsBooklet()) @@ -1420,7 +1421,7 @@ private: // Draw should abide by specified paper size Size aPaperSize; -if (mpOptions-IsDraw()) +if (bIsDraw) { aPaperSize.setWidth(rInfo.maPageSize.Width()); aPaperSize.setHeight(rInfo.maPageSize.Height()); @@ -1497,7 +1498,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()-getTime( Time( Time::SYSTEM ), false, false ); // Draw should use specified paper size when printing -if (mpOptions-IsDraw()) +if (mrBase.GetDocShell()-GetDocumentType() == DOCUMENT_TYPE_DRAW) { aInfo.maPrintSize = mrBase.GetDocument()-GetSdPage(0, PK_STANDARD)-GetSize(); maPrintSize = awt::Size(aInfo.maPrintSize.Width(), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 7b3ec856595cc52e8fec911ae420170a455d4888 Author: Caolán McNamara caol...@redhat.com Date: Thu Sep 18 11:40:26 2014 +0100 IsDraw doesn't mean the app/page is Draw it means a slide in impress. commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c Date: Mon Jun 23 20:55:21 2014 +0100 Make Draw use paper size when printing - fdo#63905 Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. suggests the intent is for this to not affect Impress and to only affect Draw, so this does that (cherry picked from commit f1f89f0202232635e7fbbd7ca47de51755b2bce0) Conflicts: sd/source/ui/view/DocumentRenderer.cxx Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b Reviewed-on: https://gerrit.libreoffice.org/11511 Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 52aa9c5..e1e3c7d 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1409,6 +1409,7 @@ private: PrintInfo rInfo) { SdDrawDocument* pDocument = mrBase.GetMainViewShell()-GetDoc(); +bool bIsDraw = pDocument-GetDocumentType() == DOCUMENT_TYPE_DRAW; rInfo.meOrientation = ORIENTATION_PORTRAIT; if( ! mpOptions-IsBooklet()) @@ -1420,7 +1421,7 @@ private: // Draw should abide by specified paper size Size aPaperSize; -if (mpOptions-IsDraw()) +if (bIsDraw) { aPaperSize.setWidth(rInfo.maPageSize.Width()); aPaperSize.setHeight(rInfo.maPageSize.Height()); @@ -1497,7 +1498,7 @@ private: aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()-getTime( Time( Time::SYSTEM ), sal_False, sal_False ); // Draw should use specified paper size when printing -if (mpOptions-IsDraw()) +if (mrBase.GetDocShell()-GetDocumentType() == DOCUMENT_TYPE_DRAW) { aInfo.maPrintSize = mrBase.GetDocument()-GetSdPage(0, PK_STANDARD)-GetSize(); maPrintSize = awt::Size(aInfo.maPrintSize.Width(), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
I am new employee, with VS problem
I documented what steps I took to build libreoffice on windows https://github.com/nicholasferguson/LibreOffice-Inx-for-VS2010-VS2012-dev-en v ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/CppunitTest_sc_ucalc.mk sc/qa sc/source
sc/CppunitTest_sc_ucalc.mk |1 sc/qa/unit/ucalc.cxx| 1357 - sc/qa/unit/ucalc.hxx|5 sc/qa/unit/ucalc_sort.cxx | 1462 sc/source/core/data/column4.cxx |7 sc/source/core/data/table3.cxx |7 6 files changed, 1478 insertions(+), 1361 deletions(-) New commits: commit 337bc5665a8524eb8adfd7e90d12a8019ee6563b Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 13:35:34 2014 -0400 fdo#83764: Write test for this. Change-Id: I4bc7c3ebdca14caa7d1c8edc2ad777a0e6dd5de2 diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 3e48ff4..e968f6c 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -345,8 +345,11 @@ public: void testFindAreaPosVertical(); void testFindAreaPosColRight(); +void testShiftCells(); + void testSort(); void testSortHorizontal(); +void testSortHorizontalWholeColumn(); void testSortSingleRow(); void testSortWithFormulaRefs(); void testSortWithStrings(); @@ -359,7 +362,6 @@ public: void testSortRefUpdate5(); void testSortOutOfPlaceResult(); void testSortPartialFormulaGroup(); -void testShiftCells(); void testNoteBasic(); void testNoteDeleteRow(); @@ -532,6 +534,7 @@ public: CPPUNIT_TEST(testFindAreaPosColRight); CPPUNIT_TEST(testSort); CPPUNIT_TEST(testSortHorizontal); +CPPUNIT_TEST(testSortHorizontalWholeColumn); CPPUNIT_TEST(testSortSingleRow); CPPUNIT_TEST(testSortWithFormulaRefs); CPPUNIT_TEST(testSortWithStrings); diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx index fb71e8f..95a5e42 100644 --- a/sc/qa/unit/ucalc_sort.cxx +++ b/sc/qa/unit/ucalc_sort.cxx @@ -189,6 +189,83 @@ void Test::testSortHorizontal() m_pDoc-DeleteTab(0); } +void Test::testSortHorizontalWholeColumn() +{ +sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); +m_pDoc-InsertTab(0, Sort); + +// 0 = empty cell +const char* aData[][5] = { +{ 4, 2, 47, a, 9 } +}; + +// Insert row data to C1:G1. +ScRange aSortRange = insertRangeData(m_pDoc, ScAddress(2,0,0), aData, SAL_N_ELEMENTS(aData)); +CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc-GetValue(ScAddress(2,0,0))); +CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(3,0,0))); +CPPUNIT_ASSERT_EQUAL(47.0, m_pDoc-GetValue(ScAddress(4,0,0))); +CPPUNIT_ASSERT_EQUAL(OUString(a), m_pDoc-GetString(ScAddress(5,0,0))); +CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc-GetValue(ScAddress(6,0,0))); + +// Extend the sort range to whole column. +aSortRange.aEnd.SetRow(MAXROW); + +SCCOL nCol1 = aSortRange.aStart.Col(); +SCCOL nCol2 = aSortRange.aEnd.Col(); +SCROW nRow1 = aSortRange.aStart.Row(); +SCROW nRow2 = aSortRange.aEnd.Row(); + +// Define C:G as sheet-local anonymous database range. +m_pDoc-SetAnonymousDBData( +0, new ScDBData(STR_DB_LOCAL_NONAME, 0, nCol1, nRow1, nCol2, nRow2, false, false)); + +// Sort C:G horizontally ascending by row 1. +ScDBDocFunc aFunc(getDocShell()); + +ScSortParam aSortData; +aSortData.nCol1 = nCol1; +aSortData.nCol2 = nCol2; +aSortData.nRow1 = nRow1; +aSortData.nRow2 = nRow2; +aSortData.bHasHeader = false; +aSortData.bByRow = false; // Sort by column (in horizontal direction). +aSortData.bIncludePattern = true; +aSortData.maKeyState[0].bDoSort = true; +aSortData.maKeyState[0].nField = 0; +aSortData.maKeyState[0].bAscending = true; +bool bSorted = aFunc.Sort(0, aSortData, true, true, true); +CPPUNIT_ASSERT(bSorted); + +// Check the sort result. +CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(2,0,0))); +CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc-GetValue(ScAddress(3,0,0))); +CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc-GetValue(ScAddress(4,0,0))); +CPPUNIT_ASSERT_EQUAL(47.0, m_pDoc-GetValue(ScAddress(5,0,0))); +CPPUNIT_ASSERT_EQUAL(OUString(a), m_pDoc-GetString(ScAddress(6,0,0))); + +// Undo and check. + +SfxUndoManager* pUndoMgr = m_pDoc-GetUndoManager(); +CPPUNIT_ASSERT(pUndoMgr); + +pUndoMgr-Undo(); +CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc-GetValue(ScAddress(2,0,0))); +CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(3,0,0))); +CPPUNIT_ASSERT_EQUAL(47.0, m_pDoc-GetValue(ScAddress(4,0,0))); +CPPUNIT_ASSERT_EQUAL(OUString(a), m_pDoc-GetString(ScAddress(5,0,0))); +CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc-GetValue(ScAddress(6,0,0))); + +// Redo and check. +pUndoMgr-Redo(); +CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(2,0,0))); +CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc-GetValue(ScAddress(3,0,0))); +CPPUNIT_ASSERT_EQUAL(9.0, m_pDoc-GetValue(ScAddress(4,0,0))); +CPPUNIT_ASSERT_EQUAL(47.0, m_pDoc-GetValue(ScAddress(5,0,0))); +CPPUNIT_ASSERT_EQUAL(OUString(a), m_pDoc-GetString(ScAddress(6,0,0))); + +m_pDoc-DeleteTab(0); +} + void Test::testSortSingleRow() { // This
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/gbuild
solenv/gbuild/UnpackedTarball.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 556d07c94b52949ca64d74ec5449c2b138b5ff95 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Thu Aug 7 13:09:20 2014 +0200 Fix tarball.rebuild on windows Change-Id: I0a649548088428bd1a1fcedab76325fffa6b72a0 (cherry picked from commit 91bfacea9058b0a00feb58879c14666d31089c21) Reviewed-on: https://gerrit.libreoffice.org/11475 Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 6021acb..a91ce57 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -412,7 +412,7 @@ endef %.rebuild : if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \ touch $(call gb_UnpackedTarball_get_target,$*) ; \ - make ;\ + $(MAKE) ;\ fi %.genpatch : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f3b404b643f907f9feff893324174c00c3c4e4a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 14:22:27 2014 -0400 Update mdds to 0.11.0. Change-Id: Ia4c413d313aafc1ba46d3d856145c0eb51a7d6ec diff --git a/download.lst b/download.lst index 8793cb9..a104a38 100644 --- a/download.lst +++ b/download.lst @@ -97,7 +97,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz -export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2 +export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] mdds 0.11.0 on master
Hi there, Just FYI, I've updated mdds package on the master branch from 0.10.3 to 0.11.0. It's a backward-compatible release, so in theory you don't need to update mdds to build master. But it contains several bug fixes, so I recommend using 0.11.0. In theory, you can also use 0.11.0 to build 4.2 and 4.3 branches as well, but I have yet to verify that myself. All the best, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - i18nlangtag/source
i18nlangtag/source/isolang/isolang.cxx |4 1 file changed, 4 insertions(+) New commits: commit f31eae7441d916ab22b3395443e0301506cb8fc1 Author: Eike Rathke er...@redhat.com Date: Tue Sep 16 13:50:27 2014 +0200 fdo#81357 no fallback for special codes without country Thanks to Justin Luth for the hint. Change-Id: I97bde18814368e589e2a1c275457489a0d7392d4 (cherry picked from commit 3ff2e4dc1d0ba922e06f0d5c90c85fee33623784) Reviewed-on: https://gerrit.libreoffice.org/11471 Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 141d913..e91b09e 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -1105,6 +1105,10 @@ com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageS case LANGUAGE_USER_LOJBAN: case LANGUAGE_KASHMIRI: case LANGUAGE_USER_KEYID: +// And the special codes without country. +case LANGUAGE_MULTIPLE: +case LANGUAGE_UNDETERMINED: +case LANGUAGE_NONE: return getLocale( pEntry); // may override default: ; // nothing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - i18nlangtag/source
i18nlangtag/source/isolang/isolang.cxx |4 1 file changed, 4 insertions(+) New commits: commit 536cd9baa6b3eea7ddce9c0e69f9612aa0688144 Author: Eike Rathke er...@redhat.com Date: Tue Sep 16 13:50:27 2014 +0200 fdo#81357 no fallback for special codes without country Thanks to Justin Luth for the hint. Change-Id: I97bde18814368e589e2a1c275457489a0d7392d4 (cherry picked from commit 3ff2e4dc1d0ba922e06f0d5c90c85fee33623784) Reviewed-on: https://gerrit.libreoffice.org/11472 Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index e7f3dd0..8860dd9 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -1097,6 +1097,10 @@ com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageS case LANGUAGE_USER_LOJBAN: case LANGUAGE_KASHMIRI: case LANGUAGE_USER_KEYID: +// And the special codes without country. +case LANGUAGE_MULTIPLE: +case LANGUAGE_UNDETERMINED: +case LANGUAGE_NONE: return getLocale( pEntry); // may override default: ; // nothing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/051b29e1025253f35f87a04e297760aa8b40611f/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] mdds 0.11.0 on master
On Thu, 2014-09-18 at 14:40 -0400, Kohei Yoshida wrote: In theory, you can also use 0.11.0 to build 4.2 and 4.3 branches as well, but I have yet to verify that myself. Just verified this. Both 4.2 and 4.3 build fine with mdds 0.11.0. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac
config_host.mk.in |1 - configure.ac |1 - 2 files changed, 2 deletions(-) New commits: commit c184e32d5976e751b8d08577bd256232a67917c5 Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Sep 18 21:40:47 2014 +0200 $(GNUMAKE) is not used outside of a configure f8062812ae76af9488bc9c64ee9365c747bd3b38 replaced it with $(MAKE) Change-Id: Ibe13cb6d93489a15bcb8c43b113b125bfbe5820f diff --git a/config_host.mk.in b/config_host.mk.in index 40865e7..e717745 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -213,7 +213,6 @@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@ export PARALLELISM?=@PARALLELISM@ @x_GNUCP@ export GNUCOPY=@GNUCP@ -export GNUMAKE=@GNUMAKE@ export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@ export GNUPATCH=@GNUPATCH@ export GNUTAR=@GNUTAR@ diff --git a/configure.ac b/configure.ac index 23a1f20..e5c01e8 100644 --- a/configure.ac +++ b/configure.ac @@ -4867,7 +4867,6 @@ else fi rm -rf $TESTGMAKEFILEFUNC AC_SUBST(HAVE_GNUMAKE_FILE_FUNC) -AC_SUBST(GNUMAKE) AC_SUBST(GNUMAKE_WIN_NATIVE) _make_ver_check=`$GNUMAKE --version | grep Built for Windows` ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: vs2012-ide-integration
Hi Nicholas, On Thu, 2014-09-18 at 08:45 -0400, nicholas ferguson wrote: I built in Visual Studio, using native compilers…modules sc and cui and all of their dependencies. This build is separate from libreoffice make files and cygwin. It doesn’t require references to make files or cygwin. I love the idea; anything to make it easier to build on Windows and remove the cygwin grief: I feel your pain. If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? Well; the best way is to send a patch of your own. We love patches =) developers talk code really. I suspect if you start something there you may find people intersted in playing with it with you chipping away at the problem. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/CustomTarget_android_desktop.mk android/CustomTarget_lo4android.mk android/experimental android/Module_android.mk
android/CustomTarget_android_desktop.mk | 14 android/CustomTarget_lo4android.mk | 36 android/Module_android.mk |1 android/experimental/LOAndroid3/AndroidManifest.xml |9 android/experimental/LOAndroid3/res/drawable-hdpi/action_search.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/action_search_light.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_img.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/bg_striped_split_img.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_compose_inverse.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_launcher_settings.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_magnifying_glass.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_refresh_inverse.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_search.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_search_inverse.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/ic_title_share_default.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/icon.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/light_sort_by_size.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_grid.png |binary android/experimental/LOAndroid3/res/drawable-hdpi/light_view_as_list.png |binary android/experimental/LOAndroid3/res/drawable-ldpi/ic_launcher.png |binary android/experimental/LOAndroid3/res/drawable-ldpi/icon.png |binary android/experimental/LOAndroid3/res/drawable-ldpi/lo_icon.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_img.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/bg_striped_split_img.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_compose_inverse.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_launcher_settings.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_magnifying_glass.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_refresh_inverse.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_search.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/ic_search_inverse.png |binary android/experimental/LOAndroid3/res/drawable-mdpi/icon.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_img.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/bg_striped_split_img.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/ic_launcher_settings.png |binary android/experimental/LOAndroid3/res/drawable-xhdpi/icon.png |binary android/experimental/LOAndroid3/res/drawable/base.png |binary android/experimental/LOAndroid3/res/drawable/bg_striped.xml |6 android/experimental/LOAndroid3/res/drawable/bg_striped_split.xml |6 android/experimental/LOAndroid3/res/drawable/black_white_gradient.xml | 15 android/experimental/LOAndroid3/res/drawable/calc.png |binary android/experimental/LOAndroid3/res/drawable/draw.png |binary
[Libreoffice-commits] core.git: android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 18 ++ 1 file changed, 5 insertions(+), 13 deletions(-) New commits: commit 966fe14af2c8782d7f16f732a73761a60b345bb1 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Fri Sep 12 13:32:00 2014 +0200 Android browser: open documents with the new viewer Change-Id: Iae63a8ec591df912938e74d67cb173f591c2a93d Reviewed-on: https://gerrit.libreoffice.org/11488 Reviewed-by: Tomaž Vajngerl qui...@gmail.com Tested-by: Tomaž Vajngerl qui...@gmail.com diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java index 96e4251..feb74b3 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -228,19 +228,11 @@ public class LibreOfficeUIActivity extends Activity implements ActionBar.OnNavig } public void open(File file) { - /* - Intent i = new Intent( this , WriterViewerActivity.class ); - i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath() ); - i.putExtra( FILTER_MODE_KEY , filterMode ); - i.putExtra( EXPLORER_VIEW_TYPE_KEY , viewMode ); - startActivity( i ); - */ - Intent i = new Intent( this , DocumentLoader.class ); -i.putExtra(input, file.getAbsolutePath() ); - i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath() ); - i.putExtra( FILTER_MODE_KEY , filterMode ); - i.putExtra( EXPLORER_VIEW_TYPE_KEY , viewMode ); - startActivity( i ); +Intent i = new Intent(Intent.ACTION_VIEW, Uri.fromFile(file)); +i.setComponent(new ComponentName( +org.libreoffice, +org.libreoffice.LibreOfficeMainActivity)); +startActivity(i); } @Override ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - android/experimental
android/experimental/LOAndroid3/AndroidManifest.xml |3 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 34 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 39 android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 53 android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java |5 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java |5 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 97 + android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 70 + android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Layer.java | 116 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java | 384 ++--- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 378 +++-- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java | 60 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java | 66 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/NinePatchTileLayer.java | 99 + android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScreenshotLayer.java | 253 +++ android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ScrollbarLayer.java | 544 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SingleTileLayer.java | 119 + android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java | 119 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewportMetrics.java | 173 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/VirtualLayer.java | 80 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomController.java | 653 -- 21 files changed, 1830 insertions(+), 1520 deletions(-) New commits: commit f02cef962b4f930eb5637dea1bb9d8c382839286 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Thu Sep 18 22:22:08 2014 +0200 android: convert to ImmutableViewportMetrics Change-Id: Idd5e604541577f6b812a971e585cee9b089d2b4b diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java index c5918e69..c12170f 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java @@ -7,6 +7,7 @@ import android.util.Log; import org.mozilla.gecko.gfx.FloatSize; import org.mozilla.gecko.gfx.GeckoLayerClient; +import org.mozilla.gecko.gfx.ImmutableViewportMetrics; import org.mozilla.gecko.gfx.SubTile; import org.mozilla.gecko.gfx.ViewportMetrics; @@ -29,9 +30,9 @@ public class LOKitThread extends Thread { mInputFile = inputFile; } -RectF normlizeRect(ViewportMetrics metrics) { +RectF normlizeRect(ImmutableViewportMetrics metrics) { RectF rect = metrics.getViewport(); -float zoomFactor = metrics.getZoomFactor(); +float zoomFactor = metrics.zoomFactor; return new RectF(rect.left / zoomFactor, rect.top / zoomFactor, rect.right / zoomFactor, rect.bottom / zoomFactor); } @@ -68,7 +69,7 @@ public class LOKitThread extends Thread { GeckoLayerClient layerClient = mApplication.getLayerClient(); layerClient.beginDrawing(mViewportMetrics); -ViewportMetrics metrics = mApplication.getLayerController().getViewportMetrics(); +ImmutableViewportMetrics metrics = mApplication.getLayerController().getViewportMetrics(); RectF viewport = normlizeRect(metrics); Rect rect = inflate(roundToTileSize(viewport, TILE_SIZE), TILE_SIZE); diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java index 1ebb9a1..e7a9059 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java @@ -149,7 +149,7 @@ public class GeckoLayerClient { mGeckoViewport = mNewGeckoViewport; mGeckoViewport.setSize(viewportSize); -PointF displayportOrigin = mGeckoViewport.getDisplayportOrigin(); +PointF displayportOrigin = mGeckoViewport.getOrigin(); RectF position = mGeckoViewport.getViewport(); mTileLayer.setPosition(RectUtils.round(position));
[Libreoffice-commits] core.git: instsetoo_native/Module_instsetoo_native.mk instsetoo_native/Package_setup.mk instsetoo_native/Package_setup_ure.mk Repository.mk scp2/source testtools/CustomTarget_uno
Repository.mk |1 instsetoo_native/Module_instsetoo_native.mk |1 instsetoo_native/Package_setup.mk |4 - instsetoo_native/Package_setup_ure.mk | 16 + scp2/source/ooo/ure.scp | 81 testtools/CustomTarget_uno_test.mk |2 6 files changed, 19 insertions(+), 86 deletions(-) New commits: commit 7d5b30b419fb49232f3476d9fb8899fe3754d96d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 18 18:07:41 2014 +0200 Use instsetoo_native-generated uno ini-file for both instdir and instsets Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656 diff --git a/Repository.mk b/Repository.mk index 69ef8ec..7b86d58 100644 --- a/Repository.mk +++ b/Repository.mk @@ -732,6 +732,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\ endif $(eval $(call gb_Helper_register_packages_for_install,ure,\ + instsetoo_native_setup_ure \ ure_install \ $(if $(ENABLE_JAVA),\ jvmfwk_javavendors \ diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index ea540eb..1566250 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -20,6 +20,7 @@ endif $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ Package_setup \ + Package_setup_ure \ )) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 9d44533..1f41c3d 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -22,8 +22,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,version) \ )) -$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_URE_ETC_FOLDER), \ -$(call gb_Helper_get_rcfile,uno) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup_ure.mk b/instsetoo_native/Package_setup_ure.mk new file mode 100644 index 000..a0c7216 --- /dev/null +++ b/instsetoo_native/Package_setup_ure.mk @@ -0,0 +1,16 @@ +# -*- 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_Package_Package,instsetoo_native_setup_ure,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup))) + +$(eval $(call gb_Package_add_files,instsetoo_native_setup_ure,$(LIBO_URE_ETC_FOLDER), \ +$(call gb_Helper_get_rcfile,uno) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index bb60cc3..18a15d7 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -146,87 +146,6 @@ End // Private Dynamic Libraries: -// We set up the URE unorc/uno.ini in scp2 because then it is easy to -// get the platform differences into it compared to constructing it in -// Makefiles etc. On OS X it goes into .app/Contents/Resources/ure/etc/unorc, -// on other Unix into .../ure/lib/unorc and on Windows into -// .../ure/bin/unorc. The latter two locations are factored out as -// SCP2_URE_DL_DIR. - -// FIXME: remove this completely? -// currently getting 'destination' at file not unique error on WNT -// but needs handling of MACOSX then... -#ifndef WNT -Profile gid_Profile_Dl_Uno_Ini -ModuleID = gid_Module_Root_Ure_Hidden; -#if defined MACOSX -Dir = gid_Brand_Dir_Share_Ure_Etc; -#else -Dir = SCP2_URE_DL_DIR; -#endif -Name = PROFILENAME(uno); -End - -ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir -ModuleID = gid_Module_Root_Ure_Hidden; -ProfileID = gid_Profile_Dl_Uno_Ini; -Section = Bootstrap; -Key = URE_INTERNAL_LIB_DIR; -#if defined MACOSX -Value = ${ORIGIN}/../../../Frameworks; -#else -Value = ${ORIGIN}; -#endif -End - -ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir -ModuleID = gid_Module_Root_Ure_Hidden; -ProfileID = gid_Profile_Dl_Uno_Ini; -Section = Bootstrap; -Key = URE_INTERNAL_JAVA_DIR; -#if defined MACOSX -Value = ${ORIGIN}/../../java; -#elif defined WNT -Value = ${ORIGIN}/../java; -#else -Value = ${ORIGIN}/../share/java; -#endif -End - -ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Classpath -ModuleID = gid_Module_Root_Ure_Hidden; -ProfileID = gid_Profile_Dl_Uno_Ini; -Section = Bootstrap; -Key = URE_INTERNAL_JAVA_CLASSPATH; -Value = ${URE_MORE_JAVA_TYPES}; -End - -ProfileItem gid_Profileitem_Dl_Uno_Uno_Types -ModuleID = gid_Module_Root_Ure_Hidden; -ProfileID = gid_Profile_Dl_Uno_Ini; -Section = Bootstrap; -Key = UNO_TYPES; -#if defined WNT -Value = ${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}; -#else -
Tag libreoffice-4.3.2.2 (on branch libreoffice-4-3-2) created
Hi all, The tag libreoffice-4.3.2.2 (AKA 4.3.2 RC2) has been created. The 4.3.2 branch will be used for fine tuning of the 4.3.2 release. (this is the last scheduled RC) The following rules apply to the branch: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-3' branch is still active and will be used for the 4.3.3 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.2_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3-2 origin/libreoffice-4-3-2 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.2.2 libreoffice-4.3.2.2 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-3-2 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.2 RC1. Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org + core + bump product version to 4.3.2.2 [Robinson Tryon] + src transl. merge must be case sensitive (fdo#80650) [David Tardon] + updated core [Robinson Tryon] + version 4.3.2.2, tag libreoffice-4.3.2.2 [Robinson Tryon] + dictionaries + version\ 4.3.2.2\,\ tag\ libreoffice-4.3.2.2 [Robinson Tryon] + help + version\ 4.3.2.2\,\ tag\ libreoffice-4.3.2.2 [Robinson Tryon] + translations + updated Slovenian translation [Andras Timar] fdo#80650 lower case greek alphabet missing in localized Math symbol table [David Tardon] + lower case greek alphabet missing in localized Math symbol table (fdo#80650) [David Tardon] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: vs2012-ide-integration
I don't understand. -Original Message- From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Michael Meeks Sent: Thursday, September 18, 2014 4:36 PM To: nicholas ferguson Cc: 'libreoffice'; havlicek.ho...@gmail.com Subject: Re: vs2012-ide-integration Hi Nicholas, On Thu, 2014-09-18 at 08:45 -0400, nicholas ferguson wrote: I built in Visual Studio, using native compilers…modules sc and cui and all of their dependencies. This build is separate from libreoffice make files and cygwin. It doesn’t require references to make files or cygwin. I love the idea; anything to make it easier to build on Windows and remove the cygwin grief: I feel your pain. If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? Well; the best way is to send a patch of your own. We love patches =) developers talk code really. I suspect if you start something there you may find people intersted in playing with it with you chipping away at the problem. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 48 +++-- 1 file changed, 43 insertions(+), 5 deletions(-) New commits: commit 79ff7fc76c74a012933230d6f3c37977eccc6398 Author: Kay Schenk ksch...@apache.org Date: Thu Sep 18 22:49:12 2014 + #i121492 Patch by: hanya Fixed date filter problems in table view. Now processes old style date format and normal for database as expected. diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 1c3849f..30170f8 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1507,7 +1507,44 @@ Reference XIndexAccess SAL_CALL OSingleSelectQueryComposer::getOrderColumns( // - namespace { -::rtl::OUString lcl_getCondition(const Sequence Sequence PropertyValue filter,const OPredicateInputController i_aPredicateInputController,const Reference XNameAccess i_xSelectColumns) +::rtl::OUString lcl_getDecomposedColumnName( const ::rtl::OUString rComposedName, const ::rtl::OUString rQuoteString ) +{ +const sal_Int32 nQuoteLength = rQuoteString.getLength(); +::rtl::OUString sName = rComposedName.trim(); +::rtl::OUString sColumnName; +sal_Int32 nPos, nRPos = 0; + +for (;;) +{ +nPos = sName.indexOf( rQuoteString, nRPos ); +if ( nPos = 0 ) +{ +nRPos = sName.indexOf( rQuoteString, nPos + nQuoteLength ); +if ( nRPos nPos ) +{ +if ( nRPos + nQuoteLength sName.getLength() ) +{ +nRPos += nQuoteLength; // -1 + 1 skip dot +} +else +{ +sColumnName = sName.copy( nPos + nQuoteLength, nRPos - nPos - nQuoteLength ); +break; +} +} +else +break; +} +else +break; +} +return sColumnName.isEmpty() ? rComposedName : sColumnName; +} + +::rtl::OUString lcl_getCondition(const Sequence Sequence PropertyValue filter, +const OPredicateInputController i_aPredicateInputController, +const Reference XNameAccess i_xSelectColumns, +const ::rtl::OUString rQuoteString ) { ::rtl::OUStringBuffer sRet; const Sequence PropertyValue * pOrIter = filter.getConstArray(); @@ -1524,9 +1561,10 @@ namespace sRet.append(pAndIter-Name); ::rtl::OUString sValue; pAndIter-Value = sValue; -if ( i_xSelectColumns.is() i_xSelectColumns-hasByName(pAndIter-Name) ) +const ::rtl::OUString sColumnName = lcl_getDecomposedColumnName( pAndIter-Name, rQuoteString ); +if ( i_xSelectColumns.is() i_xSelectColumns-hasByName(sColumnName) ) { -ReferenceXPropertySet xColumn(i_xSelectColumns-getByName(pAndIter-Name),UNO_QUERY); +ReferenceXPropertySet xColumn(i_xSelectColumns-getByName(sColumnName),UNO_QUERY); sValue = i_aPredicateInputController.getPredicateValue(sValue,xColumn,sal_True); } else @@ -1552,14 +1590,14 @@ void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence S { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, OSingleSelectQueryComposer::setStructuredFilter ); OPredicateInputController aPredicateInput(m_aContext.getLegacyServiceFactory(),m_xConnection); -setFilter(lcl_getCondition(filter,aPredicateInput,getColumns())); +setFilter(lcl_getCondition(filter,aPredicateInput,getColumns(), m_xMetaData-getIdentifierQuoteString())); } // - void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence Sequence PropertyValue filter ) throw (SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, OSingleSelectQueryComposer::setStructuredHavingClause ); OPredicateInputController aPredicateInput(m_aContext.getLegacyServiceFactory(),m_xConnection); -setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns())); +setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns(), m_xMetaData-getIdentifierQuoteString())); } // - void OSingleSelectQueryComposer::setConditionByColumn( const Reference XPropertySet column, sal_Bool andCriteria
[Libreoffice-commits] core.git: 6 commits - chart2/source
chart2/source/view/diagram/VDiagram.cxx | 28 ++--- chart2/source/view/main/ChartView.cxx| 11 +++- chart2/source/view/main/DrawModelWrapper.cxx | 35 ++- chart2/source/view/main/ShapeFactory.cxx | 24 ++ 4 files changed, 50 insertions(+), 48 deletions(-) New commits: commit 5abf95a4fe4b087f962201ffd1449fb143a89813 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 22:47:03 2014 -0400 Returned shape object is assigned but not used. Change-Id: Icd15ce57e6d4bb5384b7508d4d3ceb9cd1038f9a diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index ccc8fc4..77a70f8d 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2364,11 +2364,8 @@ void formatPage( PropertyMapper::getMultiPropertyListsFromValueMap( aNames, aValues, aNameValueMap ); AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory); -uno::Reference drawing::XShape xShape = -pShapeFactory-createRectangle( xTarget, -rPageSize, -awt::Point( 0, 0 ), -aNames, aValues ); +pShapeFactory-createRectangle( +xTarget, rPageSize, awt::Point(0, 0), aNames, aValues); } catch( const uno::Exception ex ) { commit 6ca26d642f1d7b8394d33dbd8fbdb828e6584459 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 22:42:37 2014 -0400 Pass by const reference. Change-Id: If4bcee8d9d45b43f025ee0409070afdc53b9405a diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 62b8fdd..ccc8fc4 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2338,7 +2338,7 @@ bool lcl_createLegend( const uno::Reference XLegend xLegend void formatPage( ChartModel rChartModel -, const awt::Size rPageSize +, const awt::Size rPageSize , const uno::Reference drawing::XShapes xTarget , const uno::Reference lang::XMultiServiceFactory xShapeFactory ) commit ccfbb5af4f24a0e12f7f78c801f32e6564a85d9e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 22:38:26 2014 -0400 Scope level reduction. Change-Id: I4e2f25cdb9aef851724073d32e96c76c3416de3c diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 7cfef7e..865c95e 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -63,19 +63,21 @@ namespace chart uno::Reference drawing::XShapes ShapeFactory::getOrCreateChartRootShape( const uno::Reference drawing::XDrawPage xDrawPage ) { -uno::Reference drawing::XShapes xRet( ShapeFactory::getChartRootShape( xDrawPage ) ); -if( !xRet.is() ) -{ -uno::Reference drawing::XShape xShape( m_xShapeFactory-createInstance( -com.sun.star.drawing.GroupShape ), uno::UNO_QUERY ); -uno::Reference drawing::XShapes2 xShapes2(xDrawPage, uno::UNO_QUERY_THROW); -xShapes2-addBottom(xShape); +uno::Referencedrawing::XShapes xRet = ShapeFactory::getChartRootShape(xDrawPage); +if (xRet.is()) +return xRet; -setShapeName( xShape, com.sun.star.chart2.shapes ); -xShape-setSize(awt::Size(0,0)); +// Create a new root shape and set it to the bottom of the page. The root +// shape is identified by having the name com.sun.star.chart2.shapes. +uno::Referencedrawing::XShape xShape( +m_xShapeFactory-createInstance(com.sun.star.drawing.GroupShape), uno::UNO_QUERY); +uno::Referencedrawing::XShapes2 xShapes2(xDrawPage, uno::UNO_QUERY_THROW); +xShapes2-addBottom(xShape); -xRet = uno::Referencedrawing::XShapes( xShape, uno::UNO_QUERY ); -} +setShapeName(xShape, com.sun.star.chart2.shapes); +xShape-setSize(awt::Size(0,0)); + +xRet = uno::Referencedrawing::XShapes(xShape, uno::UNO_QUERY); return xRet; } commit caa14121ea46982a97951728f08acb2dd5a97470 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Sep 18 22:19:11 2014 -0400 Scope level reduction. Change-Id: I02701e70c064fe0378ff3bfc1c31365f7fba33cc diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index fef6cab..d917ee1 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -204,24 +204,27 @@ uno::Reference lang::XMultiServiceFactory DrawModelWrapper::getShapeFactory() uno::Reference drawing::XDrawPage DrawModelWrapper::getMainDrawPage() { -//create draw page: -if( !m_xMainDrawPage.is() ) +if (m_xMainDrawPage.is()) +return m_xMainDrawPage; + +// Create draw page. +uno::Referencedrawing::XDrawPagesSupplier
[Libreoffice-qa] minutes of ESC call ...
* Present: + Jacobo, Kendy, Michael M, Ptyl, Miklos, Stephan, Muthu, Jan-Marek Andras, Robinson, Norbert * Completed Action Items: + merge the web plugin patch after the conference (Stephan) [ done and in the 4.4 release notes ] + massage plan wrt. FOSDEM dev-rooms (Thorsten) [ working around a joint dev-room ] * Pending Action Items: + Ask Bjoern to do a survey on the wrench icons (Mirek) + blog about the sad realities of web plugins (Bjoern) + open-source newer Synezip tests (Umesh) [ Plan to run these on a server on the cloud service, announce the results in the ESC meeting. ] + provide wiki links for new processes for design interation (Mirek) + poke Alex wrt. off-site backup for TDF services (Cloph) * Release Engineering update (Robinson) + 4.3.2 RC1 - status + currently staged, and has been announced, pushing to mirrors + following the steps, but the builds worked. + 4.2.7 - due in week 40 - 29th Sept freeze. + Android Remote * Crashtest update (Miklos) + a run during the conference, detected some writerfilter issues, now mostly fixed. + run interrupted by security update / re-boot + VM state not preserved across re-boots + new-run ongoing - will be announced on list. * New baseline aka C++11 (Jan-Marek) + Thread start: http://lists.freedesktop.org/archives/libreoffice/2014-September/063326.html + Previous baseline: gcc 4.1.2 (2007-02-13) + Current baseline: at least gcc 4.8.1 (2013-05-31) + There was additional discussion on IRC (2014-09-18) + There had been previous discussions in May 2014 ESC calls + Tinderboxes (TBs) now based on RH 5 + RH Developer Toolset 2.x + Official baseline announced as gcc 4.7 + Official announcement - you'll need gcc 4.7+ to compile LO 4.4 + LOconf14 talks regarding C++11 - I didn't get the fact the introduction is due for LO 4.4 + And the TBs moved the compiler / build tool baseline actually to gcc 4.8[.0] (release: 2013-03-22) - TBs actually run 4.8.n (n 0) - Basically drops support for all distros 2 years old - Ubuntu 12.04 has gcc 4.6 - I know there are PPAs - https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/ppa Just contains offical release toolchains - no updates! - https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test Unsupported (@see Workarounds) and not up to date with any baseline - I know there is an unsupported 4.7.2 in precise-updates (universe) - Already had an incompatibility bug - https://gerrit.libreoffice.org/#/c/11501/ + Since last week master requires gcc-4.7 (Stephan) + still works with gcc-4.6 - for now. + a bug introduced recently, fixed already thanks to Jan Marek + these things happen whatever the tinderboxes uses + just a function of the diverse compiler set we have. + Building master on old Ubuntu (Stephan) + building on 12.whatever - we broke that + for the TDF baseline builds, CentOS 5 - we use a devtools toolchain with a related compiler binaries that run on the baseline - apparently not available for Ubuntu. + Old versions of distros / not compiling master (Stephan) + was not seen as an issue by the distro people. + master will only go into recent versions of distros. + so we have a 12.4 build problem, and need a solution for this. + If gcc-4.6 is needed - perhaps it works (Stephan) + we have to subset the C++11 features anyway (Kendy) + only feature missing in 4.6: delegating constructors (Stephan) + 'override' and 'final' - we have macros for them anyway. + possibly some std::library features not implemented in 4.7 + from the core-language, all that is missing is delegating constructors + happy with that (Jmux) + do we get enough new goodness then ? (Michael) + sure we get tons - lots of goodies. + clang use 4.7 as their bootstrap baseline + can we have a tinderbox running gcc-4.6 (Miklos) + without that, sooner or later someone will break it. AI: + setup a LiMux based tinderbox (Jmux) AI: + send Jmux some tinderbox pointers (Norbert) + some good slides from the conference on this (Jacobo) * Hackfests (Robinson) + Seattle 'Libre-Fest' (Robinson) https://wiki.documentfoundation.org/Events/2014/Seattle_LibreFest + October 26, 2014 + Bug-triaging/Intro-to-community event + Following SeaGL conference + definite interest, heard back from some professors from the security lab + want to meet Norbert and/or Kohei - why not go ? + Toulouse Hackfest ... + Confirmed for Nov. 15-16th
[Libreoffice-qa] Tag libreoffice-4.3.2.2 (on branch libreoffice-4-3-2) created
Hi all, The tag libreoffice-4.3.2.2 (AKA 4.3.2 RC2) has been created. The 4.3.2 branch will be used for fine tuning of the 4.3.2 release. (this is the last scheduled RC) The following rules apply to the branch: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-3' branch is still active and will be used for the 4.3.3 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.2_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-3-2 origin/libreoffice-4-3-2 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.3.2.2 libreoffice-4.3.2.2 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-3-2 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.3.2 RC1. Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org + core + bump product version to 4.3.2.2 [Robinson Tryon] + src transl. merge must be case sensitive (fdo#80650) [David Tardon] + updated core [Robinson Tryon] + version 4.3.2.2, tag libreoffice-4.3.2.2 [Robinson Tryon] + dictionaries + version\ 4.3.2.2\,\ tag\ libreoffice-4.3.2.2 [Robinson Tryon] + help + version\ 4.3.2.2\,\ tag\ libreoffice-4.3.2.2 [Robinson Tryon] + translations + updated Slovenian translation [Andras Timar] fdo#80650 lower case greek alphabet missing in localized Math symbol table [David Tardon] + lower case greek alphabet missing in localized Math symbol table (fdo#80650) [David Tardon] ___ 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] LibreOffice 4.3.2 rc2 test builds available
Hello everyone! For the upcoming new version 4.3.2 the builds for RC2 are now available on pre-releases. It is a build in release-configuration, meaning that it will update a previous version of LibreOffice on Windows. Linux and Mac users can install alongside LibreOffice 4.2 For the complete schedule, see: https://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.2_release Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ The list of fixed bugs relative to 4.3.2.1 (4.3.2 RC1) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-3-2-release-4.3.2.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ 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 84027] New: FORMATTING: You modify a entered text to be longer than the Column width
https://bugs.freedesktop.org/show_bug.cgi?id=84027 Priority: medium Bug ID: 84027 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: You modify a entered text to be longer than the Column width Severity: normal Classification: Unclassified OS: Windows (All) Reporter: malutanpetro...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.0.4 release Component: Spreadsheet Product: LibreOffice Problem description: Steps to reproduce: 1. Enter text in a column 2. Modify text to textzdfxzdd just to be longer than the column width 3. Note the increased height of the row. 4. Change back the content to text and see that apparently the height remain unchanged until you will scroll out and back in the region where that row is shown... That will somehow refresh the video memory or so and all looks again ok. Current behavior: Expected behavior: Operating System: Windows 8 Version: 4.3.0.4 release -- 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 84028] New: FILESAVE: PPTX: All caps property for text is not exported.
https://bugs.freedesktop.org/show_bug.cgi?id=84028 Priority: medium Bug ID: 84028 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: PPTX: All caps property for text is not exported. Severity: normal Classification: Unclassified OS: Linux (All) Reporter: sushil.shi...@synerzip.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.4.0.0.alpha0+ Master Component: Presentation Product: LibreOffice Created attachment 106477 -- https://bugs.freedesktop.org/attachment.cgi?id=106477action=edit Text with all capital letters. Problem description: If all capital letters property is applied to text then it is not exported. Steps to reproduce: 1. Create a presentation using MS Office 2007/2010. 2. Add some text and apply case property to it. (Fonts-all caps) and save as .pptx 3. Open .pptx file on latest LO master. 4. Save file as .pptx again from LO master. 5. Open saved file on MS Office again. 6. Text with all caps is exported as small letters. Current behavior: Text with all caps is rendered correctly but not exported correctly. Expected behavior: LO should export all caps property for text properly for .pptx files. Operating System: Ubuntu Version: 4.4.0.0.alpha0+ Master -- 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 84028] FILESAVE: PPTX: All caps property for text is not exported.
https://bugs.freedesktop.org/show_bug.cgi?id=84028 Sushil sushil.shi...@synerzip.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |sushil.shi...@synerzip.com |desktop.org | -- 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 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=60e78fbb806bb45e635ba1de45ceffe187938ac0 fdo#82577: Handle Font 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 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 40259] Unexpected behaviour with Shapes → Intersect
https://bugs.freedesktop.org/show_bug.cgi?id=40259 vv...@yandex.ru changed: What|Removed |Added CC||erik.mart...@gmail.com --- Comment #6 from vv...@yandex.ru --- *** Bug 64770 has been marked as a duplicate 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 64770] EDITING: Drawing Intersection Function Not Working Correctly
https://bugs.freedesktop.org/show_bug.cgi?id=64770 vv...@yandex.ru changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from vv...@yandex.ru --- *** This bug has been marked as a duplicate of bug 40259 *** -- 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 40259] Unexpected behaviour with Shapes → Intersect
https://bugs.freedesktop.org/show_bug.cgi?id=40259 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl Version|3.4.2 release |Inherited From OOo --- Comment #7 from Cor Nouws c...@nouenoff.nl --- this must be behaviour as it has always been. Recently in https://bugs.freedesktop.org/show_bug.cgi?id=68236#c6 Regina gave some nice explanation on a 'similar' issue -- 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 40259] Unexpected behaviour with Shapes → Intersect
https://bugs.freedesktop.org/show_bug.cgi?id=40259 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Priority|high|medium --- Comment #8 from Cor Nouws c...@nouenoff.nl --- managing expectations importance to medium.. -- 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 55004] backup copy fails when using share / samba
https://bugs.freedesktop.org/show_bug.cgi?id=55004 --- Comment #20 from Eugene cas...@pisem.net --- Some version 3... But LibreOffice or our predecessor? I just found in my notes that I reported this bug for OOo-2.x WBR Eugene -- 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 84032] New: Intersection of some polygons produces wrong result
https://bugs.freedesktop.org/show_bug.cgi?id=84032 Priority: medium Bug ID: 84032 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Intersection of some polygons produces wrong result Severity: normal Classification: Unclassified OS: Windows (All) Reporter: vv...@yandex.ru Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Drawing Product: LibreOffice Created attachment 106486 -- https://bugs.freedesktop.org/attachment.cgi?id=106486action=edit Test file Open 'intersect_bug.odg', select circle (A) and ring (B) objects, run Modify-Shapes-Intersect. The resulting polygon (A ∩ B) must be equal to ring (B), not to A \ B. Tested with version 4.4.0.0.alpha0+ (f39ed4c680fe8ef2ea3f0ace91ea3175551ec9c5) -- 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 84032] Intersection of some polygons produces wrong result
https://bugs.freedesktop.org/show_bug.cgi?id=84032 --- Comment #1 from vv...@yandex.ru --- Created attachment 106487 -- https://bugs.freedesktop.org/attachment.cgi?id=106487action=edit Graphical explanation -- 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 76159] FILEOPEN: IF() and INDIRECT() in formulae causes #REF!
https://bugs.freedesktop.org/show_bug.cgi?id=76159 raal r...@post.cz changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #11 from raal r...@post.cz --- According to comment 10 I'm closing the 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 78324] Implement NUMBERTEXT in LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=78324 --- Comment #7 from Mikeyy - L10n HR libreoff...@miho.im --- Created attachment 106490 -- https://bugs.freedesktop.org/attachment.cgi?id=106490action=edit NUMBERTEXT extension with added HR language Since I can't wait for implementation of this in already available extension or as part of LibreOffice, I edited existing extension with HR (croatian) translation and data. I'm using this personaly, and few people who asked me how to convert numbers to text, but it's maybe useful for someone else also. -- 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 83593] FORMATTING: Formatting lost on XLSX diagram
https://bugs.freedesktop.org/show_bug.cgi?id=83593 raal r...@post.cz changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||r...@post.cz Ever confirmed|0 |1 --- Comment #1 from raal r...@post.cz --- I can confirm with LO 4.3.1, WIN7. Lines are incorrectly rotated. -- 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 83593] FORMATTING: Formatting lost on XLSX diagram
https://bugs.freedesktop.org/show_bug.cgi?id=83593 --- Comment #2 from raal r...@post.cz --- Created attachment 106492 -- https://bugs.freedesktop.org/attachment.cgi?id=106492action=edit small sample file -- 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