Re: [Libreoffice] [PATCH] some cleaning for Windows part - need a review
By the way, just a question: from which version is Windows supported? Only NT-based ones, WIndows 2000 or later. And even the Windows 2000 support is in my opinion don't break it on purpose only, I don't think anybody regularly checks that it works on Windows 2000. So in practice I think we would prefer to say Windows XP or later. So yeah, if you find some Windows 9x/Me specific stuff, it can be deleted. (Lots of it has already, but there might be bits left here and there.) I will have a look at your patches on Monday, unless somebody beats me to it during the weekend. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] some cleaning for Windows part - need a review
Hello,
I will have a look at your patches on Monday, unless somebody beats me
to it during the weekend.
Thanks,
based on some remarks, here exactly the same patches, but with improved
commit comments. Will be probably better to integrate these.
Regards
Pierre-André
From 94bed68189f2298d03972febeb28ebafeadf7d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Fri, 9 Sep 2011 21:58:21 +0200
Subject: [PATCH 6/6] [cppchecker] deleted unread var and code in setup_native, vistaspecial.cxx
and simplified coding after that since the logic is not needed
anymore.
---
.../customactions/shellextensions/vistaspecial.cxx | 60 ++--
1 files changed, 5 insertions(+), 55 deletions(-)
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index aede073..40ff772 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -96,7 +96,6 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
{
bool bDirectoryRemoved = true;
-std::_tstring mystr;
std::_tstring sPattern = sPath + TEXT(\\) + TEXT(*.*);
WIN32_FIND_DATA aFindData;
@@ -114,9 +113,6 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
{
std::_tstring sFileName = aFindData.cFileName;
-mystr = Current short file: + sFileName;
-// MessageBox(NULL, mystr.c_str(), Current Content, MB_OK);
-
if (( strcmp(sFileName.c_str(),sCurrentDir.c_str()) != 0 )
( strcmp(sFileName.c_str(),sParentDir.c_str()) != 0 ))
{
@@ -124,31 +120,11 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
if ( aFindData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY )
{
-bool fSuccess = RemoveCompleteDirectory(sCompleteFileName);
-if ( fSuccess )
-{
-mystr = Successfully removed content of dir + sCompleteFileName;
-// MessageBox(NULL, mystr.c_str(), Removed Directory, MB_OK);
-}
-else
-{
-mystr = An error occurred during removing content of + sCompleteFileName;
-// MessageBox(NULL, mystr.c_str(), Error removing directory, MB_OK);
-}
+RemoveCompleteDirectory(sCompleteFileName);
}
else
{
-bool fSuccess = DeleteFile( sCompleteFileName.c_str() );
-if ( fSuccess )
-{
-mystr = Successfully removed file + sCompleteFileName;
-// MessageBox(NULL, mystr.c_str(), Removed File, MB_OK);
-}
-else
-{
-mystr = An error occurred during removal of file + sCompleteFileName;
-// MessageBox(NULL, mystr.c_str(), Error removing file, MB_OK);
-}
+DeleteFile( sCompleteFileName.c_str() );
}
}
@@ -162,17 +138,9 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
// RemoveDirectory is only successful, if the last handle to the directory is closed
// - first removing content - closing handle - remove empty directory
-bool fRemoveDirSuccess = RemoveDirectory(sPath.c_str());
-if ( fRemoveDirSuccess )
-{
-mystr = Successfully removed dir + sPath;
-// MessageBox(NULL, mystr.c_str(), Removed Directory, MB_OK);
-}
-else
+if( !( RemoveDirectory(sPath.c_str()) ) )
{
-mystr = An error occurred during removal of empty directory + sPath;
-// MessageBox(NULL, mystr.c_str(), Error removing directory, MB_OK);
bDirectoryRemoved = false;
}
}
@@ -189,8 +157,6 @@ extern C UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
std::_tstring sRenameSrc = sOfficeInstallPath + TEXT(program);
std::_tstring sRenameDst = sOfficeInstallPath + TEXT(program_old);
-//MessageBox(NULL, sRenameSrc.c_str(), INSTALLLOCATION, MB_OK);
-
bool bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
if ( !bSuccess )
{
@@ -205,13 +171,6 @@ extern C UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
}
}
-#if 0
-if ( !bSuccess )
-MessageBox(NULL, Renaming folder failed, RenamePrgFolder, MB_OK);
-else
-MessageBox(NULL, Renaming folder successful, RenamePrgFolder, MB_OK);
-#endif
-
return ERROR_SUCCESS;
}
@@ -220,25 +179,16 @@ extern C UINT __stdcall RemovePrgFolder( MSIHANDLE handle
Re: [Libreoffice] How to get LVS spellchk dict into distribution
Citējot Andras Timar tima...@gmail.com: Hi, 2011/9/9 Jānis ja...@dv.lv: Hi! I's like to know how can I get Latvian spellchecker dictionary into distribution. Please give us the link to your spellchecker files and tell us about its license. From technical point of view it's a no-brainer to include it into our source tree. I can do that. the latest version, also found on openoffice extension site: http://dict.dv.lv/download/lv_LV-0.9.4.oxt Licence - LGPL Janis ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] How to get LVS spellchk dict into distribution
On Sat, Sep 10, 2011 at 8:55 AM, Jānis ja...@dv.lv wrote: Citējot Andras Timar tima...@gmail.com: Hi, 2011/9/9 Jānis ja...@dv.lv: Hi! I's like to know how can I get Latvian spellchecker dictionary into distribution. Please give us the link to your spellchecker files and tell us about its license. From technical point of view it's a no-brainer to include it into our source tree. I can do that. the latest version, also found on openoffice extension site: http://dict.dv.lv/download/lv_LV-0.9.4.oxt Licence - LGPL I'm no dictionary expert, but I'm pretty sure that Andras is asking for a link to the _sources_ something like, for example, http://cgit.freedesktop.org/libreoffice/dictionaries/tree/dictionaries/lt_LT Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] cppcheck cleanliness: duplicate expression
On Sat, Sep 10, 2011 at 12:52 AM, Korrawit Pruegsanusak detective.conan.1...@gmail.com wrote: Hello all, On Fri, Sep 9, 2011 at 14:03, Fridrich Strba fridrich.st...@graduateinstitute.ch wrote: On Fri, 2011-09-09 at 07:23 +0200, Herbert Duerr wrote: getting rid of the related UNO API would also be a good idea if there wasn't the UNO API semper fi mantra. No such mantra in the LibreOffice world I guess :) So sorry for my stupid question, but could someone please point out what should be done next? I'm quite new here. Thanks :) Well, from what I read in this thread: The immediate problem has been tweaked and a fix has been pushed.. The wider question of the 'sanity' of the related UNO API is probably a topic for http://wiki.documentfoundation.org/Development/LibreOffice4 Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] How to get LVS spellchk dict into distribution
Hi Norbert, 2011/9/10 Norbert Thiebaud nthieb...@gmail.com: I'm no dictionary expert, but I'm pretty sure that Andras is asking for a link to the _sources_ something like, for example, http://cgit.freedesktop.org/libreoffice/dictionaries/tree/dictionaries/lt_LT oxt is fine, it is a plain zip file, sources are inside. Cheers, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] random text
I'm looking for a problem that will take and odt file and replace all the text with meaningless text. Then I can upload a file and someone can hopefully figure out why I can't format it the way I want. :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] help making text fill a page
Hi James, This list is for developers working together. For support, please see here: http://www.libreoffice.org/get-help/ Regards, James wrote (10-09-11 23:23) I've been struggling with getting it to fill a page. ... -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] difficulty doing rebuild
I hope this report of difficulty doing a rebuild of LibreOffice will be of some interest. If the tale is not sufficiently sad and long to satisfy you, I can offer a typescript, 73000 lines so far and still growing grin /. The following points surprise me: (*) Rebuild failed. I see room here for improvement, but I have no idea how the improvement would work. (*) `make dev-install` still has lot of C++ files to compile. Well, I learn something new every day. (*) `make clean` of the failing module did not remove the cause of the failure. This is a small surprise that would not have delayed me if I had a faster system. Here is how I got into trouble and what I did to get past it ... I pulled commit b430e0c, which includes commit 392146b http://lists.freedesktop.org/archives/libreoffice-commits/2011-September/022007.html, which replaces libvisio version 0.0.6 with version 0.0.7, which adds several parameters to libvisio::VSDXCharacterList::addCharIX(). After an apparently successful `make`, `make dev-install` failed in tail_build/prj. The suggested recovery, `cd tail_build make clean make -r`, failed while linking libvisioimportlo.so. Investigation shows files VSD6Parser.obj and VSD11Parser.obj from an earlier build still present and referencing the function with the old signature while VSDXCharacterList.obj defines the function with the new signature. These old .obj files survived another `cd tail_build make clean`, while `cd libvision make clean` reports that there is no rule to build the target. Brute force to the rescue: `rm -r libvisio/unxlngi6` lets the subsequent `cd tail_build make` and `make dev-install` continue to a later failure. HTH, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH v2] convert Mesa to gbuild and add to tail_build
On Fri, 9 Sep 2011, Michael Stahl wrote: On 09.09.2011 21:28, Peter Foley wrote: On Fri, 9 Sep 2011, Norbert Thiebaud wrote: On Fri, Sep 9, 2011 at 11:20 AM, Peter Foley pefol...@verizon.net wrote: Without the ifeq and with SYSTEM_MESA_HEADERS=YES I got this error. /root/libreoffice/slideshow/Library_OGLTrans.mk:66: *** gb_LinkTarget_use_external: unknown external: Mesa. Stop. what happen if you change the RepositoryExternal.mk part to +ifeq ($(SYSTEM_MESA_HEADERS),YES) + +define gb_LinkTarget__use_Mesa +endef + +else + +define gb_LinkTarget__use_Mesa +$(eval $(call gb_LinkTarget_add_external_headers,$(1),Mesa_inc)) + +endef + +endif + Norbert I got the same error when SYSTEM_MESA_HEADERS=YES. But it worked when SYSTEM_MESA_HEADERS=NO. the problem is this: define gb_LinkTarget_use_external $(if $(value gb_LinkTarget__use_$(2)),\ $(call gb_LinkTarget__use_$(2),$(1)),\ $(error gb_LinkTarget_use_external: unknown external: $(2))) endef the if is just intended to check that there actually is a variable defined, but what it actually checks is whether there is a variable defined that has a non-empty value. until this Mesa case nobody noticed :) can you try the following patch: Thanks, that worked. I'll send out a new patch shortly. Peter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH v3] convert Mesa to gbuild and add to tail_build
I've attached a updated patch to convert Mesa to gbuild. PeterFrom 0735fe17137bcb1d5528ad11b9987d46a21db0ee Mon Sep 17 00:00:00 2001 From: Peter Foley pefol...@verizon.net Date: Fri, 9 Sep 2011 17:42:24 -0400 Subject: [PATCH] convert Mesa to gbuild and add to tail_build --- Mesa/Makefile | 38 ++ Mesa/Module_Mesa.mk | 35 +++ Mesa/Package_inc.mk | 40 Mesa/prj/build.lst|5 ++--- Mesa/prj/d.lst|3 --- Mesa/prj/makefile.mk | 40 Module_tail_build.mk |1 + RepositoryExternal.mk | 12 RepositoryModule_ooo.mk |1 + slideshow/Library_OGLTrans.mk |2 ++ solenv/gbuild/LinkTarget.mk | 11 +++ tail_build/prj/build.lst |2 +- 12 files changed, 179 insertions(+), 11 deletions(-) create mode 100644 Mesa/Makefile create mode 100644 Mesa/Module_Mesa.mk create mode 100644 Mesa/Package_inc.mk create mode 100644 Mesa/prj/makefile.mk diff --git a/Mesa/Makefile b/Mesa/Makefile new file mode 100644 index 000..90947b2 --- /dev/null +++ b/Mesa/Makefile @@ -0,0 +1,38 @@ +#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# http://www.openoffice.org/license.html +# for a copy of the LGPLv3 License. +# +#* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/Mesa/Module_Mesa.mk b/Mesa/Module_Mesa.mk new file mode 100644 index 000..fc70e59 --- /dev/null +++ b/Mesa/Module_Mesa.mk @@ -0,0 +1,35 @@ +# +# 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) 2011 Peter Foley pefol...@verizon.net (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_Module_Module,Mesa)) + +ifeq ($(SYSTEM_MESA_HEADERS),NO) + +$(eval $(call gb_Module_add_targets,Mesa,Package_inc)) + +endif + +# vim: set noet sw=4: diff --git a/Mesa/Package_inc.mk b/Mesa/Package_inc.mk new file mode 100644 index 000..e9e215b --- /dev/null +++ b/Mesa/Package_inc.mk @@ -0,0 +1,40 @@ +# +# 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) 2011 Peter Foley pefol...@verizon.net (initial developer) +# +# All
