Re: Build Failure on Cygwin Windows
On Friday 13 of April 2012, Matúš Kukan wrote: > On 12 April 2012 13:38, Caolán McNamara wrote: > > On Thu, 2012-04-12 at 12:57 +0200, Michael Stahl wrote: > >> rumor has it that putting the source in Cygwin home has never ever > >> worked, but i have no idea why. > > Heh, so I may be the first person in the world who have done that ? :-) ... > Anyway with this patch I was able to build in /home, install and also > write some text in Draw. > Hopefully it will work also for others (for all ?). > > Could someone, please, try ? Works for me too. I have changed the Win-x86_6-fast tinderbox to build in ~/libreoffice , so this should not go unnoticed the next time. > I think we could remove new warning from > http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies I wonder about the part about the length of the path. (c:/cygwin)/home/tinderbox/libreoffice is not that short, but the build has finished successfully, the resulting .msi installed without problems, and I didn't notice any problems when running it. Has that been fixed somehow as well? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gbuild conversion: codemaker module
Hi, gbuild conversion: codemaker module. /http://wiki.documentfoundation.org/Development/Build_System/Module_status/ is updated. The original makefile had this: -NOOPTFILES= \ -$(OBJ)$/cpputype.obj Noopt for no optimization? not sure what to do with this => ignored ;-) -- David Ostrovsky >From 4ae1b42eae3eec9f79c9d6a2b726622ffedb6d97 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 14 Apr 2012 00:30:19 +0200 Subject: [PATCH] gbuild conversion: codemaker module --- Makefile|2 +- Repository.mk | 12 + RepositoryModule_ooo.mk |1 + codemaker/Executable_cppumaker.mk | 59 + codemaker/Executable_javamaker.mk | 52 ++ codemaker/Makefile |7 +++ codemaker/Module_codemaker.mk | 38 codemaker/Package_inc.mk| 41 + codemaker/StaticLibrary_codemaker.mk| 45 +++ codemaker/StaticLibrary_commoncpp.mk| 39 codemaker/StaticLibrary_commonjava.mk | 39 codemaker/prj/build.lst | 10 +--- codemaker/prj/d.lst | 14 -- codemaker/prj/makefile.mk |1 + codemaker/source/codemaker/makefile.mk | 49 - codemaker/source/commoncpp/makefile.mk | 42 -- codemaker/source/commonjava/makefile.mk | 42 -- codemaker/source/cppumaker/makefile.mk | 73 --- codemaker/source/javamaker/makefile.mk | 66 19 files changed, 337 insertions(+), 295 deletions(-) create mode 100644 codemaker/Executable_cppumaker.mk create mode 100644 codemaker/Executable_javamaker.mk create mode 100644 codemaker/Makefile create mode 100644 codemaker/Module_codemaker.mk create mode 100644 codemaker/Package_inc.mk create mode 100644 codemaker/StaticLibrary_codemaker.mk create mode 100644 codemaker/StaticLibrary_commoncpp.mk create mode 100644 codemaker/StaticLibrary_commonjava.mk create mode 100644 codemaker/prj/makefile.mk delete mode 100644 codemaker/source/codemaker/makefile.mk delete mode 100644 codemaker/source/commoncpp/makefile.mk delete mode 100644 codemaker/source/commonjava/makefile.mk delete mode 100644 codemaker/source/cppumaker/makefile.mk delete mode 100644 codemaker/source/javamaker/makefile.mk diff --git a/Makefile b/Makefile index 4b5d025..498e028 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ binaryurp\ canvas\ chart2\ clucene\ +codemaker\ comphelper\ configmgr\ cppcanvas\ @@ -153,7 +154,6 @@ boost\ bridges\ cairo\ cli_ure\ -codemaker\ connectivity\ cosv\ cppunit\ diff --git a/Repository.mk b/Repository.mk index 52dee49..6821d1f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -58,6 +58,15 @@ $(eval $(call gb_Helper_register_executables,SDK, \ idlcpp \ )) +ifneq ($(OS),IOS) + +$(eval $(call gb_Helper_register_executables,SDK, \ +javamaker \ +cppumaker \ +)) + +endif + $(eval $(call gb_Helper_register_executables,OOO, \ spadmin.bin \ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \ @@ -550,6 +559,9 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ basegfx_s \ +codemaker \ +commoncpp \ +commonjava \ dtobj \ headless \ libeay32 \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index ea5d5ab..1eadf41 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ canvas \ chart2 \ clucene \ +codemaker \ comphelper \ configmgr \ cppcanvas \ diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk new file mode 100644 index 000..f4dbdc6 --- /dev/null +++ b/codemaker/Executable_cppumaker.mk @@ -0,0 +1,59 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +#
Re: Lightproof easyhack
Sure, you can send as many patches as you desire ;-) We love patches. So, do what Laszlo asks, but from the formal point of view, your application is eligible. F. Sent from Samsung Mobile Коростіль Данило wrote: Thank you! So shouldn't I send more patches? LOL: I've made mistake s/defeating/defending/ at my original mail. On 04/13/2012 04:35 PM, Fridrich Strba wrote: > Hello, > > This makes you eligible for the Google Summer of Code. This is not meant > that you are chosen, but your application is valid and will be > considered in the mentor meeting. > > Thanks > > Fridrich > > > On 13/04/12 15:20, Коростіль Данило wrote: >> Hello gentlemen, >> >> Sorry again for delay. I was really busy because of my defeating of >> pre-thesis report. >> >> So I've done some initial job that you can estimate. Currently I'm in >> process of improving and porting all Ukrainian rules from LT project. >> >> The patch attached. If I'm doing something wrong, just inform me. Also >> I'm working at github: >> https://github.com/korostil/lightproof_uk >> >> Thank you, sirs! > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build Failure on Cygwin Windows
>> Anyway with this patch I was able to build in /home, Yay, this will surely help many newcomers who often used to run into this problem (I assume). Great! --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gbuild conversion: unodevtools module
Hi, this patch depends on the codemaker module patch. David >From c0125ac57ec8667f28f4d5a80c888dc64fc9bb56 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 13 Apr 2012 22:33:35 +0200 Subject: [PATCH] gbuild conversion: unodevtools module --- Makefile |2 +- Repository.mk|1 + RepositoryModule_ooo.mk |1 + unodevtools/Executable_skeletonmaker.mk | 64 ++ unodevtools/Makefile |7 +++ unodevtools/Module_unodevtools.mk| 33 + unodevtools/prj/build.lst|8 +-- unodevtools/prj/d.lst|5 -- unodevtools/prj/makefile.mk |1 + unodevtools/source/skeletonmaker/makefile.mk | 63 - unodevtools/source/unodevtools/makefile.mk | 52 - 11 files changed, 110 insertions(+), 127 deletions(-) create mode 100644 unodevtools/Executable_skeletonmaker.mk create mode 100644 unodevtools/Makefile create mode 100644 unodevtools/Module_unodevtools.mk create mode 100644 unodevtools/prj/makefile.mk delete mode 100644 unodevtools/source/skeletonmaker/makefile.mk delete mode 100644 unodevtools/source/unodevtools/makefile.mk diff --git a/Makefile b/Makefile index 498e028..79f39aa 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,7 @@ ucb\ ucbhelper\ udkapi\ unixODBC\ +unodevtools\ unoil\ unotest\ unotools\ @@ -234,7 +235,6 @@ sysui\ testtools\ tomcat\ udm\ -unodevtools\ vigra\ x11_extensions\ xpdf\ diff --git a/Repository.mk b/Repository.mk index 6821d1f..bc229c9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -63,6 +63,7 @@ ifneq ($(OS),IOS) $(eval $(call gb_Helper_register_executables,SDK, \ javamaker \ cppumaker \ +uno-skeletonmaker \ )) endif diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 1eadf41..af0900e 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -123,6 +123,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ udkapi \ unixODBC \ UnoControls \ +unodevtools \ unoil \ unotest \ unotools \ diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk new file mode 100644 index 000..ee1909a --- /dev/null +++ b/unodevtools/Executable_skeletonmaker.mk @@ -0,0 +1,64 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,uno-skeletonmaker)) + +$(eval $(call gb_Executable_use_api,uno-skeletonmaker,\ +udkapi \ +)) + +$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\ +-I$(SRCDIR)/unodevtools/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_Executable_use_libraries,uno-skeletonmaker,\ +reg \ +sal \ +salhelper \ +cppu \ +cppuhelper \ +)) + +$(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\ +codemaker \ +commoncpp \ +commonjava \ +)) + +$(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\ +unodevtools/source/unodevtools/options \ +unodevtools/source/unodevtools/typeblob \ +unodevtools/source/unodevtools/typemanager \ +unodevtools/source/skeletonmaker/skeletonmaker \ +unodevtools/source/skeletonmaker/skeletoncommon \ +unodevtools/source/skeletonmaker/javatypemaker \ +unodevtools/source/skeletonmaker/cpptypemaker \ +unodevtools/source/skeletonmaker/javacompskeleton \ +unodevtools/source/skeletonmaker/cppcompskeleton \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unodevtools/Makefile b/unodevtools/Makefile new file mode 100644 index 000..ccb1c85 --- /dev/null +++ b/unodevtools/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))
Re: [PATCH] gbuild conversion: codemaker module
On Sat, Apr 14, 2012 at 3:22 AM, David Ostrovsky wrote: > Hi, > > gbuild conversion: codemaker module. > > http://wiki.documentfoundation.org/Development/Build_System/Module_status > > is updated. > > The original makefile had this: > > -NOOPTFILES= \ > - $(OBJ)$/cpputype.obj > > Noopt for no optimization? > not sure what to do with this => ignored ;-) See svx/Library_svxcore.mk for one such use-case or git grep COMPILERNOOPTFLAGS Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] gbuild conversion: codemaker module
On Sat, Apr 14, 2012 at 4:25 AM, Norbert Thiebaud wrote: > On Sat, Apr 14, 2012 at 3:22 AM, David Ostrovsky > wrote: >> Hi, >> >> gbuild conversion: codemaker module. Note: using commoncpp and commonjava as global name (that is in Repository.mk) is not a great choice... that became clear to me, reading the next patch (unodevtools) and finding +$(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\ +codemaker \ +commoncpp \ +commonjava \ +)) and even though I've just read the codemaker one few minutes prior, I was 'huh ? what's that common* stuff, where that come from... Note: I understand that the make that was replaced used similar (poor) naming -- $(COMMONCPPLIBST) and the like -- but still. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] gbuild conversion: codemaker module
On Sat, Apr 14, 2012 at 10:22:12AM +0200, David Ostrovsky wrote: > Hi, > > gbuild conversion: codemaker module. > > /http://wiki.documentfoundation.org/Development/Build_System/Module_status/ > > is updated. > > The original makefile had this: > > -NOOPTFILES= \ > -$(OBJ)$/cpputype.obj > > Noopt for no optimization? > not sure what to do with this => ignored ;-) This was introduced in 2001 and the commit message says "inlining doesn't work here for msvc6", so it is quite possible it is not needed anymore :-) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] gbuild conversion: codemaker module
On 14/04/12 10:22, David Ostrovsky wrote: > Hi, > > gbuild conversion: codemaker module. > > /http://wiki.documentfoundation.org/Development/Build_System/Module_status/ > > is updated. > > The original makefile had this: > > -NOOPTFILES= \ > -$(OBJ)$/cpputype.obj > > Noopt for no optimization? > not sure what to do with this => ignored ;-) presumably goes together with this: -.IF "$(COM)"!="GCC" -CFLAGSNOOPT+=-Ob0 -.ENDIF and these were introduced by a commit in 2001 with the message > #87298# inlining doesn't work here for msvc6 so... i guess just leave it out and hope the compiler is fixed now (no need to carry workarounds for ancient compilers around) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: getting a list at build time of supported languages ?
On Fri, Apr 13, 2012 at 01:07:16PM +0100, Caolán McNamara wrote: > I suppose we don't have a current mechanism to get a list a build time > of all the languages that we support in the UI as options for setting > the language ? If you mean all, that's solenv/inc/langlist.mk, I think. For the actually enabled ones, WITH_LANG / WITH_LANG_LIST in config_host.mk comes to my mind. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Remove unused debug facilities from basebmp
On Saturday 14 of April 2012, Gábor Stefanik wrote: > Remove debug dumping facility from basebmp. From the patch: "Used in vcl/headless/svpgdi.cxx when OSL_DEBUG_LEVEL > 2" And it indeed is. Moreover it looks like quite useful debugging functionality, so I don't think it should be removed just because unusedcode.easy lists it. It should always be checked whether what's listed should really be removed, the file is just automatically generated and it is fallible. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Clean up basegfx's polygon tools code
On Sat, Apr 14, 2012 at 01:13:24AM +0200, Gábor Stefanik wrote: > Remove unused functions from basegfx's polygon tools. Pushed, thanks for this. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] [fdo#40778] Remove dictionary choice when adding new entry to the spellchecker
Hereby the patch to fix bug fdo#40778. -- Greetings, Rob Snelders ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [fdo#40778] Remove dictionary choice when adding new entry to the spellchecker
Hey 2012/4/14 Rob Snelders : > Hereby the patch to fix bug fdo#40778. > > -- did you forget to attach the patch? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] gbuild conversion: codemaker module
On Sat, Apr 14, 2012 at 3:22 AM, David Ostrovsky wrote: > Hi, > > gbuild conversion: codemaker module. Pushed, thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] gbuild conversion: unodevtools module
On Sat, Apr 14, 2012 at 4:14 AM, David Ostrovsky wrote: > Hi, > > this patch depends on the codemaker module patch. Pushed thanks, I also added a patch to rename common* into comdemaker_* to make it more obvious where that came from I also remove some leftover from the converion (a couple of *.pmk and .mk ) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [fdo#40778] Remove dictionary choice when adding new entry to the spellchecker
Ah yes.. sorry about that..
On 14-04-12 13:52, Markus Mohrhard wrote:
Hey
2012/4/14 Rob Snelders:
Hereby the patch to fix bug fdo#40778.
--
did you forget to attach the patch?
Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
>From 6a7d65d968e83bdfdcf2e681dc8d35813eac019e Mon Sep 17 00:00:00 2001
From: Rob Snelders
Date: Sat, 14 Apr 2012 13:17:04 +0200
Subject: [PATCH] fdo#40778 Remove dictionary choice when adding new entry to
the spellchecker
---
cui/source/dialogs/SpellDialog.cxx | 21 +
cui/source/inc/SpellDialog.hxx |4 +++-
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 23b3aa4..1681d67 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -324,7 +324,10 @@ void SpellDialog::Init_Impl()
aSuggestionLB.SetDoubleClickHdl( LINK( this, SpellDialog, ChangeHdl ) );
aSentenceED.SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) );
-aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictionaryHdl ) );
+
+aAddToDictMB.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
+aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictSelectHdl ) );
+aAddToDictMB.SetClickHdl(LINK ( this, SpellDialog, AddToDictClickHdl ) );
aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) );
aExplainLink.SetClickHdl( LINK( this, SpellDialog, HandleHyperlink ) );
@@ -1009,7 +1012,19 @@ void SpellDialog::InitUserDicts()
}
//---
-IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
+IMPL_LINK(SpellDialog, AddToDictClickHdl, MenuButton*, pButton )
+{
+return AddToDictionaryExecute(1, pButton->GetPopupMenu());
+}
+
+//---
+IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton )
+{
+return AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu());
+}
+
+//---
+int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu )
{
aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
@@ -1017,8 +1032,6 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
//manually changed
const String aNewWord= aSentenceED.GetErrorText();
-sal_uInt16 nItemId = pButton->GetCurItemId();
-PopupMenu *pMenu = pButton->GetPopupMenu();
String aDicName ( pMenu->GetItemText( nItemId ) );
uno::Reference< linguistic2::XDictionary > xDic;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 2d9383b..f302e1f 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -212,13 +212,15 @@ private:
DECL_LINK(CancelHdl, void *);
DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
DECL_LINK(UndoHdl, void *);
-DECL_LINK( AddToDictionaryHdl, MenuButton* );
+DECL_LINK( AddToDictSelectHdl, MenuButton* );
+DECL_LINK( AddToDictClickHdl, MenuButton* );
DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * );
+int AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu );
voidStartSpellOptDlg_Impl();
voidInitUserDicts();
voidUpdateBoxes_Impl();
--
1.7.5.4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] gbuild conversion: codemaker module
Am 14.04.2012 11:48, schrieb Michael Stahl: On 14/04/12 10:22, David Ostrovsky wrote: Hi, gbuild conversion: codemaker module. /http://wiki.documentfoundation.org/Development/Build_System/Module_status/ is updated. The original makefile had this: -NOOPTFILES= \ -$(OBJ)$/cpputype.obj Noopt for no optimization? not sure what to do with this => ignored ;-) presumably goes together with this: -.IF "$(COM)"!="GCC" -CFLAGSNOOPT+=-Ob0 -.ENDIF and these were introduced by a commit in 2001 with the message #87298# inlining doesn't work here for msvc6 so... i guess just leave it out and hope the compiler is fixed now (no need to carry workarounds for ancient compilers around) Actually there are many places with this ugly inlining workaround for MSC compiler. Matus posted recently, that -Ob0 option is even a default one. If somebody with MS box could confirm that this is not needed any more, I would clean it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Replace SV_DECL_PTRARR_DEL by ptr_vector in WW8ListManager
Hi
This patch replace SV_DECL_PTRARR_DEL by a simple ptr_vector in
WW8ListManager.
I'm not sure about this comment in the destructor, the object is always
destroyed, I think we should use a ptr_vector too, or don't destroy
unconditionally (*aIter).
/*
named lists remain in doc!!!
unnamed lists are deleted when unused
pLFOInfos are in any case destructed
*/
for(std::vector::iterator aIter = maLSTInfos.begin();
aIter != maLSTInfos.end(); ++aIter)
{
if ((*aIter)->pNumRule && !(*aIter)->bUsedInDoc &&
(*aIter)->pNumRule->IsAutoRule())
{
rDoc.DelNumRule((*aIter)->pNumRule->GetName());
}
delete *aIter;
}
Thanks in advance for reviewing
Best regards
--
Arnaud Versini
0001-Use-boost::ptr_vector-in-WW8ListManager-instead-of-SV_DECL_PTRARR_DEL.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix proposed for fdo#48683
Hello,
I reproduced the problem indicated by fdo#48683, attached :
- bt with symbols
(https://bugs.freedesktop.org/attachment.cgi?id=59969&action=edit)
- valgrind logs
(https://bugs.freedesktop.org/attachment.cgi?id=59970&action=edit)
Here are the lines of editeng/source/editeng/impedit3.cxx which seem to
cause the problem :
2421 TextPortion* pTP = 0;
2422 for ( nPortion = 0; nPortion < nPortions; nPortion++ )
2423 {
2424 pTP = pParaPortion->GetTextPortions()[ nPortion ];
2425 if ( ( nPos+pTP->GetLen() ) > nStartPos )
2426 {
2427 DBG_ASSERT( nPos <= nStartPos, "Wrong Start!" );
2428 DBG_ASSERT( nPos+pTP->GetLen() >= nEnd, "Wrong End!"
);
2429 break;
2430 }
2431 nPos = nPos + pTP->GetLen();
2432 }
2433 DBG_ASSERT( pTP, "RecalcTextPortion: Portion not found" );
2434 if ( ( nPos == nStartPos ) && ( (nPos+pTP->GetLen()) == nEnd
) )
2435 {
2436 // Remove portion;
2437 sal_uInt8 nType = pTP->GetKind();
2438 pParaPortion->GetTextPortions().Remove( nPortion );
2439 delete pTP;
Since pTP corresponds to the address of pParaPortion->GetTextPortions()[
nPortion ]
I wonder if these both lines wouldn't be incompatible:
- pParaPortion->GetTextPortions().Remove( nPortion );
- delete pTP;
So I propose this easy fix:
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 0d6877b..2c557da 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2436,7 +2436,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
// Remove portion;
sal_uInt8 nType = pTP->GetKind();
pParaPortion->GetTextPortions().Remove( nPortion );
-delete pTP;
if ( nType == PORTIONKIND_LINEBREAK )
{
TextPortion* pNext = pParaPortion->GetTextPortions()[
nPortion ];
I can commit and push on master of course but I'd like first your opinion
about this since I could missed something.
Julien.
--
View this message in context:
http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-48683-tp3910199p3910199.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
unbuilded code in sd/source/ui/notes
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi I just discovered that sd/source/ui/notes is not built since very long time, if built once in the past... It looks like a window to hold comments for slides. Slides comments are in place with another approach, apparently. Is this a feature we curently miss by mistake, or is a dead code never finished/released? Thanks - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJPiYpfAAoJEJp3R7nH3vLxzLoH/RtDPwoQvjHJp5qeMPjFQP6K KldSZ9UtIqt1fN11c+EsaLfb1VQcD50s/1bav12eEnY+3xfOf60ZbhzDbrYdVRm5 ls1BiXCDW+4a2zXaRa99VJvojLzcBsnAgwcPQpO9QN3O2E1WHZ9Q+IRWWX0pBUw9 fKMEgzD6SQLSOrg5BE10i5pBsowFjl6NPCwU/GEupbaNJQlW5LMJsmsfluCzHRGW JENSmK0fGK5210basquQ+x56nFiHdmqjk+7BKIabi/At9cMjLCZcUUQO9NvrsnK9 hhe4P6ihsZAmdSDbOdEPHdis+BdCZtcGqfk8WL7NR9p7f8Cp4P2Wj7Gq5+5KlEM= =6RDR -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fix proposed for fdo#48683
Hi Julien, On Sat, Apr 14, 2012 at 9:59 AM, julien2412 wrote: > I can commit and push on master of course but I'd like first your opinion > about this since I could missed something. Yup, your fix is right on. Please push to master. I did refactor this part, and now the text portion container manages the life cycle of stored containers. There is no need to delete stored elements outside of it. So, you did the right thing here. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fix proposed for fdo#48683
Hi Julien,
On Sat, Apr 14, 2012 at 11:08 AM, Kohei Yoshida wrote:
> I did refactor this part, and now the text portion container manages
> the life cycle of stored containers. There is no need to delete
> stored elements outside of it. So, you did the right thing here.
While you are at it, the same method still contains two other delete
calls toward the bottom. You can remove them also.
One gotcha is that, in the following code block near the bottom of the method
pParaPortion->GetTextPortions().Remove( nLastPortion );
if ( nLastPortion && pTP->GetLen() )
{
TextPortion* pPrev =
pParaPortion->GetTextPortions()[nLastPortion - 1];
DBG_ASSERT( pPrev->GetKind() == PORTIONKIND_TEXT, "Portion?!" );
pPrev->SetLen( pPrev->GetLen() + pTP->GetLen() );
pPrev->GetSize().Width() = (-1);
}
delete pTP;
You need to move the Remove() call to after the if block, since the
object pointed to by pTP is still accessed in the if block. Leaving
it where it is would cause a segfault.
Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Good instructions how to install Xcode 3.2.6 on latest Lion
Found this nice post while investigating this today, to help a fellow hacker at the Hackfest: https://discussions.apple.com/message/17977393#17977393 --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED on master] Re: [PATCH] fix proposed for fdo#48683
Hi Kohei, First thank you for your support. I commited and pushed the fix on master, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=95cc5de63b20c5986fe8f3913da86002eabd7cb1 I removed the 3 "delete" + moved the line you talked about (hope I did it well :-) ) If I didn't misunderstand what you said on the thread, it mustn't and can't be applied on 3.5 branch so no need to ask review for this. Anyway thank you again. Julien. -- View this message in context: http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-48683-tp3910199p3910415.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
Re: [PUSHED on master] Re: [PATCH] fix proposed for fdo#48683
On Sat, Apr 14, 2012 at 12:12 PM, julien2412 wrote: > Hi Kohei, > > First thank you for your support. > I commited and pushed the fix on master, see > http://cgit.freedesktop.org/libreoffice/core/commit/?id=95cc5de63b20c5986fe8f3913da86002eabd7cb1 > > I removed the 3 "delete" + moved the line you talked about (hope I did it > well :-) ) Yup, you did it all correctly. :-) > If I didn't misunderstand what you said on the thread, it mustn't and can't > be applied on 3.5 branch so no need to ask review for this. That's correct. The refactoring is done on master only, so the 3-5 branch is not affected. Good stuff! Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[patch] [fdo#42986] Presentations in Wide-screen
Hi,
Patches for bug fdo#42986
--
Greetings,
Rob Snelders
>From b7e5a0d1ec7fdd4371f50b0ff101f4b37aa0ce1f Mon Sep 17 00:00:00 2001
From: Rob Snelders
Date: Sat, 14 Apr 2012 17:26:27 +0200
Subject: [PATCH] fdo#42986 Add Presentationsize 16:9 Widescreen
---
cui/source/tabpages/page.cxx | 10 +-
cui/source/tabpages/page.h|3 ++-
cui/source/tabpages/page.src |3 ++-
i18nutil/inc/i18nutil/paper.hxx |5 +++--
i18nutil/source/utility/paper.cxx |6 --
sd/source/core/drawdoc2.cxx |2 +-
vcl/source/gdi/print.cxx |2 +-
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index a0b5cc8..13e32e3 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -995,13 +995,13 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
if ( eMode == SVX_PAGE_MODE_PRESENTATION )
{
-// Draw: bei Papierformat soll der Rand 1cm betragen
+// Draw: With on screen no border
long nTmp = 0;
-sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( PAPER_SCREEN_16_9 == ePaper));
if ( !bScreen )
-// bei Bildschirm keinen Rand
-nTmp = 1; // entspr. 1cm
+// with paper take a borden
+nTmp = 1; //cm
// Abfragen, ob fuer Raender 0 gesetzt ist:
if ( bScreen || aRightMarginEdit.GetValue() == 0 )
@@ -1410,7 +1410,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
-if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() )
+if ( (ePaper != PAPER_SCREEN_4_3 || ePaper != PAPER_SCREEN_16_9) && IsMarginOutOfRange() )
{
if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText ).Execute() == RET_NO )
{
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index bc7ad78..87858fe 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -54,7 +54,7 @@
#define PAPERSIZE_C65 16
#define PAPERSIZE_DL17
#define PAPERSIZE_DIA 18
-#define PAPERSIZE_SCREEN19
+#define PAPERSIZE_SCREEN_4_319
#define PAPERSIZE_C 20
#define PAPERSIZE_D 21
#define PAPERSIZE_E 22
@@ -74,6 +74,7 @@
#define PAPERSIZE_B6_JIS36
#define PAPERSIZE_POSTCARD_JP 46
#define PAPERSIZE_A656
+#define PAPERSIZE_SCREEN_16_9 78
#endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 91873c7..8f81d65 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -452,7 +452,8 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
< "Dia Slide" ; PAPERSIZE_DIA ; > ;
-< "Screen" ; PAPERSIZE_SCREEN ; > ;
+< "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ;
+ < "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ;
< "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
};
};
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index d5be9ec..5c08661 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -58,7 +58,7 @@ enum Paper
PAPER_ENV_C65,
PAPER_ENV_DL,
PAPER_SLIDE_DIA,
-PAPER_SCREEN,
+PAPER_SCREEN_4_3,
PAPER_C,
PAPER_D,
PAPER_E,
@@ -116,7 +116,8 @@ enum Paper
PAPER_ARCHB,
PAPER_ARCHC,
PAPER_ARCHD,
-PAPER_ARCHE
+PAPER_ARCHE,
+PAPER_SCREEN_16_9
};
// defined for 'equal size' test with the implementation array
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 63b5cff..a79089d 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -93,7 +93,7 @@ static PageDesc aDinTab[] =
{ MM2MM100( 114 ), MM2MM100( 229 ),"EnvC65", NULL },
{ MM2MM100( 110 ), MM2MM100( 220 ),"EnvDL", "DL" },
{ MM2MM100( 180),MM2MM100( 270 ),NULL, NULL }, //Dia
-{ MM2MM100( 210),MM2MM100( 280 ),NULL, NULL }, //Screen
+{ MM2MM100( 210),MM2MM100( 280 ),NULL, NULL }, //Screen 4:3
{ IN2MM100( 17 ),IN2MM100( 22 ), "AnsiC", "CSheet" },
{ IN2MM100( 22 ),IN2MM100( 34 ), "AnsiD", "DSheet" },
{ IN2MM100( 34 ),IN2MM100( 44 ), "AnsiE", "ESheet" },
@@ -155,7 +155,9 @@ static PageDesc aDinTab[] =
{ IN2MM100( 12 ),IN2MM100( 18 ), "ARCHB", NULL },
{ IN2MM100( 18 ),IN2MM100( 24 ), "ARCHC", NULL },
{ IN2MM100( 24 ),IN2MM100( 36 ), "ARCHD", NULL },
-{ IN2MM100( 36 ),IN2MM100( 48 ), "ARCHE", NULL }
+{ IN2MM100( 36 ),IN2MM1
[PATCH 3-5] fdo#42537: fix RTL menu rendering on Windows
Hi! The bug: https://bugs.freedesktop.org/show_bug.cgi?id=42537 The fix for libreoffice-3-5 attached. It consists of the following commits: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a4cc4d3ec982ac61100b337125983afa0bb6fbc3 http://cgit.freedesktop.org/libreoffice/core/commit/?id=532904765073c827bed3181d97c217909db1843f http://cgit.freedesktop.org/libreoffice/core/commit/?id=7179a362dd5788c4c4f7197d15abfa17e0cad584 http://cgit.freedesktop.org/libreoffice/core/commit/?id=3a603d376a2bc2b839be3b89a8ecf8df1c42260b And it seems to work... :) I attached the screenshot that shows how the menus look now in both RTL and LTR modes. You may guess that commit 53290476 could affect other platforms, yes, actually it could affect only kde, and I verified that - no side effects there. Thanks, Ivan 0001-fdo-42537-fix-RTL-menu-rendering-on-Windows.patch Description: application/mbox <>___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused code (connectivity)
This patch removes unused code as listed in unusedcode.easy 0001-Remove-unused-code-in-connectivity.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #269 from dE 2012-04-14 10:39:36 PDT --- I don't think these bugs should be added here - Bug 47355 -- the probability of someone placing the picture 'as character' and then resizing the image is very less... very few people are affected by this. Bug 48081 -- 99% of custom animation is used on simple static text. This bug has an easy workaround. Bug 46509 -- No one uses this feature. I don't yet understand how do you use it. Editing wiki directly in wiki's language is easier. Bug 45376 -- not a major problem for many and has a workaround, but cause this already has a patch,.. Bug 45341 -- unused feature. Bug 45171 -- it's not even confirmed. If you want security, encrypt your partitions, or put it in an encrypted archive. Bug 45085 -- not a big problem. Bug 45084 -- rarely used feature. Bug 45049 -- same Bug 44861 -- same Let's process these first. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[PATCH] Remove unused code (sd)
This patch removes unused code as listed in unusedcode.easy 0001-Remove-unused-code-in-sd.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [patch] [fdo#42986] Presentations in Wide-screen
Hi,
Here is a corrected patch, without tab's in it.
--
Greetings,
Rob Snelders
On 14-04-12 18:58, Rob Snelders wrote:
Hi,
Patches for bug fdo#42986
--
Greetings,
Rob Snelders
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
>From eaf512ac6d636f13b2574edeef118cd816f5d5da Mon Sep 17 00:00:00 2001
From: Rob Snelders
Date: Sat, 14 Apr 2012 21:21:25 +0200
Subject: [PATCH] fdo#42986 Add Presentationsize 16:9 Widescreen
---
cui/source/tabpages/page.cxx | 10 +-
cui/source/tabpages/page.h|3 ++-
cui/source/tabpages/page.src |3 ++-
i18nutil/inc/i18nutil/paper.hxx |5 +++--
i18nutil/source/utility/paper.cxx |6 --
sd/inc/sdenumdef.hxx |2 +-
sd/source/core/drawdoc2.cxx |2 +-
sd/source/ui/app/sdmod1.cxx | 10 ++
sd/source/ui/dlg/dlgass.cxx |6 ++
sd/source/ui/dlg/dlgass.src | 10 ++
sd/source/ui/inc/dlgass.hrc |1 +
vcl/source/gdi/print.cxx |2 +-
12 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index a0b5cc8..13e32e3 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -995,13 +995,13 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
if ( eMode == SVX_PAGE_MODE_PRESENTATION )
{
-// Draw: bei Papierformat soll der Rand 1cm betragen
+// Draw: With on screen no border
long nTmp = 0;
-sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( PAPER_SCREEN_16_9 == ePaper));
if ( !bScreen )
-// bei Bildschirm keinen Rand
-nTmp = 1; // entspr. 1cm
+// with paper take a borden
+nTmp = 1; //cm
// Abfragen, ob fuer Raender 0 gesetzt ist:
if ( bScreen || aRightMarginEdit.GetValue() == 0 )
@@ -1410,7 +1410,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
-if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() )
+if ( (ePaper != PAPER_SCREEN_4_3 || ePaper != PAPER_SCREEN_16_9) && IsMarginOutOfRange() )
{
if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText ).Execute() == RET_NO )
{
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index bc7ad78..87858fe 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -54,7 +54,7 @@
#define PAPERSIZE_C65 16
#define PAPERSIZE_DL17
#define PAPERSIZE_DIA 18
-#define PAPERSIZE_SCREEN19
+#define PAPERSIZE_SCREEN_4_319
#define PAPERSIZE_C 20
#define PAPERSIZE_D 21
#define PAPERSIZE_E 22
@@ -74,6 +74,7 @@
#define PAPERSIZE_B6_JIS36
#define PAPERSIZE_POSTCARD_JP 46
#define PAPERSIZE_A656
+#define PAPERSIZE_SCREEN_16_9 78
#endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 91873c7..2137ff2 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -452,7 +452,8 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
< "Dia Slide" ; PAPERSIZE_DIA ; > ;
-< "Screen" ; PAPERSIZE_SCREEN ; > ;
+< "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ;
+< "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ;
< "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
};
};
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index d5be9ec..5c08661 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -58,7 +58,7 @@ enum Paper
PAPER_ENV_C65,
PAPER_ENV_DL,
PAPER_SLIDE_DIA,
-PAPER_SCREEN,
+PAPER_SCREEN_4_3,
PAPER_C,
PAPER_D,
PAPER_E,
@@ -116,7 +116,8 @@ enum Paper
PAPER_ARCHB,
PAPER_ARCHC,
PAPER_ARCHD,
-PAPER_ARCHE
+PAPER_ARCHE,
+PAPER_SCREEN_16_9
};
// defined for 'equal size' test with the implementation array
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 63b5cff..a79089d 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -93,7 +93,7 @@ static PageDesc aDinTab[] =
{ MM2MM100( 114 ), MM2MM100( 229 ),"EnvC65", NULL },
{ MM2MM100( 110 ), MM2MM100( 220 ),"EnvDL", "DL" },
{ MM2MM100( 180),MM2MM100( 270 ),NULL, NULL }, //Dia
-{ MM2MM100( 210),MM2MM100( 280 ),NULL, NULL }, //Screen
+{ MM2MM100( 210),MM2MM100( 280 ),NULL, NULL }, //Screen
Re: [patch] [fdo#42986] Presentations in Wide-screen
Hi,
There was an error in page.cxx. I fixed that now.
Thanks to Rodolfo for seeing it.
--
Greetings,
Rob Snelders
On 14-04-12 21:26, Rob Snelders wrote:
Hi,
Here is a corrected patch, without tab's in it.
--
Greetings,
Rob Snelders
On 14-04-12 18:58, Rob Snelders wrote:
Hi,
Patches for bug fdo#42986
--
Greetings,
Rob Snelders
___
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
>From eaf512ac6d636f13b2574edeef118cd816f5d5da Mon Sep 17 00:00:00 2001
From: Rob Snelders
Date: Sat, 14 Apr 2012 21:21:25 +0200
Subject: [PATCH] fdo#42986 Add Presentationsize 16:9 Widescreen
---
cui/source/tabpages/page.cxx | 10 +-
cui/source/tabpages/page.h|3 ++-
cui/source/tabpages/page.src |3 ++-
i18nutil/inc/i18nutil/paper.hxx |5 +++--
i18nutil/source/utility/paper.cxx |6 --
sd/inc/sdenumdef.hxx |2 +-
sd/source/core/drawdoc2.cxx |2 +-
sd/source/ui/app/sdmod1.cxx | 10 ++
sd/source/ui/dlg/dlgass.cxx |6 ++
sd/source/ui/dlg/dlgass.src | 10 ++
sd/source/ui/inc/dlgass.hrc |1 +
vcl/source/gdi/print.cxx |2 +-
12 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index a0b5cc8..13e32e3 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -995,13 +995,13 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
if ( eMode == SVX_PAGE_MODE_PRESENTATION )
{
-// Draw: bei Papierformat soll der Rand 1cm betragen
+// Draw: With on screen no border
long nTmp = 0;
-sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( PAPER_SCREEN_16_9 == ePaper));
if ( !bScreen )
-// bei Bildschirm keinen Rand
-nTmp = 1; // entspr. 1cm
+// with paper take a borden
+nTmp = 1; //cm
// Abfragen, ob fuer Raender 0 gesetzt ist:
if ( bScreen || aRightMarginEdit.GetValue() == 0 )
@@ -1410,7 +1410,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
-if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() )
+if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && IsMarginOutOfRange() )
{
if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText ).Execute() == RET_NO )
{
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index bc7ad78..87858fe 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -54,7 +54,7 @@
#define PAPERSIZE_C65 16
#define PAPERSIZE_DL17
#define PAPERSIZE_DIA 18
-#define PAPERSIZE_SCREEN19
+#define PAPERSIZE_SCREEN_4_319
#define PAPERSIZE_C 20
#define PAPERSIZE_D 21
#define PAPERSIZE_E 22
@@ -74,6 +74,7 @@
#define PAPERSIZE_B6_JIS36
#define PAPERSIZE_POSTCARD_JP 46
#define PAPERSIZE_A656
+#define PAPERSIZE_SCREEN_16_9 78
#endif
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 91873c7..2137ff2 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -452,7 +452,8 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
< "C5 Envelope" ; PAPERSIZE_C5 ; > ;
< "C4 Envelope" ; PAPERSIZE_C4 ; > ;
< "Dia Slide" ; PAPERSIZE_DIA ; > ;
-< "Screen" ; PAPERSIZE_SCREEN ; > ;
+< "Screen 4:3" ; PAPERSIZE_SCREEN_4_3 ; > ;
+< "Screen 16:9" ; PAPERSIZE_SCREEN_16_9 ; > ;
< "Japanese Postcard" ; PAPERSIZE_POSTCARD_JP; > ;
};
};
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index d5be9ec..5c08661 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -58,7 +58,7 @@ enum Paper
PAPER_ENV_C65,
PAPER_ENV_DL,
PAPER_SLIDE_DIA,
-PAPER_SCREEN,
+PAPER_SCREEN_4_3,
PAPER_C,
PAPER_D,
PAPER_E,
@@ -116,7 +116,8 @@ enum Paper
PAPER_ARCHB,
PAPER_ARCHC,
PAPER_ARCHD,
-PAPER_ARCHE
+PAPER_ARCHE,
+PAPER_SCREEN_16_9
};
// defined for 'equal size' test with the implementation array
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 63b5cff..a79089d 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -93,7 +93,7 @@ static PageDesc aDinTab[] =
{ MM2
[PATCH] Fix icons for flipping
Hi all, here's a trivial patch to exchange the flipping icons for images in the Human/Oxygen themes – now they should be correct. Astron. 0001-Correct-icons-for-flipping-images-in-Oxygen-Human-th.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix proposed for fdo#48368
Hello,
I reproduced the problem indicated by fdo#48368 and attached to the
bugtracker bt with symbols (see
https://bugs.freedesktop.org/attachment.cgi?id=59985&action=edit)
Here are the lines of basctl/source/basicide/basidesh.cxx which seem to
cause the problem :
420 for ( sal_uLong nWin = 0; bCanClose && ( nWin <
aIDEWindowTable.size() ); nWin++ )
421 {
422 IDEBaseWindow* pWin = aIDEWindowTable[ nWin ];
423 if ( !pWin->CanClose() )
I runned this on gdb and found this :
aIDEWindowTable.size() = 1 but even at the first loop, pWin is null so line
423 fails.
I searched about aIDEWindowTable and found this in
basctl/source/inc/basidesh.hxx :
62 #if _SOLAR__PRIVATE
63 typedef std::map IDEWindowTable;
64 #else
65 typedef std::map IDEWindowTable;
66 #endif
So I propose this straight forward fix :
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index e4dcd98..02e10c2 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -417,9 +417,9 @@ sal_uInt16 BasicIDEShell::PrepareClose( sal_Bool bUI,
sal_Bool bForBrowsing )
else
{
sal_Bool bCanClose = sal_True;
-for ( sal_uLong nWin = 0; bCanClose && ( nWin <
aIDEWindowTable.size() ); nWin++ )
+for (IDEWindowTable::const_iterator it = aIDEWindowTable.begin();
bCanClose && (it != aIDEWindowTable.end()); ++it)
{
-IDEBaseWindow* pWin = aIDEWindowTable[ nWin ];
+IDEBaseWindow* pWin = it->second;
if ( !pWin->CanClose() )
{
if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument(
m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) )
I can commit and push on master of course but I'd like first your opinion
about this.
Julien.
--
View this message in context:
http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-48368-tp3910905p3910905.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
Re: [PUSHED] Fix icons for flipping
Hi Stefan, On Sat, Apr 14, 2012 at 10:26:23PM +0200, "Stefan Knorr (Astron)" wrote: > here's a trivial patch to exchange the flipping icons for images in > the Human/Oxygen themes – now they should be correct. Pushed, thank you! Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #270 from mi...@filmsi.net 2012-04-14 16:54:23 PDT --- I would like to nominate bug 48356 (https://bugs.freedesktop.org/show_bug.cgi?id=48356). It makes LO 3.5.x unusable in Eastern European countries when RTF export is concerned (and used). Since a lot of public sector uses rtf of MS Word files, that makes LO 3.5.x a releases very public-image-threatening to LO in these countries (those to decide whether to use open source in public sector, might start saying: "Why use open source if it has such serious bugs that can cause us severe headaches, loss of data?"). Thsnks. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[PATCH] fdo#45904: [EasyHack] move java based api tests to c++
Hello, This patch is transferring XPrintAreas test to c++, from qaDevOOo/tests/java/ifc/sheet to test/inc/test/ and test/source/ Though not all tests are transferred, I'm sending this so it could be reviewed, because it's my first patch and changes 5 files. Best regards, Artur Dorda 0001-transferring-java-XPrintAreas-to-c.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH-3-5] fsync less often ...
The attached is not that pleasant, but (I hope) solves fdo#47983
slow-down, while not loosing people's data on dodgy, modern
file-systems :-)
I'd love to get it into LibreOffice 3.5.3
Thanks,
Michael.
--
michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot
>From a0b5ba2e821091b8053bfc1d2f9c99aca7431907 Mon Sep 17 00:00:00 2001
From: Michael Meeks
Date: Sun, 15 Apr 2012 03:33:22 +0200
Subject: [PATCH] re-open output file on save to fsync to improve first-start
performance
---
sfx2/source/doc/docfile.cxx | 13 -
ucb/source/ucp/file/shell.cxx |4
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0f30aab..ced1950 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1912,9 +1912,20 @@ void SfxMedium::Transfer_Impl()
xComEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler,
Reference< ::com::sun::star::ucb::XProgressHandler >() );
-if ( ::utl::LocalFileHelper::IsLocalFile( aDest.GetMainURL( INetURLObject::NO_DECODE ) ) || !aDest.removeSegment() )
+rtl::OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) );
+if ( ::utl::LocalFileHelper::IsLocalFile( aDestURL ) || !aDest.removeSegment() )
{
TransactedTransferForFS_Impl( aSource, aDest, xComEnv );
+
+// Hideous - no clean way to do this, so we re-open the file just to fsync it
+osl::File aFile( aDestURL );
+if ( aFile.open( osl_File_OpenFlag_Write ) == osl::FileBase::E_None )
+{
+aFile.sync();
+OSL_TRACE("fsync'd saved file '%s'\n",
+ rtl::OUStringToOString( aDestURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+aFile.close();
+}
}
else
{
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 561e7f8..1cb03b3 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -1909,10 +1909,6 @@ shell::write( sal_Int32 CommandId,
}
} while( nReadBytes == nRequestedBytes );
-aFile.sync(); // fsync / flush it to disk.
-OSL_TRACE( "fsync'd file '%s'\n",
- rtl::OUStringToOString( aUnqPath, RTL_TEXTENCODING_UTF8 ).getStr() );
-
err = aFile.close();
if( err != osl::FileBase::E_None )
{
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Bug 48140 - [EasyHack] remove uno calls from xlsx import
Hello, everyone,
I have attached my patches for EasyHack 48140. I have taken baby steps,
so this just the first part of completing EasyHack 48140. I changed
WorkbookHelper::createNamedRangeObject and createLocalNamedRangeObject
to return ScRangeData* instead of Reference, and then I
adjusted all callers. You will notice I commented the old code out
instead of deleting it. I did this as this is just partial update for
the EasyHack.
I was able to successfully make sc with these changes. "make -sr
slowcheck" was also successful. My own manual tests were also
successful. I tested by running calc and opening xlsx spreadsheets
containing ranges with names. I also created names for ranges and
created names for cells in those spreadsheets. I referred to those
ranges and cells by name in other cells.
Although my tests were successful, I still fear that there is something
that I may have missed due to my current beginner level of understanding
of the sc model. I am eager to see what suggestions you all may have.
When I have more time, I later plan to make similar changes to the
database ranges and eventually remove all UNO calls in these methods
where possible. (School semester is still in for me and quite busy as
it nears the end.)
Respectfully,
Daniel Bankston
>From d781c5735dc2bdb50d95301897c11d56c47b969e Mon Sep 17 00:00:00 2001
From: Daniel Bankston
Date: Fri, 6 Apr 2012 10:18:44 -0500
Subject: [PATCH 1/7] Changing return types from Reference< XNamedRange > to ScRangeData
---
sc/source/filter/inc/workbookhelper.hxx | 18 ++
sc/source/filter/oox/workbookhelper.cxx | 20
2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index 7a52984..5e94b55 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -183,8 +183,13 @@ public:
/** Creates and returns a defined name on-the-fly in the Calc document.
The name will not be buffered in the global defined names buffer.
@param orName (in/out-parameter) Returns the resulting used name. */
-::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
-createNamedRangeObject(
+//~ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
+//~ createNamedRangeObject(
+//~ ::rtl::OUString& orName,
+//~ const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens,
+//~ sal_Int32 nIndex,
+//~ sal_Int32 nNameFlags = 0 ) const;
+ScRangeData createNamedRangeObject(
::rtl::OUString& orName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens,
sal_Int32 nIndex,
@@ -193,8 +198,13 @@ public:
/** Creates and returns a defined name on-the-fly in the sheet.
The name will not be buffered in the global defined names buffer.
@param orName (in/out-parameter) Returns the resulting used name. */
-::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
-createLocalNamedRangeObject(
+//~ ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XNamedRange >
+//~ createLocalNamedRangeObject(
+//~ ::rtl::OUString& orName,
+//~ const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens,
+//~ sal_Int32 nIndex,
+//~ sal_Int32 nNameFlags = 0, sal_Int32 nTab = -1 ) const;
+ScRangeData createLocalNamedRangeObject(
::rtl::OUString& orName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken>& rTokens,
sal_Int32 nIndex,
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 5a872c2..eae64ad 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -378,7 +378,8 @@ void lcl_addNewByNameAndTokens( ScDocument& rDoc, ScRangeName* pNames, const OUS
throw RuntimeException();
}
-Reference< XNamedRange > WorkbookGlobals::createNamedRangeObject( OUString& orName, const Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
+//~ Reference< XNamedRange > WorkbookGlobals::createNamedRangeObject( OUString& orName, const Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
+ScRangeData WorkbookGlobals::createNamedRangeObject( OUString& orName, const Sequence< FormulaToken>& rTokens, sal_Int32 nIndex, sal_Int32 nNameFlags ) const
{
