[PATCH] silence odk check
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3536 to look at the new patch set (#5). Change subject: silence odk check .. silence odk check Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e --- M odk/CustomTarget_check.mk M odk/util/check.pl 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3536/5 -- To view, visit https://gerrit.libreoffice.org/3536 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/Module_external.mk
external/Module_external.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fdd24a57655c3d15addeeca12e844cc1cd4e1765 Author: David Tardon dtar...@redhat.com Date: Mon Apr 22 06:43:52 2013 +0200 msvc80 dlls are only needed for mozab driver Change-Id: I6225926807122ed6b6a3fda4fb4067da9eb240b4 diff --git a/external/Module_external.mk b/external/Module_external.mk index ee6e994..646a6d2 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_targets,external,\ Package_msms \ Package_msvc_dlls \ $(if $(MSVC_USE_DEBUG_RUNTIME),Package_msvc_dlls_debug) \ - Package_msvc80_dlls \ + $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] add a check to catch typos in Package names
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3542 to look at the new patch set (#3). Change subject: add a check to catch typos in Package names .. add a check to catch typos in Package names Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 --- M solenv/gbuild/Package.mk 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3542/3 -- To view, visit https://gerrit.libreoffice.org/3542 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Replace chained O(U)StringBuffer::append() with operator+
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3546
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3546/1
Replace chained O(U)StringBuffer::append() with operator+
modified: basctl/source/basicide/basides2.cxx
Change-Id: I681188553058ac8712365bc2de39b0453fd19ed9
---
M basctl/source/basicide/basides2.cxx
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/basctl/source/basicide/basides2.cxx
b/basctl/source/basicide/basides2.cxx
index e08fe95..8e1daa8 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -111,19 +111,15 @@
if ( !m_aCurLibName.isEmpty() )
{
LibraryLocation eLocation = m_aCurDocument.getLibraryLocation(
m_aCurLibName );
-aTitleBuf.append(m_aCurDocument.getTitle(eLocation));
-aTitleBuf.append('.');
-aTitleBuf.append(m_aCurLibName);
+aTitleBuf = m_aCurDocument.getTitle(eLocation) + . + m_aCurLibName ;
}
else
-aTitleBuf.append(IDE_RESSTR(RID_STR_ALL));
+aTitleBuf = IDE_RESSTR(RID_STR_ALL) ;
DocumentSignature aCurSignature( m_aCurDocument );
if ( aCurSignature.getScriptingSignatureState() ==
SIGNATURESTATE_SIGNATURES_OK )
{
-aTitleBuf.append(' ');
-aTitleBuf.append(IDE_RESSTR(RID_STR_SIGNED));
-aTitleBuf.append(' ');
+aTitleBuf = aTitleBuf + + IDE_RESSTR(RID_STR_SIGNED) + ;
}
OUString aTitle(aTitleBuf.makeStringAndClear());
--
To view, visit https://gerrit.libreoffice.org/3546
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I681188553058ac8712365bc2de39b0453fd19ed9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Anurag Kanungo anuragkanu...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jurt/Package_jnilib.mk
jurt/Package_jnilib.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 6e205903f044186392a9aca24203148167552159 Author: David Tardon dtar...@redhat.com Date: Mon Apr 22 06:55:25 2013 +0200 add missing package name This means the file has not been delivered since gbuildification of jurt (that is, since 3.6). Is is needed at all? Change-Id: Iccc0b83e87609fbd3e11bca2fdb8b56de818c1fe diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk index 8767d3d..bb713d1 100644 --- a/jurt/Package_jnilib.mk +++ b/jurt/Package_jnilib.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util)) -$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe +$(eval $(call gb_Package_add_files,jurt_jnilib,lib,\ + $(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)) \ +)) # vim:set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] add a check to catch typos in Package names
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3542 to look at the new patch set (#4). Change subject: add a check to catch typos in Package names .. add a check to catch typos in Package names Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 --- M solenv/gbuild/Package.mk 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3542/4 -- To view, visit https://gerrit.libreoffice.org/3542 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Help to make it possible to add custom animation to Master Slides.
-- Forwarded message -- From: Janit Anjaria jani...@gmail.com Date: Tue, Apr 16, 2013 at 2:55 PM Subject: Help to make it possible to add custom animation to Master Slides. To: libreoffice-dev libreoffice@lists.freedesktop.org Hey! I have been looking into this bug/feature( and others too ;) ) since quite a time and have figured out ways to overcome and solve this bug which LO has. --Yes, i am talking about bug#41572 : https://bugs.freedesktop.org/show_bug.cgi?id=41572 --I have seen and dig into the bug quite a lot and also into the matter.And got a patch that has dealt with the same but it hasnt been complete(that is what i suppose,or it has not solved the full purpose.) : http://cgit.freedesktop.org/libreoffice/build/tree/ patches/dev300/sd_effects_styles.diff?h=master-backup I have understood and have tried to digest the code in this patch and have almost understood the workflow(flow of logic/concept). But there have been certain places where i think i am not yet cent percent clear and would like to get some guidance from your end. -- Line#2995 : BOOL AnimationTabPage::FillItemSet( SfxItemSet rItemSet ) The function defined here is something that is not digestable and is creating ambiguity for me. -- Line#3022 : void AnimationTabPage::Reset( const SfxItemSet rSet ) --I think after going through about 3800 lines of code there,i am in a dilemma about the actual concept of Presets and SfxItemSets. It would be great if someone could provide me an indepth conceptual clarity on that so i can move ahead and plan to add something other than something that has already been worked on. And i think once i am more-n-more clear with it i can redo the reading and grasping of the already existing patch so as to guide me on the path to move ahead. --Apart from making it possible to add all the animation(esp. custom animation effects) to the master slide..i would also like to suggest something extra which can improve the utility of the feature. --We can provide something like a popup/box,etc. that can provide a user to select the slide no. as well as the textbox no. upon which he/she wants to apply the corresponding CustomAnimation Effect. --This is something that is not a part of the code in the patch(according to what i have interpreted,because it deals with various other animation effects as well),and this can surely act like a cherry on the cake and solve the purpose of this feature in the most efficient manner.(because that is something the indepth meaning of the bug#41572). --It would be great if someone can also help me out on this(in terms of code pointers for the UI,as well for the concept part) so i can start digging the code more-n-more and contribute to this project in the most efficient manner. --Any other suggestions are welcome,and i am sure it would be a boon as it would help me to enhance this crusial feature in the best possible manner. Regards, Janit ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Bug 62096 - Replace O(U)String compareTo with ==
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3547
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/3547/1
Bug 62096 - Replace O(U)String compareTo with ==
Change-Id: I3a8befcf51cea862e9bcc2670bce506004c1be9a
---
M odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
M
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
M odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
M odk/examples/java/Inspector/InspectorAddon.java
M odk/examples/java/Inspector/ProtocolHandlerAddon.java
M odk/examples/java/Spreadsheet/EuroAdaption.java
M odk/examples/java/Text/StyleInitialization.java
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
index 27a97ec..7c9c69a 100644
---
a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
+++
b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java
@@ -125,7 +125,7 @@
// XJobExecutor
public void trigger(String sEvent) {
-if ( sEvent.compareTo( execute ) == 0 ) {
+if ( sEvent = execute ) {
try {
createDialog();
}
diff --git
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
index 86d58da..c92249e 100644
---
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
+++
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
@@ -150,12 +150,12 @@
/*IN*/String sTargetFrameName,
/*IN*/int iSearchFlags ) {
XDispatch xRet = null;
-if (
aURL.Protocol.compareTo(org.openoffice.Office.addon.example:) == 0 ) {
-if ( aURL.Path.compareTo( Function1 ) == 0 )
+if ( aURL.Protocol == org.openoffice.Office.addon.example: ) {
+if ( aURL.Path == Function1 )
xRet = this;
-if ( aURL.Path.compareTo( Function2 ) == 0 )
+if ( aURL.Path == Function2 )
xRet = this;
-if ( aURL.Path.compareTo( Help ) == 0 )
+if ( aURL.Path == Help )
xRet = this;
}
return xRet;
@@ -177,17 +177,17 @@
public void dispatch( /*IN*/com.sun.star.util.URL aURL,
/*IN*/com.sun.star.beans.PropertyValue[]
aArguments ) {
-if (
aURL.Protocol.compareTo(org.openoffice.Office.addon.example:) == 0 )
+if ( aURL.Protocol == org.openoffice.Office.addon.example: )
{
-if ( aURL.Path.compareTo( Function1 ) == 0 )
+if ( aURL.Path == Function1 )
{
showMessageBox(SDK DevGuide Add-On example, Function 1
activated);
}
-if ( aURL.Path.compareTo( Function2 ) == 0 )
+if ( aURL.Path == Function2 )
{
showMessageBox(SDK DevGuide Add-On example, Function 2
activated);
}
-if ( aURL.Path.compareTo( Help ) == 0 )
+if ( aURL.Path == Help )
{
showMessageBox(About SDK DevGuide Add-On example, This
is the SDK Add-On example);
}
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index c0e165e..9ab74c5 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++
b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -390,7 +390,7 @@
String sCommand = aEvent.getActionCommand();
//-
// open any file from disk
-if( sCommand.compareTo(COMMAND_OPEN) == 0 )
+if( sCommand == COMMAND_OPEN )
{
String sURL =
FunctionHelper.askUserForFileURL(DocumentView.this,true);
if(sURL!=null)
@@ -399,14 +399,14 @@
else
//-
// save current document
-if( sCommand.compareTo(COMMAND_SAVE) == 0 )
+if( sCommand == COMMAND_SAVE )
{
DocumentView.this.save();
}
else
//-
// export current document to html
-if(
Re: [PROPOSAL] enable gerrit buildbot trigger for all in group commiter
On Sun, Apr 21, 2013 at 11:06:20PM +0200, Bjoern Michaelsen wrote: so this is a proposal to enable the ability to trigger a build for all in the group commiter (...) This sounds attractive. We can do this ~immediately and do the through web interface / gerrit when we figured out how to do it. In the current situation, group committer can not even *see* the queue. IMHO, we could let an even bigger group see the queue; buildbot seems to have a specific capability for this: $ ssh -p 29418 lmam...@gerrit.libreoffice.org buildbot show -p core fatal: lmamane does not have viewQueue capability. Now, who should be able to see the queue? My first thought would be just everybody. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 4.0] fdo#40100 YEARFRAC function returns incorrect results for some dates
Can this fix be cherry-picked for 4.0 releases (4.0.3 would be extremely nice)? The fix solves various small erroneous results of the calc function YEARFAC. BTW, http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_YEARFRAC_function now no lnger applies for LibreOffice ;-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - jpeg/ExternalPackage_jpeg.mk jurt/CustomTarget_jnilib.mk jurt/Package_jnilib.mk vcl/source
jpeg/ExternalPackage_jpeg.mk |1 -
jurt/CustomTarget_jnilib.mk | 13 +++--
jurt/Package_jnilib.mk|6 ++
vcl/source/filter/jpeg/transupp.c | 34 +++---
4 files changed, 32 insertions(+), 22 deletions(-)
New commits:
commit 845456565db945ffd2a1551ab86446fcd1717021
Author: David Tardon dtar...@redhat.com
Date: Mon Apr 22 08:14:46 2013 +0200
DO NOT use internal headers of jpeg
They ARE NOT available when using system jpeg.
Apart of that, I am not sure if it is all right to include parts of jpeg
directly into our code.
Change-Id: Ic19a22e73094d452ffd072b819020e4a46256406
diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk
index 66cfc91..c451ed5 100644
--- a/jpeg/ExternalPackage_jpeg.mk
+++ b/jpeg/ExternalPackage_jpeg.mk
@@ -13,7 +13,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,jpeg_inc,inc/external/jpeg,\
jconfig.h \
jerror.h \
jmorecfg.h \
- jpegint.h \
jpeglib.h \
))
diff --git a/vcl/source/filter/jpeg/transupp.c
b/vcl/source/filter/jpeg/transupp.c
index fd2ff37..500b0a2 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -14,11 +14,7 @@
* interfaces.
*/
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
+#include jerror.h
#include jinclude.h
#include jpeglib.h
#include transupp.h /* My own external interface */
@@ -86,6 +82,22 @@
*source buffer it is an undocumented property of jdcoefct.c.
*/
+static void lcl_jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,
JDIMENSION num_blocks)
+/* Copy a row of coefficient blocks from one place to another. */
+{
+#ifdef FMEMCOPY
+ FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF)));
+#else
+ register JCOEFPTR inptr, outptr;
+ register long count;
+
+ inptr = (JCOEFPTR) input_row;
+ outptr = (JCOEFPTR) output_row;
+ for (count = (long) num_blocks * DCTSIZE2; count 0; count--) {
+*outptr++ = *inptr++;
+ }
+#endif
+}
LOCAL(void)
do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
@@ -116,7 +128,7 @@ do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
dst_blk_y + y_crop_blocks,
(JDIMENSION) compptr-v_samp_factor, FALSE);
for (offset_y = 0; offset_y compptr-v_samp_factor; offset_y++) {
-jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
+lcl_jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
dst_buffer[offset_y],
compptr-width_in_blocks);
}
@@ -176,12 +188,12 @@ do_flip_h_no_crop (j_decompress_ptr srcinfo,
j_compress_ptr dstinfo,
}
if (x_crop_blocks 0) {
/* Now left-justify the portion of the data to be kept.
- * We can't use a single jcopy_block_row() call because that routine
+ * We can't use a single lcl_jcopy_block_row() call because that routine
* depends on memcpy(), whose behavior is unspecified for overlapping
* source and destination areas. Sigh.
*/
for (blk_x = 0; blk_x compptr-width_in_blocks; blk_x++) {
-jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks,
+lcl_jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks,
buffer[offset_y] + blk_x,
(JDIMENSION) 1);
}
@@ -243,7 +255,7 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
}
} else {
/* Copy last partial block(s) verbatim */
-jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
+lcl_jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
dst_row_ptr + dst_blk_x,
(JDIMENSION) 1);
}
@@ -324,7 +336,7 @@ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
}
} else {
/* Just copy row verbatim. */
- jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
+ lcl_jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
dst_buffer[offset_y],
compptr-width_in_blocks);
}
@@ -630,7 +642,7 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr
dstinfo,
}
} else {
/* Any remaining right-edge blocks are only copied. */
- jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
+ lcl_jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
dst_row_ptr + dst_blk_x,
(JDIMENSION) 1);
}
commit f9c45046f39029a69f6ab90a972459d8c12f065e
Author: David Tardon dtar...@redhat.com
Date: Mon Apr 22 07:33:38 2013 +0200
create the jnilib in the right dir
macosx-create-bundle creates the .jnilib symlink in the same dir the
library is in. But we do not want to create stuff directly in $(OUTDIR).
Change-Id:
[PATCH] add a check to catch typos in Package names
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3542 to look at the new patch set (#5). Change subject: add a check to catch typos in Package names .. add a check to catch typos in Package names Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 --- M solenv/gbuild/Package.mk 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3542/5 -- To view, visit https://gerrit.libreoffice.org/3542 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] replace python-core zip built in pyuno with direct use of Pa...
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3525 to look at the new rebased patch set (#3). Change subject: replace python-core zip built in pyuno with direct use of Package .. replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset and do not deliver .lib files - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for system python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR and link against libraries in UnpackedTarball dir Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 --- M RepositoryExternal.mk M python3/ExternalPackage_python3.mk M pyuno/CustomTarget_zipcore.mk M pyuno/Module_pyuno.mk M scp2/source/python/file_python.scp M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 9 files changed, 72 insertions(+), 116 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/3 -- To view, visit https://gerrit.libreoffice.org/3525 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: jurt/Package_jnilib.mk
jurt/Package_jnilib.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 65d3bc8d40f0e10557523117464fa7c2a103636b Author: David Tardon dtar...@redhat.com Date: Mon Apr 22 08:44:58 2013 +0200 fix stupid typo Change-Id: I901a25894e4229dfae9393960b2f55aac604ab45 diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk index 2d33105..7a69d7c 100644 --- a/jurt/Package_jnilib.mk +++ b/jurt/Package_jnilib.mk @@ -27,6 +27,6 @@ $(eval $(call gb_Package_Package,jurt_jnilib,$(call gb_CustomTarget_get_workdir,jurt/util))) -$(eval $(call gb_Package_add_files,jurt_jnilib,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),libjpipe.jnilib)) +$(eval $(call gb_Package_add_file,jurt_jnilib,lib/$(basename $(call gb_Library_get_filename,jpipe)).jnilib,libjpipe.jnilib)) # vim:set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 4.0] fdo#40100 YEARFRAC function returns incorrect results for some dates
Can this fix be cherry-picked for 4.0 releases (4.0.3 would be extremely nice)? The fix solves various small erroneous results of the calc function YEARFAC. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add a check to catch typos in Package names
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3542 to look at the new patch set (#6). Change subject: add a check to catch typos in Package names .. add a check to catch typos in Package names Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 --- M solenv/gbuild/Package.mk 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3542/6 -- To view, visit https://gerrit.libreoffice.org/3542 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [REVIEW 4.0] fdo#40100 YEARFRAC function returns incorrect results for some dates
Please disregard thuis second review proposal; I accidentily sent the request twice... Winfried Van: Winfried Donkers Verzonden: maandag 22 april 2013 08:45 Aan: libreoffice@lists.freedesktop.org Onderwerp: [REVIEW 4.0] fdo#40100 YEARFRAC function returns incorrect results for some dates Can this fix be cherry-picked for 4.0 releases (4.0.3 would be extremely nice)? The fix solves various small erroneous results of the calc function YEARFAC. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/util
odk/CustomTarget_check.mk |8 ++-
odk/util/check.pl | 121 +-
2 files changed, 73 insertions(+), 56 deletions(-)
New commits:
commit e640cd59ea191e82102865ff9729adc070fea293
Author: David Tardon dtar...@redhat.com
Date: Sun Apr 21 15:08:23 2013 +0200
allow odk/util/check.pl to use two base dirs
This is in preparation for my plan to move stuff out of odkcommon.zip
and install it using filelists. The moved files will be in
$(INSTDIR)/sdk, not in the Zip's workdir, so we must look for them in
both places.
Change-Id: I7dd224c9067f2dbb522b87b7057ddc02a5fa0cad
Reviewed-on: https://gerrit.libreoffice.org/3527
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index cdc83dc..ae23d3d 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -25,10 +25,14 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\
$(if $(filter MACOSX,$(OS)),macosx,\
$(if $(filter AIX,$(OS)),aix
-$(call gb_CustomTarget_get_workdir,odk/check)/checkbin:
$(SRCDIR)/odk/util/check.pl $(call gb_CustomTarget_get_target,odk/odkcommon)
+$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
+ $(SRCDIR)/odk/util/check.pl \
+ $(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
touch $@
- $(PERL) $ $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
+ $(PERL) $ \
+ $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
+ $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
$(odk_PLATFORM) $(gb_Exectable_EXT) $@
cat $@
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 5c57cbc..7380867 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -23,16 +23,29 @@
$return = 0;
-$StartDir = $ARGV[0];
-$OperatingSystem = $ARGV[1];
-$ExePrefix = $ARGV[2];
+$PrimaryDir = $ARGV[0];
+$SecondaryDir = $ARGV[1];
+$OperatingSystem = $ARGV[2];
+$ExePrefix = $ARGV[3];
+
+sub check_file
+{
+my ($file) = @_;
+return -e $PrimaryDir/$file || -e $SecondaryDir/$file;
+}
+
+sub check_dir
+{
+my ($dir) = @_;
+return -d $PrimaryDir/$dir || -d $SecondaryDir/$dir;
+}
print Check for $OperatingSystem\n;
-if (-d $StartDir) {
+if (-d $PrimaryDir || -d $SecondaryDir) {
# check binaries
print check binaries: ;
-if (-d $StartDir/bin) {
+if (check_dir(bin)) {
my @binarylist = ( idlc,cppumaker,javamaker,
regcompare,autodoc,
unoapploader, uno-skeletonmaker );
@@ -42,26 +55,26 @@ if (-d $StartDir) {
foreach $i (@binarylist)
{
-if (! -e $StartDir/bin/$i$ExePrefix) {
+if (!check_file(bin/$i$ExePrefix)) {
$return++;
-print \nERROR: \$StartDir/bin/$i$ExePrefix\ is missing\n;
+print \nERROR: \bin/$i$ExePrefix\ is missing\n;
} else {
print +;
}
}
if ($OperatingSystem eq windows || $OperatingSystem eq mingw) {
-if ($OperatingSystem eq windows ! -e
$StartDir/bin/climaker.exe) {
+if ($OperatingSystem eq windows !check_file(bin/climaker.exe)) {
$return++;
-print \nERROR: \$StartDir/bin/climaker.exe\ is missing\n;
+print \nERROR: \bin/climaker.exe\ is missing\n;
} else {
print +;
}
}
if ($OperatingSystem eq macosx) {
-if (! -e $StartDir/bin/addsym-macosx.sh) {
+if (!check_file(bin/addsym-macosx.sh)) {
$return++;
-print \nERROR: \$StartDir/bin/addsym-macosx.sh\ is missing\n;
+print \nERROR: \bin/addsym-macosx.sh\ is missing\n;
} else {
print +;
}
@@ -73,7 +86,7 @@ if (-d $StartDir) {
# packaging files
print check packaging files: ;
-if (-d $StartDir/docs) {
+if (check_dir(docs)) {
my @filelist = ( install.html,
notsupported.html,sdk_styles.css,tools.html,
images/arrow-1.gif, images/arrow-3.gif,
@@ -90,9 +103,9 @@ if (-d $StartDir) {
foreach $i (@filelist)
{
-if (! -e $StartDir/docs/$i) {
+if (!check_file(docs/$i)) {
$return++;
-print \nERROR: \$StartDir/docs/$i\ is missing\n;
+print \nERROR: \docs/$i\ is missing\n;
} else {
print +;
}
@@ -105,37 +118,37 @@ if (-d $StartDir) {
#check configure files
print check config files: ;
if ($OperatingSystem eq windows || $OperatingSystem eq mingw) {
-if (! -e $StartDir/setsdkenv_windows.bat) {
-print \nERROR: \$StartDir/setsdkenv_windows.bat\ is missing\n;
+if (!check_file(setsdkenv_windows.bat)) {
+print \nERROR: \setsdkenv_windows.bat\ is missing\n;
$return++;
}
-if (! -e $StartDir/setsdkenv_windows.template) {
-
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk
odk/CustomTarget_check.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df09d47db035e08b3f86bb44a88b12fce6757325 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 15:40:28 2013 +0200 fix typo Change-Id: I58f0cd2248310fd7c5f1c82a6d10acc5a2446169 Reviewed-on: https://gerrit.libreoffice.org/3528 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index ae23d3d..b7454d6 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(PERL) $ \ $(INSTDIR)/$(gb_Package_SDKDIRNAME) \ $(call gb_CustomTarget_get_workdir,odk/odkcommon) \ - $(odk_PLATFORM) $(gb_Exectable_EXT) $@ + $(odk_PLATFORM) $(gb_Executable_EXT) $@ cat $@ # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/CustomTarget_bin.mk odk/CustomTarget_check.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Package_bin.mk odk/Package_macosx.mk scp2/source
odk/CustomTarget_bin.mk| 42 - odk/CustomTarget_check.mk |2 + odk/CustomTarget_odkcommon.mk |1 odk/Module_odk.mk |8 ++- odk/Package_bin.mk | 28 odk/Package_macosx.mk | 16 ++ scp2/source/sdkoo/module_sdkoo.scp |6 - scp2/source/sdkoo/sdkoo.scp| 17 ++ 8 files changed, 74 insertions(+), 46 deletions(-) New commits: commit 2996c3d41fd847232ffd18da6b00bbf6e72f1c07 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 14:53:17 2013 +0200 replace CustomTarget_odk/odkcommon/bin by Package Change-Id: Ia57ed471294595f1a8ee0aa0af05f3b82d439393 Reviewed-on: https://gerrit.libreoffice.org/3529 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_bin.mk b/odk/CustomTarget_bin.mk deleted file mode 100644 index 0a548a2..000 --- a/odk/CustomTarget_bin.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/bin)) - -odk_EXELIST := cppumaker \ - regcompare \ - idlc \ - javamaker \ - autodoc \ - unoapploader \ - uno-skeletonmaker \ - $(if $(SYSTEM_UCPP),,ucpp) \ - $(if $(filter WNT,$(OS)),climaker) - -define odk_exe -odkcommon_ZIPLIST += bin/$(1)$(gb_Executable_EXT) -$(call gb_CustomTarget_get_target,odk/odkcommon/bin): $(odk_WORKDIR)/bin/$(1)$(gb_Executable_EXT) -$(odk_WORKDIR)/bin/$(1)$(gb_Executable_EXT): $(call gb_Executable_get_target,$(1)) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$ $$@ -endef - -$(foreach exe,$(odk_EXELIST),$(eval $(call odk_exe,$(exe - -ifeq ($(OS),MACOSX) -odkcommon_ZIPLIST += bin/addsym-macosx.sh -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/bin,addsym-macosx.sh)) -$(odk_WORKDIR)/bin/addsym-macosx.sh: $(SRCDIR)/odk/pack/copying/addsym-macosx.sh - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - cp $ $@ - chmod 755 $@ -endif - -# vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index b7454d6..3f153f7 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -27,6 +27,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ + $(call gb_Package_get_target,odk_bin) \ + $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) touch $@ diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 9ba2d6e..b6cc3d2 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -19,7 +19,6 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \ $(call gb_CustomTarget_get_target,odk/odkcommon/settings) \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ - $(call gb_CustomTarget_get_target,odk/odkcommon/bin) \ $(call gb_CustomTarget_get_target,odk/odkcommon/lib) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ $(call gb_CustomTarget_get_target,odk/odkcommon/include) \ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index c18223c..86778a4 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -14,14 +14,20 @@ $(eval $(call gb_Module_add_targets,odk,\ $(if $(filter WNT,$(OS)),CustomTarget_cli) \ $(if $(DOXYGEN),CustomTarget_doxygen) \ CustomTarget_check \ - CustomTarget_bin \ CustomTarget_lib \ CustomTarget_settings \ CustomTarget_autodoc \ Executable_unoapploader \ + Package_bin \ Package_examples \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,odk,\ + Package_macosx \ +)) +endif + ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_unowinreg \ diff --git a/odk/Package_bin.mk b/odk/Package_bin.mk new file mode 100644 index 000..8c1200f --- /dev/null +++ b/odk/Package_bin.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +#
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/CustomTarget_cli.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Package_cli.mk scp2/source
odk/CustomTarget_check.mk |1 + odk/CustomTarget_cli.mk| 29 - odk/CustomTarget_odkcommon.mk |3 +-- odk/Module_odk.mk |2 +- odk/Package_cli.mk | 22 ++ scp2/source/sdkoo/module_sdkoo.scp |1 + scp2/source/sdkoo/sdkoo.scp|9 + 7 files changed, 35 insertions(+), 32 deletions(-) New commits: commit 5c7f6ca7e15bbac390730eeb30a864763756447c Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 15:19:32 2013 +0200 replace CustomTarget_odk/odkcommon/cli by Package Change-Id: I1d747fec9b1bf2aeef2a1886981f7f07a338ea12 Reviewed-on: https://gerrit.libreoffice.org/3530 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 3f153f7..c0046cd 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,6 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(call gb_Package_get_target,odk_bin) \ + $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) diff --git a/odk/CustomTarget_cli.mk b/odk/CustomTarget_cli.mk deleted file mode 100644 index 88f2625..000 --- a/odk/CustomTarget_cli.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/cli)) - -odk_CLILIST := cli_basetypes.dll \ - cli_uretypes.dll \ - cli_oootypes.dll \ - cli_ure.dll \ - cli_cppuhelper.dll - -define odk_cli -odkcommon_ZIPLIST += cli/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/cli): $(odk_WORKDIR)/cli/$(1) -$(odk_WORKDIR)/cli/$(1): $(call gb_CliAssembly_get_target,$(1)) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$ $$@ -endef - -$(foreach cli,$(odk_CLILIST),$(eval $(call odk_cli,$(cli - -# vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index b6cc3d2..4e903a1 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -21,8 +21,7 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ $(call gb_CustomTarget_get_target,odk/odkcommon/lib) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ - $(call gb_CustomTarget_get_target,odk/odkcommon/include) \ - $(if $(filter MSC,$(COM)),$(call gb_CustomTarget_get_target,odk/odkcommon/cli)) + $(call gb_CustomTarget_get_target,odk/odkcommon/include) ifeq ($(OS),WNT) odk_CONFIGLIST := cfgWin.js \ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 86778a4..a7ccf52 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,odk)) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_odkcommon \ - $(if $(filter WNT,$(OS)),CustomTarget_cli) \ + $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),CustomTarget_doxygen) \ CustomTarget_check \ CustomTarget_lib \ diff --git a/odk/Package_cli.mk b/odk/Package_cli.mk new file mode 100644 index 000..bbb3c85 --- /dev/null +++ b/odk/Package_cli.mk @@ -0,0 +1,22 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,odk_cli,$(OUTDIR)/bin)) + +$(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,odk_cli,$(gb_Package_SDKDIRNAME)/cli,\ + cli_basetypes.dll \ + cli_cppuhelper.dll \ + cli_oootypes.dll \ + cli_ure.dll \ + cli_uretypes.dll \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index 24b78c0..28ab105 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -35,6 +35,7 @@ Module gid_Module_Optional_Sdkoo
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/CustomTarget_classes.mk odk/CustomTarget_unowinreg.mk odk/Module_odk.mk odk/Package_unowinreg.mk odk/Zip_uno_loader_classes.mk scp2/source
odk/CustomTarget_check.mk |1 + odk/CustomTarget_classes.mk|7 --- odk/CustomTarget_unowinreg.mk | 12 +--- odk/Module_odk.mk |3 ++- odk/Package_unowinreg.mk | 28 odk/Zip_uno_loader_classes.mk |1 - scp2/source/sdkoo/module_sdkoo.scp |1 + scp2/source/sdkoo/sdkoo.scp|9 + 8 files changed, 42 insertions(+), 20 deletions(-) New commits: commit 1ea1818dd15bcfc1605764b237e6f71e8fcb5635 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 15:50:23 2013 +0200 use Package for unowinreg Change-Id: I7546e8938ba41e1462e704bd0405c5a887151d7b Reviewed-on: https://gerrit.libreoffice.org/3531 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index c0046cd..cc29e01 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -30,6 +30,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ + $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) touch $@ diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk index b009a58..ad59a4a 100644 --- a/odk/CustomTarget_classes.mk +++ b/odk/CustomTarget_classes.mk @@ -28,11 +28,4 @@ $(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader) cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) touch $@ -odkcommon_ZIPLIST += classes/win/unowinreg.dll -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/classes,win/unowinreg.dll)) -$(odk_WORKDIR)/classes/win/unowinreg.dll: $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll - mkdir -p $(dir $@) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - cp $ $@ - # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk index 76fe2f9..3a46ddf 100644 --- a/odk/CustomTarget_unowinreg.mk +++ b/odk/CustomTarget_unowinreg.mk @@ -11,11 +11,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/unowinreg)) $(eval $(call gb_CustomTarget_register_target,odk/unowinreg,unowinreg.dll)) -ifeq ($(BUILD_UNOWINREG),YES) -ifeq ($(COM),MSC) -$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(call gb_Library_get_target,unowinreg) - cp $ $@ -else # COM=GCC $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ $(SRCDIR)/odk/source/unowinreg/win/unowinreg.cxx $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ \ @@ -25,12 +20,7 @@ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\ $(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \ -shared -o $@ $ \ - -Wl,--kill-at -lkernel32 -ladvapi32 + -Wl,--kill-at -lkernel32 -ladvapi32 \ $(MINGWSTRIP) $@ -endif -else # BUILD_UNOWINREG=NO -$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(TARFILE_LOCATION)/$(UNOWINREG_DLL) - cp $ $@ -endif # vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index a7ccf52..531fdbe 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -30,10 +30,11 @@ endif ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ - CustomTarget_unowinreg \ + $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \ CustomTarget_classes \ CustomTarget_javadoc \ $(if $(filter WNT,$(OS)),Library_unowinreg) \ + Package_unowinreg \ Zip_uno_loader_classes \ )) endif diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk new file mode 100644 index 000..0fd0928 --- /dev/null +++ b/odk/Package_unowinreg.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +ifeq ($(BUILD_UNOWINREG),YES) +ifeq ($(COM),MSC) +odk_unowinreg_DIR := $(OUTDIR)/bin +else +odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg) +endif +odk_unowinreg_FILE := unowinreg.dll +else # BUILD_UNOWINREG=NO +odk_unowinreg_DIR := $(TARFILE_LOCATION) +odk_unowinreg_FILE := $(UNOWINREG_DLL) +endif +
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/CustomTarget_lib.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Package_lib.mk scp2/source
odk/CustomTarget_check.mk |1 odk/CustomTarget_lib.mk| 40 - odk/CustomTarget_odkcommon.mk |1 odk/Module_odk.mk |2 - odk/Package_lib.mk | 28 + scp2/source/sdkoo/module_sdkoo.scp |1 scp2/source/sdkoo/sdkoo.scp|7 ++ 7 files changed, 38 insertions(+), 42 deletions(-) New commits: commit 0d752247d882fd120a3f8d984c73c78e9d565e79 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 16:08:16 2013 +0200 replace CustomTarget_odk/odkcommon/lib by Package Change-Id: I929384077255b2fd944abf2da573c66572dec62b Reviewed-on: https://gerrit.libreoffice.org/3532 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index cc29e01..dc2ff27 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -30,6 +30,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ + $(call gb_Package_get_target,odk_lib) \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) diff --git a/odk/CustomTarget_lib.mk b/odk/CustomTarget_lib.mk deleted file mode 100644 index 910211e..000 --- a/odk/CustomTarget_lib.mk +++ /dev/null @@ -1,40 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/lib)) - -define odk_lib -odkcommon_ZIPLIST += lib/$(notdir $(1)) -$(call gb_CustomTarget_get_target,odk/odkcommon/lib) : \ - $(odk_WORKDIR)/lib/$(notdir $(1)) -$(odk_WORKDIR)/lib/$(notdir $(1)) : $(1) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$ $$@ -endef - -ifeq ($(COM),MSC) -odk_LIBLIST := \ - sal \ - salhelper \ - cppu \ - cppuhelper \ - purpenvhelper - -$(foreach lib,$(odk_LIBLIST),$(eval $(call odk_lib,$(call gb_Library_get_target,$(lib) -else ifeq ($(OS),LINUX) -odkcommon_ZIPLIST += lib/libsalcpprt.a -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/lib,libsalcpprt.a)) -$(odk_WORKDIR)/lib/libsalcpprt.a: $(call gb_StaticLibrary_get_target,salcpprt) - mkdir -p $(dir $@) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - cp $ $@ -endif - -# vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 4e903a1..99e42e6 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -19,7 +19,6 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \ $(call gb_CustomTarget_get_target,odk/odkcommon/settings) \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ - $(call gb_CustomTarget_get_target,odk/odkcommon/lib) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ $(call gb_CustomTarget_get_target,odk/odkcommon/include) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 531fdbe..58bdb4d 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -14,12 +14,12 @@ $(eval $(call gb_Module_add_targets,odk,\ $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),CustomTarget_doxygen) \ CustomTarget_check \ - CustomTarget_lib \ CustomTarget_settings \ CustomTarget_autodoc \ Executable_unoapploader \ Package_bin \ Package_examples \ + Package_lib \ )) ifeq ($(OS),MACOSX) diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk new file mode 100644 index 000..4a3199c --- /dev/null +++ b/odk/Package_lib.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,odk_lib,$(OUTDIR)/lib)) + +$(eval $(call gb_Package_set_outdir,odk_lib,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\ + $(if $(filter
[PUSHED] allow odk/util/check.pl to use two base dirs
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3527 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3527 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dd224c9067f2dbb522b87b7057ddc02a5fa0cad Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/CustomTarget_config_win.mk odk/CustomTarget_html.mk odk/CustomTarget_odkcommon.mk odk/Module_odk.mk odk/Package_config.mk odk/Package_conf
odk/CustomTarget_check.mk |9 +++ odk/CustomTarget_config_win.mk | 19 +++ odk/CustomTarget_html.mk | 25 ++ odk/CustomTarget_odkcommon.mk | 92 - odk/Module_odk.mk | 15 ++ odk/Package_config.mk | 28 +++ odk/Package_config_notwin.mk | 19 +++ odk/Package_config_win.mk | 16 ++ odk/Package_docs.mk| 40 odk/Package_html.mk| 23 + scp2/source/sdkoo/module_sdkoo.scp |5 ++ scp2/source/sdkoo/sdkoo.scp| 37 ++ 12 files changed, 235 insertions(+), 93 deletions(-) New commits: commit 4f4344b51599d7fd7febeefa4fa46c38c36af57b Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 16:36:06 2013 +0200 chip more files off the odkcommon.zip block Change-Id: I3d5d841d094f397130e37799a2f26e4d85f7c136 Reviewed-on: https://gerrit.libreoffice.org/3533 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index dc2ff27..68c26e5 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -29,8 +29,15 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ - $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ + $(call gb_Package_get_target,odk_config) \ + $(if $(filter WNT,$(OS)),\ + $(call gb_Package_get_target,odk_config_win),\ + $(call gb_Package_get_target,odk_config_notwin) \ + ) \ + $(call gb_Package_get_target,odk_docs) \ + $(call gb_Package_get_target,odk_html) \ $(call gb_Package_get_target,odk_lib) \ + $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) diff --git a/odk/CustomTarget_config_win.mk b/odk/CustomTarget_config_win.mk new file mode 100644 index 000..2a9fc1f --- /dev/null +++ b/odk/CustomTarget_config_win.mk @@ -0,0 +1,19 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,odk/config)) + +$(eval $(call gb_CustomTarget_register_targets,odk/config,\ +setsdkenv_windows.bat \ +)) + +$(call gb_CustomTarget_get_workdir,odk/config)/setsdkenv_windows.bat : $(SRCDIR)/odk/config/setsdkenv_windows.bat + sed $ -e 's#__SDKNAME__#libreoffice$(PRODUCTVERSION)_sdk#' $@ + +# vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk new file mode 100644 index 000..9c96ac4 --- /dev/null +++ b/odk/CustomTarget_html.mk @@ -0,0 +1,25 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,odk/html)) + +$(eval $(call gb_CustomTarget_register_targets,odk/html,\ + docs/install.html \ + docs/notsupported.html \ + docs/tools.html \ + examples/DevelopersGuide/examples.html \ + examples/examples.html \ + index.html \ +)) + +$(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html + $(call gb_Output_announce,$*.html,$(true),SED,1) + cat $ | tr -d \015 | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCTVERSION)/g' $@ + +# vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 99e42e6..246247a 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -22,96 +22,4 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ $(call gb_CustomTarget_get_target,odk/odkcommon/include) -ifeq ($(OS),WNT) -odk_CONFIGLIST := cfgWin.js \ - setsdkenv_windows.template \ - setsdkname.bat -else -odk_CONFIGLIST := configure.pl \ - setsdkenv_unix \ - setsdkenv_unix.sh.in \ - -endif - -define odk_config -odkcommon_ZIPLIST += $(1) -$(call
[PUSHED] fix typo
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3528 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3528 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58f0cd2248310fd7c5f1c82a6d10acc5a2446169 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] replace CustomTarget_odk/odkcommon/cli by Package
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3530 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3530 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d747fec9b1bf2aeef2a1886981f7f07a338ea12 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] use Package for unowinreg
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3531 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3531 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7546e8938ba41e1462e704bd0405c5a887151d7b Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] replace CustomTarget_odk/odkcommon/lib by Package
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3532 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3532 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I929384077255b2fd944abf2da573c66572dec62b Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/CustomTarget_odkcommon.mk odk/CustomTarget_settings.mk odk/Module_odk.mk odk/Package_settings_generated.mk odk/Package_settings.mk scp2/so
odk/CustomTarget_check.mk |2 ++ odk/CustomTarget_odkcommon.mk |1 - odk/CustomTarget_settings.mk | 20 ++-- odk/Module_odk.mk |2 ++ odk/Package_settings.mk| 21 + odk/Package_settings_generated.mk | 18 ++ scp2/source/sdkoo/module_sdkoo.scp |2 ++ scp2/source/sdkoo/sdkoo.scp| 14 ++ 8 files changed, 61 insertions(+), 19 deletions(-) New commits: commit 60b2b24d8e5c2a63cdac0f0c6141c8bbd95f1960 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 17:38:36 2013 +0200 replace CustomTarget_odk/odkcommon/settings by Package Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a Reviewed-on: https://gerrit.libreoffice.org/3534 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 68c26e5..ee693ff 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -38,6 +38,8 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Package_get_target,odk_html) \ $(call gb_Package_get_target,odk_lib) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ + $(call gb_Package_get_target,odk_settings) \ + $(call gb_Package_get_target,odk_settings_generated) \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index 246247a..6b500e8 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -17,7 +17,6 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \ $(if $(SOLAR_JAVA),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/java/ref)) \ $(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \ - $(call gb_CustomTarget_get_target,odk/odkcommon/settings) \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ $(call gb_CustomTarget_get_target,odk/odkcommon/include) diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index 358561b..581d522 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -9,25 +9,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings)) -odk_SETTINGSLIST := settings.mk \ - std.mk \ - stdtarget.mk \ - $(if $(filter WNT,$(OS)),component.uno.def) - -define odk_settings -odkcommon_ZIPLIST += settings/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/settings): $(odk_WORKDIR)/settings/$(1) -$(odk_WORKDIR)/settings/$(1): $(SRCDIR)/odk/settings/$(1) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$ $$@ -endef - -$(foreach setting,$(odk_SETTINGSLIST),$(eval $(call odk_settings,$(setting - -odkcommon_ZIPLIST += settings/dk.mk $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk)) -$(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk + +$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1) tr -d \015 $ | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 6a51a13..36eacef 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -24,6 +24,8 @@ $(eval $(call gb_Module_add_targets,odk,\ Package_html \ Package_examples \ Package_lib \ + Package_settings \ + Package_settings_generated \ )) ifeq ($(OS),WNT) diff --git a/odk/Package_settings.mk b/odk/Package_settings.mk new file mode 100644 index 000..ff01fd2 --- /dev/null +++ b/odk/Package_settings.mk @@ -0,0 +1,21 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,odk_settings,$(SRCDIR)/odk/settings)) + +$(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,odk_settings,$(gb_Package_SDKDIRNAME)/settings,\ + $(if $(filter WNT,$(OS)),component.uno.def) \ + settings.mk
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 085c5c6beade545e4e93cf8463b6848cf2d19060 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 17:42:17 2013 +0200 make odk inst. check a check target Change-Id: I1bd8ee091a3c74ad05af69a4b7d5a2db21731b76 Reviewed-on: https://gerrit.libreoffice.org/3535 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 36eacef..6e78471 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_odkcommon \ $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),CustomTarget_doxygen) \ - CustomTarget_check \ CustomTarget_html \ CustomTarget_settings \ CustomTarget_autodoc \ @@ -62,5 +61,8 @@ $(eval $(call gb_Module_add_targets,odk,\ Zip_odkcommon \ )) +$(eval $(call gb_Module_add_check_targets,odk,\ + CustomTarget_check \ +)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk odk/util
odk/CustomTarget_check.mk | 13 +++--
odk/util/check.pl |1 -
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 43c422ebb7a7c1431d179ed1b9572fabf9845aa8
Author: David Tardon dtar...@redhat.com
Date: Sun Apr 21 18:15:15 2013 +0200
silence odk check
Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
Reviewed-on: https://gerrit.libreoffice.org/3536
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index ee693ff..85113b3 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -43,11 +43,12 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg))
\
$(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
- touch $@
- $(PERL) $ \
- $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
- $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
- $(odk_PLATFORM) $(gb_Executable_EXT) $@
- cat $@
+ $(call gb_Helper_print_on_error,\
+ $(PERL) $ \
+ $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
+ $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
+ $(odk_PLATFORM) $(gb_Executable_EXT) \
+ ,$@.log \
+ )
# vim: set noet sw=4 ts=4:
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 7380867..542361e 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -367,7 +367,6 @@ if (-d $PrimaryDir || -d $SecondaryDir) {
if( $return != 0 )
{
print ERROR\n;
-unlink $ARGV[3];
} else {
print OK\n;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] chip more files off the odkcommon.zip block
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3533 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3533 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d5d841d094f397130e37799a2f26e4d85f7c136 Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] replace CustomTarget_odk/odkcommon/settings by Package
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3534 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3534 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] make odk inst. check a check target
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3535 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3535 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1bd8ee091a3c74ad05af69a4b7d5a2db21731b76 Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] silence odk check
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3536 to look at the new rebased patch set (#6). Change subject: silence odk check .. silence odk check Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e --- M odk/CustomTarget_check.mk M odk/util/check.pl 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3536/6 -- To view, visit https://gerrit.libreoffice.org/3536 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] silence odk check
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3536 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3536 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Do not store return value for later, just exit
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3541 to look at the new rebased patch set (#2). Change subject: Do not store return value for later, just exit .. Do not store return value for later, just exit Change-Id: If71398ee5a29652303ae492d23e3910526307d3c --- M editeng/source/editeng/textconv.cxx 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3541/2 -- To view, visit https://gerrit.libreoffice.org/3541 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If71398ee5a29652303ae492d23e3910526307d3c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/hangulhanja.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit d1f99bdf2abf591994b6efb2e73dcd31fdee8384
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Apr 21 17:38:39 2013 +0200
bDocumentDone is always false
Change-Id: Ifde4d9235d3eacf0317b19885f5ea57e1c695cb3
Reviewed-on: https://gerrit.libreoffice.org/3538
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/misc/hangulhanja.cxx
b/editeng/source/misc/hangulhanja.cxx
index a1493fe..4f7189a 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -535,9 +535,8 @@ namespace editeng
bool HangulHanjaConversion_Impl::ContinueConversion( bool
_bRepeatCurrentUnit )
{
bool bNeedUserInteraction = false; // when we leave here, do we need
user interaction?
-bool bDocumentDone = false; // did we already check the whole
document?
-while ( !bDocumentDone !bNeedUserInteraction
implNextConvertible( _bRepeatCurrentUnit ) )
+while ( !bNeedUserInteraction implNextConvertible(
_bRepeatCurrentUnit ) )
{
OUString sCurrentUnit( GetCurrentUnit() );
@@ -581,7 +580,7 @@ namespace editeng
}
}
-return bDocumentDone || !bNeedUserInteraction;
+return !bNeedUserInteraction;
}
bool
HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion(
HHC::ConversionDirection rDirection )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] sal_Bool to bool
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3537 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3537 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5831dfb7270ce3983a454c6c40558a74931d5200 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] replace python-core zip built in pyuno with direct use of Pa...
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3525 to look at the new rebased patch set (#4). Change subject: replace python-core zip built in pyuno with direct use of Package .. replace python-core zip built in pyuno with direct use of Package - python3: deliver files to INSTDIR, with same layout as instset and do not deliver .lib files - pyuno: remove obsolete python.bin targets - pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX platforms (sadly it is apparently still needed for system python on MinGW) - scp2: use the python3 filelist There is still a problem here because the installer does not currently allow to preserve the executable bit on files in a filelist - RepositoryExternal: run python executable from INSTDIR and link against libraries in UnpackedTarball dir Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 --- M RepositoryExternal.mk M python3/ExternalPackage_python3.mk M pyuno/CustomTarget_zipcore.mk M pyuno/Module_pyuno.mk M scp2/source/python/file_python.scp M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 9 files changed, 72 insertions(+), 116 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/4 -- To view, visit https://gerrit.libreoffice.org/3525 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] bDocumentDone is always false
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3538 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3538 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifde4d9235d3eacf0317b19885f5ea57e1c695cb3 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - editeng/source vcl/source
editeng/source/misc/hangulhanja.cxx |8 +++-
vcl/source/filter/jpeg/transupp.c | 12
2 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 6e2bc6403be0f9cf4cf324f870623c87f45cfa93
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 22 09:20:09 2013 +0200
-Werror=unused-parameter
Change-Id: I01995091350ed4a4edefa13ca6946d23062112a1
diff --git a/vcl/source/filter/jpeg/transupp.c
b/vcl/source/filter/jpeg/transupp.c
index a1c3416..54472ff 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -1594,6 +1594,8 @@ jcopy_markers_setup (j_decompress_ptr srcinfo,
JCOPY_OPTION option)
for (m = 0; m 16; m++)
jpeg_save_markers(srcinfo, JPEG_APP0 + m, 0x);
}
+#else
+ (void) srcinfo; (void) option;
#endif /* SAVE_MARKERS_SUPPORTED */
}
commit 2a65f0e1857fccd4427eed733a49d8a4c2f67856
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 22 09:17:06 2013 +0200
Make jdiv_round_up available (-Werror=implicit-function-declaration)
...apparently caused by 845456565db945ffd2a1551ab86446fcd1717021 DO NOT use
internal headers of jpeg. The warning there I am not sure if it is all
right
to include parts of jpeg directly into our code still holds, of course.
Change-Id: I4754dbcd9b2c3eafc64d32c3b83faa53cf913abd
diff --git a/vcl/source/filter/jpeg/transupp.c
b/vcl/source/filter/jpeg/transupp.c
index 500b0a2..a1c3416 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -21,6 +21,16 @@
#include jpegcomp.h
#include ctype.h /* to declare isdigit() */
+/* Definition of jdiv_round_up is copied here from jutils.c in jpeg-8c.tar.gz,
+ just as the rest of this file appears to be copied here from transupp.c in
+ jpeg-8c.tar.gz: */
+static long
+jdiv_round_up (long a, long b)
+/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
+/* Assumes a = 0, b 0 */
+{
+ return (a + b - 1L) / b;
+}
#if JPEG_LIB_VERSION = 70
#define dstinfo_min_DCT_h_scaled_size dstinfo-min_DCT_h_scaled_size
commit 684aff90b0657cc46f1f453b8de4b3bdcb2f543e
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Apr 21 17:48:41 2013 +0200
Slightly simplify loop
Change-Id: If44e86ceecd4a407d3b4e294a03a84ad010f95e1
Reviewed-on: https://gerrit.libreoffice.org/3539
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/misc/hangulhanja.cxx
b/editeng/source/misc/hangulhanja.cxx
index 4f7189a..7d2c01e 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -534,9 +534,7 @@ namespace editeng
bool HangulHanjaConversion_Impl::ContinueConversion( bool
_bRepeatCurrentUnit )
{
-bool bNeedUserInteraction = false; // when we leave here, do we need
user interaction?
-
-while ( !bNeedUserInteraction implNextConvertible(
_bRepeatCurrentUnit ) )
+while ( implNextConvertible( _bRepeatCurrentUnit ) )
{
OUString sCurrentUnit( GetCurrentUnit() );
@@ -576,11 +574,11 @@ namespace editeng
// do not look for the next convertible: We have to wait for
the user to interactivly
// decide what happens with the current convertible
-bNeedUserInteraction = true;
+return false;
}
}
-return !bNeedUserInteraction;
+return true;
}
bool
HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion(
HHC::ConversionDirection rDirection )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/textconv.cxx | 148 +---
editeng/source/editeng/textconv.hxx | 36
2 files changed, 91 insertions(+), 93 deletions(-)
New commits:
commit 43513fec9c74d70da83a71c9a06e191db3f02d40
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Apr 21 18:20:15 2013 +0200
Prefer standard prefix for data members
Change-Id: Ic0d0cdc88ee17bdeeb53855162085c30b25f9004
Reviewed-on: https://gerrit.libreoffice.org/3540
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index 7c24c7e..f47de16 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -52,22 +52,20 @@ TextConvWrapper::TextConvWrapper( Window* pWindow,
bool bIsStart,
EditView* pView ) :
HangulHanjaConversion( pWindow, rxContext, rSourceLocale, rTargetLocale,
pTargetFont, nOptions, bIsInteractive )
+, m_nConvTextLang(LANGUAGE_NONE)
+, m_nUnitOffset(0)
+, m_nLastPos(0)
+, m_aConvSel(pView-GetSelection())
+, m_pEditView(pView)
+, m_pWin(pWindow)
+, m_bStartChk(false)
+, m_bStartDone(bIsStart)
+, m_bEndDone(false)
+, m_bAllowChange(false)
{
DBG_ASSERT( pWindow, TextConvWrapper: window missing );
-nConvTextLang = LANGUAGE_NONE;
-nUnitOffset = 0;
-
-bStartChk = false;
-bStartDone = bIsStart;
-bEndDone= false;
-pWin= pWindow;
-pEditView = pView;
-
-aConvSel= pEditView-GetSelection();
-aConvSel.Adjust(); // make Start = End
-
-bAllowChange = false;
+m_aConvSel.Adjust(); // make Start = End
}
@@ -80,17 +78,17 @@ bool TextConvWrapper::ConvNext_impl()
{
// modified version of SvxSpellWrapper::SpellNext
-if( bStartChk )
-bStartDone = true;
+if( m_bStartChk )
+m_bStartDone = true;
else
-bEndDone = true;
+m_bEndDone = true;
-if ( bStartDone bEndDone )
+if ( m_bStartDone m_bEndDone )
{
if ( ConvMore_impl() ) // examine another document?
{
-bStartDone = true;
-bEndDone = false;
+m_bStartDone = true;
+m_bEndDone = false;
ConvStart_impl( SVX_SPELL_BODY );
return true;
}
@@ -100,20 +98,20 @@ bool TextConvWrapper::ConvNext_impl()
bool bGoOn = false;
-if ( bStartDone bEndDone )
+if ( m_bStartDone m_bEndDone )
{
if ( ConvMore_impl() ) // examine another document?
{
-bStartDone = true;
-bEndDone = false;
+m_bStartDone = true;
+m_bEndDone = false;
ConvStart_impl( SVX_SPELL_BODY );
return true;
}
}
-else if (!aConvSel.HasRange())
+else if (!m_aConvSel.HasRange())
{
-bStartChk = !bStartDone;
-ConvStart_impl( bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END
);
+m_bStartChk = !m_bStartDone;
+ConvStart_impl( m_bStartChk ? SVX_SPELL_BODY_START :
SVX_SPELL_BODY_END );
bGoOn = true;
}
return bGoOn;
@@ -126,7 +124,7 @@ bool TextConvWrapper::FindConvText_impl()
bool bFound = false;
-pWin-EnterWait();
+m_pWin-EnterWait();
bool bConvert = true;
while ( bConvert )
@@ -142,7 +140,7 @@ bool TextConvWrapper::FindConvText_impl()
bConvert = ConvNext_impl();
}
}
-pWin-LeaveWait();
+m_pWin-LeaveWait();
return bFound;
}
@@ -152,8 +150,8 @@ bool TextConvWrapper::ConvMore_impl()
// modified version of SvxSpellWrapper::SpellMore
bool bMore = false;
-EditEngine* pEE = pEditView-GetEditEngine();
-ImpEditEngine* pImpEE = pEditView-GetImpEditEngine();
+EditEngine* pEE = m_pEditView-GetEditEngine();
+ImpEditEngine* pImpEE = m_pEditView-GetImpEditEngine();
ConvInfo* pConvInfo = pImpEE-GetConvInfo();
if ( pConvInfo-bMultipleDoc )
{
@@ -161,7 +159,7 @@ bool TextConvWrapper::ConvMore_impl()
if ( bMore )
{
// The text has been entered in this engine ...
-pEditView-GetImpEditView()-SetEditSelection(
+m_pEditView-GetImpEditView()-SetEditSelection(
pEE-GetEditDoc().GetStartPaM() );
}
}
@@ -173,19 +171,19 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
{
// modified version of EditSpellWrapper::SpellStart
-EditEngine* pEE = pEditView-GetEditEngine();
-ImpEditEngine* pImpEE = pEditView-GetImpEditEngine();
+EditEngine* pEE = m_pEditView-GetEditEngine();
+ImpEditEngine* pImpEE = m_pEditView-GetImpEditEngine();
ConvInfo* pConvInfo = pImpEE-GetConvInfo();
if ( eArea == SVX_SPELL_BODY_START )
{
// Is called when Spell-forward has reached the end, and to start
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/textconv.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit e7bfe847114d7fd95e6820db01ca9ee876468fbe
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sun Apr 21 18:38:40 2013 +0200
Do not store return value for later, just exit
Change-Id: If71398ee5a29652303ae492d23e3910526307d3c
Reviewed-on: https://gerrit.libreoffice.org/3541
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index f47de16..be8c31a 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -96,8 +96,6 @@ bool TextConvWrapper::ConvNext_impl()
}
-bool bGoOn = false;
-
if ( m_bStartDone m_bEndDone )
{
if ( ConvMore_impl() ) // examine another document?
@@ -112,9 +110,10 @@ bool TextConvWrapper::ConvNext_impl()
{
m_bStartChk = !m_bStartDone;
ConvStart_impl( m_bStartChk ? SVX_SPELL_BODY_START :
SVX_SPELL_BODY_END );
-bGoOn = true;
+return true;
}
-return bGoOn;
+
+return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Slightly simplify loop
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3539 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3539 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If44e86ceecd4a407d3b4e294a03a84ad010f95e1 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Prefer standard prefix for data members
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3540 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3540 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0d0cdc88ee17bdeeb53855162085c30b25f9004 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Do not store return value for later, just exit
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3541 to look at the new rebased patch set (#3). Change subject: Do not store return value for later, just exit .. Do not store return value for later, just exit Change-Id: If71398ee5a29652303ae492d23e3910526307d3c --- M editeng/source/editeng/textconv.cxx 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3541/3 -- To view, visit https://gerrit.libreoffice.org/3541 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If71398ee5a29652303ae492d23e3910526307d3c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Do not store return value for later, just exit
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3541 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3541 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If71398ee5a29652303ae492d23e3910526307d3c Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ucb/source xmlhelp/source
ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx |2 +-
xmlhelp/source/cxxhelp/provider/databases.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 560e4fd02f8a4a3e26b3810b12d02a2d2e78593f
Author: Sameer Deshmukh sameer.deshmuk...@gmail.com
Date: Sun Apr 21 17:52:54 2013 +0530
fdo#62096 - Changed a few compareTo's to '=='
Change-Id: I0a0ba87ec517e5dd776ab45b232dd7f227451466
Reviewed-on: https://gerrit.libreoffice.org/3523
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index 0f10513..0ec097c 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -135,7 +135,7 @@ extern C int NPFR_propfind_iter( void* userdata,
if ( !aValue.isEmpty() )
{
aValue = stripDavNamespace( aValue ).toAsciiLowerCase();
-if ( aValue.compareTo( collection ) == 0 )
+if ( aValue == collection )
{
thePropertyValue.Value
= OUString(collection);
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 905c86c..8585700 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -156,7 +156,7 @@ namespace chelp {
{
bool operator()( const OUString rKey1, const OUString rKey2 )
const
{
-return rKey1.compareTo( rKey2 ) == 0;
+return (rKey1 == rKey2);
}
};
@@ -351,7 +351,7 @@ namespace chelp {
{
bool operator()( const OString rKey1, const OString rKey2 ) const
{
-return rKey1.compareTo( rKey2 ) == 0;
+return (rKey1 == rKey2);
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/db.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ca54015d7ea10f5648bccb2adfb7a321747e70f9
Author: Sameer Deshmukh sameer.deshmuk...@gmail.com
Date: Mon Apr 22 00:43:56 2013 +0530
fdo#62096 Corrected stupid error in previous patch
Change-Id: Ieb3ed1201918c5b4ba64e6f767353497e697
Reviewed-on: https://gerrit.libreoffice.org/3545
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx
b/xmlhelp/source/cxxhelp/provider/db.hxx
index d00fbab..7945591 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -68,7 +68,7 @@ namespace helpdatafileproxy {
struct eq
{
bool operator()( const OString rKey1, const OString rKey2 ) const
-{ return rKey1.compareTo( rKey2 ) == 0; }
+{ return (rKey1 == rKey2); }
};
struct ha
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build failure on master with OSX - datetime.hxx
Le 20/04/13 12:09, Jonathan Aquilina a écrit : Still failing for me in dbconversion.cxx:42 : error : integer constant is too large for 'long' type Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#62096 - Changed a few compareTo's to '=='
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3523 Approvals: Thomas Arnhold: Looks good to me, but someone else must approve Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3523 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a0ba87ec517e5dd776ab45b232dd7f227451466 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#62096 - Replaced compareTo with ==
Fridrich Strba has abandoned this change. Change subject: fdo#62096 - Replaced compareTo with == .. Patch Set 1: Abandoned Abandon change that failed review -- To view, visit https://gerrit.libreoffice.org/3544 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie5d3b3181038ddc2ffe2875aca1a5b8b18ab7a4f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#62096 replaced some compareTo's with ==
Fridrich Strba has abandoned this change. Change subject: fdo#62096 replaced some compareTo's with == .. Patch Set 1: Abandoned abandoning, since a sane part was submitted as a separate patch -- To view, visit https://gerrit.libreoffice.org/3543 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2a8e835cdd7d00a31ec4acab433527ce8b6134ca Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#62096 Corrected stupid error in previous patch
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3545 Approvals: Thomas Arnhold: Verified; Looks good to me, but someone else must approve Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3545 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb3ed1201918c5b4ba64e6f767353497e697 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Bug 60265 - Document converter wizard fails to find powerpoi...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3548 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3548/1 Bug 60265 - Document converter wizard fails to find powerpoint files to convert ppt,pps,pptx,ppsx,pptm,ppsm are being detected and ppt,pptx,pps are being converted to odp but Formats ppsx , pptm , ppsm are not being converted still . I think there is some problem with these formats support . and we require make-dev-install to make it work , as make wizards doesnt modify the build . Change-Id: Ib7aa92a2888b3957784b51d7c439f63a0a84cf7c --- M wizards/source/importwizard/DialogModul.xba 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index a9ea8f9..350d9f1 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -344,9 +344,9 @@ MSFilterName(1,3) = sMSDocumentCheckBox(1) MSFilterName(1,4) = quot;Excelquot; - MSFilterName(2,0) = quot;ppt|pps|pptx|pptm|ppsx|ppsmquot; + MSFilterName(2,0) = quot;ppt|pps|pptxquot; MSFilterName(2,1) = quot;impress8|impress8|impress8|impress8|impress8|impress8quot; - MSFilterName(2,2) = quot;odp|odpquot; + MSFilterName(2,2) = quot;odpquot; MSFilterName(2,3) = sMSDocumentCheckBox(2) MSFilterName(2,4) = quot;PowerPointquot; @@ -366,7 +366,15 @@ MSFilterName(5,1) = quot;impress8_template|impress8_template|impress8_templatequot; MSFilterName(5,2) = quot;otpquot; MSFilterName(5,3) = sMSTemplateCheckBox(2) - MSFilterName(5,4) = quot;PowerPointquot; + MSFilterName(5,4) = quot;PowerPointquot; + + MSFilterName(5,0) = quot;pptm|ppsx|ppsmquot; + MSFilterName(5,1) = quot;impress8|impress8|impress8quot; + MSFilterName(5,2) = quot;odpquot; + MSFilterName(5,3) = sMSTemplateCheckBox(2) + MSFilterName(5,4) = quot;PowerPointquot; + + End Sub -- To view, visit https://gerrit.libreoffice.org/3548 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7aa92a2888b3957784b51d7c439f63a0a84cf7c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Anurag Kanungo anuragkanu...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/inc sal/qa writerfilter/source
sal/inc/rtl/string.hxx|8
sal/qa/rtl_strings/rtl_OString.cxx|6 +++---
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 14 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit dd47994722eaead16099145e593fbf878072d52b
Author: Sameer Deshmukh sameer.deshmuk...@gmail.com
Date: Sat Apr 20 23:35:23 2013 +0530
fdo#62096: Replaced some compareTo with ==
Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c
Reviewed-on: https://gerrit.libreoffice.org/3509
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index e3d5afb..8151262 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -782,25 +782,25 @@ public:
template typename T
friend typename internal::CharPtrDetector T, bool ::Type operator==(
const OString rStr1, const T value ) SAL_THROW(())
{
-return rStr1.compareTo( value ) == 0;
+return (rStr1 == value);
}
template typename T
friend typename internal::NonConstCharArrayDetector T, bool ::Type
operator==( const OString rStr1, T value ) SAL_THROW(())
{
-return rStr1.compareTo( value ) == 0;
+return (rStr1 == value);
}
template typename T
friend typename internal::CharPtrDetector T, bool ::Type operator==(
const T value, const OString rStr2 ) SAL_THROW(())
{
-return rStr2.compareTo( value ) == 0;
+return (rStr2 == value);
}
template typename T
friend typename internal::NonConstCharArrayDetector T, bool ::Type
operator==( T value, const OString rStr2 ) SAL_THROW(())
{
-return rStr2.compareTo( value ) == 0;
+return (rStr2 == value);
}
/**
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx
b/sal/qa/rtl_strings/rtl_OString.cxx
index 1934f06..293381c 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -1929,7 +1929,7 @@ sal_Bool test_valueOf( const char** resArray, int n,
sal_Int16 radix,
bRes = c_rtl_tres_state
(
hRtlTestResult,
-aStr2.compareTo(aStr1) == 0,
+aStr2 == aStr1,
(sal_Char*)resArray[i],
createName( pMeth, valueOf, i )
);
@@ -2163,7 +2163,7 @@ sal_Bool SAL_CALL
test_rtl_OString_valueOf_Int32_WrongRadix(
bRes = c_rtl_tres_state
(
hRtlTestResult,
-aStr2.compareTo( aStr1 ) == 0,
+aStr2 == aStr1,
if radix not valid then radix must be 10,
valueOf(sal_Int32, sal_Int32 radix): radix = -5
);
@@ -2411,7 +2411,7 @@ sal_Bool SAL_CALL
test_rtl_OString_valueOf_Int64_WrongRadix(
bRes = c_rtl_tres_state
(
hRtlTestResult,
-aStr2.compareTo(aStr1) == 0,
+aStr2 == aStr1,
if radix not valid then radix must be 10,
valueOf(sal_Int64, sal_Int32 radix): radix = -5
);
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 96f37bd..3305e7c 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -169,16 +169,16 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
{
beans::StringPair aPair = aSeq[i];
-if (aPair.First.compareTo(sType) == 0
-aPair.Second.compareTo(sStreamType) == 0)
+if (aPair.First == sType
+aPair.Second == sStreamType)
bFound = true;
-else if (aPair.First.compareTo(sId) == 0
- aPair.Second.compareTo(rId) == 0)
+else if (aPair.First == sId
+ aPair.Second == rId)
bFound = true;
-else if (aPair.First.compareTo(sTarget) == 0)
+else if (aPair.First == sTarget)
sMyTarget = aPair.Second;
-else if (aPair.First.compareTo(sTargetMode) == 0
- aPair.Second.compareTo(sExternal) == 0)
+else if (aPair.First == sTargetMode
+ aPair.Second == sExternal)
bExternalTarget = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Python scripts other than Logo missing in master build
Hi, On Sun, Apr 21, 2013 at 10:46:35AM -0700, julien2412 wrote: Hello Alex, I've made some changes on this lately and noticed a typo in scripting/Package_ScriptsPython.mk The third line shows Scripting instead of scripting. Badfully i don't have access to my laptop to change this. Could Anyone do it? This is fixed now. I also have a patch on gerrit (https://gerrit.libreoffice.org/#/c/3542/) that should catch such mistakes in the future (and it has already caught several more :-) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62096: Replaced some compareTo with ==
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3509 to look at the new patch set (#2). Change subject: fdo#62096: Replaced some compareTo with == .. fdo#62096: Replaced some compareTo with == Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c --- M sal/inc/rtl/string.hxx M sal/qa/rtl_strings/rtl_OString.cxx A wizards/com/sun/star/wizards/table/.#CallTableWizard.java M writerfilter/source/ooxml/OOXMLStreamImpl.cxx 4 files changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3509/2 -- To view, visit https://gerrit.libreoffice.org/3509 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#62096: Replaced some compareTo with ==
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3509 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3509 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#62096: Replaced some compareTo with ==
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3509 to look at the new patch set (#3). Change subject: fdo#62096: Replaced some compareTo with == .. fdo#62096: Replaced some compareTo with == Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c --- M sal/inc/rtl/string.hxx M sal/qa/rtl_strings/rtl_OString.cxx M writerfilter/source/ooxml/OOXMLStreamImpl.cxx 3 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3509/3 -- To view, visit https://gerrit.libreoffice.org/3509 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/basides2.cxx | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 97f6625d9a49f62f09b0f9ddab8fa4935de45ae5
Author: anuragkanungo anuragkanu...@gmail.com
Date: Sun Apr 21 23:58:21 2013 +0530
Replace chained O(U)StringBuffer::append() with operator+
modified: basctl/source/basicide/basides2.cxx
Change-Id: I681188553058ac8712365bc2de39b0453fd19ed9
Reviewed-on: https://gerrit.libreoffice.org/3546
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/basctl/source/basicide/basides2.cxx
b/basctl/source/basicide/basides2.cxx
index e08fe95..8e1daa8 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -111,19 +111,15 @@ void Shell::SetMDITitle()
if ( !m_aCurLibName.isEmpty() )
{
LibraryLocation eLocation = m_aCurDocument.getLibraryLocation(
m_aCurLibName );
-aTitleBuf.append(m_aCurDocument.getTitle(eLocation));
-aTitleBuf.append('.');
-aTitleBuf.append(m_aCurLibName);
+aTitleBuf = m_aCurDocument.getTitle(eLocation) + . + m_aCurLibName ;
}
else
-aTitleBuf.append(IDE_RESSTR(RID_STR_ALL));
+aTitleBuf = IDE_RESSTR(RID_STR_ALL) ;
DocumentSignature aCurSignature( m_aCurDocument );
if ( aCurSignature.getScriptingSignatureState() ==
SIGNATURESTATE_SIGNATURES_OK )
{
-aTitleBuf.append(' ');
-aTitleBuf.append(IDE_RESSTR(RID_STR_SIGNED));
-aTitleBuf.append(' ');
+aTitleBuf = aTitleBuf + + IDE_RESSTR(RID_STR_SIGNED) + ;
}
OUString aTitle(aTitleBuf.makeStringAndClear());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] related to fdo#63546.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3549
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3549/1
related to fdo#63546.
set appropriate alignment when wrt direction of selected cells is changed.
Change-Id: Ie98a46af97236ab4303d030f11bd167939dde32b
---
M sc/source/ui/view/formatsh.cxx
1 file changed, 41 insertions(+), 13 deletions(-)
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3f2b26d..3f54bcb 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2086,26 +2086,54 @@
pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection,
ATTR_WRITINGDIR ) );
-const SfxItemSet rAttrSet =
pTabViewShell-GetSelectionPattern()-GetItemSet();
const SfxPoolItem* pItem = NULL;
const SvxHorJustifyItem* pHorJustify = NULL;
SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
-
-if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) ==
SFX_ITEM_SET )
+ScRange aRange;
+GetViewData()-GetMarkData().GetMarkArea(aRange);
+ScMarkData aMark = GetViewData()-GetMarkData();
+ScDocument * pDoc = GetViewData()-GetDocument();
+if (aMark.IsMultiMarked())
{
-pHorJustify = (const SvxHorJustifyItem*)pItem;
-eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+int i = 0, j = 0;
+for ( ; aRange.aStart.Col()+i = aRange.aEnd.Col() ; i++ )
+{
+for ( ; aRange.aStart.Row()+j = aRange.aEnd.Row() ; j++ )
+{
+pItem = pDoc-GetAttr( aRange.aStart.Col()+i,
aRange.aStart.Row()+j, aMark.GetFirstSelected(), ATTR_HOR_JUSTIFY );
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify(
pHorJustify-GetValue() );
+
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER
eHorJustify != SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+pDoc-ApplyAttr( aRange.aStart.Col()+i,
aRange.aStart.Row()+j, aMark.GetFirstSelected(), SvxHorJustifyItem(
SVX_HOR_JUSTIFY_LEFT, ATTR_HOR_JUSTIFY ) );
+else
+pDoc-ApplyAttr( aRange.aStart.Col()+i,
aRange.aStart.Row()+j, aMark.GetFirstSelected(), SvxHorJustifyItem(
SVX_HOR_JUSTIFY_RIGHT, ATTR_HOR_JUSTIFY ) );
+}
+}
+j = 0;
+}
}
-
-if( eHorJustify != SVX_HOR_JUSTIFY_CENTER eHorJustify !=
SVX_HOR_JUSTIFY_BLOCK )
+else
{
-if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
- rReq.AppendItem( SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT,
SID_H_ALIGNCELL ) );
-else
- rReq.AppendItem( SvxHorJustifyItem(
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+const SfxItemSet rAttrSet =
pTabViewShell-GetSelectionPattern()-GetItemSet();
+if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem)
== SFX_ITEM_SET )
+{
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+}
-rReq.SetSlot( SID_H_ALIGNCELL );
-ExecuteSlot( rReq, GetInterface() );
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER eHorJustify !=
SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+ rReq.AppendItem( SvxHorJustifyItem(
SVX_HOR_JUSTIFY_LEFT, SID_H_ALIGNCELL ) );
+else
+ rReq.AppendItem( SvxHorJustifyItem(
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+
+rReq.SetSlot( SID_H_ALIGNCELL );
+ExecuteSlot( rReq, GetInterface() );
+}
}
pDocSh-GetUndoManager()-LeaveListAction();
--
To view, visit https://gerrit.libreoffice.org/3549
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie98a46af97236ab4303d030f11bd167939dde32b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Replace chained O(U)StringBuffer::append() with operator+
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3546 Approvals: Thomas Arnhold: Verified; Looks good to me, but someone else must approve Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3546 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I681188553058ac8712365bc2de39b0453fd19ed9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Anurag Kanungo anuragkanu...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/inc sal/qa writerfilter/source
sal/inc/rtl/string.hxx|8
sal/qa/rtl_strings/rtl_OString.cxx|6 +++---
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 14 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ff4464659ec54732c45729ace964d60e77d19eb2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Apr 22 09:53:49 2013 +0200
Revert fdo#62096: Replaced some compareTo with ==
This reverts commit dd47994722eaead16099145e593fbf878072d52b.
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 8151262..e3d5afb 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -782,25 +782,25 @@ public:
template typename T
friend typename internal::CharPtrDetector T, bool ::Type operator==(
const OString rStr1, const T value ) SAL_THROW(())
{
-return (rStr1 == value);
+return rStr1.compareTo( value ) == 0;
}
template typename T
friend typename internal::NonConstCharArrayDetector T, bool ::Type
operator==( const OString rStr1, T value ) SAL_THROW(())
{
-return (rStr1 == value);
+return rStr1.compareTo( value ) == 0;
}
template typename T
friend typename internal::CharPtrDetector T, bool ::Type operator==(
const T value, const OString rStr2 ) SAL_THROW(())
{
-return (rStr2 == value);
+return rStr2.compareTo( value ) == 0;
}
template typename T
friend typename internal::NonConstCharArrayDetector T, bool ::Type
operator==( T value, const OString rStr2 ) SAL_THROW(())
{
-return (rStr2 == value);
+return rStr2.compareTo( value ) == 0;
}
/**
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx
b/sal/qa/rtl_strings/rtl_OString.cxx
index 293381c..1934f06 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -1929,7 +1929,7 @@ sal_Bool test_valueOf( const char** resArray, int n,
sal_Int16 radix,
bRes = c_rtl_tres_state
(
hRtlTestResult,
-aStr2 == aStr1,
+aStr2.compareTo(aStr1) == 0,
(sal_Char*)resArray[i],
createName( pMeth, valueOf, i )
);
@@ -2163,7 +2163,7 @@ sal_Bool SAL_CALL
test_rtl_OString_valueOf_Int32_WrongRadix(
bRes = c_rtl_tres_state
(
hRtlTestResult,
-aStr2 == aStr1,
+aStr2.compareTo( aStr1 ) == 0,
if radix not valid then radix must be 10,
valueOf(sal_Int32, sal_Int32 radix): radix = -5
);
@@ -2411,7 +2411,7 @@ sal_Bool SAL_CALL
test_rtl_OString_valueOf_Int64_WrongRadix(
bRes = c_rtl_tres_state
(
hRtlTestResult,
-aStr2 == aStr1,
+aStr2.compareTo(aStr1) == 0,
if radix not valid then radix must be 10,
valueOf(sal_Int64, sal_Int32 radix): radix = -5
);
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 3305e7c..96f37bd 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -169,16 +169,16 @@ bool
OOXMLStreamImpl::lcl_getTarget(uno::Referenceembed::XRelationshipAccess
{
beans::StringPair aPair = aSeq[i];
-if (aPair.First == sType
-aPair.Second == sStreamType)
+if (aPair.First.compareTo(sType) == 0
+aPair.Second.compareTo(sStreamType) == 0)
bFound = true;
-else if (aPair.First == sId
- aPair.Second == rId)
+else if (aPair.First.compareTo(sId) == 0
+ aPair.Second.compareTo(rId) == 0)
bFound = true;
-else if (aPair.First == sTarget)
+else if (aPair.First.compareTo(sTarget) == 0)
sMyTarget = aPair.Second;
-else if (aPair.First == sTargetMode
- aPair.Second == sExternal)
+else if (aPair.First.compareTo(sTargetMode) == 0
+ aPair.Second.compareTo(sExternal) == 0)
bExternalTarget = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PROPOSAL] enable gerrit buildbot trigger for all in group commiter
On Sun, Apr 21, 2013 at 07:02:29PM -0500, Norbert Thiebaud wrote: On Sun, Apr 21, 2013 at 4:06 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Opinions? as of now the only way to do that is to give buildbot admin ACL and to use a command line to schedule build... So what is the trouble with temporary doing that with the group committers? Your point about the long term solution notwithstanding, clearly that is where we want to end up. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PROPOSAL] enable gerrit buildbot trigger for all in group commiter
Hi, On Mon, Apr 22, 2013 at 07:50:55AM +0200, Lionel Elie Mamane wrote: On Sun, Apr 21, 2013 at 11:06:20PM +0200, Bjoern Michaelsen wrote: so this is a proposal to enable the ability to trigger a build for all in the group commiter (...) This sounds attractive. We can do this ~immediately and do the through web interface / gerrit when we figured out how to do it. Yes, thats the proposal. Have a working interim solution there. In the current situation, group committer can not even *see* the queue. IMHO, we could let an even bigger group see the queue; buildbot seems to have a specific capability for this: $ ssh -p 29418 lmam...@gerrit.libreoffice.org buildbot show -p core fatal: lmamane does not have viewQueue capability. Now, who should be able to see the queue? My first thought would be just everybody. I dont think we should overinvest in that interim solution though and separating can view queue from can schedule job is quite some work. In the long run having the queue visible on a website (which polls the state via ssh) should do. As for resources: Given the current build times and number of committers, this ends up with ~one build per committer per week on average to give you an broad idea. OTOH, some will not use it (or not use it right away) and if the queue is idling, there is little reason not to give it some work. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PROPOSAL] enable gerrit buildbot trigger for all in group commiter
On Mon, Apr 22, 2013 at 10:10:46AM +0200, Bjoern Michaelsen wrote: On Mon, Apr 22, 2013 at 07:50:55AM +0200, Lionel Elie Mamane wrote: On Sun, Apr 21, 2013 at 11:06:20PM +0200, Bjoern Michaelsen wrote: so this is a proposal to enable the ability to trigger a build for all in the group commiter (...) In the current situation, group committer can not even *see* the queue. IMHO, we could let an even bigger group see the queue; buildbot seems to have a specific capability for this: $ ssh -p 29418 lmam...@gerrit.libreoffice.org buildbot show -p core fatal: lmamane does not have viewQueue capability. Now, who should be able to see the queue? My first thought would be just everybody. I dont think we should overinvest in that interim solution though and separating can view queue from can schedule job is quite some work. The error message gave me the impression that the separation was already done, and that is was only a matter of configuration. If it is not, then shrug. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLImport.cxx | 22 +++--
xmloff/source/chart/SchXMLLegendContext.cxx |6 ++--
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 32 ++
xmloff/source/chart/SchXMLSeries2Context.cxx | 25 +---
xmloff/source/chart/SchXMLSeriesHelper.cxx| 19 ---
xmloff/source/chart/SchXMLTableContext.cxx| 30
xmloff/source/chart/SchXMLTools.cxx | 31 -
xmloff/source/chart/contexts.cxx | 16 +
8 files changed, 60 insertions(+), 121 deletions(-)
New commits:
commit 671b73789b2b09384e278efa0b989560b6606e4f
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sun Apr 21 18:49:52 2013 +0300
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- replaced dbg_* with sal_*
Change-Id: I4db4a2db0f4f2e9913826f428ba129099b1ac8a8
Reviewed-on: https://gerrit.libreoffice.org/3526
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/xmloff/source/chart/SchXMLImport.cxx
b/xmloff/source/chart/SchXMLImport.cxx
index 6f758c8..91ba282 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -165,7 +165,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
}
else
{
-OSL_FAIL( No valid XChartDocument given as XModel );
+SAL_WARN(xmloff.chart, No valid XChartDocument given as XModel );
pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
}
@@ -436,12 +436,7 @@ void SchXMLImportHelper::DeleteDataSeries(
}
catch( const uno::Exception ex )
{
-(void)ex; // avoid warning for pro build
-OSL_FAIL( OUStringToOString(
-OUString( Exception caught. Type: ) +
-OUString::createFromAscii( typeid( ex ).name()) +
-OUString( , Message: ) +
-ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+ SAL_WARN(xmloff.chart, Exception caught. Type:
OUString::createFromAscii( typeid( ex ).name()) , Message: ex.Message);
}
}
@@ -520,12 +515,7 @@ Reference chart2::XDataSeries
SchXMLImportHelper::GetNewDataSeries(
}
catch( const uno::Exception ex )
{
-(void)ex; // avoid warning for pro build
-OSL_FAIL( OUStringToOString(
-OUString( Exception caught. Type: ) +
-OUString::createFromAscii( typeid( ex ).name()) +
-OUString( , Message: ) +
-ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+SAL_WARN(xmloff.chart, Exception caught. Type:
OUString::createFromAscii( typeid( ex ).name()) , Message: ex.Message);
}
return xResult;
}
@@ -678,12 +668,8 @@ void SAL_CALL SchXMLImport::setTargetDocument( const
uno::Reference lang::XComp
}
catch( const uno::Exception rEx )
{
-#ifdef DBG_UTIL
OString aBStr(OUStringToOString(rEx.Message,
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE(SchXMLChartContext::StartElement(): Exception caught: %s,
aBStr.getStr());
-#else
-(void)rEx; // avoid warning for pro build
-#endif
+SAL_INFO(xmloff.chart, SchXMLChartContext::StartElement():
Exception caught: aBStr);
}
}
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx
b/xmloff/source/chart/SchXMLLegendContext.cxx
index ba44bf3..73b651fb 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -105,7 +105,7 @@ void SchXMLLegendContext::StartElement( const
uno::Reference xml::sax::XAttribu
}
catch(const beans::UnknownPropertyException)
{
-OSL_TRACE( Property HasLegend not found );
+SAL_INFO(xmloff.chart, Property HasLegend not found );
}
}
@@ -113,7 +113,7 @@ void SchXMLLegendContext::StartElement( const
uno::Reference xml::sax::XAttribu
uno::Reference beans::XPropertySet xLegendProps( xLegendShape,
uno::UNO_QUERY );
if( !xLegendShape.is() || !xLegendProps.is() )
{
-OSL_TRACE( legend could not be created );
+SAL_INFO(xmloff.chart, legend could not be created );
return;
}
@@ -151,7 +151,7 @@ void SchXMLLegendContext::StartElement( const
uno::Reference xml::sax::XAttribu
}
catch(const beans::UnknownPropertyException)
{
-OSL_TRACE( Property Alignment (legend) not found );
+SAL_INFO(xmloff.chart, Property Alignment (legend)
not found );
}
}
break;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index
[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3526 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3526 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4db4a2db0f4f2e9913826f428ba129099b1ac8a8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ioan Radu ioan.rad...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failure on master with OSX - datetime.hxx
On Mon, Apr 22, 2013 at 09:29:45AM +0200, Alexander Thurgood wrote: Still failing for me in dbconversion.cxx:42 : error : integer constant is too large for 'long' type Should have been fixed by commit 693d25f8a601ee3738a396fbd8a9b838f19e39c9 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Apr 20 17:31:26 2013 -0500 connectivity: use LL qualifier for int64 contants Change-Id: Iaafbd62920c2b695c5810766d143a01c288e813f If not, let us know. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window2.cxx | 56 +++---
1 file changed, 20 insertions(+), 36 deletions(-)
New commits:
commit c16de2eb12cc8d2885d55f7d240a17fa0444a3ca
Author: Tor Lillqvist t...@iki.fi
Date: Sun Apr 21 18:16:12 2013 +0300
Factor out identical code for vertical and horizontal scrollbar
Change-Id: Ifc4925feccea9c35654356120b157f27d7cbfd3b
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 8388095..98d7559 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1197,26 +1197,19 @@ sal_Bool Window::HandleScrollCommand( const
CommandEvent rCmd,
// ---
-// Not that when called for COMMAND_WHEEL above, despite its name,
-// pVScrl isn't necessarily the vertical scroll bar. Depending on
-// whether the scroll is horizontal or vertical, it is either the
-// horizontal or vertical scroll bar. nY is correspondingly either
-// the horizontal or vertical scroll amount.
-
-void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX,
- ScrollBar* pVScrl, long nY )
+static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN )
{
-if ( pHScrl nX pHScrl-IsEnabled() pHScrl-IsInputEnabled() !
pHScrl-IsInModalMode() )
+if ( pScrl nN pScrl-IsEnabled() pScrl-IsInputEnabled() !
pScrl-IsInModalMode() )
{
-long nNewPos = pHScrl-GetThumbPos();
+long nNewPos = pScrl-GetThumbPos();
-if ( nX == -LONG_MAX )
-nNewPos += pHScrl-GetPageSize();
-else if ( nX == LONG_MAX )
-nNewPos -= pHScrl-GetPageSize();
+if ( nN == -LONG_MAX )
+nNewPos += pScrl-GetPageSize();
+else if ( nN == LONG_MAX )
+nNewPos -= pScrl-GetPageSize();
else
{
-const double fVal = (double)nNewPos - ((double)nX *
pHScrl-GetLineSize());
+const double fVal = (double)nNewPos - ((double)nN *
pScrl-GetLineSize());
if ( fVal LONG_MIN )
nNewPos = LONG_MIN;
@@ -1226,31 +1219,22 @@ void Window::ImplHandleScroll( ScrollBar* pHScrl, long
nX,
nNewPos = (long)fVal;
}
-pHScrl-DoScroll( nNewPos );
+pScrl-DoScroll( nNewPos );
}
-if ( pVScrl nY pVScrl-IsEnabled() pVScrl-IsInputEnabled() !
pVScrl-IsInModalMode() )
-{
-long nNewPos = pVScrl-GetThumbPos();
-
-if ( nY == -LONG_MAX )
-nNewPos += pVScrl-GetPageSize();
-else if ( nY == LONG_MAX )
-nNewPos -= pVScrl-GetPageSize();
-else
-{
-const double fVal = (double)nNewPos - ((double)nY *
pVScrl-GetLineSize());
+}
-if ( fVal LONG_MIN )
-nNewPos = LONG_MIN;
-else if ( fVal LONG_MAX )
-nNewPos = LONG_MAX;
-else
-nNewPos = (long)fVal;
-}
+// Note that when called for COMMAND_WHEEL above, despite its name,
+// pVScrl isn't necessarily the vertical scroll bar. Depending on
+// whether the scroll is horizontal or vertical, it is either the
+// horizontal or vertical scroll bar. nY is correspondingly either
+// the horizontal or vertical scroll amount.
-pVScrl-DoScroll( nNewPos );
-}
+void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX,
+ ScrollBar* pVScrl, long nY )
+{
+lcl_HandleScrollHelper( pHScrl, nX );
+lcl_HandleScrollHelper( pVScrl, nY );
}
DockingManager* Window::GetDockingManager()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - basic/source
basic/source/sbx/sbxscan.cxx | 202 +--
1 file changed, 121 insertions(+), 81 deletions(-)
New commits:
commit 565c2dd3039a7c9aa1d82eadc4d5e54ea87cda9c
Author: Eike Rathke er...@redhat.com
Date: Tue Mar 19 23:23:16 2013 +0100
resolved rhbz#919020 Basic CDbl() and CSng() scan localized number
Code wrongly replaced decimal separator with '.' and used atof() to scan
the number string which itself may be localized on *iX systems but not
on Windows. Hence on *iX the numbers may had been truncated where on
Windows they were not.
Additionally made this work with Unicode separators if defined for the
locale, removed the awkward conversion to ASCII byte string and
eliminated use of toupper() and isdigit() calls. Also eliminated a
possible buffer overflow.
(cherry picked from commit 9e9f39d171cafa035d7b8e74187e25c3581cb89d)
Conflicts:
basic/source/sbx/sbxscan.cxx
replace decimal separator at correct position, rhbz#919020
(cherry picked from commit e96c7a60c88bc1e3008ebdeafd59327933d6707f)
Reviewed-on: https://gerrit.libreoffice.org/2859
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
(cherry picked from commit 96b079e24f86f7f49a624573783c6e103012f942)
Conflicts:
basic/source/sbx/sbxscan.cxx
Change-Id: I35d82e8f267ecb925783bf6f2de044a29c08f688
Reviewed-on: https://gerrit.libreoffice.org/3486
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 63f6dea..00463d9 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -63,107 +63,131 @@ void ImpGetIntntlSep( sal_Unicode rcDecimalSep,
sal_Unicode rcThousandSep )
rcThousandSep = rData.getNumThousandSep().GetBuffer()[0];
}
+inline bool ImpIsDigit( sal_Unicode c )
+{
+return '0' = c c = '9';
+}
+
+/** NOTE: slightly differs from strchr() in that it does not consider the
+terminating NULL character to be part of the string and returns bool
+instead of pointer, if character is 0 returns false.
+ */
+bool ImpStrChr( const sal_Unicode* p, sal_Unicode c )
+{
+if (!c)
+return false;
+while (*p)
+{
+if (*p++ == c)
+return true;
+}
+return false;
+}
+
+bool ImpIsAlNum( sal_Unicode c )
+{
+return (c 128) ? isalnum( static_castchar(c) ) : false;
+}
+
// scanning a string according to BASIC-conventions
-// but exponent may also be a D, so data type is SbxDOUBLED
+// but exponent may also be a D, so data type is SbxDOUBLE
// conversion error if data type is fixed and it doesn't fit
SbxError ImpScan( const ::rtl::OUString rWSrc, double nVal, SbxDataType
rType,
sal_uInt16* pLen, sal_Bool bAllowIntntl, sal_Bool
bOnlyIntntl )
{
-::rtl::OString aBStr( ::rtl::OUStringToOString( rWSrc,
RTL_TEXTENCODING_ASCII_US ) );
-
-char cIntntlComma, cIntntl1000;
-char cNonIntntlComma = '.';
-
-sal_Unicode cDecimalSep, cThousandSep = 0;
+sal_Unicode cIntntlDecSep, cIntntlGrpSep;
+sal_Unicode cNonIntntlDecSep = '.';
if( bAllowIntntl || bOnlyIntntl )
{
-ImpGetIntntlSep( cDecimalSep, cThousandSep );
-cIntntlComma = (char)cDecimalSep;
-cIntntl1000 = (char)cThousandSep;
+ImpGetIntntlSep( cIntntlDecSep, cIntntlGrpSep );
+if( bOnlyIntntl )
+cNonIntntlDecSep = cIntntlDecSep;
}
-
else
{
-cIntntlComma = cNonIntntlComma;
-cIntntl1000 = cNonIntntlComma;
+cIntntlDecSep = cNonIntntlDecSep;
+cIntntlGrpSep = 0; // no group separator accepted in non-i18n
}
-if( bOnlyIntntl )
-{
-cNonIntntlComma = cIntntlComma;
-cIntntl1000 = (char)cThousandSep;
-}
-
-const char* pStart = aBStr.getStr();
-const char* p = pStart;
-rtl::OStringBuffer aBuf( rWSrc.getLength());
-sal_Bool bRes = sal_True;
-sal_Bool bMinus = sal_False;
+const sal_Unicode* const pStart = rWSrc.getStr();
+const sal_Unicode* p = pStart;
+rtl::OUStringBuffer aBuf( rWSrc.getLength());
+bool bRes = true;
+bool bMinus = false;
nVal = 0;
SbxDataType eScanType = SbxSINGLE;
-while( *p ( *p == ' ' || *p == '\t' ) ) p++;
+while( *p == ' ' || *p == '\t' )
+p++;
if( *p == '-' )
-p++, bMinus = sal_True;
-if( isdigit( *p ) ||( (*p == cNonIntntlComma || *p == cIntntlComma ||
-*p == cIntntl1000) isdigit( *(p+1 ) ) ) )
+{
+p++;
+bMinus = true;
+}
+if( ImpIsDigit( *p ) || ((*p == cNonIntntlDecSep || *p == cIntntlDecSep ||
+(cIntntlDecSep *p == cIntntlGrpSep)) ImpIsDigit(
*(p+1) )))
{
short exp = 0;
-short comma = 0;
+short decsep = 0;
Re: Build failure on master with OSX - datetime.hxx
Le 22/04/13 10:20, Lionel Elie Mamane a écrit : On Mon, Apr 22, 2013 at 09:29:45AM +0200, Alexander Thurgood wrote: Should have been fixed by commit 693d25f8a601ee3738a396fbd8a9b838f19e39c9 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Apr 20 17:31:26 2013 -0500 connectivity: use LL qualifier for int64 contants Change-Id: Iaafbd62920c2b695c5810766d143a01c288e813f Ah, OK, I started my build before that commit went in. Will do a fresh pull/build. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Replace chained O(U)StringBuffer::append() with operator+
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3550
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3550/1
Replace chained O(U)StringBuffer::append() with operator+
Change-Id: I24923acfe693eca63d641b6d685c0f4e3dcd9298
---
M sw/qa/complex/writer/CheckBookmarks.java
M sw/qa/core/uwriter.cxx
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/sw/qa/complex/writer/CheckBookmarks.java
b/sw/qa/complex/writer/CheckBookmarks.java
index 2a42711..1cb8499 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -70,10 +70,7 @@
XTextContent xBookmarkAsContent = UnoRuntime.queryInterface(
XTextContent.class,
xBookmark);
-buffer.append(sBookmarkname);
-buffer.append(:);
-buffer.append(xBookmarkAsContent.getAnchor().getString());
-buffer.append(;);
+buffer = buffer + sBookmarkname + : +
xBookmarkAsContent.getAnchor().getString() + ; ;
}
java.security.MessageDigest sha1 =
java.security.MessageDigest.getInstance(SHA-1);
sha1.reset();
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 26dded0..b8e5470 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -296,22 +296,14 @@
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE);
OUString sViewText = aModelToViewHelper.getViewText();
-OUStringBuffer aBuffer;
-aBuffer.append(A C );
-aBuffer.append(CH_TXTATR_BREAKWORD);
-aBuffer.append( D);
+OUStringBuffer aBuffer = A C + CH_TXTATR_BREAKWORD +
D;
CPPUNIT_ASSERT(sViewText == aBuffer.makeStringAndClear());
}
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEREDLINED);
OUString sViewText = aModelToViewHelper.getViewText();
-OUStringBuffer aBuffer;
-aBuffer.append(BB );
-aBuffer.append(CH_TXTATR_BREAKWORD);
-aBuffer.append( C );
-aBuffer.append(CH_TXTATR_BREAKWORD);
-aBuffer.append( D);
+OUStringBuffer aBuffer = BB + CH_TXTATR_BREAKWORD + C
+ CH_TXTATR_BREAKWORD + D ;
CPPUNIT_ASSERT(sViewText == aBuffer.makeStringAndClear());
}
@@ -330,10 +322,7 @@
{
ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEINVISIBLE |
HIDEREDLINED);
OUString sViewText = aModelToViewHelper.getViewText();
-OUStringBuffer aBuffer;
-aBuffer.append(C );
-aBuffer.append(CH_TXTATR_BREAKWORD);
-aBuffer.append( D);
+OUStringBuffer aBuffer = C + CH_TXTATR_BREAKWORD +
D;
CPPUNIT_ASSERT(sViewText == aBuffer.makeStringAndClear());
}
--
To view, visit https://gerrit.libreoffice.org/3550
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24923acfe693eca63d641b6d685c0f4e3dcd9298
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Anurag Kanungo anuragkanu...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] resolved rhbz#919020 Basic CDbl() and CSng() scan localized ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3486 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3486 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35d82e8f267ecb925783bf6f2de044a29c08f688 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failure on master with OSX - datetime.hxx
On Mon, Apr 22, 2013 at 10:28:21AM +0200, Alexander Thurgood wrote: Le 22/04/13 10:20, Lionel Elie Mamane a écrit : On Mon, Apr 22, 2013 at 09:29:45AM +0200, Alexander Thurgood wrote: Should have been fixed by commit 693d25f8a601ee3738a396fbd8a9b838f19e39c9 Ah, OK, I started my build before that commit went in. Will do a fresh pull/build. Some git recipes for such cases: First, do git fetch. It will do the first half of a pull, that is fetch the new commits from the central repository, but without touching your local branches / tree. Then, you can do stuff like: git diff HEAD..remotes/origin/master -- path/to/file.cxx git log -p HEAD..remotes/origin/master -- path/to/file.cxx git blame remotes/origin/master -- path/to/file.cxx to see the state of that file in the central repository, and see if the failing line has been changed since you last pulled. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
0 files changed New commits: commit 6d18625207aa6c9a1861a0bc1e266f0c931fdd79 Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 22 11:51:24 2013 +0300 chmod +x Change-Id: I2358b2241bf260afb85005c247cb8be82104e2e5 diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers old mode 100644 new mode 100755 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE : RE : Difficulties to build LO for windows
Hello Sorry for the late update, but I did succeed building on windows I had to modify setup_osl.inf and delete the call to gid_MergeModule_Microsoft_VC100_CRT_x86. Now I tried to add language parameter: --with-lang=en-US fr de it es I had this bug http://d.hatena.ne.jp/foral/2027 which is normal (see here https://wiki.documentfoundation.org/User:Foral/Build_Win#For_localized_build) But now I have this error: log for /cygdrive/f/git/libo/svx/prj [ build DEP ] SRS:svx/res Error starting rsc2 compiler svx 0 #define ITEM_FORM_CONTROL_PROPERTIES !defined _GLOBLMN_HRC 0 all Con~trol... 20130418 17:45:22 ^ f640: f:/git/libo/workdir/wntmsci12.pro/inc/svx\globlmn.hrc, line 1: Error: syntax error f256: Error: !! 1 Error found!! F:/git/libo/solenv/gbuild/AllLangResTarget.mk:96: recipe for target `/cygdrive/f/git/libo/workdir/wntmsci12.pro/SrsPartTarget/svx/source/form/datanavi.src' failed make[2]: *** [/cygdrive/f/git/libo/workdir/wntmsci12.pro/SrsPartTarget/svx/source/form/datanavi.src] Error 1 make[2]: *** Waiting for unfinished jobs Error starting rsc2 compiler svx 0 #define ITEM_FORM_CONTROL_PROPERTIES !defined _GLOBLMN_HRC 0 all Con~trol... 20130418 17:45:22 ^ f640: f:/git/libo/workdir/wntmsci12.pro/inc/svx\globlmn.hrc, line 1: Error: syntax error f256: Error: !! 1 Error found!! F:/git/libo/solenv/gbuild/AllLangResTarget.mk:96: recipe for target `/cygdrive/f/git/libo/workdir/wntmsci12.pro/SrsPartTarget/svx/source/fmcomp/gridctrl.src' failed make[2]: *** [/cygdrive/f/git/libo/workdir/wntmsci12.pro/SrsPartTarget/svx/source/fmcomp/gridctrl.src] Error 1 Error starting rsc2 compiler I tried this patch http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-svx.patch?revision=1.1view=markup because of this bug https://bugs.freedesktop.org/show_bug.cgi?id=38958 with no result.. Have you any solution? Matthieu. De : Gay, Matthieu Date d'envoi : jeudi 4 avril 2013 11:26 À : michael.me...@suse.com; Michael Stahl Cc: libreoffice@lists.freedesktop.org; Jan Holesovsky Objet : RE : RE : Difficulties to build LO for windows Update: About my problem I've done: /usr/bin/sh cd D:/libreOffice/git4/libo source ./Env.Host.sh cd instsetoo_native rm -Rf D:/libreOffice/git4/libo/instsetoo_native/wntmsci12.pro # optional module 'clean' build the result is: ** ERROR: ERROR: msm file not found: Microsoft_VC100_CRT_x86.msm ! in function: merge_mergemodules_into_msi_database ** I will try to this solution: http://markmail.org/message/ineeoshkfn3d5eav#query:+page:1+mid:ineeoshkfn3d5eav+state:results commit: 238eba337cedda17a9ed1ce7e91755c66446195a De : Gay, Matthieu Date d'envoi : jeudi 4 avril 2013 10:17 À : michael.me...@suse.com; Michael Stahl Cc: libreoffice@lists.freedesktop.org; Jan Holesovsky Objet : RE : RE : Difficulties to build LO for windows Hello, Yes it works! Thanks for your activity ! I met others problems here the problem and solution: Error: test cppunit ko Solution: I'll have to delete some wmf files See here: http://lists.freedesktop.org/archives/libreoffice/2012-January/024403.html Error: file globlmn.hrc not found Solution: apply a Patch See here http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-svx.patch?revision=1.1view=markup Error: Cannot open include file: 'atlbase.h': No such file or directory Solution: Solution: use: --disable-atl et --disable-activex See here: http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/16228 I had also not found problem in the step creating help pack (file listed in setup_osl.inf) which I resolved by putting these arguments: --with-system-dicts --without-myspell-dicts Now the error is still in creating help pack step, here the log: Use of uninitialized value $value in lc at D://libreOffice/git4/libo/solenv/bin/modules/installer/packagelist.pm line 451. ... analyzing files ... ... analyzing files with flag ARCHIVE ... ... analyzing files with flag SUBST_FILENAME ... ... analyzing files with flag SCPZIP_REPLACE ... ... analyzing files with flag PATCH_SO_NAME ... ... analyzing files with flag HIDDEN ... ... analyzing all directories for this product ... ... analyzing links ... ... analyzing unix links ... ... creating profiles ... 1: No such file or directory at -e line 1 Use of uninitialized value in substitution (s///) at D://libreOffice/git4/libo/solenv/bin/modules/installer/scri titems.pm line 849. Use of uninitialized value in substitution (s///) at D://libreOffice/git4/libo/solenv/bin/modules/installer/scri titems.pm line 848. ... analyzing folder ... ... analyzing folderitems ... ... analyzing registryitems ... ... analyzing modules ... ... creating inf files ... ... analyzing package list ... ... creating installation set in
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/table2.cxx |6 ++
sc/source/ui/view/viewfun3.cxx |4 +---
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 07a7f97b21a02284456e575fe4404f0d216a6723
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Apr 17 03:13:23 2013 +0200
replace one more auto_ptr
Change-Id: I903be81ba3e23c43a481ba775d762c06557942db
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index a39be5b..9f091a6 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1615,9 +1615,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
}
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-std::auto_ptrScDocument pMixDoc;
-SAL_WNODEPRECATED_DECLARATIONS_POP
+boost::scoped_ptrScDocument pMixDoc;
if (bSkipEmpty || nFunction)
{
if (nFlags IDF_CONTENTS)
commit 0216d0e1ff84ae8ebab3d40bf69bae605264e82b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Apr 17 03:05:16 2013 +0200
copy conditional formats correctly, fdo#63607
Change-Id: I80307944c5a9a873f972e6c349ec4fe48ae848e9
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 5b024fd..5af802f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1128,6 +1128,12 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
if (bFlagChange)
pDestTab-InvalidatePageBreaks();
+if(nFlags IDF_ATTRIB)
+{
+pDestTab-mpCondFormatList-DeleteArea(nCol1, nRow1, nCol2, nRow2);
+pDestTab-CopyConditionalFormat(nCol1, nRow1, nCol2, nRow2, 0, 0,
this);
+}
+
pDestTab-SetOutlineTable( pOutlineTable ); // auch nur wenn
bColRowFlags
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: install-gdb-printers exec perms ?
Hi, On Sat, Apr 20, 2013 at 10:40:45PM +0100, Michael Meeks michael.me...@suse.com wrote: I just built master from clean and got a non-executable solenv/bin/install-gdb-printers which apparently caused a build failure. Too late to fix it for me just now - hope it helps; chmod +x might fix it I hope ;-) Hmm, I guess that was a local problem at you -- here it's already executable and git log says it always was. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Python extension not working on Mac (LibreOffice 4.0.2.2)
Hello, On Apr/19/2013, Norbert Thiebaud wrote: On Monday I can try using LO 4.0.3 RC1, sadly I don't have access to Mac hardware before. 4.0.3.1 has been rebuilt and will be mirrored soonish... and should not have that bug. by monday you should be able to download a working 4.0.3.1 I've just tested: works perfectly, thanks! 4.0.2.2 is already released... it is unclear how we are going to handle this... re-downloading a release version after release is not usually a 'good thing(tm). The release team will discuss what they want to do about that... any inside here? Thank you, -- Carles Pina i Estany Web: http://pinux.info || Blog: http://pintant.cat ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Allow switching between HarfBuzz and LE at runtime
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3521 to look at the new rebased patch set (#2). Change subject: Allow switching between HarfBuzz and LE at runtime .. Allow switching between HarfBuzz and LE at runtime Using the env variable SAL_USE_HARFBUZZ. Change-Id: If83d4e0e6b9e9a06481840661d51fff6af35b3ae --- M vcl/generic/glyphs/gcach_layout.cxx 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3521/2 -- To view, visit https://gerrit.libreoffice.org/3521 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If83d4e0e6b9e9a06481840661d51fff6af35b3ae Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Khaled Hosny khaledho...@eglug.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: smoketest/com smoketest/data
smoketest/com/sun/star/comp/smoketest/description.xml |2 +- smoketest/data/Basic/Standard/Test_Ext.xml|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b9cc769926fa2558b8e76181b0cc850347410a09 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Apr 22 11:00:54 2013 +0200 Adapt smoketest to new TestExtension.oxt description.xml Change-Id: Ie618a9dc4551aa580e6f764e20812da234b6239e diff --git a/smoketest/com/sun/star/comp/smoketest/description.xml b/smoketest/com/sun/star/comp/smoketest/description.xml index 7d25919..ccbac75 100644 --- a/smoketest/com/sun/star/comp/smoketest/description.xml +++ b/smoketest/com/sun/star/comp/smoketest/description.xml @@ -18,7 +18,7 @@ -- d:description xmlns:d=http://openoffice.org/extensions/description/2006; - d:identifier value=smoketest.TestExtension/ + d:identifier value=org.libreoffice.smoketest.TestExtension/ d:version value=1/ d:dependencies d:OpenOffice.org-minimal-version d:name=OpenOffice.org 2.3 value=2.3/ diff --git a/smoketest/data/Basic/Standard/Test_Ext.xml b/smoketest/data/Basic/Standard/Test_Ext.xml index 06639d4..29a68f8 100644 --- a/smoketest/data/Basic/Standard/Test_Ext.xml +++ b/smoketest/data/Basic/Standard/Test_Ext.xml @@ -80,7 +80,7 @@ Sub TestExtensions gCurrentTestCase = cEXTUninstall apos;Remove the package -ext_mgr.removeExtension(quot;org.openoffice.legacy.quot; + cExtensionFileName, cExtensionFileName, quot;userquot;,obj_null, cmdEnv) + ext_mgr.removeExtension(quot;org.libreoffice.smoketest.TestExtensionquot;, cExtensionFileName, quot;userquot;,obj_null, cmdEnv) apos;Try to create the service which is contained in the now removed extension. oTestExtension = createUnoService(cUnoSmoketestTestExtension) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
new feature: how to document it?
(Moving discussion to documentation team ML. Please keep me in CC, I'm
not subscribed / I don't read that ML often.)
On Sun, Apr 21, 2013 at 11:46:56AM +0200, Alex Thurgood wrote:
Le 20/04/2013 23:34, Lionel Elie Mamane a écrit :
One last question: where can I edit the help to document a new feature
I'm introducing (namely, the option that the storage value is the
index in the list)? I grepped for a string that appears in the right
help page, but no result. In particular, I did not find it in the
helpcontent2 directory. Also, do we have our fork of the
OpenOffice.org Developer's Guide?
AFAIK, there is nothing about the MVC paradigm and its application in
database controls in the helpcontent, (...)
That's not what I meant. When I'm editing the properties of a listbox,
in the data tab and I press F1 I get a new window entitled
LibreOffice Help - LibreOffice Base, with content like below. That's
what I intended to change.
I tried grepping for allows you to assign a data source in the
LibreOffice source code to find the file I'm supposed to change, no
luck.
I added the feature that the BoundColumn can now be -1 also. I'd
also like to explicitly document that 0 or empty have the same
behaviour.
https://wiki.documentfoundation.org/Documentation/Development
sends me to http://www.odfauthors.org/libreoffice/english/, but:
- This site's built-in search does not find anything when I search
for allows you to assign a data source to the selected control
- Base Guide has nothing
- Base Handbook, the chapter Base H/b Ch4 Forms could be
relevant, but again, searching in this document (in LibreOffice
writer), I don't find the text I want to change.
Here's the first fifth or so of the page/document I want to edit:
- BEGIN QUOTE ---
Data
The Data tab page allows you to assign a data source to the selected
control.
To access this command...
Open context menu of a selected form element - choose Control - Data
tab
Open Form Controls toolbar or Form Design toolbar, click Control icon
- Data tab
For forms with database links, the associated database is defined in
the Form Properties. You will find the functions for this on the Data
tab page.
The possible settings of the Data tab page of a control depend on the
respective control. You will only see the options that are available
for the current control and context. The following fields are available:
Bound field
If you delete the contents of the Bound field cell in the property
browser, the first field of the result set is used to display and to
exchange data.
This property for list boxes defines which data field of a linked
table is displayed in the form.
If a list box in the form is to display contents of a table linked to
the form table, then define in the Type of list contents field if the
display is determined by an SQL command or the (linked) table is
accessed. With the Bound field property, you use an index to specify
to which data field of the query or of the table the list field is
linked.
The property Bound field is only for forms that are used to access
more than one table. If the form is based on only one table, the field
to be displayed in the form is specified directly under Data
field. However, if you want the list box to display data from a table
that is linked to the current table over a common data field, the
linked data field is defined by the property Bound field.
If you selected SQL under Type of list contents, the SQL command
determines the index to be specified. Example: If you specify an SQL
command such as SELECT Field1, Field2 FROM tablename under List
content, refer to the following table:
Bound field
Link
{empty}
The database field Field1 is linked to the field specified under
Data field.
1
The database field Field2 is linked to the field specified under
Data field.
If you selected Table under Type of list contents, the table
structure defines the index to be specified. Example: If a database
table is selected under List content, refer to the following table:
Bound field
Link
{empty}
The 1st column of the table is linked to the field specified under
Data field.
1
The 2nd column of the table is linked to the field specified under
Data field.
2
The 3rd column of the table is linked to the field specified under
Data field.
- END QUOTE ---
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: install-gdb-printers exec perms ?
On Mon, 2013-04-22 at 11:01 +0200, Miklos Vajna wrote: Hmm, I guess that was a local problem at you -- here it's already executable and git log says it always was. Plenty of scope for user error here ;-) PEBKAC etc. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 28509115f7f60541d69b37bea0720305ea13d363 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Apr 22 11:18:32 2013 +0200 Bump version diff --git a/configure.ac b/configure.ac index 151f581..0b7ddcf 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([libvisio_version_major],[0]) m4_define([libvisio_version_minor],[0]) -m4_define([libvisio_version_micro],[25]) +m4_define([libvisio_version_micro],[26]) m4_define([libvisio_version],[libvisio_version_major.libvisio_version_minor.libvisio_version_micro]) # = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: new feature: how to document it?
On Mon, Apr 22, 2013 at 11:11:46AM +0200, Lionel Elie Mamane wrote: Le 20/04/2013 23:34, Lionel Elie Mamane a écrit : One last question: where can I edit the help to document a new feature I'm introducing (namely, the option that the storage value is the index in the list)? I grepped for a string that appears in the right help page, but no result. In particular, I did not find it in the helpcontent2 directory. Also, do we have our fork of the OpenOffice.org Developer's Guide? When I'm editing the properties of a listbox, in the data tab and I press F1 I get a new window entitled LibreOffice Help - LibreOffice Base, with content like below. That's what I intended to change. I tried grepping for allows you to assign a data source in the LibreOffice source code to find the file I'm supposed to change, no luck. It turns out, git grep does not go into submodules :-| I was doing: $ git grep -i 'allows you to assign a data source' $ git grep -i 'allows you to assign a data source' -- helpcontent2/ This got me going: $ cd helpcontent2 git grep -i 'allows you to assign a data source' Are the identifiers like id=par_id3154206 essentially random (and I can just put other random ones for new paragraphs), or do they have some hidden meaning (and then please explain me how to generate the id for a paragraph I'm adding). Thanks in advance, -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source svx/inc svx/source
dev/null |binary
svx/inc/galtheme.hrc |2 +-
svx/inc/svx/gallery.hxx |1 +
svx/source/gallery2/galtheme.src |8
4 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 36557ab053c5bb28bf5203cabcb4d6cb2ae893b0
Author: Armin Le Grand a...@apache.org
Date: Thu Nov 29 15:15:00 2012 +
fdo#63749: #118845# corrected missing ressource for gallery theme htmlexpo
(cherry picked from commit fee688fd96329f628f83623ea91c32e10eeb134b)
Conflicts:
svx/inc/svx/gallery.hxx
Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3
Reviewed-on: https://gerrit.libreoffice.org/3507
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/extras/source/gallery/gallery_system/sg25.sdg
b/extras/source/gallery/gallery_system/sg25.sdg
deleted file mode 100644
index af78e56..000
Binary files a/extras/source/gallery/gallery_system/sg25.sdg and /dev/null
differ
diff --git a/extras/source/gallery/gallery_system/sg25.sdv
b/extras/source/gallery/gallery_system/sg25.sdv
deleted file mode 100644
index 4449591..000
Binary files a/extras/source/gallery/gallery_system/sg25.sdv and /dev/null
differ
diff --git a/extras/source/gallery/gallery_system/sg25.thm
b/extras/source/gallery/gallery_system/sg25.thm
deleted file mode 100644
index e7b0a49..000
Binary files a/extras/source/gallery/gallery_system/sg25.thm and /dev/null
differ
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 7eda727..52b9fdd 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -39,7 +39,7 @@
#define RID_GALLERYSTR_THEME_MAPS (RID_GALLERYSTR_THEME_START + 12)
#define RID_GALLERYSTR_THEME_PEOPLE
(RID_GALLERYSTR_THEME_START + 13)
#define RID_GALLERYSTR_THEME_SURFACES
(RID_GALLERYSTR_THEME_START + 14)
-// free
+#define RID_GALLERYSTR_THEME_HTMLBUTTONS
(RID_GALLERYSTR_THEME_START + 15)
#define RID_GALLERYSTR_THEME_POWERPOINT
(RID_GALLERYSTR_THEME_START + 16)
#define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18)
#define RID_GALLERYSTR_THEME_SYMBOLS
(RID_GALLERYSTR_THEME_START + 19)
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index f7b7b56..a2b010b 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -41,6 +41,7 @@
#define GALLERY_THEME_3D1
#define GALLERY_THEME_BULLETS 3
#define GALLERY_THEME_HOMEPAGE 10
+#define GALLERY_THEME_HTMLBUTTONS 15
#define GALLERY_THEME_POWERPOINT16
#define GALLERY_THEME_SOUNDS18
#define GALLERY_THEME_USERSOUNDS21
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 34650c5..4b63b82 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -119,6 +119,14 @@ String RID_GALLERYSTR_THEME_SURFACES
//
-
+String RID_GALLERYSTR_THEME_HTMLBUTTONS
+{
+// !!! Don't translate, please !!!
+Text = private://gallery/hidden/HtmlExportButtons;
+};
+
+//
-
+
String RID_GALLERYSTR_THEME_POWERPOINT
{
// !!! Don't translate, please !!!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fe/e688fd96329f628f83623ea91c32e10eeb134b
fe/e688fd96329f628f83623ea91c32e10eeb134b |1 + 1 file changed, 1 insertion(+) New commits: commit 35b264363973bf1b5bef9d39239f791138a58248 Author: Michael Meeks michael.me...@suse.com Date: Mon Apr 22 10:23:55 2013 +0100 Notes added by 'git notes add' diff --git a/fe/e688fd96329f628f83623ea91c32e10eeb134b b/fe/e688fd96329f628f83623ea91c32e10eeb134b new file mode 100644 index 000..ab2b765 --- /dev/null +++ b/fe/e688fd96329f628f83623ea91c32e10eeb134b @@ -0,0 +1 @@ +merged as: 36557ab053c5bb28bf5203cabcb4d6cb2ae893b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#63749: #118845# corrected missing ressource for gallery ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3507 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3507 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I263bc8bcd4232d8e9b4a971fd611b451840618a3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: new feature: how to document it?
Hi Lionel, On 22/04/2013 11:20, Lionel Elie Mamane wrote: On Mon, Apr 22, 2013 at 11:11:46AM +0200, Lionel Elie Mamane wrote: Le 20/04/2013 23:34, Lionel Elie Mamane a écrit : One last question: where can I edit the help to document a new feature I'm introducing (namely, the option that the storage value is the index in the list)? I grepped for a string that appears in the right help page, but no result. In particular, I did not find it in the helpcontent2 directory. Also, do we have our fork of the OpenOffice.org Developer's Guide? When I'm editing the properties of a listbox, in the data tab and I press F1 I get a new window entitled LibreOffice Help - LibreOffice Base, with content like below. That's what I intended to change. I tried grepping for allows you to assign a data source in the LibreOffice source code to find the file I'm supposed to change, no luck. It turns out, git grep does not go into submodules :-| I was doing: $ git grep -i 'allows you to assign a data source' $ git grep -i 'allows you to assign a data source' -- helpcontent2/ This got me going: $ cd helpcontent2 git grep -i 'allows you to assign a data source' Are the identifiers like id=par_id3154206 essentially random (and I can just put other random ones for new paragraphs), or do they have some hidden meaning (and then please explain me how to generate the id for a paragraph I'm adding). I get it too with in share/02 file 01170102.xhp par_id3155306 2 help.text In id=par_xxx, the 'par' part indicate a paragraph, and the 'xxx' part can be any random numbers, but must be unique in the .xhp file. Kind regards Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: Changes to 'refs/tags/libvisio-0.0.26'
Tag 'libvisio-0.0.26' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-04-22 10:35 -0700 Tagging 0.0.26 release Changes since libvisio-0.0.25-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/zoomitem.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ad57664323e3ddf04ae99dba14ddaa22da2aacba Author: Noel Power noel.po...@suse.com Date: Mon Apr 22 10:29:02 2013 +0100 fdo#63659 sigh fix brain lapse, missing break Change-Id: I02ab972cfad577423585d25587b925b5b1153506 diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 1f64cd5..ee28560 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -120,6 +120,7 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any rVal, sal_uInt8 nMemberI aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); aSeq[2].Value = sal_Int16( eType ); rVal = aSeq; +break; } case MID_VALUE: rVal = (sal_Int32) GetValue(); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#63659 sigh fix brain lapse, missing break
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3551 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/3551/1 fdo#63659 sigh fix brain lapse, missing break Change-Id: I02ab972cfad577423585d25587b925b5b1153506 (cherry picked from commit ad57664323e3ddf04ae99dba14ddaa22da2aacba) --- M sfx2/source/doc/zoomitem.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 09b2ae7..7849e59 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -120,6 +120,7 @@ aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); aSeq[2].Value = sal_Int16( eType ); rVal = aSeq; +break; } case MID_VALUE: rVal = (sal_Int32) GetValue(); break; -- To view, visit https://gerrit.libreoffice.org/3551 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02ab972cfad577423585d25587b925b5b1153506 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/Package_gallsystem.mk
extras/Package_gallsystem.mk |3 --- 1 file changed, 3 deletions(-) New commits: commit 3bcd2d3787c5c6598656b34c00f04612bc99d8d2 Author: Michael Meeks michael.me...@suse.com Date: Mon Apr 22 10:40:51 2013 +0100 remove sg25 gallery packaging rules. diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk index 21771d4..85718e7 100644 --- a/extras/Package_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -18,9 +18,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\ sg24.sdg \ sg24.sdv \ sg24.thm \ - sg25.sdg \ - sg25.sdv \ - sg25.thm \ sg36.sdg \ sg36.sdv \ sg36.thm \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: touch/Library_libotouch.mk
touch/Library_libotouch.mk |5 - 1 file changed, 5 deletions(-) New commits: commit 0b3a76048a57f8a3e8c033d6f41dae5f83165c9b Author: Tor Lillqvist t...@iki.fi Date: Mon Apr 22 12:43:55 2013 +0300 Bin bogus include setting Change-Id: Idf61c1d466bf7f40fe17ae5f4f33b74cc709772a diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index cd0a14c..c172e6d 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -8,11 +8,6 @@ $(eval $(call gb_Library_Library,libotouch)) -$(eval $(call gb_Library_set_include,libotouch,\ --I$(SRCDIR)/libotouch/inc \ -$$(INCLUDE) \ -)) - $(eval $(call gb_Library_use_sdk_api,libotouch)) $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/generic/libotouch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build failure on master with OSX - datetime.hxx
Le 22/04/13 10:34, Lionel Elie Mamane a écrit : to see the state of that file in the central repository, and see if the failing line has been changed since you last pulled. Cheers, I must admit to not really understanding the details of how git works in practice (despite reading some of the man pages and even a more graphical explanation), so the various commands for fetching bits, rolling back, resetting, and comparing, etc, are still confusing for me. I have saved your tips for future reference. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - autogen.sh boost/boost.6369.warnings.patch editeng/inc editeng/source
autogen.sh |1 +
boost/boost.6369.warnings.patch | 21 +
editeng/inc/editeng/numitem.hxx |1 +
editeng/source/items/numitem.cxx | 17 +
4 files changed, 40 insertions(+)
New commits:
commit fe82b2237baa7f64fc53e8c864535a28264baa6e
Author: Caolán McNamara caol...@redhat.com
Date: Sun Apr 21 21:30:35 2013 +0100
some more warnings in parts of boost we will use soon
Change-Id: Ie7a16402ab577ccae7688284712ed2657b509f76
diff --git a/boost/boost.6369.warnings.patch b/boost/boost.6369.warnings.patch
index 2cc1ebd..5a7e336 100644
--- a/boost/boost.6369.warnings.patch
+++ b/boost/boost.6369.warnings.patch
@@ -320,4 +320,25 @@
+rule_info(std::string(name_to_register), trace_node_))
).second;
}
+
+--- misc/boost_1_44_0/boost/variant/variant.hpp2012-01-08
20:16:41.321760852 +
misc/build/boost_1_44_0/boost/variant/variant.hpp 2012-01-08
20:25:43.233484675 +
+@@ -1143,14 +1143,14 @@
+ which_t which_;
+ storage_t storage_;
+-void indicate_which(int which)
++void indicate_which(int i_which)
+ {
+-which_ = static_castwhich_t( which );
++which_ = static_castwhich_t( i_which );
+ }
+
+-void indicate_backup_which(int which)
++void indicate_backup_which(int i_which)
+ {
+-which_ = static_castwhich_t( -(which + 1) );
++which_ = static_castwhich_t( -(i_which + 1) );
+ }
+
+ private: // helpers, for queries (below)
commit 1cb1db442e46616b1de121141cd94c114d4fce52
Author: Caolán McNamara caol...@redhat.com
Date: Sun Apr 21 13:50:12 2013 +0100
restore SvxNumRule::SetLevel variant
correctly removed as unused by 1dc612970f57aa5599c6d1b7afb10a3f5f4403d2 but
we
will need it again
Change-Id: I2d5c391506a84abe435547232398aa43a3468fe6
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index f17e9cf..9f88e79 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -267,6 +267,7 @@ public:
const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
const SvxNumberFormat GetLevel(sal_uInt16 nLevel)const;
voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat
rFmt, sal_Bool bIsValid = sal_True);
+voidSetLevel(sal_uInt16 nLevel, const SvxNumberFormat*
pFmt);
sal_BoolIsContinuousNumbering()const
{return bContinuousNumbering;}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 7ef42e0..973dd63 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -836,6 +836,23 @@ void SvxNumRule::SetLevel( sal_uInt16 i, const
SvxNumberFormat rNumFmt, sal_Boo
}
}
+void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
+{
+DBG_ASSERT(nLevel SVX_MAX_NUM, Wrong Level );
+
+if( nLevel SVX_MAX_NUM )
+{
+aFmtsSet[nLevel] = 0 != pFmt;
+if(pFmt)
+SetLevel(nLevel, *pFmt);
+else
+{
+delete aFmts[nLevel];
+aFmts[nLevel] = 0;
+}
+}
+}
+
String SvxNumRule::MakeNumString( const SvxNodeNum rNum, sal_Bool
bInclStrings ) const
{
String aStr;
commit 53e6c475939df22c849d410efc2aa9bfd28ad819
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 22 10:23:49 2013 +0100
aix stuffs stuff into /opt/freeware/share in defacto default
Change-Id: I2cd8e3498f81b96041c81cdc48ca6277ccbb210d
diff --git a/autogen.sh b/autogen.sh
index 2498c5a..0e61ee5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -162,6 +162,7 @@ my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
$aclocal_flags .= -I $src_path/m4;
$aclocal_flags .= -I $src_path/m4/mac if ($system eq 'Darwin');
+$aclocal_flags .= -I /opt/freeware/share/aclocal if ($system eq 'AIX');
$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq
'Darwin'));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
