Re: [Libreoffice] [PATCH] Fix sc build
On Sun, Oct 17, 2010 at 09:46:26PM +0200, Miklos Vajna wrote: > Hi David, > > Your recent commit which removed solenv/inc/sc.mk and > solenv/inc/scpre.mk in bootstrap.git breaks the build of sc here. > > Given that the change is in makefile.mk files, tinderbox won't notice > it, I assume. ;) > Hi, tinderbox is much smarter than you think it is :) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove bogus version control comments
Second time submitting this patch to the list - the first time I
forgot [Libreoffice] in the subject line and presume it got eaten by
people's spam filters!
Fairly trivial patch removing bogus version control comments, in order
to test and get to know the build / git management / patch generation
and submission process.
Patch is contributed under the LGPLv3+.
If the format is incorrect and should be submitted another way, please
let me know!
From 34f8ed2ae24e75f46b2cdd98b0653165b07f8ef3 Mon Sep 17 00:00:00 2001
From: Mattias Johnsson
Date: Sun, 17 Oct 2010 22:30:14 +1100
Subject: [PATCH] Remove bogus version control comments
---
sw/source/core/access/accmap.cxx | 128 ++---
1 files changed, 7 insertions(+), 121 deletions(-)
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 141b38b..75acf31 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -69,12 +69,9 @@
#include
#include
#include
-// OD 15.01.2003 #103492#
#include
-// --> OD 2005-12-13 #i27301#
#include
#include
-// <--
#include
#include
@@ -158,10 +155,6 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/,
{
// do not broadcast notifications for writer fly frames, because there
// are no shapes that need to know about them.
-// OD 01.07.2003 #110554# - correct condition in order not to broadcast
-// notifications for writer fly frames.
-// OD 01.07.2003 #110554# - do not broadcast notifications for plane
-// objects
const SdrHint *pSdrHint = PTR_CAST( SdrHint, &rHint );
if ( !pSdrHint ||
( pSdrHint->GetObject() &&
@@ -236,11 +229,9 @@ public:
maInfo.SetSdrView( pMap->GetShell()->GetDrawView() );
maInfo.SetWindow( pMap->GetShell()->GetWin() );
maInfo.SetViewForwarder( pMap );
-// --> OD 2005-08-08 #i52858# - method name changed
uno::Reference < document::XEventBroadcaster > xModelBroadcaster =
new SwDrawModellListener_Impl(
pMap->GetShell()->getIDocumentDrawModelAccess()->GetOrCreateDrawModel() );
-// <--
maInfo.SetControllerBroadcaster( xModelBroadcaster );
}
@@ -334,9 +325,7 @@ private:
// the same as xAcc for any other
// event type
EventType meType; // The event type
-// --> OD 2005-12-12 #i27301# - use new type definition for
tAccessibleStates mnStates; // check states or update caret pos
-// <--
SwAccessibleEvent_Impl& operator==( const SwAccessibleEvent_Impl& );
@@ -383,7 +372,6 @@ public:
"wrong event constructor, (CHILD_)POS_CHANGED only" );
}
-// --> OD 2005-12-12 #i27301# - use new type definition for parameter <_nStates>
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
const SwAccessibleChild& rFrmOrObj,
@@ -432,12 +420,10 @@ public:
}
// only used in method
-// --> OD 2005-12-12 #i27301# - use new type definition for parameter <_nStates>
inline void SetStates( tAccessibleStates _nStates )
{
mnStates |= _nStates;
}
-// <--
inline sal_Bool IsUpdateCursorPos() const
{
@@ -451,32 +437,26 @@ public:
{
return (mnStates & ACC_STATE_RELATION_MASK) != 0;
}
-// --> OD 2005-12-12 #i27301# - new event TEXT_SELECTION_CHANGED
inline sal_Bool IsInvalidateTextSelection() const
{
return ( mnStates & ACC_STATE_TEXT_SELECTION_CHANGED ) != 0;
}
-// <--
-// --> OD 2009-01-07 #i88069# - new event TEXT_ATTRIBUTE_CHANGED
+
inline sal_Bool IsInvalidateTextAttrs() const
{
return ( mnStates & ACC_STATE_TEXT_ATTRIBUTE_CHANGED ) != 0;
}
-// <--
-// --> OD 2005-12-12 #i27301# - use new type definition
-// for return value
+
inline tAccessibleStates GetStates() const
{
return mnStates & ACC_STATE_MASK;
}
-// <--
-// --> OD 2005-12-12 #i27301# - use new type definition
-// for return value
+
inline tAccessibleStates GetAllStates() const
{
return mnStates;
}
-// <--
+
};
//--
@@ -551,9 +531,7 @@ class SwAccessibleEventMap_Impl: public _SwAccessibleEventMap_Impl
};
//--
-// --> OD 2005-12-13 #i27301# - map containing the accessible paragraph, which
-// have a selection. Needed to keep this information to submit corresponding
-// TEXT_SELECTION_CHANGED events.
+
struct SwAccessibleParaSelection
{
xub_StrLen nStartOfSelection;
@@ -581,7 +559,6 @@ typedef ::std::map< uno::WeakReference < XAccessible >,
class SwAccessibleSelectedParas_Impl: public _SwAccessibleSelectedParas_Impl
{};
-/
Re: [Libreoffice] PATCH
2010/10/17 Júlio Hoffimann : > Hi, > My first time contributing with an open source project. I hope to help with > a little. Hi julio. Thanks for you patches. > Patch1: Some translate. I pushed part of this one. I selected the removal, instead of the translation of some of these comment (Created at, Modified at, are not very useful to keep around) > Patch2: Cleanup comments and some formatting. I'm afraid that this one doesn't apply. That usually means that you created it from an older version of the code (you did not pull -r to rebase you commit), or somebody else submitted a change that conflicts with yours. You may want to pull the latest version and see what has change that conflict with your patch Norbert > ___ > 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
Re: [Libreoffice] [Pushed][PATCH] unused macro bufsizeof
On Sun, Oct 17, 2010 at 2:39 PM, Kenneth Venken wrote: > Hi, > > this patch removes the unused bufsizeof macro. Pushed, thanks. Norbert > > BTW, this patch and all other patches submitted by me to be used in > LibreOffice are released under LGPLv3+. > > -- Kenneth > > > ___ > 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
Re: [Libreoffice] [PATCH]replaces ELEMENTS_OF_ARRAY with SAL_N_ELEMENTS
On Sun, Oct 17, 2010 at 2:21 PM, Kenneth Venken wrote: > replaces the ELEMENTS_OF_ARRAY macro, defined in sal/osl/os2/file_url.h, > with the SAL_N_ELEMENTS, defined in sal/macros.h > > Thanks. Pushed except for one chunk: Be careful with 'replace all' :-) @ -48,11 +48,11 @@ #ifdef __MINGW32__ #include #endif //# -#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0]))) +#define SAL_N_ELEMENTS(arr) (sizeof(arr)/(sizeof((arr)[0]))) static const wchar_t UNC_PREFIX[] = L""; static const wchar_t BACKSLASH = '\\'; static const wchar_t SLASH = '/'; Norbert > > ___ > 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
Re: [Libreoffice] [Pushed][PATCH] Filters - Remove unnecessary comments from sw_unotbl.cxx
On Sun, Oct 17, 2010 at 2:59 PM, jgraeme wrote: > A patch to remove commented out code & unnecessary comments. Pushed, Thanks. > > Graeme > > ___ > 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] boost exceptions
Hi again! Another step ahead; using only ENVLINKFLAGS and not ENVLIBFLAGS, I avoided the ar problem. I'm trying to build against the external boost libraries and see: Compiling: svl/source/numbers/zforfind.cxx g++ -fmessage-length=0 -c -O1 -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -fexceptions -I/usr/pkg/include/db4 -I/usr/pkg/include -I/usr/X11R7/include -I. -I../../unxbsdx3.pro/inc/numbers -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxbsdx3.pro/inc -I. -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/stl -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/external -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/res -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/stl -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/inc/Xp31 -I/usr/pkg/java/openjdk7/include -I/usr/pkg/java/openjdk7/include/netbsd -I/us r/pkg/java/openjdk7/include/native_threads/include -I/usr/X11R7/include -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/offuh -I. -I../../res -I. -pipe -Wno-ctor-dtor-privacy -fexceptions -I/usr/pkg/include/db4 -I/usr/pkg/include -I/usr/X11R7/include -fpic -DNETBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64 -pthread -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/g++ -DSUPD=330 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGSTREAMER -DCUI -DSOLAR_JAVA -DSVL_DLLIMPLEMENTATION -DSHAREDLIB -D_DLL_ -fno-exceptions -DEXCEPTIONS_OFF -o ../../unxbsdx3.pro/slo/zforfind.o /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/svl/source/numbers/zforfind.cxx /usr/pkg/include/boost/throw_exception.hpp: In function 'void boost::throw_exception(const E&) [with E = boost::bad_weak_ptr]': /usr/pkg/include/boost/smart_ptr/detail/shared_count.hpp:421: instantiated from here /usr/pkg/include/boost/throw_exception.hpp:61: error: exception handling disabled, use -fexceptions to enable dmake: Error code 1, while making '../../unxbsdx3.pro/slo/zforfind.obj' As you can see, I already added "-fexceptions" to the g++ arguments. Does this mean I have to recompile the boost libraries with -fexceptions? Thanks, Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] error in put()
On Sun, Oct 17, 2010 at 06:13:52PM +0200, Thomas Klausner wrote: > /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx: > In member function 'void HelpKeyword::dump(DB*)': > /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:231: > error: invalid conversion from 'DBT*' to 'unsigned int' Tracked it down. The problem was two versions of db installed and the wrong headers were used. Build is still running... Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Fix sc build
Hi David, Your recent commit which removed solenv/inc/sc.mk and solenv/inc/scpre.mk in bootstrap.git breaks the build of sc here. Given that the change is in makefile.mk files, tinderbox won't notice it, I assume. ;) I'm attaching a patch that fixes the problem for me. OK to push? Thanks, Miklos From cd178802357fe77499c81e6f20fb6f367ee24625 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 17 Oct 2010 21:44:19 +0200 Subject: [PATCH] sc: no longer include non-existing scpre.mk and sc.mk They were empty anyway so just including them fixes the problem. @@ -31,9 +31,7 @@ TARGET=view # --- Settings - -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files --- sc/source/core/data/makefile.mk|2 -- sc/source/core/src/makefile.mk |2 -- sc/source/core/tool/makefile.mk|2 -- sc/source/filter/dif/makefile.mk |2 -- sc/source/filter/excel/makefile.mk |2 -- sc/source/filter/ftools/makefile.mk|2 -- sc/source/filter/html/makefile.mk |2 -- sc/source/filter/lotus/makefile.mk |2 -- sc/source/filter/qpro/makefile.mk |2 -- sc/source/filter/rtf/makefile.mk |2 -- sc/source/filter/starcalc/makefile.mk |2 -- sc/source/filter/xcl97/makefile.mk |2 -- sc/source/filter/xml/makefile.mk |2 -- sc/source/ui/Accessibility/makefile.mk |2 -- sc/source/ui/app/makefile.mk |2 -- sc/source/ui/attrdlg/makefile.mk |2 -- sc/source/ui/cctrl/makefile.mk |2 -- sc/source/ui/dbgui/makefile.mk |2 -- sc/source/ui/docshell/makefile.mk |2 -- sc/source/ui/drawfunc/makefile.mk |2 -- sc/source/ui/formdlg/makefile.mk |2 -- sc/source/ui/miscdlgs/makefile.mk |2 -- sc/source/ui/namedlg/makefile.mk |2 -- sc/source/ui/navipi/makefile.mk|2 -- sc/source/ui/optdlg/makefile.mk|2 -- sc/source/ui/pagedlg/makefile.mk |2 -- sc/source/ui/src/makefile.mk |2 -- sc/source/ui/styleui/makefile.mk |2 -- sc/source/ui/undo/makefile.mk |2 -- sc/source/ui/unoobj/makefile.mk|2 -- sc/source/ui/view/makefile.mk |2 -- 31 files changed, 0 insertions(+), 62 deletions(-) diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk index 9041e1c..f3b3a35 100644 --- a/sc/source/core/data/makefile.mk +++ b/sc/source/core/data/makefile.mk @@ -38,9 +38,7 @@ AUTOSEG=true # --- Settings - -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files diff --git a/sc/source/core/src/makefile.mk b/sc/source/core/src/makefile.mk index 13d0c21..10da798 100644 --- a/sc/source/core/src/makefile.mk +++ b/sc/source/core/src/makefile.mk @@ -33,9 +33,7 @@ TARGET=core # --- Settings - -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files diff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mk index 9819cf2..b1cad58 100644 --- a/sc/source/core/tool/makefile.mk +++ b/sc/source/core/tool/makefile.mk @@ -38,9 +38,7 @@ AUTOSEG=true # --- Settings - -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk index c24de4c..70944b9 100644 --- a/sc/source/filter/dif/makefile.mk +++ b/sc/source/filter/dif/makefile.mk @@ -38,9 +38,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch # --- Settings - -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk index d5b90ab..c961873 100644 --- a/sc/source/filter/excel/makefile.mk +++ b/sc/source/filter/excel/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings - -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk index 27a960e..d37e74a 100644 --- a/sc/source/filter/ftools/makefile.mk +++ b/sc/source/filter/ftools/makefile.mk @@ -38,9 +38,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch # --- Settings -
[Libreoffice] [PATCH] unused macro bufsizeof
Hi, this patch removes the unused bufsizeof macro. BTW, this patch and all other patches submitted by me to be used in LibreOffice are released under LGPLv3+. -- Kenneth diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index 57ec786..ad67487 100644 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -393,8 +393,6 @@ typedef BOOL (WINAPI *GetModuleInformation_PROC)( DWORD cb // size of the structure ); -#define bufsizeof(buffer) (sizeof(buffer) / sizeof((buffer)[0])) - /* This version can fail because PSAPI.DLL is not always part of NT 4 despite MSDN Libary 6.0a say so */ static sal_Bool SAL_CALL _osl_addressGetModuleURL_NT( void *pv, rtl_uString **pustrURL ) diff --git a/sal/systools/win32/uwinapi/Uwinapi.h b/sal/systools/win32/uwinapi/Uwinapi.h index eb2e6bf..2d0cadc 100644 --- a/sal/systools/win32/uwinapi/Uwinapi.h +++ b/sal/systools/win32/uwinapi/Uwinapi.h @@ -47,11 +47,6 @@ EXTERN_C WINBASEAPI LPWSTR WINAPI lstrrchrW( LPCWSTR lpString, WCHAR c ); #define lstrchr lstrchrA #endif -// macro that calculates the count of elements of a static array - -#define bufsizeof(buf) (sizeof(buf) / sizeof((buf)[0])) - - #define IsValidHandle(Handle) ((DWORD)(Handle) + 1 > 1) #ifdef __cplusplus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH]replaces ELEMENTS_OF_ARRAY with SAL_N_ELEMENTS
replaces the ELEMENTS_OF_ARRAY macro, defined in sal/osl/os2/file_url.h,
with the SAL_N_ELEMENTS, defined in sal/macros.h
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
index 04d103a..6ea7490 100644
--- a/sal/osl/os2/file_url.cxx
+++ b/sal/osl/os2/file_url.cxx
@@ -52,6 +52,7 @@
#include "file_error_transl.h"
#include "file_url.h"
+#include
#include "file_path_helper.hxx"
#include "uunxapi.hxx"
@@ -824,7 +825,7 @@ oslFileError SAL_CALL _osl_getSystemPathFromFileURL( rtl_uString *strURL, rtl_uS
/* Indicates local root */
if ( nDecodedLen == nSkip )
-rtl_uString_newFromStr_WithLength( &strTempPath, (const sal_Unicode*)WSTR_SYSTEM_ROOT_PATH, ELEMENTS_OF_ARRAY(WSTR_SYSTEM_ROOT_PATH) - 1 );
+rtl_uString_newFromStr_WithLength( &strTempPath, (const sal_Unicode*)WSTR_SYSTEM_ROOT_PATH, SAL_N_ELEMENTS(WSTR_SYSTEM_ROOT_PATH) - 1 );
else
rtl_uString_newFromStr_WithLength( &strTempPath, pDecodedURL + nSkip, nDecodedLen - nSkip );
diff --git a/sal/osl/os2/file_url.h b/sal/osl/os2/file_url.h
index f63580f..c0f950c 100644
--- a/sal/osl/os2/file_url.h
+++ b/sal/osl/os2/file_url.h
@@ -51,8 +51,6 @@ const sal_Unicode UNICHAR_SLASH = ((sal_Unicode)'/');
const sal_Unicode UNICHAR_COLON = ((sal_Unicode)':');
const sal_Unicode UNICHAR_DOT = ((sal_Unicode)'.');
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
-
#if OSL_DEBUG_LEVEL > 0
#define OSL_ENSURE_FILE( cond, msg, file ) ( (cond) ? (void)0 : _osl_warnFile( msg, file ) )
#else
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 3b8200c..fca14ca 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -34,6 +34,7 @@
#include "osl/file.h"
#include "file_url.h"
+#include
#include "file_error.h"
#include "path_helper.hxx"
@@ -49,7 +50,7 @@
#endif
//#
-#define ELEMENTS_OF_ARRAY(arr) (sizeof(arr)/(sizeof((arr)[0])))
+#define SAL_N_ELEMENTS(arr) (sizeof(arr)/(sizeof((arr)[0])))
static const wchar_t UNC_PREFIX[] = L"";
static const wchar_t BACKSLASH = '\\';
@@ -146,7 +147,7 @@ namespace /* private */
//#
inline bool is_UNC_path(const sal_Unicode* path)
-{ return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast(path), ELEMENTS_OF_ARRAY(UNC_PREFIX) - 1)); }
+{ return (0 == wcsncmp(UNC_PREFIX, reinterpret_cast(path), SAL_N_ELEMENTS(UNC_PREFIX) - 1)); }
//#
inline bool is_UNC_path(const rtl::OUString& path)
@@ -1250,16 +1251,16 @@ bool is_floppy_volume_mount_point(const rtl::OUString& path)
osl::systemPathEnsureSeparator(p);
TCHAR vn[51];
-if (GetVolumeNameForVolumeMountPoint(reinterpret_cast(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
+if (GetVolumeNameForVolumeMountPoint(reinterpret_cast(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
{
TCHAR vnfloppy[51];
if (is_floppy_A_present() &&
-GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
+GetVolumeNameForVolumeMountPoint(FLOPPY_A, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
(0 == wcscmp(vn, vnfloppy)))
return true;
if (is_floppy_B_present() &&
-GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, ELEMENTS_OF_ARRAY(vnfloppy)) &&
+GetVolumeNameForVolumeMountPoint(FLOPPY_B, vnfloppy, SAL_N_ELEMENTS(vnfloppy)) &&
(0 == wcscmp(vn, vnfloppy)))
return true;
}
@@ -1322,7 +1323,7 @@ static UINT get_volume_mount_point_drive_type(const rtl::OUString& path)
osl::systemPathEnsureSeparator(p);
TCHAR vn[51];
-if (GetVolumeNameForVolumeMountPoint(reinterpret_cast(p.getStr()), vn, ELEMENTS_OF_ARRAY(vn)))
+if (GetVolumeNameForVolumeMountPoint(reinterpret_cast(p.getStr()), vn, SAL_N_ELEMENTS(vn)))
return GetDriveType(vn);
return DRIVE_NO_ROOT_DIR;
@@ -1573,7 +1574,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
case DRIVE_REMOTE:
{
TCHAR szBuffer[1024];
-DWORD const dwBufsizeConst = ELEMENTS_OF_ARRAY(szBuffer);
+DWORD const dwBufsizeConst = SAL_N_ELEMENTS(szBuffer);
DWORD dwBufsize = dwBufsizeConst;
DWORD dwResult = WNetGetConnection( cDrive, szBuffer, &dwBufsize );
@@ -1592,7 +1593,7 @@ static oslFileError SAL_CALL osl_getDriveInfo(
case DRIVE_FIXED:
{
TCHAR szVolumeNameBuffer[1024];
-DWORD const dwBufsizeConst = ELEMENTS_OF_ARRAY(szVolumeNameBuffer);
+DWORD const dwBufsizeConst = SAL_N_ELEMENTS(szVolumeNameBuffer);
if ( GetVolumeInformation( cRoot, szVolumeNameBuffer, dwBufsizeConst,
Re: [Libreoffice] [PATCH, EasyHack] Fix for setup_native win32 SAL_N_ELEMENTS
On Sat, Oct 16, 2010 at 2:51 PM, Michael Meeks wrote: > Hi Florian,. > > On Sat, 2010-10-16 at 17:34 +0200, Bircher Florian wrote: >> Reason: missing #include > > Looks like someone merged your commit :-) Look like I forgot to reply-to-ALL again :-( Norbert > > Thanks, > > Michael. > > -- > michael.me...@novell.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
Re: [Libreoffice] Newbie dev question: no "rawbuild" directory after git clone
I've updated http://wiki.documentfoundation.org/Development#Required_Libraries.2FDeps to tell the developer to run make in loroot if rawbuild does not exist. This will create rawbuild. (at least, it did in my test.) Almost done installing LibreOffice on my end. David Norton On Sat, Oct 16, 2010 at 14:10, Terrell Prude' Jr. wrote: > Michael Meeks wrote: > >> Hi Terrell, >> >> On Fri, 2010-10-15 at 20:07 -0400, Terrell Prude' Jr. wrote: >> >> >>> I'm attempting to get a proper development environment to build >>> LibreOffice. Pulled a clone of the git repository, and it looks like I have >>> everything except for the loroot/rawbuild directory. Problem: looks like >>> the rawbuild directory is needed for building LibreOffice. Here's what I >>> did. >>> >>> >> .. >> >> >>> After that, an "ls " shows everything on the development Wiki page except >>> for rawbuild/. >>> >>> >> >>Odd :-) it is possible that rawbuild is created by 'bin/unpack' >> which >> is run as you do your first 'make' - if so, we should update the wiki >> page that describes the directories; can you test & see ? >> >>http://wiki.documentfoundation.org/Development/Code_Overview >> >>Thanks ! >> >>Michael. >> >> > > OK, I just learned it's a good idea to "Reply-All" when responding to > ensure the list sees replies. :-) > > Glad to test, but a little tip would help. My other boxes, including the > one I'm on now, are all running CentOS 5, and the "yum-builddep > openoffice.org" command returns "no openoffice.org.src". Is there a > specific repository I need to point to? > > My other box, running Debian Lenny, just finished compiling and > dev-installing, and LibreOffice comes up just great on it. Cool beans! > Thanks to Kohei for the "bin/g pull -r" trick from loroot/ to get rawbuild/ > on that guy. > > --TP > > > ___ > 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] error in put()
On Sun, Oct 17, 2010 at 05:58:23PM +0200, Thomas Klausner wrote: > With some help from Fridrich, we found that it wanted to use the > external one, but still doesn't respect LDFLAGS here. Setting > ENVLINKFLAGS solved this problem. > > Fails later now, though: > Making:libstdstrm.a > ar -r -L/usr/pkg/lib -Wl,-R/usr/pkg/lib > ../unxbsdx3.pro/lib/libstdstrm.a ../unxbsdx3.pro/obj/stream.o > ../unxbsdx3.pro/obj/strmsys.o ../unxbsdx3.pro/obj/cachestr.o > ../unxbsdx3.pro/obj/vcompat.o > ranlib ../unxbsdx3.pro/lib/libstdstrm.a > ar: illegal option -- L Running parts of the build without environment variables, parts with, makes it continue until: g++ -fmessage-length=0 -c -O1 -DENABLE_LAYOUT=0 -DENABLE_LAYOUT_EXPERIMENTAL=0 -I/usr/pkg/include -I/usr/pkg/include/libxml2 -DSYSTEM_DB -I/usr/pkg/include -DSYSTEM_EXPAT -I. -I../../unxbsdx3.pro/inc/HelpLinker -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxbsdx3.pro/inc -I. -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/stl -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/external -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/inc -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/res -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/stl -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/inc/Xp31 -I/usr/pkg/java/openjdk7/include -I/usr/pkg/java/openjdk7 /include/netbsd -I/usr/pkg/java/openjdk7/include/native_threads/include -I/usr/X11R7/include -I/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/inc/offuh -I. -I../../res -I. -pipe -Wno-ctor-dtor-privacy-DNETBSD -DUNX -DVCL -DGCC -DC341 -DX86_64 -DX86_64 -pthread -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/g++ -DSUPD=330 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGSTREAMER -DCUI -DSOLAR_JAVA -DHELPLINKER_DLLIMPLEMENTATION -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o ../../unxbsdx3.pro/obj/HelpLinker.o /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx: In member function 'void HelpKeyword::dump(DB*)': /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:231: error: invalid conversion from 'DBT*' to 'unsigned int' /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:231: error: too many arguments to function /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx: In member function 'void HelpLinker::addBookmark(DB*, FILE*, std::string, const std::string&, const std::string&, const std::string&, const std::string&)': /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:383: error: invalid conversion from 'DBT*' to 'unsigned int' /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:383: error: too many arguments to function /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx: In member function 'void HelpLinker::link()': /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:679: error: invalid conversion from 'DBT*' to 'unsigned int' /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/l10ntools/source/help/HelpLinker.cxx:679: error: too many arguments to function dmake: Error code 1, while making '../../unxbsdx3.pro/obj/HelpLinker.obj' Line 231 is: table->put(table, NULL, &key, &value, 0); 383 is: dbBase->put(dbBase, NULL, &key, &data, 0); 679 is: helpText->put(helpText, NULL, &keyDbt, &textDbt, 0); What's the "put" prototype? Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] missing libicui18n
On Sun, Oct 17, 2010 at 9:37 AM, Thomas Klausner wrote: > Hi! > > I hacked around a few build issues (I'm not yet sure how to handle the > rpath issues, ignore the -Wl,-R parts below), now the build fails for > me with: > > Entering > /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/i18npool/source/indexentry > > Making: genindex_data > unx > g++ -Wl,-z,combreloc -Wl,-z,defs > -Wl,-R/usr/local/lib/libreoffice/basis-link/program > -Wl,-R/usr/local/lib/libreoffice@/basis-link/ure-link/lib > -Wl,-R/archive/cvs/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib > > -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib > -Wl,-export-dynamic -L../../unxbsdx3.pro/lib -L../lib > -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/lib > -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib > -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/lib > -L/usr/pkg/java/openjdk7/lib -L/usr/pkg/java/openjdk7/jre/lib/amd64 > -L/usr/pkg/java/openjdk7/jre/lib/amd64/client > -L/usr/pkg/java/openjdk7/jre/lib/amd64/native_threads -L/usr/X11R7/lib > -R/usr/X11R7/lib -L/usr/pkg/lib/xulrunner-sdk/sdk/lib > ../../unxbsdx3.pro/obj/genindex_data.o \ > -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -luno_sal -licui18n > -licuuc -licudata -lm -lc -lgcc_s -lstdc++ -lpthread -o > ../../unxbsdx3.pro/bin/genindex_data > ld: cannot find -licui18n > dmake: Error code 1, while making '../../unxbsdx3.pro/bin/genindex_data' > > And it's true, there is no libicui18n* anywhere. How should it have been > built? libicui18n is part of ICU. there is an icu package that is bundled with libreoffice, but it's use it conditioned with the --with-system-icu flags. If you build with the later flags then you system version of icu will be used... and if you do not have one... you're in trouble (I'm not sure this is the reason for your specific problem, just extrapolating a possible cause) Norbert > > Thanks, > Thomas > ___ > 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] ODF thumbnailer for win32/osx
Does LibreOffice ship an ODF thumbnail implementation for file-managers on Windows and Mac OSX? If so, where in the sources can I find it? If not, can anyone point me to other implementations? -- Regards Jon Nordby - www.jonnor.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ure: Fix more typos in documentation
On Sun, Oct 17, 2010 at 9:44 AM, Aurimas Fišeras wrote: > 2010.10.17 17:15, Norbert Thiebaud rašė: >> On Sun, Oct 17, 2010 at 6:35 AM, Aurimas Fišeras wrote: >>> >>> Fixes more typos in documentation. >> >> Aurimas, >> >> Thanks for the patch. >> >> I partially merged it, based on the following criteria: >> >> 1/ we can't have unicode characters in the source code, so I did not >> merge "Bézier" which showed up as Bzier. for me. > It's unfortunate, what causes such limitation? History, the weight of millions of line of existing code, and the fact that Unicode support is still only recently ubiquitous. The good news is that ascci being a subset of utf-8, at some point in the future it might be possible to switch to utf-8... but the cost/benefit ratio is not in favor of such endeavor > However, it should at > least be "Bezier" with a capital B. I'll fix it later. > Sure. >> >> 2/ Some of these correction were a matter of British English vs American >> English > Yes, I greped all documentation and there were more instances of > American English (e.g. behavior) than British English so I used American > English spelling to be more consistent. > > There are files where both spellings are used in the same file. Which > spelling should be used in this case? > > As I understand from lack of en-US translation in libreoffice/l10n, > en-US is the primary language of LibreOffice? Documentation should also > be in en-US, shouldn't it? Honestly I do not have a strong opinion on the matter, and I didn't want to be the one starting a turf war on english dialect. > >> >> 3/ Some were neologism that have - in my view anyway - a distinct sens >> in the context of computing. prepend for example has a meaning which I >> find distinct to prefix (prefix/postfix - prepend/append) > I didn't see any difference between prepend and prefix in that > particular place and replaced it with a more formal "to prefix" > "prepend definition jargon /pree'pend'/ (by analogy with "append") To > prefix or add to the beginning." > However, I will leave the only other place where it is used unchanged ;) I have only read the change you submitted... so I don't know about the other places... It's just that I have used, in API names, the symmetry of append/prepend (like chaine_append(...) and chaine_prepend(...)) so I can imagine that the use of prepend _may_ have been intentional. > >> >> I also apologized, but I had to submit your contribution under Aurimas >> Fiseras, as I was not able to type Fišeras in my console > ;) > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] missing libicui18n
On Sun, Oct 17, 2010 at 04:37:29PM +0200, Thomas Klausner wrote: > And it's true, there is no libicui18n* anywhere. How should it have been > built? With some help from Fridrich, we found that it wanted to use the external one, but still doesn't respect LDFLAGS here. Setting ENVLINKFLAGS solved this problem. Fails later now, though: Making:libstdstrm.a ar -r -L/usr/pkg/lib -Wl,-R/usr/pkg/lib ../unxbsdx3.pro/lib/libstdstrm.a ../unxbsdx3.pro/obj/stream.o ../unxbsdx3.pro/obj/strmsys.o ../unxbsdx3.pro/obj/cachestr.o ../unxbsdx3.pro/obj/vcompat.o ranlib ../unxbsdx3.pro/lib/libstdstrm.a ar: illegal option -- L Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ure: Fix more typos in documentation
2010.10.17 17:15, Norbert Thiebaud rašė: > On Sun, Oct 17, 2010 at 6:35 AM, Aurimas Fišeras wrote: >> >> Fixes more typos in documentation. > > Aurimas, > > Thanks for the patch. > > I partially merged it, based on the following criteria: > > 1/ we can't have unicode characters in the source code, so I did not > merge "Bézier" which showed up as Bzier. for me. It's unfortunate, what causes such limitation? However, it should at least be "Bezier" with a capital B. I'll fix it later. > > 2/ Some of these correction were a matter of British English vs American > English Yes, I greped all documentation and there were more instances of American English (e.g. behavior) than British English so I used American English spelling to be more consistent. There are files where both spellings are used in the same file. Which spelling should be used in this case? As I understand from lack of en-US translation in libreoffice/l10n, en-US is the primary language of LibreOffice? Documentation should also be in en-US, shouldn't it? > > 3/ Some were neologism that have - in my view anyway - a distinct sens > in the context of computing. prepend for example has a meaning which I > find distinct to prefix (prefix/postfix - prepend/append) I didn't see any difference between prepend and prefix in that particular place and replaced it with a more formal "to prefix" "prepend definition jargon /pree'pend'/ (by analogy with "append") To prefix or add to the beginning." However, I will leave the only other place where it is used unchanged ;) > > I also apologized, but I had to submit your contribution under Aurimas > Fiseras, as I was not able to type Fišeras in my console ;) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] missing libicui18n
Hi! I hacked around a few build issues (I'm not yet sure how to handle the rpath issues, ignore the -Wl,-R parts below), now the build fails for me with: Entering /disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/i18npool/source/indexentry Making:genindex_data unx g++ -Wl,-z,combreloc -Wl,-z,defs -Wl,-R/usr/local/lib/libreoffice/basis-link/program -Wl,-R/usr/local/lib/libreoffice@/basis-link/ure-link/lib -Wl,-R/archive/cvs/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib -Wl,-export-dynamic -L../../unxbsdx3.pro/lib -L../lib -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/lib -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solver/330/unxbsdx3.pro/lib -L/disk/2/archive/libreoffice/build/libreoffice-3.2.99.2/solenv/unxbsdx3/lib -L/usr/pkg/java/openjdk7/lib -L/usr/pkg/java/openjdk7/jre/lib/amd64 -L/usr/pkg/java/openjdk7/jre/lib/amd64/client -L/usr/pkg/java/openjdk7/jre/lib/amd64/native_threads -L/usr/X11R7/lib -R/usr/X11R7/lib -L/usr/pkg/lib/xulrunner-sdk/sdk/lib ../../unxbsdx3.pro/obj/genindex_data.o \ -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -luno_sal -licui18n -licuuc -licudata -lm -lc -lgcc_s -lstdc++ -lpthread -o ../../unxbsdx3.pro/bin/genindex_data ld: cannot find -licui18n dmake: Error code 1, while making '../../unxbsdx3.pro/bin/genindex_data' And it's true, there is no libicui18n* anywhere. How should it have been built? Thanks, Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ure: Fix more typos in documentation
On Sun, Oct 17, 2010 at 6:35 AM, Aurimas Fišeras wrote: > > Fixes more typos in documentation. Aurimas, Thanks for the patch. I partially merged it, based on the following criteria: 1/ we can't have unicode characters in the source code, so I did not merge "Bézier" which showed up as Bzier. for me. 2/ Some of these correction were a matter of British English vs American English 3/ Some were neologism that have - in my view anyway - a distinct sens in the context of computing. prepend for example has a meaning which I find distinct to prefix (prefix/postfix - prepend/append) I also apologized, but I had to submit your contribution under Aurimas Fiseras, as I was not able to type Fišeras in my console Norbert > > Patch is contributed under the LGPLv3+. > > > > ___ > 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
Re: [Libreoffice] [Pushed] [PATCH]SAL_N_ELEMENTS
On Sat, Oct 16, 2010 at 7:13 PM, Kenneth Venken wrote: > Hi, > > some patches to fix EASY HACK 2.6 Pushed, Thanks. Norbert > > found some equivalent macros: > - elementsof > - ELEMENTS_OF_ARRAY > - bufsizeof > > i'll try and replace them all with SAL_N_ELEMENTS tomorrow. > > > > ___ > 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
Re: [Libreoffice] The Windows installer
On 10/14/2010 12:00 PM, Tor Lillqvist wrote: I see that it's an installer that includes all the languages but i wonder if it is really necessary and if the languages are the only cause. Well, there certainly isn't hundreds (or even tens) of megabytes of new code, as far as I know, so yes, it must be the languages. Clearly it's not code. I thought about debugging symbols or something that went wrong during compilation or that got erroneously included in the final archive. Of course, this is supposed to be a meritocracy, I think, so if you have actual experience in building and packaging OOo or LO installers, that gives you more clout. I'm not a developer, just a user and i'm trying to help filing bug report, testing your beta releases and discussing like now to make LibreOffice better. I really appreciate this open approach. Sorry, but I think that is against the Document Foundation's "Next Decade Manifesto", which says: "WE REJECT: [...] the creeping domination of computer desktops by a single language forcing people to learn a foreign language before they can express themselves electronically" When i wrote the message i didn't read the manifesto. I understand your point. OK, so if an *installer* could be multi-lingual even if it installs just the English UI, what you say could be a viable approach. Currently that is not possible, as far as I know, but it should be possible to do it that way using some amount of work on the Perl code that directs the installer generation. Something to discuss, sure. In my opinion: * 320 MB for an installer is too much. If you don't have a fast internet access or if you have a mobile provider that gives you time/data limit, probably you'd have to find another way to get LibreOffice. * An unique installer that include all the languages is a really good idea if we are able to find a way to reduce its size to saner value. Up to then, i find more viable the approach of providing separate installer for each language. This is something to which OOo users are already comfortable with. And i think that also in this case the installer is already big enough! ;-) * A multi-lingual installer, as you said, that include only a single language has some options: - the localized build is integrated, and so you are again in the OOo default, where you have to download an installer for the language you want. - the installer is only the installer and doesn't include the LO archive. In that case you have to find a way to obtain it: the installer can download it (i don't really like that options, since makes life more difficult for administrators), or the user have to manually download both the installer and the localized LO build (similar, but inversed go-oo approach). For now i'd stay with the OOo default (and many other projects default) to have one installer for one language. Just my opinion. Ciao. Cesare. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove bogus version control comments
Fairly trivial patch removing bogus version control comments, in order
to test and get to know the build / git management / patch generation
and submission process.
Patch is contributed under the LGPLv3+.
If the format is incorrect and should be submitted another way, please
let me know!
From 34f8ed2ae24e75f46b2cdd98b0653165b07f8ef3 Mon Sep 17 00:00:00 2001
From: Mattias Johnsson
Date: Sun, 17 Oct 2010 22:30:14 +1100
Subject: [PATCH] Remove bogus version control comments
---
sw/source/core/access/accmap.cxx | 128 ++---
1 files changed, 7 insertions(+), 121 deletions(-)
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 141b38b..75acf31 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -69,12 +69,9 @@
#include
#include
#include
-// OD 15.01.2003 #103492#
#include
-// --> OD 2005-12-13 #i27301#
#include
#include
-// <--
#include
#include
@@ -158,10 +155,6 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/,
{
// do not broadcast notifications for writer fly frames, because there
// are no shapes that need to know about them.
-// OD 01.07.2003 #110554# - correct condition in order not to broadcast
-// notifications for writer fly frames.
-// OD 01.07.2003 #110554# - do not broadcast notifications for plane
-// objects
const SdrHint *pSdrHint = PTR_CAST( SdrHint, &rHint );
if ( !pSdrHint ||
( pSdrHint->GetObject() &&
@@ -236,11 +229,9 @@ public:
maInfo.SetSdrView( pMap->GetShell()->GetDrawView() );
maInfo.SetWindow( pMap->GetShell()->GetWin() );
maInfo.SetViewForwarder( pMap );
-// --> OD 2005-08-08 #i52858# - method name changed
uno::Reference < document::XEventBroadcaster > xModelBroadcaster =
new SwDrawModellListener_Impl(
pMap->GetShell()->getIDocumentDrawModelAccess()->GetOrCreateDrawModel() );
-// <--
maInfo.SetControllerBroadcaster( xModelBroadcaster );
}
@@ -334,9 +325,7 @@ private:
// the same as xAcc for any other
// event type
EventType meType; // The event type
-// --> OD 2005-12-12 #i27301# - use new type definition for
tAccessibleStates mnStates; // check states or update caret pos
-// <--
SwAccessibleEvent_Impl& operator==( const SwAccessibleEvent_Impl& );
@@ -383,7 +372,6 @@ public:
"wrong event constructor, (CHILD_)POS_CHANGED only" );
}
-// --> OD 2005-12-12 #i27301# - use new type definition for parameter <_nStates>
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
const SwAccessibleChild& rFrmOrObj,
@@ -432,12 +420,10 @@ public:
}
// only used in method
-// --> OD 2005-12-12 #i27301# - use new type definition for parameter <_nStates>
inline void SetStates( tAccessibleStates _nStates )
{
mnStates |= _nStates;
}
-// <--
inline sal_Bool IsUpdateCursorPos() const
{
@@ -451,32 +437,26 @@ public:
{
return (mnStates & ACC_STATE_RELATION_MASK) != 0;
}
-// --> OD 2005-12-12 #i27301# - new event TEXT_SELECTION_CHANGED
inline sal_Bool IsInvalidateTextSelection() const
{
return ( mnStates & ACC_STATE_TEXT_SELECTION_CHANGED ) != 0;
}
-// <--
-// --> OD 2009-01-07 #i88069# - new event TEXT_ATTRIBUTE_CHANGED
+
inline sal_Bool IsInvalidateTextAttrs() const
{
return ( mnStates & ACC_STATE_TEXT_ATTRIBUTE_CHANGED ) != 0;
}
-// <--
-// --> OD 2005-12-12 #i27301# - use new type definition
-// for return value
+
inline tAccessibleStates GetStates() const
{
return mnStates & ACC_STATE_MASK;
}
-// <--
-// --> OD 2005-12-12 #i27301# - use new type definition
-// for return value
+
inline tAccessibleStates GetAllStates() const
{
return mnStates;
}
-// <--
+
};
//--
@@ -551,9 +531,7 @@ class SwAccessibleEventMap_Impl: public _SwAccessibleEventMap_Impl
};
//--
-// --> OD 2005-12-13 #i27301# - map containing the accessible paragraph, which
-// have a selection. Needed to keep this information to submit corresponding
-// TEXT_SELECTION_CHANGED events.
+
struct SwAccessibleParaSelection
{
xub_StrLen nStartOfSelection;
@@ -581,7 +559,6 @@ typedef ::std::map< uno::WeakReference < XAccessible >,
class SwAccessibleSelectedParas_Impl: public _SwAccessibleSelectedParas_Impl
{};
-// <--
// helper class that stores preview data
class SwAccPreviewData
@@ -597,10 +574,6 @@ class SwAccPreviewData
/** adjust logic page retangle to
[Libreoffice] Fwd: [For Review] merge of most vos-removal patches left. and little related housekeeping
I've pushed the branch 'feature/vos-removal' for review I have rebased against master Saturday morning GMT, with relatively few conflict. The resulting build passed a trivial 'smoketest' (openining a couple of spreadsheet, text document ...) I have NOT built against Win or MacOS... there are almost certainly some oops for these platforms. I'll appreciate very a much feedback from person that can build on these targets. There is still a little bit of vos left but the end is near. For reviewers: commit marked as 'merge of vosremoval-xxx' are meant to be more-or-less a transcription of the original patch in dev300 with the same name. Most of these patches did not apply very well, actually for many of them they mis-apply so badly that I just used the original patch as a guide, without even bothering with trying to apply. Along the way I did some re factoring around Guard on the SolarMutex. Few modules had there own variation of a Guard class for the SolarMutex, some other used directly vos:OGuard aGuard(Application::GetSolarMutex()) Now for these use-pattern I mostly use ::SolarMutexGuard aGuard Below is the relevant git-log n...@tpa10 ~/git/oo/build/clone/libs-gui (feature/vos-removal)$ g log master...HEAD = artwork = = base = commit 042d9be3f340fb68407edc23eda8275da730e9bd Author: Norbert Thiebaud Date: Sat Oct 16 03:13:32 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually commit e10b3f985f9ecc9043ba0b3829a178931bae66d3 Author: Norbert Thiebaud Date: Fri Oct 15 12:22:54 2010 -0500 merge vosremoval-reference.diff commit 11628553d86d9223f2d56a0a420627c529da309a Author: Norbert Thiebaud Date: Thu Oct 14 22:00:34 2010 -0500 repl OClearableGuard(SolarMutex) by SolarMutexGuard as none needed clear() Four site used a Clearbale Guard on the SolarMutex, but non of these site actually needed to clear the Guard, so SolarMutexGuard fit nicely commit d502d4f6a6e08e72b1a8f22b55b23c74354f653b Author: Norbert Thiebaud Date: Wed Oct 13 01:38:41 2010 -0500 use SolarMutexGuard to guard the SolarMutex = bootstrap = commit 09243b571ef85a77ce5f76eed4b9f5d7cea16d61 Author: Norbert Thiebaud Date: Sat Oct 16 03:14:13 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually = calc = commit cfe3128ea5689d1a1539f50994c98e324f8de56d Author: Norbert Thiebaud Date: Sat Oct 16 03:15:13 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually commit f5aae02fc75814fe8f54345adc06276bd00d4c21 Author: Norbert Thiebaud Date: Fri Oct 15 12:20:01 2010 -0500 merge vosremoval-reference.diff commit ccb5d7fcc1521348bd1d42a35b85a31400379e11 Author: Norbert Thiebaud Date: Thu Oct 14 22:22:13 2010 -0500 Use a SolarMutexGuard rather that direct acquire/release on the SolarMutex commit 548db1dced20c99d75611e25c4b5729766b41eb1 Author: Norbert Thiebaud Date: Thu Oct 14 22:20:56 2010 -0500 Replace a suspicious Guard on a solar mutex. This site use a OClearableGuard that is being converted to a SolarMutexGuard Guard will do... What is suspicious is the point where it is cleared. It seems that it is way to early to serve its declared purpose. commit 52d14efd1cf18656dcddec5e6468d4a934cb5e3c Author: Norbert Thiebaud Date: Thu Oct 14 22:18:02 2010 -0500 replace ScUnoGuard by SolarMutexGuard ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex(). This is now provided by the class SolarMutexGuard. commit c382d82381cbf69cc930f05321278b483abc53a3 Author: Norbert Thiebaud Date: Wed Oct 13 01:41:46 2010 -0500 use SolarMutexGuard to guard the SolarMutex = components = commit c439041d0ed166fc586b140284aa54c73a06bce6 Author: Norbert Thiebaud Date: Sat Oct 16 04:30:41 2010 -0500 migrate vos::OModule to osl:Module commit f8802b92d4c10092f23ba19fce17306fb84fff54 Author: Norbert Thiebaud Date: Sat Oct 16 03:15:49 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually commit fb5f1c44fc068f86b44ed23cdc05be5a83a4c916 Author: Norbert Thiebaud Date: Fri Oct 15 12:18:51 2010 -0500 merge vosremoval-reference.diff commit 3eac7d8aa940fef1234e3ae6bd43cadda6fbc4af Author: Norbert Thiebaud Date: Thu Oct 14 22:03:58 2010 -0500 migrate use of OClearableGuard(SolarMutex) to SolarMutexGuard 3 helper class and a site were using OClearableGuard on the SolarMutex None of these actually needed the Clearable feature, so they were replaced by a simple SolarMutexGuard. commit 755807090d1a5e6d679763891034d1856e62bf6b Author: Norbert Thiebaud Date: Thu Oct 14 14:00:57 2010 -0500 remove the class TLBSolarMutex and u
[Libreoffice] [PATCH] replaces elementsof with SAL_N_ELEMENTS
Hi,
these patches removes the elementsof macro, defined in
, and replaces it with the SAL_N_ELEMENTS
macro, defined in
Kenneth
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp
index f7918ee..bb4821b 100644
--- a/crashrep/source/win32/soreport.cpp
+++ b/crashrep/source/win32/soreport.cpp
@@ -60,6 +60,7 @@
#endif
#include
+#include
#include
#include
#include
@@ -155,7 +156,7 @@ static FILE *_tmpfile(void)
TCHAR szTempPath[MAX_PATH];
-if ( GetTempPath( elementsof(szTempPath), szTempPath ) )
+if ( GetTempPath( SAL_N_ELEMENTS(szTempPath), szTempPath ) )
{
TCHAR szFileName[MAX_PATH];
@@ -397,27 +398,27 @@ void CrashReportParams::ReadFromEnvironment()
{
TCHAR szBuffer[2048];
-DWORD dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYSERVER"), szBuffer, elementsof(szBuffer) );
+DWORD dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYSERVER"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
-if ( dwResult && dwResult < elementsof(szBuffer) )
+if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
sProxyServer = szBuffer;
-dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYPORT"), szBuffer, elementsof(szBuffer) );
+dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPPROXYPORT"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
-if ( dwResult && dwResult < elementsof(szBuffer) )
+if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
sProxyPort = szBuffer;
-dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_RETURNADDRESS"), szBuffer, elementsof(szBuffer) );
+dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_RETURNADDRESS"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
-if ( dwResult && dwResult < elementsof(szBuffer) )
+if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
{
sEmail = szBuffer;
// fAllowContact = TRUE;
}
-dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPCONNECTIONTYPE"), szBuffer, elementsof(szBuffer) );
+dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_HTTPCONNECTIONTYPE"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
-if ( dwResult && dwResult < elementsof(szBuffer) )
+if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
{
if ( 0 == _tcsicmp( szBuffer, _T("DIRECT") ) )
uInternetConnection = 1;
@@ -427,15 +428,15 @@ void CrashReportParams::ReadFromEnvironment()
uInternetConnection = 0;
}
-dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_SUBJECT"), szBuffer, elementsof(szBuffer) );
+dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_SUBJECT"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
-if ( dwResult && dwResult < elementsof(szBuffer) )
+if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
sTitle = szBuffer;
-dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_BODYFILE"), szBuffer, elementsof(szBuffer) );
+dwResult = GetEnvironmentVariable( TEXT("ERRORREPORT_BODYFILE"), szBuffer, SAL_N_ELEMENTS(szBuffer) );
-if ( dwResult && dwResult < elementsof(szBuffer) )
+if ( dwResult && dwResult < SAL_N_ELEMENTS(szBuffer) )
{
FILE *fp = _xfopen( szBuffer, _T("rb") );
@@ -446,11 +447,11 @@ void CrashReportParams::ReadFromEnvironment()
sComment = TEXT("");
-while ( 0 != (nBytesRead = fread( aUTF8Buffer, sizeof(aUTF8Buffer[0]), elementsof(aUTF8Buffer), fp )) )
+while ( 0 != (nBytesRead = fread( aUTF8Buffer, sizeof(aUTF8Buffer[0]), SAL_N_ELEMENTS(aUTF8Buffer), fp )) )
{
TCHAR aBuffer[256+1];
-DWORD dwCharacters = MultiByteToWideChar( CP_UTF8, 0, aUTF8Buffer, nBytesRead, aBuffer, elementsof(aBuffer) - 1 );
+DWORD dwCharacters = MultiByteToWideChar( CP_UTF8, 0, aUTF8Buffer, nBytesRead, aBuffer, SAL_N_ELEMENTS(aBuffer) - 1 );
aBuffer[dwCharacters] = 0;
sComment += aBuffer;
}
@@ -513,7 +514,7 @@ static int LoadAndFormatString( HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer,
TCHAR szBuffer[FORMATBUFSIZE];
TCHAR szBuffer2[FORMATBUFSIZE];
-LoadString( hInstance, uID, szBuffer, elementsof(szBuffer) );
+LoadString( hInstance, uID, szBuffer, SAL_N_ELEMENTS(szBuffer) );
LPCTSTR src;
LPTSTR dest;
@@ -622,7 +623,7 @@ static string GetModuleDirectory( HMODULE hModule )
CHAR szModuleNameUTF8[MAX_PATH] = "";
-WideCharToMultiByte( CP_UTF8, 0, szModuleName, -1, szModuleNameUTF8, elementsof(szModuleNameUTF8), NULL, NULL );
+WideCharToMultiByte( CP_UTF8, 0, szModuleName, -1, szModuleNameUTF8, SAL_N_ELEMENTS(szModuleNameUTF8), NULL, NULL );
return string( szModuleNameUTF8 );
}
@@ -661,7 +662,7 @@ BOOL WriteReportFile( CrashReportParams *pParams )
BOOL fSuccess = FALSE;
TCHAR szTempPath[MAX_PATH];
-if ( GetTempPath( elementsof(szTempPath), szTempPath ) )
+if ( Get
[Libreoffice] [For Review] mer of most vos-removal patches left. and little related houskeeping
I've pushed the branch 'feature/vos-removal' for review I have rebased against master Saturday morning GMT, with relatively few conflict. The resulting build passed a trivial 'smoketest' (openining a couple of spreadsheet, text document ...) I have NOT built against Win or MacOS... there are almost certainly some oops for these platforms. I'll appreciate very a much feedback from person that can build on these targets. There is still a little bit of vos left but the end is near. For reviewers: commit marked as 'merge of vosremoval-xxx' are meant to be more-or-less a transcription of the original patch in dev300 with the same name. Most of these patches did not apply very well, actually for many of them they mis-apply so badly that I just used the original patch as a guide, without even bothering with trying to apply. Along the way I did some re factoring around Guard on the SolarMutex. Few modules had there own variation of a Guard class for the SolarMutex, some other used directly vos:OGuard aGuard(Application::GetSolarMutex()) Now for these use-pattern I mostly use ::SolarMutexGuard aGuard Below is the relevant git-log n...@tpa10 ~/git/oo/build/clone/libs-gui (feature/vos-removal)$ g log master...HEAD = artwork = = base = commit 042d9be3f340fb68407edc23eda8275da730e9bd Author: Norbert Thiebaud Date: Sat Oct 16 03:13:32 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually commit e10b3f985f9ecc9043ba0b3829a178931bae66d3 Author: Norbert Thiebaud Date: Fri Oct 15 12:22:54 2010 -0500 merge vosremoval-reference.diff commit 11628553d86d9223f2d56a0a420627c529da309a Author: Norbert Thiebaud Date: Thu Oct 14 22:00:34 2010 -0500 repl OClearableGuard(SolarMutex) by SolarMutexGuard as none needed clear() Four site used a Clearbale Guard on the SolarMutex, but non of these site actually needed to clear the Guard, so SolarMutexGuard fit nicely commit d502d4f6a6e08e72b1a8f22b55b23c74354f653b Author: Norbert Thiebaud Date: Wed Oct 13 01:38:41 2010 -0500 use SolarMutexGuard to guard the SolarMutex = bootstrap = commit 09243b571ef85a77ce5f76eed4b9f5d7cea16d61 Author: Norbert Thiebaud Date: Sat Oct 16 03:14:13 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually = calc = commit cfe3128ea5689d1a1539f50994c98e324f8de56d Author: Norbert Thiebaud Date: Sat Oct 16 03:15:13 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually commit f5aae02fc75814fe8f54345adc06276bd00d4c21 Author: Norbert Thiebaud Date: Fri Oct 15 12:20:01 2010 -0500 merge vosremoval-reference.diff commit ccb5d7fcc1521348bd1d42a35b85a31400379e11 Author: Norbert Thiebaud Date: Thu Oct 14 22:22:13 2010 -0500 Use a SolarMutexGuard rather that direct acquire/release on the SolarMutex commit 548db1dced20c99d75611e25c4b5729766b41eb1 Author: Norbert Thiebaud Date: Thu Oct 14 22:20:56 2010 -0500 Replace a suspicious Guard on a solar mutex. This site use a OClearableGuard that is being converted to a SolarMutexGuard Guard will do... What is suspicious is the point where it is cleared. It seems that it is way to early to serve its declared purpose. commit 52d14efd1cf18656dcddec5e6468d4a934cb5e3c Author: Norbert Thiebaud Date: Thu Oct 14 22:18:02 2010 -0500 replace ScUnoGuard by SolarMutexGuard ScUnoGaurd provide a Guard wrapper around Application::GetSolarMutex(). This is now provided by the class SolarMutexGuard. commit c382d82381cbf69cc930f05321278b483abc53a3 Author: Norbert Thiebaud Date: Wed Oct 13 01:41:46 2010 -0500 use SolarMutexGuard to guard the SolarMutex = components = commit c439041d0ed166fc586b140284aa54c73a06bce6 Author: Norbert Thiebaud Date: Sat Oct 16 04:30:41 2010 -0500 migrate vos::OModule to osl:Module commit f8802b92d4c10092f23ba19fce17306fb84fff54 Author: Norbert Thiebaud Date: Sat Oct 16 03:15:49 2010 -0500 merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually commit fb5f1c44fc068f86b44ed23cdc05be5a83a4c916 Author: Norbert Thiebaud Date: Fri Oct 15 12:18:51 2010 -0500 merge vosremoval-reference.diff commit 3eac7d8aa940fef1234e3ae6bd43cadda6fbc4af Author: Norbert Thiebaud Date: Thu Oct 14 22:03:58 2010 -0500 migrate use of OClearableGuard(SolarMutex) to SolarMutexGuard 3 helper class and a site were using OClearableGuard on the SolarMutex None of these actually needed the Clearable feature, so they were replaced by a simple SolarMutexGuard. commit 755807090d1a5e6d679763891034d1856e62bf6b Author: Norbert Thiebaud Date: Thu Oct 14 14:00:57 2010 -0500 re
Re: [Libreoffice] [PATCH] More dead code removal under connectivity
On Sun, Oct 17, 2010 at 08:04:27PM +1300, Luke Symes wrote: > This patch cleans up miscellaneous dead code in libs-core/connectivity/*. Thanks! Pushed. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] C{,PP}FLAGS ignored in sal
On Fri, Oct 15, 2010 at 06:48:34PM +0200, Thomas Klausner wrote: > On Fri, Oct 15, 2010 at 01:22:46PM +0200, David Tardon wrote: > > There is ENVCFLAGS for flags to add to $CC and ENVCFLAGSCXX for flags > > to add to $CXX . > > That's a very good tip, thank you. > > Why aren't the environment's CFLAGS and CPPFLAGS variables added > automatically? Good question :) > > Is there a similar LDFLAGS or LIBS variable? I've found ENVLIBFLAGS and ENVLINKFLAGS. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] More dead code removal under connectivity
This patch cleans up miscellaneous dead code in libs-core/connectivity/*.
From 73220a35215bdc6ae195ddf6cd2775dd15c966e4 Mon Sep 17 00:00:00 2001
From: Luke Symes
Date: Sun, 17 Oct 2010 20:01:58 +1300
Subject: [PATCH] Cleanup some more dead code under connectivity.
---
avmedia/source/gstreamer/gstplayer.cxx | 30 --
.../sun/star/sdbcx/comp/hsqldb/StorageAccess.java | 42 +---
connectivity/inc/connectivity/CommonTools.hxx |2 -
3 files changed, 1 insertions(+), 73 deletions(-)
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 78a3a9a..e415080 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -126,13 +126,8 @@ static GstBusSyncReply gst_pipeline_bus_sync_handler( GstBus *, GstMessage * mes
void Player::processMessage( GstMessage *message )
{
-//DBG ( "gst message received: src name: %s structure type: %s",
-//gst_object_get_name (message->src),
-//message->structure ? gst_structure_get_name (message->structure) : "");
-
switch( GST_MESSAGE_TYPE( message ) ) {
case GST_MESSAGE_EOS:
-//DBG( "EOS, reset state to NULL" );
gst_element_set_state( mpPlaybin, GST_STATE_READY );
mbPlayPending = false;
if (mbLooping)
@@ -160,9 +155,6 @@ void Player::processMessage( GstMessage *message )
GstBusSyncReply Player::processSyncMessage( GstMessage *message )
{
DBG( "%p processSyncMessage", this );
-//DBG ( "gst message received: src name: %s structure type: %s",
-//gst_object_get_name (message->src),
-//message->structure ? gst_structure_get_name (message->structure) : "");
if (message->structure) {
if( !strcmp( gst_structure_get_name( message->structure ), "prepare-xwindow-id" ) && mnWindowID != 0 ) {
@@ -245,9 +237,6 @@ void Player::preparePlaybin( const ::rtl::OUString& rURL, bool bFakeVideo )
{
GstBus *pBus;
-//sal_Bool aSuccess = osl_setCondition( maSizeCondition );
-//DBG( "%p set condition result: %d", this, aSuccess );
-
if( mpPlaybin != NULL ) {
gst_element_set_state( mpPlaybin, GST_STATE_NULL );
mbPlayPending = false;
@@ -301,8 +290,6 @@ bool Player::create( const ::rtl::OUString& rURL )
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
-//DBG ("Player::start");
-
// set the pipeline state to READY and run the loop
if( mbInitialized && NULL != mpPlaybin )
{
@@ -352,8 +339,6 @@ double SAL_CALL Player::getDuration( )
if( mpPlaybin && mnDuration > 0 ) {
duration = mnDuration / 1E9;
-
-//DBG( "gst duration: %lld ns duration: %lf s", gst_duration, duration );
}
return duration;
@@ -516,8 +501,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
g_object_get( G_OBJECT( mpPlaybin ), "volume", &nGstVolume, NULL );
nVolumeDB = (sal_Int16) ( 20.0*log10 ( nGstVolume ) );
-
-//DBG( "get volume: %d gst volume: %lf", nVolumeDB, nGstVolume );
}
return nVolumeDB;
@@ -573,9 +556,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
rArguments[ 2 ] >>= mnWindowID;
DBG( "window ID: %ld", mnWindowID );
}
-
-//if( !pWindow->create( aArguments ) )
-//xRet = uno::Reference< ::media::XPlayerWindow >();
}
return xRet;
@@ -588,16 +568,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
{
uno::Reference< media::XFrameGrabber > xRet;
-/*if( maURL.getLength() > 0 )
-{
-FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
-
-xRet = pGrabber;
-
-if( !pGrabber->create( maURL ) )
-xRet.clear();
-}*/
-
return xRet;
}
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
index 52d4035..8a1af51 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
@@ -24,25 +24,14 @@
* for a copy of the LGPLv3 License.
*
/
-/*
- * StorageAccess.java
- *
- * Created on 17. August 2004, 13:32
- */
package com.sun.star.sdbcx.comp.hsqldb;
-/**
- *
- * @author oj93728
- */
-
public class StorageAccess implements org.hsqldb.lib.Storage {
String key;
String name;
boolean readonly;
NativeStorageAccess access;
-// public SimpleLog appLog;
/** Creates a new instance of StorageAccess */
public StorageAccess(String name,Boolean readonly,Object key) throws java.io.IOException{
this.key = (String)key;
@@ -55,37 +44,29 @@ public class StorageAccess implements org.hsqldb.lib.Storage {
} catch(Exception e){
