Help needed about failing build (same pb as Clang tinderbox)
Hello, Clang tinderbox fails with : ERROR: Can´t copy file: HTML - /home/tinderbox/master-build/solver/unxlngi6/installation/opt/ No such file or directory at /home/tinderbox/master-build/solenv/bin/modules/installer/worker.pm line 376. The problem comes from or is triggered by this commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=192c3ca83354921313d452fa4353c2bc8da1a13e. I have the same problem when testing these changes on pc Debian x86-64 with master sources updated yesterday. Thanks to David, some missing commas had been added. Still, this problem appears and the weird thing is it doesn't seem reproduceable in any case. I read again the commit, took a look to the line 376 of worker.pm, for this I tried to add some installer::logger::print_message just before line 376 in worker.pm but just didn't see them when running make dev-install. I really don't know how to investigate about this because I don't understand what means the HTML part. Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/Help-needed-about-failing-build-same-pb-as-Clang-tinderbox-tp4049931.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/file_extra_ooo.scp | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit fa0faf3f04882b55a8ef2524f66b00371857 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Apr 15 07:01:29 2013 +0200 Add missing semicolons Change-Id: I880ddfe30361ab1984ec6a234176d47ad3dcb435 diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 2d702b6..e779524 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -244,21 +244,21 @@ End File gid_File_Extra_Gallbullets Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallbullets.filelist; End File gid_File_Extra_Gallhtmlexpo Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallhtmlexpo.filelist; End File gid_File_Extra_Gallroot Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallroot.filelist; End @@ -272,14 +272,14 @@ End File gid_File_Extra_Gallsounds Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallsounds.filelist; End File gid_File_Extra_Gallsystem Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallsystem.filelist; Patchfiles = (); End @@ -287,14 +287,14 @@ End File gid_File_Extra_Gallwwwback Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallwwwback.filelist; End File gid_File_Extra_Gallwwwgraf Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST) +Styles = (FILELIST); Name = extras_gallwwwgraf.filelist; End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: Help needed about failing build (same pb as Clang tinderbox)
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=fa0faf3f04882b55a8ef2524f66b00371857 (add missing semi colons) should fix this. Sorry for the noise. Julien -- View this message in context: http://nabble.documentfoundation.org/Help-needed-about-failing-build-same-pb-as-Clang-tinderbox-tp4049931p4049935.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/filelists.pm | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 578d3476f0c1bc13ac08cc111f5d758226f4d07b
Author: David Tardon dtar...@redhat.com
Date: Mon Apr 15 07:09:02 2013 +0200
add error checking into installer/filelist.pm
Change-Id: Iccb314155ac70984fa70e7d1ec839edd9eb14270
diff --git a/solenv/bin/modules/installer/filelists.pm
b/solenv/bin/modules/installer/filelists.pm
index d3447be..5aa0506 100644
--- a/solenv/bin/modules/installer/filelists.pm
+++ b/solenv/bin/modules/installer/filelists.pm
@@ -40,8 +40,15 @@ sub resolve_filelist_flag
foreach my $path (@{$filelist})
{
-# TODO: check that the file is really under $outdir
-# TODO: check existence of the file
+if ((index $path, $outdir) != 0)
+{
+installer::logger::print_error(file '$path' is not in
'$outdir');
+}
+if (!-f $path)
+{
+installer::logger::print_error(file '$path' does not
exist);
+}
+
my $subpath = substr $path, ((length $outdir) + 1); # drop
separator too
my %newfile = ();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
FDO#61146 - Supplied libstdc++.so.6 is older than system one - causing DSO load failure
Can someone check this out, confirm prioritize it - been sitting unconfirmed for way too longer. I checked it out but am unsure how to confirm it without similar distro. Thanks in advance, trying to tackle these older unconfirmed bugs against version 4+. https://bugs.freedesktop.org/show_bug.cgi?id=61146 Best, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AllLangHelp.mk |2 +- solenv/gbuild/HelpTarget.mk | 30 -- 2 files changed, 17 insertions(+), 15 deletions(-) New commits: commit cc1c050390ee68105f2f67edf3b6005880861c9b Author: David Tardon dtar...@redhat.com Date: Sun Apr 14 16:51:52 2013 +0200 gbuild: pass config. file to HelpTarget explicitly This is preparation for delivering HelpTarget files as a Package, which would not be possible with the previous impl. Change-Id: Ia79effcb77aaa7054987879c394cb277e377c9d8 Reviewed-on: https://gerrit.libreoffice.org/3383 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index 95cdd8c..d154de2 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -51,7 +51,6 @@ $(call gb_AllLangHelp_get_clean_target,%) : # gb_AllLangHelp_AllLangHelp__one_lang module lang helpname zipname define gb_AllLangHelp_AllLangHelp__one_lang $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) -$(call gb_HelpTarget_set_configdir,$(3),$(gb_AllLangHelp_AUXDIR)) $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) $(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_target,$(3)) @@ -156,6 +155,7 @@ endef define gb_AllLangHelp__use_linked_module $(call gb_HelpTarget_use_linked_module,$(call gb_AllLangHelp__get_helpname,$(1),$(3)),$(call gb_AllLangHelp__get_helpname,$(2),$(3))) $(call gb_HelpTarget_set_indexed,$(call gb_AllLangHelp__get_helpname,$(1),$(3))) +$(call gb_HelpTarget_set_configfile,$(call gb_AllLangHelp__get_helpname,$(1),$(3)),$(gb_AllLangHelp_AUXDIR)/$(3)/$(1)) endef diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 9fd03b8..70ff4ca 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -273,11 +273,11 @@ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ -o $(WORKDIR)/dummy.zip \ -src $(HELP_SRCDIR) \ -zipdir $(HELP_WORKDIR) \ - -compact $(gb_HelpLinkTarget_COMPACTTARGET) + -compact $(gb_HelpLinkTarget_COMPACTTARGET) \ -idxcaption $(gb_HelpLinkTarget_IDXCAPTIONTARGET) \ -idxcontent $(gb_HelpLinkTarget_IDXCONTENTTARGET) \ -sty $(gb_HelpLinkTarget_EMBEDTARGET) \ - $(if $(and $(HELP_CONFIGDIR),$(HELP_INDEXED)),-add $(HELP_MODULE).cfg $(HELP_CONFIGDIR)/$(HELP_LANG)/$(HELP_MODULE).cfg) \ + $(if $(HELP_CONFIGFILE),-add $(HELP_MODULE).cfg $(HELP_CONFIGFILE)) \ $(if $(HELP_TREE),-add $(HELP_MODULE).tree $(HELP_TREE)) \ $(foreach file,$(HELP_ADD_FILES),-add $(notdir $(file)) $(file)) \ $(foreach extra,$(HELP_EXTRA_ADD_FILES),-add $(subst $(COMMA), ,$(extra))) \ @@ -313,7 +313,7 @@ $(call gb_HelpLinkTarget_get_clean_target,%) : # gb_HelpLinkTarget_HelpLinkTarget name module lang workdir define gb_HelpLinkTarget_HelpLinkTarget $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_ADD_FILES := -$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR := +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGFILE := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := @@ -329,9 +329,10 @@ $(call gb_HelpLinkTarget_get_target,$(1)) :| $(dir $(call gb_HelpLinkTarget_get_ endef -# gb_HelpLinkTarget_set_configdir target configdir -define gb_HelpLinkTarget_set_configdir -$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR := $(2) +# gb_HelpLinkTarget_set_configfile target configfile +define gb_HelpLinkTarget_set_configfile +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGFILE := $(2) +$(call gb_HelpLinkTarget_get_target,$(1)) : $(2) endef @@ -511,8 +512,7 @@ define gb_HelpTarget__get_command $(call gb_Output_announce,$(2),$(true),HLP,4) cd $(call gb_HelpTarget_get_workdir,$(2)) \ $(gb_HelpJarTarget_COMMAND) -q -0 -rX --filesync --must-match $(1) \ - $(HELP_PACK_FILES) \ - $(if $(and $(HELP_CONFIGDIR),$(HELP_INDEXED)),$(HELP_MODULE).cfg) + $(HELP_PACK_FILES) endef $(dir $(call gb_HelpTarget_get_target,%)).dir : @@ -551,7 +551,6 @@ $(call gb_HelpTarget_get_clean_target,%) : # # gb_HelpTarget_HelpTarget target module lang define gb_HelpTarget_HelpTarget -$(call gb_HelpTarget_get_target,$(1)) : HELP_CONFIGDIR := $(call gb_HelpTarget_get_target,$(1)) : HELP_MODULE := $(2) $(call gb_HelpTarget_get_target,$(1)) : HELP_INDEXED := $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3) @@ -610,11 +609,14 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_PACK_FILES += $(2) endef -# gb_HelpTarget_set_configdir target configdir -define gb_HelpTarget_set_configdir -$(call gb_HelpLinkTarget_set_configdir,$(1),$(SRCDIR)/$(2)) - -$(call gb_HelpTarget_get_target,$(1)) : HELP_CONFIGDIR := $(SRCDIR)/$(2) +# Set config. file used for the help module.
[PUSHED] gbuild: pass config. file to HelpTarget explicitly
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3383 Approvals: David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3383 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia79effcb77aaa7054987879c394cb277e377c9d8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: David Tardon dtar...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WIP: date/time IDL datatypes incompatible change
Hello LibreOffice gerrit bot, Eike Rathke, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2783 to look at the new patch set (#16). Change subject: WIP: date/time IDL datatypes incompatible change .. WIP: date/time IDL datatypes incompatible change Done: - nanosecond precision - signed (allowed negative) year TODO: timezone Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 --- M basic/source/runtime/methods.cxx M comphelper/source/misc/anycompare.cxx M comphelper/source/misc/types.cxx M connectivity/inc/connectivity/dbconversion.hxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/jdbc/ConnectionLog.cxx M connectivity/source/drivers/kab/KResultSet.cxx M connectivity/source/drivers/macab/macabutilities.hxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/postgresql/pq_tools.cxx M connectivity/source/inc/odbc/OTools.hxx M editeng/source/items/flditem.cxx M editeng/source/uno/unofield.cxx M extensions/source/logging/csvformatter.cxx M extensions/source/logging/logrecord.cxx M extensions/source/logging/plaintextformatter.cxx M extensions/source/propctrlr/formcomponenthandler.cxx M extensions/source/propctrlr/standardcontrol.cxx M filter/source/msfilter/svdfppt.cxx M forms/qa/integration/forms/TimeValidator.java M forms/source/component/Time.cxx M forms/source/xforms/convert.cxx M forms/source/xforms/datatypes.cxx M framework/source/jobs/jobdata.cxx M odk/examples/DevelopersGuide/Forms/TimeValidator.java M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl M offapi/com/sun/star/util/Duration.idl M offapi/com/sun/star/util/Time.idl M offapi/type_reference/types.rdb M oox/source/core/xmlfilterbase.cxx M oox/source/dump/dumperbase.cxx M oox/source/ppt/comments.cxx M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java M reportbuilder/java/org/libreoffice/report/SDBCReportData.java M reportdesign/source/filter/xml/xmlControlProperty.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/inc/chgtrack.hxx M sc/source/core/data/dbdocutl.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/tool/chgtrack.cxx M sc/source/core/tool/chgviset.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/oox/unitconverter.cxx M sc/source/filter/xcl97/XclExpChangeTrack.cxx M sc/source/filter/xcl97/XclImpChangeTrack.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/ui/docshell/docsh3.cxx M sc/source/ui/miscdlgs/sharedocdlg.cxx M sc/source/ui/unoobj/fielduno.cxx M sc/source/ui/view/viewfun6.cxx M scripting/source/pyprov/pythonscript.py M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/pptx-epptooxml.cxx M sd/source/ui/annotations/annotationmanager.cxx M sd/source/ui/dlg/animobjs.cxx M sfx2/qa/complex/sfx2/DocumentProperties.java M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/bastyp/frmhtmlw.cxx M sfx2/source/bastyp/helper.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/versdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svl/source/misc/fstathelper.cxx M svtools/source/contnr/DocumentInfoPreview.cxx M svtools/source/contnr/contentenumeration.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M svtools/source/table/cellvalueconversion.cxx M svx/source/fmcomp/gridcell.cxx M sw/source/core/doc/doccomp.cxx M sw/source/core/doc/docglbl.cxx M sw/source/core/doc/docredln.cxx M sw/source/core/fields/docufld.cxx M sw/source/core/fields/flddat.cxx M sw/source/core/unocore/swunohelper.cxx M sw/source/core/unocore/unoredline.cxx M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8par.cxx M sw/source/filter/xml/XMLRedlineImportHelper.cxx M tools/Library_tl.mk M tools/inc/tools/datetime.hxx M tools/inc/tools/time.hxx M tools/source/datetime/datetime.cxx M tools/source/datetime/ttime.cxx M tools/source/inet/inetmsg.cxx M tools/source/rc/rc.cxx M ucb/source/sorter/sortresult.cxx M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/file/shell.cxx M ucb/source/ucp/ftp/ftpdirp.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M unotools/inc/unotools/datetime.hxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/datetime.cxx M unotools/source/ucbhelper/ucbhelper.cxx
[Libreoffice-commits] core.git: scp2/inc scp2/macros scp2/source solenv/gbuild
scp2/inc/macros.inc |9 +
scp2/macros/macro.pl |2 +-
scp2/source/base/file_base.scp |5 ++---
scp2/source/calc/file_calc.scp |5 ++---
scp2/source/draw/file_draw.scp |5 ++---
scp2/source/impress/file_impress.scp |5 ++---
scp2/source/math/file_math.scp |5 ++---
scp2/source/ooo/file_ooo.scp | 14 ++
scp2/source/writer/file_writer.scp |5 ++---
solenv/gbuild/AllLangHelp.mk | 17 +
solenv/gbuild/HelpTarget.mk | 33 +
solenv/gbuild/TargetLocations.mk |1 -
12 files changed, 46 insertions(+), 60 deletions(-)
New commits:
commit d23f8bb0caf814684a4b5820f8d4d1389d9dda14
Author: David Tardon dtar...@redhat.com
Date: Sun Apr 14 19:19:40 2013 +0200
gbuild: deliver help files as packages
Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
Reviewed-on: https://gerrit.libreoffice.org/3384
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7ae0b4e..6ff7959 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -56,6 +56,7 @@
#define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang))
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
+#define EXTRAFILELISTNAME(prefix,name,lang)
STRING(CONCAT4(prefix,name,lang,.filelist))
#define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
@@ -81,13 +82,13 @@
Styles = (ARCHIVE)
#ifdef WITH_HELPPACK_INTEGRATION
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
TXT_FILE_BODY; \
-Styles = (ARCHIVE,FORCEHELPPACK,LANGUAGEMODULE)
+Styles = (FILELIST,FORCEHELPPACK,LANGUAGEMODULE)
#else
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
TXT_FILE_BODY; \
-Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
+Styles = (FILELIST,HELPPACK,LANGUAGEMODULE)
#endif
#define PACKED_LIB_FILE_BODY \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index dc5d2a9..2ad3fad 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -169,7 +169,7 @@ sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
next if ( $poorhelplocalizations{$lang} );
print OUTFILE ; unless $first;
$first = 0;
-print OUTFILE \\\n\tName ($lang) = EXTRAFILENAME(name,_$lang);
+print OUTFILE \\\n\tName ($lang) =
EXTRAFILELISTNAME(HelpTarget/,name,/$lang);
}
print OUTFILE \n\n;
}
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index f684e1d..fb1a230 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -66,10 +66,9 @@ STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
#if defined WITH_HELP
File gid_File_Help_Sdatabase_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index f598556..8f5dfbb 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -71,10 +71,9 @@ STD_RES_FILE( gid_File_Res_Sc, sc )
#if defined WITH_HELP
File gid_File_Help_Scalc_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 676112f..4b7c4db 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -36,10 +36,9 @@ End
#if defined WITH_HELP
File gid_File_Help_Sdraw_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/impress/file_impress.scp
b/scp2/source/impress/file_impress.scp
index 88cbf69..f2eebf0 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -57,10 +57,9 @@ End
#if defined WITH_HELP
File gid_File_Help_Simpress_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/math/file_math.scp
[PUSHED] gbuild: deliver help files as packages
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3384 Approvals: LibreOffice gerrit bot: Verified David Tardon: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3384 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: 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: Help needed for fdo#63311
Hi Christina, On Sun, 2013-04-14 at 22:34 +0200, Regina Henschel wrote: Christina Roßmanith schrieb: if you add text (e.g. abc) to a shape like a smiley, save the document, delete the text and save again the text is still present in the saved file. Closing the drawing isn't necessary. Urgh; looks like another horror around the lifecycle of the UNO peers for shapes; do we have an idea where the problem was introduced (is bibisection easy?). Saving is not necessary. As I commented in the issue, you can see when you look at the shape with a macro, that the content is not erased. As Regina says, the same UNO API would be used for both save and macro interfacing. Some of the code here is pretty unpleasantly and tightly coupled between UNO impls. and svx/ to find some related commits I would dig around / before: git log -u 7fec8dfcaca4efc92516f9af51a3157f1a11ccd7 -- svx/source/svdraw/svdoashp.cxx For potential problem areas :-) HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WIP: date/time IDL datatypes incompatible change
Hello LibreOffice gerrit bot, Eike Rathke, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2783 to look at the new patch set (#17). Change subject: WIP: date/time IDL datatypes incompatible change .. WIP: date/time IDL datatypes incompatible change Done: - nanosecond precision - signed (allowed negative) year TODO: timezone Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 --- M basic/source/runtime/methods.cxx M comphelper/source/misc/anycompare.cxx M comphelper/source/misc/types.cxx M connectivity/inc/connectivity/dbconversion.hxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/jdbc/ConnectionLog.cxx M connectivity/source/drivers/kab/KResultSet.cxx M connectivity/source/drivers/macab/macabutilities.hxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/postgresql/pq_tools.cxx M connectivity/source/inc/odbc/OTools.hxx M editeng/source/items/flditem.cxx M editeng/source/uno/unofield.cxx M extensions/source/logging/csvformatter.cxx M extensions/source/logging/logrecord.cxx M extensions/source/logging/plaintextformatter.cxx M extensions/source/propctrlr/formcomponenthandler.cxx M extensions/source/propctrlr/standardcontrol.cxx M filter/source/msfilter/svdfppt.cxx M forms/qa/integration/forms/TimeValidator.java M forms/source/component/Time.cxx M forms/source/xforms/convert.cxx M forms/source/xforms/datatypes.cxx M framework/source/jobs/jobdata.cxx M odk/examples/DevelopersGuide/Forms/TimeValidator.java M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl M offapi/com/sun/star/util/Duration.idl M offapi/com/sun/star/util/Time.idl M offapi/type_reference/types.rdb M oox/source/core/xmlfilterbase.cxx M oox/source/dump/dumperbase.cxx M oox/source/ppt/comments.cxx M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java M reportbuilder/java/org/libreoffice/report/SDBCReportData.java M reportdesign/source/filter/xml/xmlControlProperty.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/inc/chgtrack.hxx M sc/source/core/data/dbdocutl.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/tool/chgtrack.cxx M sc/source/core/tool/chgviset.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/oox/unitconverter.cxx M sc/source/filter/xcl97/XclExpChangeTrack.cxx M sc/source/filter/xcl97/XclImpChangeTrack.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/ui/docshell/docsh3.cxx M sc/source/ui/miscdlgs/sharedocdlg.cxx M sc/source/ui/unoobj/fielduno.cxx M sc/source/ui/view/viewfun6.cxx M scripting/source/pyprov/pythonscript.py M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/pptx-epptooxml.cxx M sd/source/ui/annotations/annotationmanager.cxx M sd/source/ui/dlg/animobjs.cxx M sfx2/qa/complex/sfx2/DocumentProperties.java M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/bastyp/frmhtmlw.cxx M sfx2/source/bastyp/helper.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/versdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svl/source/misc/fstathelper.cxx M svtools/source/contnr/DocumentInfoPreview.cxx M svtools/source/contnr/contentenumeration.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M svtools/source/table/cellvalueconversion.cxx M svx/source/fmcomp/gridcell.cxx M sw/source/core/doc/doccomp.cxx M sw/source/core/doc/docglbl.cxx M sw/source/core/doc/docredln.cxx M sw/source/core/fields/docufld.cxx M sw/source/core/fields/flddat.cxx M sw/source/core/unocore/swunohelper.cxx M sw/source/core/unocore/unoredline.cxx M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8par.cxx M sw/source/filter/xml/XMLRedlineImportHelper.cxx M tools/Library_tl.mk M tools/inc/tools/datetime.hxx M tools/inc/tools/time.hxx M tools/source/datetime/datetime.cxx M tools/source/datetime/ttime.cxx M tools/source/inet/inetmsg.cxx M tools/source/rc/rc.cxx M ucb/source/sorter/sortresult.cxx M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/file/shell.cxx M ucb/source/ucp/ftp/ftpdirp.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M unotools/inc/unotools/datetime.hxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/datetime.cxx M unotools/source/ucbhelper/ucbhelper.cxx
[PATCH] dataform.ui widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3386 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3386/1 dataform.ui widget Change-Id: I43722339ed72adde46ed307e1906c34a32e7b507 --- A sc/uiconfig/scalc/ui/dataform.ui 1 file changed, 151 insertions(+), 0 deletions(-) diff --git a/sc/uiconfig/scalc/ui/dataform.ui b/sc/uiconfig/scalc/ui/dataform.ui new file mode 100644 index 000..c64b4cc --- /dev/null +++ b/sc/uiconfig/scalc/ui/dataform.ui @@ -0,0 +1,151 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=dataform +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesData Form/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=button1 +property name=label translatable=yes_New/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=button2 +property name=label translatable=yes_Delete/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=button3 +property name=label translatable=yes_Restore/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child +child + object class=GtkButton id=button4 +property name=label translatable=yes_Previous Record/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position3/property + /packing +/child +child + object class=GtkButton id=button5 +property name=label translatable=yesNe_xt Record/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position4/property + /packing +/child +child + object class=GtkButton id=button6 +property name=label translatable=yes_Close/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property
[PATCH] selectsource.ui widget
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3387 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3387/1 selectsource.ui widget Change-Id: I4a0028bbdbacebf8015215c7c060a686a0e784d3 --- A sc/uiconfig/scalc/ui/selectsource.ui 1 file changed, 210 insertions(+), 0 deletions(-) diff --git a/sc/uiconfig/scalc/ui/selectsource.ui b/sc/uiconfig/scalc/ui/selectsource.ui new file mode 100644 index 000..2c2bccd --- /dev/null +++ b/sc/uiconfig/scalc/ui/selectsource.ui @@ -0,0 +1,210 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=selectsource +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesSelect Source/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox3 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area3 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok1 +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=has_defaultTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel1 +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help1 +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_action_appearanceFalse/property +property name=use_stockTrue/property +property name=image_positiontop/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=Selection +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkRadioButton id=radiobutton1 +property name=label translatable=yes_Current selection/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_action_appearanceFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +property
[PATCH] Convert SfxChildList_Impl from SfxPtrArr to std::vector
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3388
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/3388/1
Convert SfxChildList_Impl from SfxPtrArr to std::vector
and simplify use site
Change-Id: I287c280e1206f72dfaff4f38c24c8997e726887a
---
M sfx2/source/appl/workwin.cxx
M sfx2/source/inc/workwin.hxx
2 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 2f43e60..d9aa77c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -524,14 +524,14 @@
void SfxWorkWindow::Sort_Impl()
{
aSortedList.clear();
-for (sal_uInt16 i=0; ipChildren-Count(); i++)
+for (sal_uInt16 i = 0; i aChildren.size(); ++i)
{
-SfxChild_Impl *pCli = (*pChildren)[i];
+SfxChild_Impl *pCli = aChildren[i];
if (pCli)
{
sal_uInt16 k;
for (k=0; kaSortedList.size(); k++)
-if (ChildAlignValue((*pChildren)[aSortedList[k]]-eAlign)
+if (ChildAlignValue( aChildren[aSortedList[k]]-eAlign )
ChildAlignValue(pCli-eAlign))
break;
aSortedList.insert( aSortedList.begin() + k, i );
@@ -614,13 +614,10 @@
pBindings-SetWorkWindow_Impl( this );
pChildWins = new SfxChildWindows_Impl;
-pChildren = new SfxChildList_Impl;
// For the ObjectBars a integral place in the Childlist is reserved,
// so that they always come in a defined order.
-SfxChild_Impl* pChild=0;
-for (sal_uInt16 n=0; n SFX_OBJECTBAR_MAX; ++n)
-pChildren-Insert(0,pChild);
+aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, NULL );
// create and initialize layout manager listener
Reference com::sun::star::frame::XFrame xFrame = GetFrameInterface();
@@ -648,8 +645,7 @@
}
// Delete help structure for Child-Windows
-DBG_ASSERT( pChildren-Count() == 0, dangling children );
-delete pChildren;
+DBG_ASSERT( aChildren.empty(), dangling children );
delete pChildWins;
if ( m_xLayoutManagerListener.is() )
@@ -744,7 +740,7 @@
// Delete StatusBar
ResetStatusBar_Impl();
-// Delete ObjectBars (this is done last, so that pChildren does not
+// Delete ObjectBars (this is done last, so that aChildren does not
// receive dead Pointers)
for ( sal_uInt16 i = 0; i aObjBarList.size(); i++ )
{
@@ -757,7 +753,7 @@
// ObjectBars are all released at once, since they occupy a
// fixed contiguous area in the array pChild
-pChildren-Remove(0, SFX_OBJECTBAR_MAX);
+aChildren.clear();
bSorted = sal_False;
nChildren = 0;
@@ -839,7 +835,7 @@
for ( sal_uInt16 n=0; naSortedList.size(); ++n )
{
-SfxChild_Impl* pCli = (*pChildren)[aSortedList[n]];
+SfxChild_Impl* pCli = aChildren[aSortedList[n]];
if ( !pCli-pWin )
continue;
@@ -981,7 +977,7 @@
SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
{
DBG_CHKTHIS(SfxWorkWindow, 0);
-DBG_ASSERT( pChildren-Count() 255, too many children );
+DBG_ASSERT( aChildren.size() 255, too many children );
DBG_ASSERT( SfxChildAlignValid(eAlign), invalid align );
DBG_ASSERT( !FindChild_Impl(rWindow), child registered more than once );
@@ -993,10 +989,10 @@
eAlign, rWindow.IsVisible());
pChild-bCanGetFocus = bCanGetFocus;
-pChildren-Insert(pChildren-Count(), pChild);
+aChildren.push_back(pChild);
bSorted = sal_False;
nChildren++;
-return (*pChildren)[pChildren-Count()-1];
+return aChildren.back();
}
//
@@ -1007,19 +1003,18 @@
SfxChild_Impl *pChild = 0;
sal_uInt16 nPos;
-for ( nPos = 0; nPos pChildren-Count(); ++nPos )
+for ( nPos = 0; nPos aChildren.size(); ++nPos )
{
-pChild = (*pChildren)[nPos];
-if ( pChild )
- if ( pChild-pWin == rWindow )
+pChild = aChildren[nPos];
+if ( pChild pChild-pWin == rWindow )
break;
}
-if ( nPos pChildren-Count() )
+if ( nPos aChildren.size() )
{
bSorted = sal_False;
nChildren--;
-pChildren-Remove(nPos);
+aChildren.erase(aChildren.begin() + nPos);
delete pChild;
}
else {
@@ -1034,12 +1029,11 @@
DBG_CHKTHIS(SfxWorkWindow, 0);
SfxChild_Impl *pChild = 0;
-sal_uInt16 nCount = pChildren-Count();
+sal_uInt16 nCount = aChildren.size();
for ( sal_uInt16 nPos = 0; nPos nCount; ++nPos )
{
-pChild = (*pChildren)[nPos];
-if ( pChild )
- if ( pChild-pWin == rWindow )
+pChild = aChildren[nPos];
+if ( pChild pChild-pWin == rWindow )
return pChild;
}
@@ -1054,11 +1048,10
REMINDER: Release 4.0.3.1 from libreoffice-4-0 branch
Hi, please note that the commit deadline for 4.0.3.1, aka rc1, is on today, April 15, 2013. The tag and branch libreoffice-4-0-3 is going to be created tomorrow. Only commits with 3 reviewers will be allowed for that branch. See also http://wiki.documentfoundation.org/ReleasePlan#4.0_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help with reviewing pending commits. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WIP: date/time IDL datatypes incompatible change
Hello LibreOffice gerrit bot, Eike Rathke, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2783 to look at the new patch set (#18). Change subject: WIP: date/time IDL datatypes incompatible change .. WIP: date/time IDL datatypes incompatible change Done: - nanosecond precision - signed (allowed negative) year TODO: timezone Also: assorted improvements / bugfixes in date/time handling code. Some factorisation of copy/pasted code. Change-Id: I761a1b0b8731c82f19a0c37acbcf43d3c06d6cd6 --- M basic/source/runtime/methods.cxx M comphelper/source/misc/anycompare.cxx M comphelper/source/misc/types.cxx M connectivity/inc/connectivity/dbconversion.hxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/drivers/calc/CTable.cxx M connectivity/source/drivers/dbase/DTable.cxx M connectivity/source/drivers/file/FDateFunctions.cxx M connectivity/source/drivers/jdbc/ConnectionLog.cxx M connectivity/source/drivers/kab/KResultSet.cxx M connectivity/source/drivers/macab/macabutilities.hxx M connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx M connectivity/source/drivers/odbcbase/OPreparedStatement.cxx M connectivity/source/drivers/odbcbase/OResultSet.cxx M connectivity/source/drivers/postgresql/pq_tools.cxx M connectivity/source/inc/odbc/OTools.hxx M editeng/source/items/flditem.cxx M editeng/source/uno/unofield.cxx M extensions/source/logging/csvformatter.cxx M extensions/source/logging/logrecord.cxx M extensions/source/logging/plaintextformatter.cxx M extensions/source/propctrlr/formcomponenthandler.cxx M extensions/source/propctrlr/standardcontrol.cxx M filter/source/msfilter/svdfppt.cxx M forms/qa/integration/forms/TimeValidator.java M forms/source/component/Time.cxx M forms/source/xforms/convert.cxx M forms/source/xforms/datatypes.cxx M framework/source/jobs/jobdata.cxx M odk/examples/DevelopersGuide/Forms/TimeValidator.java M offapi/com/sun/star/util/Date.idl M offapi/com/sun/star/util/DateTime.idl M offapi/com/sun/star/util/DateTimeRange.idl M offapi/com/sun/star/util/Duration.idl M offapi/com/sun/star/util/Time.idl M offapi/type_reference/types.rdb M oox/source/core/xmlfilterbase.cxx M oox/source/dump/dumperbase.cxx M oox/source/ppt/comments.cxx M qadevOOo/tests/java/mod/_forms/ODatabaseForm.java M reportbuilder/java/org/libreoffice/report/SDBCReportData.java M reportdesign/source/filter/xml/xmlControlProperty.cxx M sax/qa/cppunit/test_converter.cxx M sax/source/tools/converter.cxx M sc/inc/chgtrack.hxx M sc/source/core/data/dbdocutl.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/tool/chgtrack.cxx M sc/source/core/tool/chgviset.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/html/htmlexp.cxx M sc/source/filter/oox/unitconverter.cxx M sc/source/filter/xcl97/XclExpChangeTrack.cxx M sc/source/filter/xcl97/XclImpChangeTrack.cxx M sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx M sc/source/filter/xml/XMLConverter.cxx M sc/source/ui/docshell/docsh3.cxx M sc/source/ui/miscdlgs/sharedocdlg.cxx M sc/source/ui/unoobj/fielduno.cxx M sc/source/ui/view/viewfun6.cxx M scripting/source/pyprov/pythonscript.py M sd/source/filter/eppt/eppt.cxx M sd/source/filter/eppt/pptx-epptooxml.cxx M sd/source/ui/annotations/annotationmanager.cxx M sd/source/ui/dlg/animobjs.cxx M sfx2/qa/complex/sfx2/DocumentProperties.java M sfx2/source/appl/sfxpicklist.cxx M sfx2/source/bastyp/frmhtmlw.cxx M sfx2/source/bastyp/helper.cxx M sfx2/source/dialog/dinfdlg.cxx M sfx2/source/dialog/versdlg.cxx M sfx2/source/doc/SfxDocumentMetaData.cxx M sfx2/source/doc/objcont.cxx M sfx2/source/doc/oleprops.cxx M sfx2/source/view/viewprn.cxx M svl/source/items/dateitem.cxx M svl/source/misc/fstathelper.cxx M svtools/source/contnr/DocumentInfoPreview.cxx M svtools/source/contnr/contentenumeration.cxx M svtools/source/misc/templatefoldercache.cxx M svtools/source/svhtml/parhtml.cxx M svtools/source/table/cellvalueconversion.cxx M svx/source/fmcomp/gridcell.cxx M sw/source/core/doc/doccomp.cxx M sw/source/core/doc/docglbl.cxx M sw/source/core/doc/docredln.cxx M sw/source/core/fields/docufld.cxx M sw/source/core/fields/flddat.cxx M sw/source/core/unocore/swunohelper.cxx M sw/source/core/unocore/unoredline.cxx M sw/source/filter/ww8/wrtww8.cxx M sw/source/filter/ww8/ww8par.cxx M sw/source/filter/xml/XMLRedlineImportHelper.cxx M tools/Library_tl.mk M tools/inc/tools/datetime.hxx M tools/inc/tools/time.hxx M tools/source/datetime/datetime.cxx M tools/source/datetime/ttime.cxx M tools/source/inet/inetmsg.cxx M tools/source/rc/rc.cxx M ucb/source/sorter/sortresult.cxx M ucb/source/ucp/cmis/cmis_content.cxx M ucb/source/ucp/file/shell.cxx M ucb/source/ucp/ftp/ftpdirp.cxx M ucb/source/ucp/ftp/ftpdirp.hxx M unotools/inc/unotools/datetime.hxx M unotools/source/i18n/localedatawrapper.cxx M unotools/source/misc/datetime.cxx M unotools/source/ucbhelper/ucbhelper.cxx
Configuration failure on Mac with 10.6 SDK in configure/gnutls when attempting build from master
Hi all, After make clean, fresh pull from master, I am getting a persistent configuration failure in autogen.sh/configure : checking whether to use gnutls... ./configure: line 37515: syntax error near unexpected token `else' ./configure: line 37515: `else' Error running configure at /Users/Shared/Repos/LO/core/autogen.sh line 205. make: *** [/Users/Shared/Repos/LO/core/config_host.mk] Error 2 Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FDO#61146 - Supplied libstdc++.so.6 is older than system one - causing DSO load failure
On Sun, 2013-04-14 at 22:18 -0700, Joel Madero wrote: Can someone check this out, confirm prioritize it - been sitting unconfirmed for way too longer. I checked it out but am unsure how to confirm it without similar distro. Thanks in advance, trying to tackle these older unconfirmed bugs against version 4+. https://bugs.freedesktop.org/show_bug.cgi?id=61146 I have closed the bug. The problem does not longer exists in 4.0.1 and newer builds. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/drivers/odbcbase/OTools.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit b475a63edea91daccfc179506b53a5f2ae7fc12b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Apr 15 01:27:39 2013 +0200
fdo#61142 mixup between size and length
Change-Id: Ia2903d5139378e97bb2e8d00ccb2c213d3e1dee6
Reviewed-on: https://gerrit.libreoffice.org/3385
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx
b/connectivity/source/drivers/odbcbase/OTools.cxx
index d568b7f..7165c4d 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -424,11 +424,15 @@ Sequencesal_Int8 OTools::getBytesValue(const
OConnection* _pConnection,
// we assume everyone (LibO ODBC) uses UTF-16; see
OPreparedStatement::setParameter
BOOST_STATIC_ASSERT(sizeof(sal_Unicode) == 2);
BOOST_STATIC_ASSERT(sizeof(SQLWCHAR)== 2);
+BOOST_STATIC_ASSERT(sizeof(waCharArray) % 2 == 0);
+// Size == number of bytes, Len == number of UTF-16 code units
+const SQLLEN nMaxSize = sizeof(waCharArray);
+const SQLLEN nMaxLen = sizeof(waCharArray) / sizeof(sal_Unicode);
+BOOST_STATIC_ASSERT(nMaxLen * sizeof(sal_Unicode) == nMaxSize);
+
// read the unicode data
-const SQLLEN nMaxLen = sizeof(waCharArray) / sizeof(sal_Unicode);
SQLLEN pcbValue = SQL_NO_TOTAL;
-
-while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue = nMaxLen) )
+while ((pcbValue == SQL_NO_TOTAL ) || (pcbValue = nMaxSize) )
{
OTools::ThrowException(_pConnection,
(*(T3SQLGetData)_pConnection-getOdbcFunction(ODBC3SQLGetData))(
@@ -446,7 +450,7 @@ Sequencesal_Int8 OTools::getBytesValue(const OConnection*
_pConnection,
SQLLEN nReadChars;
OSL_ENSURE( (pcbValue 0) || (pcbValue % 2 == 0),
ODBC: SQLGetData of SQL_C_WCHAR returned odd number
of bytes);
-if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue = nMaxLen) )
+if ( (pcbValue == SQL_NO_TOTAL) || (pcbValue = nMaxSize) )
{
// we filled the buffer; remove the terminating null character
nReadChars = nMaxLen-1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-l10n] REMINDER: Release 4.0.3.1 from libreoffice-4-0 branch
Any new strings? Thanks, m. 2013/4/15 Petr Mladek pmla...@suse.cz Hi, please note that the commit deadline for 4.0.3.1, aka rc1, is on today, April 15, 2013. The tag and branch libreoffice-4-0-3 is going to be created tomorrow. Only commits with 3 reviewers will be allowed for that branch. See also http://wiki.documentfoundation.org/ReleasePlan#4.0_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help with reviewing pending commits. -- Unsubscribe instructions: E-mail to l10n+h...@global.libreoffice.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.libreoffice.org/global/l10n/ All messages sent to this list will be publicly archived and cannot be deleted ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/framework/mediacontrol.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 2a6009ffc10dc64dd6f8dc23f653ee8a49f9d86d Author: Andras Timar ati...@suse.com Date: Mon Apr 15 00:11:40 2013 -0700 use large icons in Media Player window when icon size is set to large Change-Id: Ib1506f4917eed6b05af3df0e83b2843fd370d374 diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 553d130..09355e1 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -24,6 +24,7 @@ #include avmedia/mediaplayer.hxx #include helpids.hrc #include tools/time.hxx +#include svtools/miscopt.hxx #include vcl/svapp.hxx #include vcl/lstbox.hxx #include unotools/syslocale.hxx @@ -63,7 +64,7 @@ namespace avmedia MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : Control( pParent ), -maImageList( AVMEDIA_RESID( AVMEDIA_IMGLST ) ), +maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ), maItem( 0, AVMEDIA_SETMASK_ALL ), maPlayToolBox( this, WB_3DLOOK ), maTimeSlider( this, WB_HORZ | WB_DRAG | WB_3DLOOK | WB_SLIDERSET ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#61142 mixup between size and length
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3385 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3385 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2903d5139378e97bb2e8d00ccb2c213d3e1dee6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu 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: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 91 +-
1 file changed, 64 insertions(+), 27 deletions(-)
New commits:
commit a580678e8719d08ef9355b714f840837e89bd5b3
Author: Eike Rathke er...@redhat.com
Date: Sat Apr 13 16:15:24 2013 +0200
resolved fdo#63421 crash in pivot table with accessibility
The scenario of fdo#63421 (loading data and re-dragging the same field)
is not needed, simple data is sufficient and crash happened also when
dragging (removing) a field from a pane and dropping it anywhere else.
Multiple errors:
* getAccessibleChildCount() must return the real current count of
children, not what mpFieldWindow says; AtkListener::updateChildList()
uses this value to repopulate its own list; a child is added after it
is added to mpFieldWindow but removed before it is removed from
mpFieldWindow;
* LostFocus() uses an index of -1 if the last child was already removed
and the field was dropped after dragging it away from a pane, handle
that but it still does not look right
* RemoveField() called CommitChange() with
AccessibleEventObject::NewValue set instead of OldValue, leading to
AtkListener::handleChildAdded() being called instead of
handleChildRemoved()
Apparently this never worked since 2002.
Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8
(cherry picked from commit 26114dcdf9d55a5a2490de6de619337e9733b0e2)
Reviewed-on: https://gerrit.libreoffice.org/3372
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 035004ae..8490572 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -259,7 +259,7 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32
nOldIndex)
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference XAccessibleContext (this);
-aEvent.NewValue = xTempAcc;
+aEvent.OldValue = xTempAcc;
CommitChange(aEvent); // gone child - event
@@ -270,25 +270,41 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32
nOldIndex)
void ScAccessibleDataPilotControl::FieldFocusChange(sal_Int32 nOldIndex,
sal_Int32 nNewIndex)
{
-OSL_ENSURE(static_castsize_t(nOldIndex) maChildren.size()
-static_castsize_t(nNewIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nOldIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nOldIndex].pAcc)
-maChildren[nOldIndex].pAcc-ResetFocused();
+if (0 = nOldIndex static_castsize_t(nOldIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nOldIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nOldIndex].pAcc)
+maChildren[nOldIndex].pAcc-ResetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() old
index out of bounds: nOldIndex);
+}
-xTempAcc = maChildren[nNewIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nNewIndex].pAcc)
-maChildren[nNewIndex].pAcc-SetFocused();
+if (0 = nNewIndex static_castsize_t(nNewIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nNewIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nNewIndex].pAcc)
+maChildren[nNewIndex].pAcc-SetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() new
index out of bounds: nNewIndex);
+}
}
void ScAccessibleDataPilotControl::FieldNameChange(sal_Int32 nIndex)
{
-OSL_ENSURE(static_castsize_t(nIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-ChangeName();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nIndex].pAcc)
+maChildren[nIndex].pAcc-ChangeName();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldNameChange() index
out of bounds: nIndex);
+}
}
void ScAccessibleDataPilotControl::GotFocus()
@@ -298,9 +314,16 @@ void ScAccessibleDataPilotControl::GotFocus()
OSL_ENSURE(mpFieldWindow-GetFieldCount() == maChildren.size(), did
not recognize a child count change);
sal_Int32 nIndex(mpFieldWindow-GetSelectedField());
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 91 +-
1 file changed, 64 insertions(+), 27 deletions(-)
New commits:
commit 1e2f42eaee187b655c06de877e7aab98a26ecc34
Author: Eike Rathke er...@redhat.com
Date: Sat Apr 13 16:15:24 2013 +0200
resolved fdo#63421 crash in pivot table with accessibility
The scenario of fdo#63421 (loading data and re-dragging the same field)
is not needed, simple data is sufficient and crash happened also when
dragging (removing) a field from a pane and dropping it anywhere else.
Multiple errors:
* getAccessibleChildCount() must return the real current count of
children, not what mpFieldWindow says; AtkListener::updateChildList()
uses this value to repopulate its own list; a child is added after it
is added to mpFieldWindow but removed before it is removed from
mpFieldWindow;
* LostFocus() uses an index of -1 if the last child was already removed
and the field was dropped after dragging it away from a pane, handle
that but it still does not look right
* RemoveField() called CommitChange() with
AccessibleEventObject::NewValue set instead of OldValue, leading to
AtkListener::handleChildAdded() being called instead of
handleChildRemoved()
Apparently this never worked since 2002.
(cherry picked from commit 26114dcdf9d55a5a2490de6de619337e9733b0e2)
Conflicts:
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8
Reviewed-on: https://gerrit.libreoffice.org/3374
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 0b826fa..c71eff6 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -268,7 +268,7 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32
nOldIndex)
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference XAccessibleContext (this);
-aEvent.NewValue = xTempAcc;
+aEvent.OldValue = xTempAcc;
CommitChange(aEvent); // gone child - event
@@ -279,25 +279,41 @@ void ScAccessibleDataPilotControl::RemoveField(sal_Int32
nOldIndex)
void ScAccessibleDataPilotControl::FieldFocusChange(sal_Int32 nOldIndex,
sal_Int32 nNewIndex)
{
-OSL_ENSURE(static_castsal_uInt32(nOldIndex) maChildren.size()
-static_castsal_uInt32(nNewIndex) maChildren.size(), did
not recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nOldIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nOldIndex].pAcc)
-maChildren[nOldIndex].pAcc-ResetFocused();
+if (0 = nOldIndex static_castsize_t(nOldIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nOldIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nOldIndex].pAcc)
+maChildren[nOldIndex].pAcc-ResetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() old
index out of bounds: nOldIndex);
+}
-xTempAcc = maChildren[nNewIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nNewIndex].pAcc)
-maChildren[nNewIndex].pAcc-SetFocused();
+if (0 = nNewIndex static_castsize_t(nNewIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc =
maChildren[nNewIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nNewIndex].pAcc)
+maChildren[nNewIndex].pAcc-SetFocused();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldFocusChange() new
index out of bounds: nNewIndex);
+}
}
void ScAccessibleDataPilotControl::FieldNameChange(sal_Int32 nIndex)
{
-OSL_ENSURE(static_castsal_uInt32(nIndex) maChildren.size(), did not
recognize a child count change);
-
-uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
-if (xTempAcc.is() maChildren[nIndex].pAcc)
-maChildren[nIndex].pAcc-ChangeName();
+if (0 = nIndex static_castsize_t(nIndex) maChildren.size())
+{
+uno::Reference XAccessible xTempAcc = maChildren[nIndex].xWeakAcc;
+if (xTempAcc.is() maChildren[nIndex].pAcc)
+maChildren[nIndex].pAcc-ChangeName();
+}
+else
+{
+SAL_WARN( sc, ScAccessibleDataPilotControl::FieldNameChange() index
out of bounds: nIndex);
+}
}
void ScAccessibleDataPilotControl::GotFocus()
@@ -307,9 +323,16 @@ void ScAccessibleDataPilotControl::GotFocus()
OSL_ENSURE(static_castsal_uInt32(mpDPFieldWindow-GetFieldCount())
== maChildren.size(), did not recognize a child count change);
[PUSHED libreoffice-4-0] resolved fdo#63421 crash in pivot table with accessibility
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3372 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3372 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 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
[PUSHED libreoffice-3-6] resolved fdo#63421 crash in pivot table with accessibility
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3374 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3374 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfb59d947002d2212bc67b414daecb65c55edae8 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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - reportbuilder/java
reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
| 11 +++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 91021f11a30b1a2da4f878e9f245675ef6da17a1
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Apr 12 18:54:45 2013 +0200
fdo#36858
1) No valueType (Format/Number/General) is like float valueType
(Format/Number/any other)
2) We use 1/1/1900 as startdate for number-from-date, stick to it more
consistently
Change-Id: Ib1008d1c30be602d8173457738c915087ed17391
Reviewed-on: https://gerrit.libreoffice.org/3363
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index ad303af..8c9e986 100644
---
a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++
b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -126,9 +126,10 @@ public class FormatValueUtility
}
else if (value instanceof java.sql.Date)
{
-if (float.equals(valueType))//@see
http://qa.openoffice.org/issues/show_bug.cgi?id=108954
+if (float.equals(valueType) || valueType == null)
{
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
+// This is to work around fdo#63478
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
}
else
{
@@ -137,8 +138,12 @@ public class FormatValueUtility
}
else if (value instanceof Date)
{
+// This is what we *should* do, but see fdo#63478
+// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, date);
+// variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
date-value, formatDate((Date) value));
+// so we do that instead to work around:
variableSection.setAttribute(OfficeNamespaces.OFFICE_NS,
VALUE_TYPE, float);
-variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
HSSFDateUtil.getExcelDate((Date) value, false, 2).toString());
+variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE,
HSSFDateUtil.getExcelDate((Date) value, false, 0).toString());
}
else if (value instanceof BigDecimal)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7e16f5c0e8409aba10149501629b05bbcdd8939a Author: Rafael Dominguez venccsra...@gmail.com Date: Wed Apr 10 10:25:31 2013 -0430 Set Template Manager dialog minimum size. Change-Id: I2d30bf2c3fb33b8297477f80704aa057911a2bba Reviewed-on: https://gerrit.libreoffice.org/3353 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index a5edb7b..82289ba 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -244,6 +244,8 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent) mpViewBar-RemoveItem(nPos); } +SetMinOutputSizePixel(GetOutputSizePixel()); + mpViewBar-Show(); mpActionBar-Show(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/control/templatelocalview.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 94cb2604ea75a504ecab5f500701099e00859b7c
Author: Rafael Dominguez venccsra...@gmail.com
Date: Wed Apr 10 10:36:09 2013 -0430
Remove thumbnail from local view if we erase it throught the search view.
Change-Id: I3ec486313bedcc633b020a2feea3d30730da98f0
Reviewed-on: https://gerrit.libreoffice.org/3354
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 884897c..f1a3421 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -352,7 +352,11 @@ bool TemplateLocalView::removeTemplate (const sal_uInt16
nItemId, const sal_uInt
pIter = pItem-maTemplates.erase(pIter);
-RemoveItem(nItemId);
+if (maRegions[i]-mnRegionId == mnCurRegionId-1)
+{
+RemoveItem(nItemId);
+Invalidate();
+}
// Update Doc Idx for all templates that follow
for (; pIter != pItem-maTemplates.end(); ++pIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#36858
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3363 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3363 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1008d1c30be602d8173457738c915087ed17391 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Set Template Manager dialog minimum size.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3353 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3353 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d30bf2c3fb33b8297477f80704aa057911a2bba Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Remove thumbnail from local view if we erase it throught the...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3354 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3354 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ec486313bedcc633b020a2feea3d30730da98f0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Rafael Dominguez venccsra...@gmail.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: Branch 'libreoffice-4-0' - reportbuilder/java
reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java | 10
+-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 8bd84f28561a68aebcf59384de0f6b07819ede99
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 18:03:58 2013 +0200
reportbuilder: do not use empty tablename
Change-Id: I03ed5e810468ee206820a250c740b80c0ceda432
Reviewed-on: https://gerrit.libreoffice.org/3341
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
index d0168a6..d940718 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
@@ -253,7 +253,15 @@ public class SDBCReportDataFactory implements
DataSourceFactory
try
{
column =
UnoRuntime.queryInterface(XPropertySet.class, columns.getByName(expression));
-expression = quote +
column.getPropertyValue(TableName) + quote + . + quote + expression + quote;
+String prefix;
+prefix =
(String)column.getPropertyValue(TableName);
+if (prefix == null)
+prefix = ;
+if (prefix.length() 0)
+{
+prefix = quote + prefix + quote + .;
+}
+expression = prefix + quote + expression +
quote;
}
catch (Exception ex)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/drivers/postgresql/pq_statement.cxx |2 +-
connectivity/source/drivers/postgresql/pq_tools.cxx | 14 --
2 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 3695b86bc35fc8c1011ca6d629cdd28bcd7c15aa
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 17:16:27 2013 +0200
pgsql-sdbc: set tablename even if we do not know the schema
Change-Id: I74c04e1262cc413696a12aca9af603beded7b07f
Reviewed-on: https://gerrit.libreoffice.org/3342
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 7304b15..edf7dc3 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -654,7 +654,7 @@ bool executePostgresCommand( const rtl::OString cmd,
struct CommandData *data
}
}
-else if( sourceTable.getLength() -1 != sourceTable.indexOf( '.' ) )
+else if( sourceTable.getLength() 0)
{
splitConcatenatedIdentifier( sourceTable, schema, table );
}
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 84d9741..86872a7 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -673,10 +673,20 @@ void splitConcatenatedIdentifier( const rtl::OUString
source, rtl::OUString *f
{
OStringVector vec;
tokenizeSQL( rtl::OUStringToOString( source, RTL_TEXTENCODING_UTF8 ), vec
);
-if( vec.size() == 3 )
+switch (vec.size())
{
-*first = rtl::OStringToOUString( vec[0] , RTL_TEXTENCODING_UTF8 );
+case 1:
+*first = OUString();
+*second = rtl::OStringToOUString( vec[0], RTL_TEXTENCODING_UTF8 );
+break;
+case 3:
+*first = rtl::OStringToOUString( vec[0], RTL_TEXTENCODING_UTF8 );
*second = rtl::OStringToOUString( vec[2], RTL_TEXTENCODING_UTF8 );
+break;
+default:
+ SAL_WARN(connectivity.drivers.postgresql,
+ pq_tools::splitConcatenatedIdentifier unexpected number of
tokens in identifier:
+ vec.size());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] reportbuilder: do not use empty tablename
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3341 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3341 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03ed5e810468ee206820a250c740b80c0ceda432 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] use ImpEditEngine::ImplInitDigitModel() to set digit languag...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3389 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3389/1 use ImpEditEngine::ImplInitDigitModel() to set digit language. Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97 --- M editeng/source/editeng/impedit3.cxx 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 1299920e8..92bb45a 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4320,19 +4320,8 @@ // #114278# Also setting up digit language from Svt options // (cannot reliably inherit the outdev's setting) -LanguageType eLang; - -if( !pCTLOptions ) -pCTLOptions = new SvtCTLOptions; - -if ( SvtCTLOptions::NUMERALS_HINDI == pCTLOptions-GetCTLTextNumerals() ) -eLang = LANGUAGE_ARABIC_SAUDI_ARABIA; -else if ( SvtCTLOptions::NUMERALS_ARABIC == pCTLOptions-GetCTLTextNumerals() ) -eLang = LANGUAGE_ENGLISH; -else -eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType(); - -pOutDev-SetDigitLanguage( eLang ); +LanguageType eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType(); +ImplInitDigitMode( pOutDev, eLang ); } Reference i18n::XBreakIterator ImpEditEngine::ImplGetBreakIterator() const -- To view, visit https://gerrit.libreoffice.org/3389 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97 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 libreoffice-4-0] pgsql-sdbc: set tablename even if we do not know the schema
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3342 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3342 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74c04e1262cc413696a12aca9af603beded7b07f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu 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: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 11
--
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit c15217f477f0a9810811746796d778a5d20b89d5
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Apr 10 17:15:23 2013 +0200
pgsql-sdbc: ResultSetMetaData::getTableName return tablename (without
schema)
Change-Id: I319ba91045fa43922d7b694a4f13322295590c81
Reviewed-on: https://gerrit.libreoffice.org/3343
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index f6089cc..6d9abf9 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -407,16 +407,7 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column )
{
(void) column;
// LEM TODO This is very fishy.. Should probably return the table to which
that column belongs!
-rtl::OUString ret;
-if( m_tableName.getLength() )
-{
-OUStringBuffer buf( 128 );
-buf.append( m_schemaName );
-buf.appendAscii( . );
-buf.append( m_tableName );
-ret = buf.makeStringAndClear();
-}
-return ret;
+return m_tableName;
}
::rtl::OUString ResultSetMetaData::getCatalogName( sal_Int32 column )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/fmcomp/gridctrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 93301cf7ca8fff91b594d2ebe7bb24510acfdd3c
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Apr 14 09:37:00 2013 +0200
fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)
Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae
Reviewed-on: https://gerrit.libreoffice.org/3378
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9a40816..2663b8f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3397,7 +3397,7 @@ void DbGridControl::KeyInput( const KeyEvent rEvt )
{
size_t Location = GetModelColumnPos( nColId );
DbGridColumn* pColumn = ( Location m_aColumns.size() ) ?
m_aColumns[ Location ] : NULL;
-OStringTransfer::CopyString( GetCurrentRowCellText(
pColumn,m_xPaintRow ), this );
+OStringTransfer::CopyString( GetCurrentRowCellText( pColumn,
m_xCurrentRow ), this );
return;
}
}
___
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' - svx/source
svx/source/fmcomp/gridctrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8ee665cf3f5a4b7899e99fc426aa958dc296ad19
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun Apr 14 09:37:00 2013 +0200
fdo#52179 on copy kb-shortcut, from *current* row, not last painted row (!)
Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae
Reviewed-on: https://gerrit.libreoffice.org/3379
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 13c8f3e..528881b 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3397,7 +3397,7 @@ void DbGridControl::KeyInput( const KeyEvent rEvt )
{
size_t Location = GetModelColumnPos( nColId );
DbGridColumn* pColumn = ( Location m_aColumns.size() ) ?
m_aColumns[ Location ] : NULL;
-OStringTransfer::CopyString( GetCurrentRowCellText(
pColumn,m_xPaintRow ), this );
+OStringTransfer::CopyString( GetCurrentRowCellText( pColumn,
m_xCurrentRow ), this );
return;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] pgsql-sdbc: ResultSetMetaData::getTableName return tablename...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3343 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3343 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I319ba91045fa43922d7b694a4f13322295590c81 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#52179 on copy kb-shortcut, from *current* row, not last ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3378 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3378 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#52179 on copy kb-shortcut, from *current* row, not last ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3379 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3379 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39be862abb7c72234adad9c517d4a0570a1d71ae Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp | 83 --
1 file changed, 47 insertions(+), 36 deletions(-)
New commits:
commit 5db615427ac595fbef53e229cb5efc626a6ce571
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sun Apr 14 09:27:18 2013 +0200
Add x6 text justification overrides
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 12e6026..8813465 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -190,48 +190,59 @@ static void _readX6StyleString(WPXInputStream *input,
unsigned length, libcdr::C
{
return;
}
- boost::optionalstd::string fontName =
pt.get_optionalstd::string(character.latin.font);
- if (!!fontName)
-style.m_fontName = fontName.get().c_str();
- unsigned short encoding = pt.get(character.latin.charset, 0);
- if (encoding || style.m_charSet == (unsigned short)-1)
-style.m_charSet = encoding;
- processNameForEncoding(style.m_fontName, style.m_charSet);
- boost::optionalunsigned fontSize =
pt.get_optionalunsigned(character.latin.size);
- if (!!fontSize)
-style.m_fontSize = (double)fontSize.get() / 254000.0;
- if (pt.count(character.outline))
- {
-style.m_lineStyle.lineType = 0;
-boost::optionalunsigned lineWidth =
pt.get_optionalunsigned(character.outline.width);
-if (!!lineWidth)
- style.m_lineStyle.lineWidth = (double)lineWidth.get() / 254000.0;
-boost::optionalstd::string color =
pt.get_optionalstd::string(character.outline.color);
-if (!!color)
+ if (pt.count(character))
+ {
+boost::optionalstd::string fontName =
pt.get_optionalstd::string(character.latin.font);
+if (!!fontName)
+ style.m_fontName = fontName.get().c_str();
+unsigned short encoding = pt.get(character.latin.charset, 0);
+if (encoding || style.m_charSet == (unsigned short)-1)
+ style.m_charSet = encoding;
+processNameForEncoding(style.m_fontName, style.m_charSet);
+boost::optionalunsigned fontSize =
pt.get_optionalunsigned(character.latin.size);
+if (!!fontSize)
+ style.m_fontSize = (double)fontSize.get() / 254000.0;
+
+if (pt.count(character.outline))
+{
+ style.m_lineStyle.lineType = 0;
+ boost::optionalunsigned lineWidth =
pt.get_optionalunsigned(character.outline.width);
+ if (!!lineWidth)
+style.m_lineStyle.lineWidth = (double)lineWidth.get() / 254000.0;
+ boost::optionalstd::string color =
pt.get_optionalstd::string(character.outline.color);
+ if (!!color)
+ {
+double opacity = 1.0;
+parseColourString(color.get().c_str(), style.m_lineStyle.color,
opacity);
+ }
+}
+
+if (pt.count(character.fill))
{
- double opacity = 1.0;
- parseColourString(color.get().c_str(), style.m_lineStyle.color, opacity);
+ boost::optionalunsigned short type = pt.get_optionalunsigned
short(character.fill.type);
+ if (!!type)
+style.m_fillStyle.fillType = type.get();
+ boost::optionalstd::string color1 =
pt.get_optionalstd::string(character.fill.primaryColor);
+ if (!!color1)
+ {
+double opacity = 1.0;
+parseColourString(color1.get().c_str(), style.m_fillStyle.color1,
opacity);
+ }
+ boost::optionalstd::string color2 =
pt.get_optionalstd::string(character.fill.primaryColor);
+ if (!!color2)
+ {
+double opacity = 1.0;
+parseColourString(color2.get().c_str(), style.m_fillStyle.color2,
opacity);
+ }
}
}
- if (pt.count(character.fill))
+ if (pt.count(paragraph))
{
-boost::optionalunsigned short type = pt.get_optionalunsigned
short(character.fill.type);
-if (!!type)
- style.m_fillStyle.fillType = type.get();
-boost::optionalstd::string color1 =
pt.get_optionalstd::string(character.fill.primaryColor);
-if (!!color1)
-{
- double opacity = 1.0;
- parseColourString(color1.get().c_str(), style.m_fillStyle.color1,
opacity);
-}
-boost::optionalstd::string color2 =
pt.get_optionalstd::string(character.fill.primaryColor);
-if (!!color2)
-{
- double opacity = 1.0;
- parseColourString(color2.get().c_str(), style.m_fillStyle.color2,
opacity);
-}
+boost::optionalunsigned align =
pt.get_optionalunsigned(paragraph.justify);
+if (!!align)
+ style.m_align = align.get();
}
}
___
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/impedit3.cxx | 15 ++- 1 file changed, 2 insertions(+), 13 deletions(-) New commits: commit 1e7bc069056518e216be7765796dff26ba06bb32 Author: navin patidar pati...@kacst.edu.sa Date: Mon Apr 15 10:24:46 2013 +0300 use ImpEditEngine::ImplInitDigitModel() to set digit language. Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97 Reviewed-on: https://gerrit.libreoffice.org/3389 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 1299920e8..92bb45a 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4320,19 +4320,8 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 nPara, // #114278# Also setting up digit language from Svt options // (cannot reliably inherit the outdev's setting) -LanguageType eLang; - -if( !pCTLOptions ) -pCTLOptions = new SvtCTLOptions; - -if ( SvtCTLOptions::NUMERALS_HINDI == pCTLOptions-GetCTLTextNumerals() ) -eLang = LANGUAGE_ARABIC_SAUDI_ARABIA; -else if ( SvtCTLOptions::NUMERALS_ARABIC == pCTLOptions-GetCTLTextNumerals() ) -eLang = LANGUAGE_ENGLISH; -else -eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType(); - -pOutDev-SetDigitLanguage( eLang ); +LanguageType eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType(); +ImplInitDigitMode( pOutDev, eLang ); } Reference i18n::XBreakIterator ImpEditEngine::ImplGetBreakIterator() const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] use ImpEditEngine::ImplInitDigitModel() to set digit languag...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3389 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3389 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Convert SfxChildWindows_Impl from SfxPtrArr to std::vector
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3390
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3390/1
Convert SfxChildWindows_Impl from SfxPtrArr to std::vector
- also remove dead struct SfxSplitWin_Impl
Change-Id: I408bd994b206963b5ac115f4d47fc79c6687e051
---
M sfx2/source/appl/workwin.cxx
M sfx2/source/inc/workwin.hxx
2 files changed, 63 insertions(+), 72 deletions(-)
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d9aa77c..435bddd 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -613,8 +613,6 @@
pBindings-SetWorkWindow_Impl( this );
-pChildWins = new SfxChildWindows_Impl;
-
// For the ObjectBars a integral place in the Childlist is reserved,
// so that they always come in a defined order.
aChildren.insert( aChildren.begin(), SFX_OBJECTBAR_MAX, NULL );
@@ -646,7 +644,6 @@
// Delete help structure for Child-Windows
DBG_ASSERT( aChildren.empty(), dangling children );
-delete pChildWins;
if ( m_xLayoutManagerListener.is() )
m_xLayoutManagerListener-dispose();
@@ -689,11 +686,11 @@
}
// Delete Child-Windows
-for ( n=0; npChildWins-Count(); )
+for ( n=0; naChildWins.size(); )
{
-SfxChildWin_Impl* pCW = (*pChildWins)[n];
-pChildWins-Remove(n);
- SfxChildWindow *pChild = pCW-pWin;
+SfxChildWin_Impl* pCW = aChildWins[n];
+aChildWins.erase(aChildWins.begin());
+SfxChildWindow *pChild = pCW-pWin;
if (pChild)
{
pChild-Hide();
@@ -960,9 +957,9 @@
sal_Bool SfxWorkWindow::PrepareClose_Impl()
{
-for (sal_uInt16 n=0; npChildWins-Count(); n++)
+for (sal_uInt16 n=0; naChildWins.size(); n++)
{
-SfxChildWin_Impl *pCW = (*pChildWins)[n];
+SfxChildWin_Impl *pCW = aChildWins[n];
SfxChildWindow *pChild = pCW-pWin;
if ( pChild !pChild-QueryClose() )
return sal_False;
@@ -1057,9 +1054,9 @@
{
// We have to find the SfxChildWin_Impl to retrieve the
// SFX_CHILDWIN flags that can influence visibility.
-for (sal_uInt16 n=0; npChildWins-Count(); n++)
+for (sal_uInt16 n=0; naChildWins.size(); n++)
{
-SfxChildWin_Impl* pCWin = (*pChildWins)[n];
+SfxChildWin_Impl* pCWin = aChildWins[n];
SfxChild_Impl*pChild = pCWin-pCli;
if ( pChild == pCli )
{
@@ -1142,8 +1139,8 @@
for ( n = 0; n aObjBarList.size(); n++ )
aObjBarList[n].bDestroy = sal_True;
-for ( n = 0; n pChildWins-Count(); ++n )
-(*pChildWins)[n]-nId = 0;
+for ( n = 0; n aChildWins.size(); ++n )
+aChildWins[n]-nId = 0;
}
//
@@ -1435,9 +1432,9 @@
void SfxWorkWindow::UpdateChildWindows_Impl()
{
// any current or in the context available Childwindows
-for ( sal_uInt16 n=0; npChildWins-Count(); n++ )
+for ( sal_uInt16 n=0; naChildWins.size(); n++ )
{
-SfxChildWin_Impl *pCW = (*pChildWins)[n];
+SfxChildWin_Impl *pCW = aChildWins[n];
SfxChildWindow *pChildWin = pCW-pWin;
sal_Bool bCreate = sal_False;
if ( pCW-nId !pCW-bDisabled (pCW-aInfo.nFlags
SFX_CHILDWIN_ALWAYSAVAILABLE || IsVisible_Impl( pCW-nVisibility ) ) )
@@ -1680,9 +1677,9 @@
//
void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent,
sal_uInt16 nId )
{
-for ( sal_uInt16 n = 0; n pChildWins-Count(); ++n )
+for ( sal_uInt16 n = 0; n aChildWins.size(); ++n )
{
-SfxChildWindow *pCW = (*pChildWins)[n]-pWin;
+SfxChildWindow *pCW = aChildWins[n]-pWin;
if (pCW pCW-GetAlignment() == SFX_ALIGN_NOALIGNMENT
pCW-GetType() != nId)
{
Window *pWin = pCW-GetWindow();
@@ -1722,9 +1719,9 @@
else
{
// configure direct childwindow
-for (sal_uInt16 n=0; npChildWins-Count(); n++)
+for (sal_uInt16 n=0; naChildWins.size(); n++)
{
-pCW = (*pChildWins)[n];
+pCW = aChildWins[n];
SfxChildWindow *pChild = pCW-pWin;
if ( pChild )
{
@@ -1983,11 +1980,11 @@
if ( pWork )
{
// The Parent already known?
-sal_uInt16 nCount = pWork-pChildWins-Count();
+sal_uInt16 nCount = pWork-aChildWins.size();
for (sal_uInt16 n=0; nnCount; n++)
-if ((*pWork-pChildWins)[n]-nSaveId == nId)
+if (pWork-aChildWins[n]-nSaveId == nId)
{
-pCW = (*pWork-pChildWins)[n];
+pCW = pWork-aChildWins[n];
break;
}
}
@@ -1995,11 +1992,11 @@
if ( !pCW )
{
// If
Re: review for 4.0.3 deadline? [PATCH] fdo#63391 deadlock on opening .odb file that auto-connects t...
Hi Lionel, On Sun, Apr 14, 2013 at 04:26:20PM +0200, Lionel Elie Mamane lio...@mamane.lu wrote: If I could get some feedback on this before we freeze/branch 4.0.3, it would help me decide whether to try to get it in 4.0.3 (or not)... Thanks in advance! As Petr mentioned in the other mail, 4.0.3.1 deadline is today, though you can still get in fixes for 4.0.3.2 with 3x review after that. HTH, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Library_merged.mk
Library_merged.mk | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit 645f327ec4009eddac512958bc022a8d668a762c Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Apr 15 10:06:30 2013 +0200 libmerged: fix linking against cppunit again Fix for: ./program/soffice.bin: error while loading shared libraries: libcppunit-1.13.so.0: cannot open shared object file: No such file or directory Change-Id: Ib73010f69c7fcab0e5759df9e77e0848aa80579f diff --git a/Library_merged.mk b/Library_merged.mk index 044df38..43c6489 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_externals,merged,\ boostdatetime \ $(call gb_Helper_optional,DESKTOP,clucene) \ - cppunit \ cups \ curl \ expat \ @@ -58,14 +57,20 @@ $(eval $(call gb_Library_use_externals,merged,\ lcms2 \ libxml2 \ libxslt \ - libexslt \ $(if $(filter-out IOS,$(OS)),lpsolve) \ mythes \ nss3 \ - $(call gb_Helper_optional,PYUNO,python) \ zlib \ )) +ifeq (ALL,$(MERGELIBS)) +$(eval $(call gb_Library_use_externals,merged,\ + cppunit \ + libexslt \ + $(call gb_Helper_optional,PYUNO,python) \ +)) +endif + ifeq ($(ENABLE_GRAPHITE),TRUE) $(eval $(call gb_Library_use_externals,merged,\ graphite \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
broken add filter libs to libmerged ?
Hi, in http://cgit.freedesktop.org/libreoffice/core/commit/?id=1472c5ed16744e1ec918fdb18feaf868dd5a1c47 add filter libs to libmerged I see changed names of exported symbols like -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport egiGraphicExport #endif but there must be also someone calling the function and that code is not adapted. Peter, could you please do such changes only for --enable-mergelibs=all ? (and not for --enable-mergelibs) Or do it generally.. And maybe if you could use gerrit more often, it would be nice. In this case, I think the names should be changed without any #ifdefs, for all cases.. And the call sites adapted accordingly. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Summer of Code projects
Hi Tobia, On Sun, Apr 14, 2013 at 12:16:13AM +0200, Tobia Tesan tobia.te...@gmail.com wrote: The big, fat disclaimer: I have real world programming experience with small and medium projects and I'm a reasonably good student (my grades are around 95/100 - or, roughly, I'm in the top 5%), but I have never hacked LO. Was any of those a C++ project? I read the proposed ideas, but I'm not sure if they are doable without previous experience with the codebase - especially, such a /huge/ codebase. Should I give it a try anyway? Sure! As long as you have fairly decent C++ knowledge, you should not worry, mentors will help you get bootstrapped. I knew nothing about the internal API's etc in 2010, still could complete a project successfully. They sound like fun and doable hacks - I guess they might be combined with other stuff from EasyHacks, too, but I'd like to hear from someone who knows what kind of beast the codebase is before jumping in. So, try to solve an EasyHack, that is needed anyway to be eligible, better to do it now, instead of during the last weekend in a rush before the deadline. :-) P.s.: My English may sound a bit shaky. Because it is. Sorry about that! No need to worry, it's OK. Best, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Updatetable is called when we call SetAttrToSelectedCells in...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3391 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/3391/1 Updatetable is called when we call SetAttrToSelectedCells in clicking OK Calling this method again is not required. Change-Id: I2bb0bb616cc978717a1494e01f257631aadd613c --- M svx/source/table/tablecontroller.cxx 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 0330cf7..90869c9 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -758,7 +758,6 @@ SetAttrToSelectedCells(aNewSet, sal_False); } -UpdateTableShape(); } } -- To view, visit https://gerrit.libreoffice.org/3391 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bb0bb616cc978717a1494e01f257631aadd613c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Removal of Dead code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3392
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3392/1
Removal of Dead code
Change-Id: I4a8aa2d2f89fd3ee56ac10c2551076a6063d570c
---
M svx/source/table/tablecontroller.cxx
1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 90869c9..8d038a8 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2008,10 +2008,6 @@
}
}
}
-
-if( mpView-IsTextEdit() )
-{
-}
}
//
--
To view, visit https://gerrit.libreoffice.org/3392
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a8aa2d2f89fd3ee56ac10c2551076a6063d570c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/codemaker/typemanager.cxx |1
codemaker/source/cppumaker/cpputype.cxx| 46 +
2 files changed, 23 insertions(+), 24 deletions(-)
New commits:
commit 4b73d334a9c5d8ae1fe16b2cc04100b9f333595a
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 15 10:38:01 2013 +0200
Further adapt CppuType::dumpCppuGetType to using unoidl/ instead of
registry/
Change-Id: Ib46d7b8934f63d88ea953707fa1fbfb51c524efd
diff --git a/codemaker/source/codemaker/typemanager.cxx
b/codemaker/source/codemaker/typemanager.cxx
index e07b553..5116aba 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -492,6 +492,7 @@ codemaker::UnoType::Sort TypeManager::decompose(
case codemaker::UnoType::SORT_ANY:
case codemaker::UnoType::SORT_ENUM_TYPE:
case codemaker::UnoType::SORT_PLAIN_STRUCT_TYPE:
+case codemaker::UnoType::SORT_EXCEPTION_TYPE:
case codemaker::UnoType::SORT_INTERFACE_TYPE:
if (nucleus != 0) {
*nucleus = n;
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 446e1f9..7540c02 100755
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -162,7 +162,8 @@ public:
OUString getTypeClass(OUString const name, bool cStyle = false);
-void dumpCppuGetType(FileStream out, OUString const name);
+void dumpCppuGetType(
+FileStream out, OUString const name, OUString const * ownName = 0);
sal_uInt32 getInheritedMemberCount();
@@ -799,8 +800,15 @@ void CppuType::dumpType(
}
}
-void CppuType::dumpCppuGetType(FileStream out, OUString const name) {
-switch (m_typeMgr-getSort(resolveOuterTypedefs(name))) {
+void CppuType::dumpCppuGetType(
+FileStream out, OUString const name, OUString const * ownName)
+{
+//TODO: What are these calls good for?
+OUString nucleus;
+sal_Int32 rank;
+codemaker::UnoType::Sort sort = m_typeMgr-decompose(
+name, true, nucleus, rank, 0, 0);
+switch (rank == 0 ? sort : codemaker::UnoType::SORT_SEQUENCE_TYPE) {
case codemaker::UnoType::SORT_VOID:
case codemaker::UnoType::SORT_BOOLEAN:
case codemaker::UnoType::SORT_BYTE:
@@ -823,10 +831,16 @@ void CppuType::dumpCppuGetType(FileStream out, OUString
const name) {
case codemaker::UnoType::SORT_INSTANTIATED_POLYMORPHIC_STRUCT_TYPE:
case codemaker::UnoType::SORT_EXCEPTION_TYPE:
case codemaker::UnoType::SORT_INTERFACE_TYPE:
-out indent() ::cppu::UnoType ;
-dumpType(out, name, false, false, false, true);
-out ::get();\n;
+// Take care of recursion like struct S { sequenceS x; }:
+if (ownName == 0 || nucleus != *ownName) {
+out indent() ::cppu::UnoType ;
+dumpType(out, name, false, false, false, true);
+out ::get();\n;
+}
break;
+case codemaker::UnoType::SORT_TYPEDEF:
+assert(false); // this cannot happen
+// fall through
default:
throw CannotDumpException(
unexpected entity \ + name
@@ -1984,15 +1998,7 @@ void
PlainStructType::dumpComprehensiveGetCppuType(FileStream out) {
i-type, static_cast sal_uInt32 (types.size(.
second)
{
-if ((codemaker::UnoType::getSort(u2b(i-type))
- == codemaker::UnoType::SORT_COMPLEX)
- b2u(codemaker::UnoType::decompose(u2b(i-type))) != name_)
-// take care of recursion like struct S { sequenceS x; };
-{
-out indent() ::cppu::UnoType ;
-dumpType(out, i-type, false, false, false, true);
-out ::get();\n;
-}
+dumpCppuGetType(out, i-type, name_);
// For typedefs, use the resolved type name, as there will be no
// information available about the typedef itself at runtime (the
// above getCppuType call will make available information about the
@@ -2488,15 +2494,7 @@ void
PolyStructType::dumpComprehensiveGetCppuType(FileStream out) {
i-type, static_cast sal_uInt32 (types.size(.
second)
{
-if ((codemaker::UnoType::getSort(u2b(i-type))
- == codemaker::UnoType::SORT_COMPLEX)
- b2u(codemaker::UnoType::decompose(u2b(i-type))) != name_)
-// take care of recursion like struct S { sequenceS x; };
-{
-out indent() ::cppu::UnoType ;
-dumpType(out, i-type, false, false, false, true);
-out ::get();\n;
-}
+dumpCppuGetType(out, i-type, name_);
// For typedefs, use the resolved type name, as there will be no
// information available about the typedef
[PATCH] remove dead class SfxResourceManager
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3393
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3393/1
remove dead class SfxResourceManager
Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879
---
D sfx2/inc/resmgr.hxx
M sfx2/inc/sfx2/app.hxx
M sfx2/source/appl/appdata.cxx
M sfx2/source/inc/appdata.hxx
4 files changed, 0 insertions(+), 69 deletions(-)
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
deleted file mode 100644
index 7e6f837..000
--- a/sfx2/inc/resmgr.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_RESMGR_HXX
-#define _SFX_RESMGR_HXX
-
-#include sfx2/minarray.hxx
-
-class SfxMessageDescription;
-class SfxMessageTable;
-class Bitmap;
-class ResMgr;
-
-DECL_PTRARRAY(SfxResMgrArr, ResMgr *, 1, 1);
-
-// INCLUDE ---
-
-class SfxResourceManager
-{
-SfxResMgrArraResMgrArr;
-SfxResMgrArraResMgrBmpArr;
-sal_uInt16 nEnterCount;
-SfxMessageTable*pMessageTable;
-
-private:
-voidClearMsgTable_Impl();
-SfxMessageDescription* MakeDesc_Impl(sal_uInt16);
-
-public:
-SfxResourceManager();
-~SfxResourceManager();
-
-sal_uInt16 RegisterResource( const char *pFileName);
-voidReleaseResource( sal_uInt16 nRegisterId );
-
-sal_uInt16 RegisterBitmap(const char *pMono, const
char *pColor);
-
-sal_uInt16 RegisterBitmap( const char *pSingleFile );
-voidReleaseBitmap( sal_uInt16 nRegisterId );
-
-Bitmap GetAllBitmap( sal_uInt16 nBmpsPerRow );
-
-voidEnter();
-voidLeave();
-SfxMessageDescription* CreateDescription( sal_uInt16 nId );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 2f81d6d..858140d 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -65,7 +65,6 @@
class SfxObjectShell;
class SfxObjectShellArr_Impl;
class SfxProgress;
-class SfxResourceManager;
class SfxSlotPool;
class SfxStbCtrlFactArr_Impl;
class SfxTbxCtrlFactArr_Impl;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 2988d8b..a2c79ca 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -112,7 +112,6 @@
, pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
, pViewFrame( 0 )
, pSlotPool( 0 )
-, pResMgr( 0 )
, pAppDispat( 0 )
, pInterfaces( 0 )
, nDocNo(0)
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 786528a..3e92ccd8 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -56,7 +56,6 @@
class ResMgr;
class SfxViewFrame;
class SfxSlotPool;
-class SfxResourceManager;
class SfxDispatcher;
class SfxInterface;
class BasicManager;
@@ -129,7 +128,6 @@
pBasMgrListener;
SfxViewFrame* pViewFrame;
SfxSlotPool*pSlotPool;
-SfxResourceManager* pResMgr;
SfxDispatcher* pAppDispat; // Dispatcher if no document
SfxInterface** pInterfaces;
--
To view, visit https://gerrit.libreoffice.org/3393
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit f99df8b7ac4cba88ba5f6aa5439605fcff2d1e3e Author: Stephan Bergmann sberg...@redhat.com Date: Mon Apr 15 10:51:04 2013 +0200 Fix for LibreOfficeDev naming scheme Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index bb8af19..78ed0a1 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -102,15 +102,15 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_DEV_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice_*_archive.zip - mv $(DEVINSTALLDIR)/LibreOffice_*_archive/* $(DEVINSTALLDIR)/opt - rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip + mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt + rmdir $(DEVINSTALLDIR)/LibreOffice*_archive $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice_*_archive_sdk.zip - mv $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK/sdk \ + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(DEVINSTALLDIR)/opt/ - rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK - rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk + rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK + rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk else # LIBO_DEV_INSTALL $(call instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT)) ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Mihkel Tõnnov mihh...@gmail.com changed: What|Removed |Added Depends on||62073 --- Comment #216 from Mihkel Tõnnov mihh...@gmail.com --- Adding back bug 62073 which was accidentally removed right after nomination. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/inc sfx2/source
sfx2/inc/resmgr.hxx | 65 ---
sfx2/inc/sfx2/app.hxx|1
sfx2/source/appl/appdata.cxx |1
sfx2/source/inc/appdata.hxx |2 -
4 files changed, 69 deletions(-)
New commits:
commit f47c3906ee0fc35f4b219fb24a0e270956821369
Author: Noel Grandin n...@peralex.com
Date: Mon Apr 15 10:36:16 2013 +0200
remove dead class SfxResourceManager
Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879
Reviewed-on: https://gerrit.libreoffice.org/3393
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
deleted file mode 100644
index 7e6f837..000
--- a/sfx2/inc/resmgr.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_RESMGR_HXX
-#define _SFX_RESMGR_HXX
-
-#include sfx2/minarray.hxx
-
-class SfxMessageDescription;
-class SfxMessageTable;
-class Bitmap;
-class ResMgr;
-
-DECL_PTRARRAY(SfxResMgrArr, ResMgr *, 1, 1);
-
-// INCLUDE ---
-
-class SfxResourceManager
-{
-SfxResMgrArraResMgrArr;
-SfxResMgrArraResMgrBmpArr;
-sal_uInt16 nEnterCount;
-SfxMessageTable*pMessageTable;
-
-private:
-voidClearMsgTable_Impl();
-SfxMessageDescription* MakeDesc_Impl(sal_uInt16);
-
-public:
-SfxResourceManager();
-~SfxResourceManager();
-
-sal_uInt16 RegisterResource( const char *pFileName);
-voidReleaseResource( sal_uInt16 nRegisterId );
-
-sal_uInt16 RegisterBitmap(const char *pMono, const
char *pColor);
-
-sal_uInt16 RegisterBitmap( const char *pSingleFile );
-voidReleaseBitmap( sal_uInt16 nRegisterId );
-
-Bitmap GetAllBitmap( sal_uInt16 nBmpsPerRow );
-
-voidEnter();
-voidLeave();
-SfxMessageDescription* CreateDescription( sal_uInt16 nId );
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 2f81d6d..858140d 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -65,7 +65,6 @@ class SfxNewFileDialog;
class SfxObjectShell;
class SfxObjectShellArr_Impl;
class SfxProgress;
-class SfxResourceManager;
class SfxSlotPool;
class SfxStbCtrlFactArr_Impl;
class SfxTbxCtrlFactArr_Impl;
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 2988d8b..a2c79ca 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -112,7 +112,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
, pViewFrame( 0 )
, pSlotPool( 0 )
-, pResMgr( 0 )
, pAppDispat( 0 )
, pInterfaces( 0 )
, nDocNo(0)
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 786528a..3e92ccd8 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -56,7 +56,6 @@ class SfxObjectShellArr_Impl;
class ResMgr;
class SfxViewFrame;
class SfxSlotPool;
-class SfxResourceManager;
class SfxDispatcher;
class SfxInterface;
class BasicManager;
@@ -129,7 +128,6 @@ public:
pBasMgrListener;
SfxViewFrame* pViewFrame;
SfxSlotPool*pSlotPool;
-SfxResourceManager* pResMgr;
SfxDispatcher* pAppDispat; // Dispatcher if no document
SfxInterface** pInterfaces;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Missing extensions in build?
On 04/14/2013 10:16 AM, Andras Timar wrote: On Sun, Apr 14, 2013 at 8:11 AM, Chris Sherlock chris.sherloc...@gmail.com wrote: When I run make dev-install, I'm noticing the following: Couldn't find '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/URE/bin': skipping Couldn't find '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/presenter-screen': skipping Couldn't find '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/nlpsolver': skipping Couldn't find '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/pdf-import': skipping Couldn't find '/home/chris/repos/LibreOffice/core/solver/unxlngi6.pro/installation/opt/share/extensions/wiki-publisher': skipping Any ideas what might be causing this? http://opengrok.libreoffice.org/xref/core/solenv/bin/linkoo#142 presenter-screen and pdfimport are not extensions any more, nlpsolver and wiki-publisher are not built by default. I'm not sure about URE/bin. On Linux at least, it is ure/bin not URE/bin. Is that output coming from linkoo? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] remove dead class SfxResourceManager
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3393 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3393 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33590e7907c593d821e2eafda0e04c76c8b99879 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Try one approach to compile a class as one compilation unit
On 13/04/13 15:20, Tor Lillqvist (via Code Review) wrote: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3373 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3373/1 Try one approach to compile a class as one compilation unit In many cases the sources for some class have been split up into several source files, typically suffixed with a number 0, 1, 2 etc. Presumably this has been done because some compiler years ago was not capable of compiling all the source for that class at one time, or some other no longer relevant reason. It would be nice to get rid of this convention, so that clever compilers have a better chance of noticing unused private fields in a class, for instance. On the other hand, just combining the source files in question into one source file and removing the old source files from git leads to a discontinuity in version control history. I don't believe that this split was done ( in this case ) to get around compiler limitations or whatnot. It seems in this case that the split here is a logical one ( to distinguish between p-code operations that take zero, one or two ( 0,1,2 :-) ) parameters. If you look in the source code at the SbiRuntime::StepXXX methods you will see what I mean. Still though, splitting the class source across different source files is not intuitive ( certainly I remember being confused with this particular example when I first came across it ) I suppose perhaps a different class design ( or separation with helper classes or whatever ) would achieve the same goal. Even though I have gotten used to the twisted reality that is Libreoffice source code organisation Maybe a good compromise would be to introduce one new source file what would include the existing numbered source files? Or, as in this case, include the others into one already appropriately named source file? sounds like that is probably the best solution to preserve the history, otoh it kinda sticks in the throat not to prune these anachronisms Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablecontroller.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 6bdc3e83d9d3e0ae3c6e7cb9d1024757b6745e2e
Author: Gokul gswaminat...@kacst.edu.sa
Date: Mon Apr 15 11:23:59 2013 +0300
Removal of Dead code
Change-Id: I4a8aa2d2f89fd3ee56ac10c2551076a6063d570c
Reviewed-on: https://gerrit.libreoffice.org/3392
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 3cb77ca..cd11910 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2007,10 +2007,6 @@ void
SvxTableController::MergeAttrFromSelectedCells(SfxItemSet rAttr, bool bOnl
}
}
}
-
-if( mpView-IsTextEdit() )
-{
-}
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Removal of Dead code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3392 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3392 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a8aa2d2f89fd3ee56ac10c2551076a6063d570c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Convert SfxShellStack_Impl from SfxPtrArr to std::vector
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3394
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/3394/1
Convert SfxShellStack_Impl from SfxPtrArr to std::vector
Change-Id: I1ffd615a505029242a87337c9ef42c8156c42d70
---
M sfx2/inc/sfx2/dispatch.hxx
M sfx2/source/control/dispatch.cxx
2 files changed, 49 insertions(+), 54 deletions(-)
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index c7aaae3..2b02a5e 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -28,11 +28,11 @@
#include sfx2/bindings.hxx
#include sfx2/viewfrm.hxx
#include map
+#include vector
class SfxSlotServer;
class SfxShell;
class SfxRequest;
-class SfxShellStack_Impl;
class SfxHintPoster;
class SfxViewFrame;
class SfxBindings;
@@ -41,6 +41,8 @@
class SfxModule;
struct SfxDispatcher_Impl;
+typedef std::vectorSfxShell* SfxShellStack_Impl;
+
namespace com
{
namespace sun
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 16a83a1..26fd6f0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -30,6 +30,7 @@
#include stdio.h
#include stdarg.h
#include stdlib.h // due to bsearch
+#include algorithm
#include svtools/helpopt.hxx
@@ -37,7 +38,6 @@
#include appdata.hxx
#include sfx2/sfxhelp.hxx
#include sfx2/dispatch.hxx
-#include sfx2/minstack.hxx
#include sfx2/msg.hxx
#include sfx2/objface.hxx
#include sfx2/bindings.hxx
@@ -66,8 +66,6 @@
DBG_NAME(SfxDispatcherFillState)
typedef std::vectorSfxRequest* SfxRequestPtrArray;
-
-DECL_PTRSTACK(SfxShellStack_Impl, SfxShell*, 8, 4 );
struct SfxToDo_Impl
{
@@ -552,14 +550,15 @@
for(std::dequeSfxToDo_Impl::reverse_iterator i =
pImp-aToDoStack.rbegin(); i != pImp-aToDoStack.rend(); ++i)
{
if(i-bPush)
-aStack.Push(i-pCluster);
+aStack.push_back(i-pCluster);
else
{
SfxShell* pPopped(NULL);
do
{
-DBG_ASSERT( aStack.Count(), popping from empty stack );
-pPopped = aStack.Pop();
+DBG_ASSERT( !aStack.empty(), popping from empty stack );
+pPopped = aStack.back();
+aStack.pop_back();
}
while(i-bUntil pPopped != i-pCluster);
DBG_ASSERT(pPopped == i-pCluster, popping unpushed
SfxInterface);
@@ -568,9 +567,9 @@
sal_Bool bReturn;
if ( bDeep )
-bReturn = aStack.Contains(rShell);
+bReturn = std::find(aStack.begin(), aStack.end(), rShell) !=
aStack.end();
else
-bReturn = aStack.Top() == rShell;
+bReturn = aStack.back() == rShell;
return bReturn;
}
@@ -596,15 +595,15 @@
SFX_STACK(SfxDispatcher::GetShellLevel);
Flush();
-for ( sal_uInt16 n = 0; n pImp-aStack.Count(); ++n )
-if ( pImp-aStack.Top( n ) == rShell )
+for ( sal_uInt16 n = 0; n pImp-aStack.size(); ++n )
+if ( *( pImp-aStack.rbegin() + n ) == rShell )
return n;
if ( pImp-pParent )
{
sal_uInt16 nRet = pImp-pParent-GetShellLevel(rShell);
if ( nRet == USHRT_MAX )
return nRet;
-return nRet + pImp-aStack.Count();
+return nRet + pImp-aStack.size();
}
return USHRT_MAX;
@@ -624,9 +623,9 @@
*/
{
-sal_uInt16 nShellCount = pImp-aStack.Count();
+sal_uInt16 nShellCount = pImp-aStack.size();
if ( nIdx nShellCount )
-return pImp-aStack.Top(nIdx);
+return *(pImp-aStack.rbegin() + nIdx);
else if ( pImp-pParent )
return pImp-pParent-GetShell( nIdx - nShellCount );
return 0;
@@ -717,8 +716,8 @@
if ( IsAppDispatcher() )
return;
-for ( int i = int(pImp-aStack.Count()) - 1; i = 0; --i )
-pImp-aStack.Top( (sal_uInt16) i )-DoActivate_Impl(pImp-pFrame,
bMDI);
+for ( int i = int(pImp-aStack.size()) - 1; i = 0; --i )
+(*(pImp-aStack.rbegin() + i ))-DoActivate_Impl(pImp-pFrame, bMDI);
if ( bMDI pImp-pFrame )
{
@@ -743,8 +742,8 @@
void SfxDispatcher::DoParentActivate_Impl()
{
-for ( int i = int(pImp-aStack.Count()) - 1; i = 0; --i )
-pImp-aStack.Top( (sal_uInt16) i )-ParentActivate();
+for ( int i = int(pImp-aStack.size()) - 1; i = 0; --i )
+(*(pImp-aStack.rbegin() + i ))-ParentActivate();
}
//
@@ -798,8 +797,8 @@
if ( IsAppDispatcher() !pSfxApp-IsDowning() )
return;
-for ( sal_uInt16 i = 0; i pImp-aStack.Count(); ++i )
-pImp-aStack.Top(i)-DoDeactivate_Impl(pImp-pFrame, bMDI);
+for ( sal_uInt16 i = 0; i pImp-aStack.size(); ++i )
+(*(pImp-aStack.rbegin() + i))-DoDeactivate_Impl(pImp-pFrame, bMDI);
sal_Bool bHidePopups = bMDI pImp-pFrame;
if ( pNew pImp-pFrame )
@@ -831,8 +830,8 @@
void
[Libreoffice-commits] core.git: framework/source
framework/source/services/backingwindow.cxx | 44 ++--
1 file changed, 22 insertions(+), 22 deletions(-)
New commits:
commit ae9e61e0e1b87eaaa6f70ebf3de77096151c1ca7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Sat Apr 13 19:17:09 2013 -0300
Simple string cleanup in backingwindow.cxx
Change-Id: I5bd7152f0dfdc5459e9a754af1e8c65234ff606d
Reviewed-on: https://gerrit.libreoffice.org/3377
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/framework/source/services/backingwindow.cxx
b/framework/source/services/backingwindow.cxx
index 652b6c6..f18152b 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -160,16 +160,16 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
Referencelang::XMultiServiceFactory xConfig =
configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext() );
SequenceAny args(1);
PropertyValue val(
-OUString( nodepath ),
+nodepath,
0,
-Any(OUString( /org.openoffice.Office.Common/Help/StartCenter)),
+Any(OUString(/org.openoffice.Office.Common/Help/StartCenter)),
PropertyState_DIRECT_VALUE);
args.getArray()[0] = val;
Referencecontainer::XNameAccess
xNameAccess(xConfig-createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args),
UNO_QUERY);
if( xNameAccess.is() )
{
//throws css::container::NoSuchElementException,
css::lang::WrappedTargetException
-Any value(
xNameAccess-getByName(OUString(StartCenterHideExternalLinks)) );
+Any value( xNameAccess-getByName(StartCenterHideExternalLinks)
);
mnHideExternalLinks = value.getsal_Int32();
}
}
@@ -177,9 +177,9 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
{
}
-String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
-String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
+OUString aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
+OUString aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
+OUString aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
// clean up resource stack
FreeResource();
@@ -328,24 +328,24 @@ void BackingWindow::prepareRecentFileMenu()
rArgsList.realloc( nArgs );
nArgs--;
-rArgsList[nArgs].Name = OUString( FilterName );
+rArgsList[nArgs].Name = FilterName;
rArgsList[nArgs].Value = makeAny( aFilter );
if( !aFilterOpt.isEmpty() )
{
nArgs--;
-rArgsList[nArgs].Name = OUString( FilterOptions );
+rArgsList[nArgs].Name = FilterOptions;
rArgsList[nArgs].Value = makeAny( aFilterOpt );
}
// documents in the picklist will never be opened as templates
nArgs--;
-rArgsList[nArgs].Name = OUString( AsTemplate );
+rArgsList[nArgs].Name = AsTemplate;
rArgsList[nArgs].Value = makeAny( (sal_Bool) sal_False );
nArgs--;
-rArgsList[nArgs].Name = OUString( Referer );
-rArgsList[nArgs].Value = makeAny( OUString( private:user ) );
+rArgsList[nArgs].Name = Referer;
+rArgsList[nArgs].Value = makeAny( OUString(private:user) );
// and finally create an entry in the popupmenu
OUString aMenuTitle;
@@ -389,7 +389,7 @@ void BackingWindow::prepareRecentFileMenu()
}
else
{
-String aNoDoc( FwkResId( STR_NODOCUMENT ) );
+OUString aNoDoc( FwkResId( STR_NODOCUMENT ) );
mpRecentMenu-InsertItem( 0x, aNoDoc );
}
maOpenButton.SetPopupMenu( mpRecentMenu );
@@ -885,7 +885,7 @@ IMPL_LINK_NOARG(BackingWindow, ToolboxHdl)
Referencelang::XMultiServiceFactory xConfig =
configuration::theDefaultProvider::get(
comphelper::getProcessComponentContext() );
SequenceAny args(1);
PropertyValue val(
-OUString( nodepath ),
+nodepath,
0,
Any(OUString::createFromAscii(pNodePath)),
PropertyState_DIRECT_VALUE);
@@ -917,27 +917,27 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
{
// dispatch the appropriate URL and end the dialog
if( pButton == maWriterButton )
-dispatchURL( OUString( WRITER_URL ) );
+dispatchURL( WRITER_URL );
else if( pButton == maCalcButton )
-dispatchURL( OUString( CALC_URL ) );
+dispatchURL( CALC_URL );
else if( pButton == maImpressButton )
-dispatchURL( OUString( IMPRESS_WIZARD_URL ) );
+dispatchURL( IMPRESS_WIZARD_URL );
else if( pButton == maDrawButton )
-dispatchURL(
[PUSHED] Simple string cleanup in backingwindow.cxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3377 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3377 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5bd7152f0dfdc5459e9a754af1e8c65234ff606d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br 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: sc/uiconfig
sc/uiconfig/scalc/ui/externaldata.ui | 293 +++ 1 file changed, 293 insertions(+) New commits: commit c115d63bf4b5c80aa66b01f48d0c4b51560b8bd3 Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Sun Apr 14 15:39:17 2013 +0300 Converted Insert - Link to External data widget. Change-Id: Ife2f49853a9974010d6247ae40df9b534d044c12 Reviewed-on: https://gerrit.libreoffice.org/3381 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/externaldata.ui b/sc/uiconfig/scalc/ui/externaldata.ui new file mode 100644 index 000..4673442 --- /dev/null +++ b/sc/uiconfig/scalc/ui/externaldata.ui @@ -0,0 +1,293 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=externaldata +property name=can_focusFalse/property +property name=border_width6/property +property name=title translatable=yesExternal Data/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=top_padding6/property +property name=left_padding12/property +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkBox id=box3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=spacing6/property +child +
[Libreoffice-commits] core.git: 3 commits - extras/source filter/source sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk svtools/inc svtools/source
extras/source/glade/libreoffice-catalog.xml.in |4 filter/source/msfilter/svdfppt.cxx | 10 ++ sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/inc/helpids.h |2 sc/inc/sc.hrc |2 sc/inc/scabstdlg.hxx |2 sc/source/ui/attrdlg/scdlgfact.cxx | 21 sc/source/ui/attrdlg/scdlgfact.hxx |3 sc/source/ui/docshell/arealink.cxx |2 sc/source/ui/inc/linkarea.hrc | 35 --- sc/source/ui/inc/linkarea.hxx | 19 +-- sc/source/ui/miscdlgs/linkarea.cxx | 93 --- sc/source/ui/miscdlgs/linkarea.src | 119 - sc/source/ui/view/cellsh1.cxx |3 sc/uiconfig/scalc/ui/externaldata.ui | 79 ++-- svtools/inc/svtools/inettbc.hxx|9 - svtools/source/control/inettbc.cxx | 30 -- 18 files changed, 148 insertions(+), 287 deletions(-) New commits: commit 4f4ab917261e0f3fef242e54a2a5e45fb75aeb82 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 10:36:15 2013 +0100 convert external data dialog to .ui Change-Id: I2dfaf152bd473f73fdeec08a8c2ac6b007d38352 diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 4867639..eac9600 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -106,7 +106,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/miscdlgs/protectiondlg.src \ sc/source/ui/miscdlgs/acredlin.src \ sc/source/ui/miscdlgs/sharedocdlg.src \ -sc/source/ui/miscdlgs/linkarea.src \ sc/source/ui/formdlg/formdlgs.src \ sc/source/ui/formdlg/dwfunctr.src \ sc/source/core/src/compiler.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 8f800bf..4371959 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -63,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/definename \ sc/uiconfig/scalc/ui/deletecells \ sc/uiconfig/scalc/ui/deletecontents \ + sc/uiconfig/scalc/ui/externaldata \ sc/uiconfig/scalc/ui/formatcellsdialog \ sc/uiconfig/scalc/ui/insertname \ sc/uiconfig/scalc/ui/insertsheet \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 6f210c8..fa4323c 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -196,8 +196,6 @@ #define HID_DATAPILOT_SERVICE SC_HID_DATAPILOT_SERVICE // Other help IDs (max.70) --- -#define HID_SCDLG_LINKAREAURL SC_HID_SCDLG_LINKAREAURL - #define HID_SELECTTABLES SC_HID_SELECTTABLES #define HID_SC_REPLCELLSWARN SC_HID_SC_REPLCELLSWARN diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4749970..d131092 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1064,7 +1064,7 @@ #define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) #define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) -#define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) + #define RID_SCDLG_DPDATAFIELD (SC_DIALOGS_START + 133) #define RID_SCDLG_DPSUBTOTAL_OPT(SC_DIALOGS_START + 134) #define RID_SCDLG_DPNUMGROUP(SC_DIALOGS_START + 135) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 89997d4..026a03e 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -396,7 +396,7 @@ public: virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg const std::vectorString rEntryList ) = 0; -virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg +virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0; //add for ScLinkedAreaDlg virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg sal_uInt16 nResId, // derivative for every dialog! diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 98b656f..83f3c23 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -982,27 +982,12 @@ AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Wind } // add for ScSelEntryDlg end - -AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg ( Window* pParent, -int nId) +AbstractScLinkedAreaDlg *
[PUSHED] Converted Insert - Link to External data widget.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3381 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3381 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife2f49853a9974010d6247ae40df9b534d044c12 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 83/0bd984a9db75a76057a969a96a17233ed4d7ee
83/0bd984a9db75a76057a969a96a17233ed4d7ee |1 + 1 file changed, 1 insertion(+) New commits: commit 548d3b1cf1f48c52115c2bb9d1d36411c250829a Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 10:39:51 2013 +0100 Notes added by 'git notes add' diff --git a/83/0bd984a9db75a76057a969a96a17233ed4d7ee b/83/0bd984a9db75a76057a969a96a17233ed4d7ee new file mode 100644 index 000..6305891 --- /dev/null +++ b/83/0bd984a9db75a76057a969a96a17233ed4d7ee @@ -0,0 +1 @@ +merged as: ca09d2df977d473341546882cf48c70ebd322d42 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: 2 commits - scripts/docdiff.sh
scripts/docdiff.sh | 96 +
1 file changed, 96 insertions(+)
New commits:
commit 5306df2204cad2387fb43deef5fcaa145a7086bf
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Apr 15 11:44:09 2013 +0200
docdiff: fix typo to make -k work
Change-Id: I510e34fcf8de78f5000e52b2d1450dab4c18439c
diff --git a/scripts/docdiff.sh b/scripts/docdiff.sh
index cb04a06..ef5669a 100755
--- a/scripts/docdiff.sh
+++ b/scripts/docdiff.sh
@@ -69,7 +69,7 @@ while getopts r:t:skhq opt ; do
r) RES=$OPTARG ;;
t) TMP=$OPTARG ;;
s) SORT=sort -n -k2,2 ;;
- s) KEEP=1 ;;
+ k) KEEP=1 ;;
q) QUIET=1; GS=gs -q;;
h) usage; exit ;;
?) usage; exit ;;
commit 6786524958bdd3400a244e090f75f57e6956eeef
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Apr 15 11:40:35 2013 +0200
scripts: import oodocdiff.sh from old build repo
Change-Id: I967e8786ddf08e638cc58845c6dc8ccaca962856
diff --git a/scripts/docdiff.sh b/scripts/docdiff.sh
new file mode 100755
index 000..cb04a06
--- /dev/null
+++ b/scripts/docdiff.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2010 Thorsten Behrens, Miklos Vajna
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the Software), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# This little hack is much inspired by Caolan McNamara's original
+# OpenOffice.org convwatch work
+#
+
+
+# check for required gs
+which gs /dev/null 21 || {
+ echo need gs; exit 1
+}
+
+# check for required imagemagick tools
+which composite /dev/null 21 || {
+ echo need imagemagick's composite; exit 1
+}
+which identify /dev/null 21 || {
+ echo need imagemagick's identify; exit 1
+}
+
+usage ()
+{
+echo Usage: $0 [options] input1.ps input2.ps
+echo
+echo Generates graphical comparison between input1 input2
+echo and outputs count of different pixel values to stdout
+echo
+echo Options:
+echo -rnumSet image resolution to num dpi (defaults to 75)
+echo -ttmpdir Set tmpdir location to use (defaults to /tmp)
+echo -s Sort output by number of increasing differences
+echo -k Keep temp images
+echo -h This help information
+echo -q Be quiet
+}
+
+RES=75
+TMP=/tmp
+SORT=cat
+GS=gs
+
+# Parse command line options
+while getopts r:t:skhq opt ; do
+ case $opt in
+ r) RES=$OPTARG ;;
+ t) TMP=$OPTARG ;;
+ s) SORT=sort -n -k2,2 ;;
+ s) KEEP=1 ;;
+ q) QUIET=1; GS=gs -q;;
+ h) usage; exit ;;
+ ?) usage; exit ;;
+ esac
+done
+
+shift $(($OPTIND - 1))
+
+mkdir $TMP/$$.cmpdir
+
+test -z $QUIET echo Generating bitmap renderings of $1 ...
+$GS -dNOPROMPT -dBATCH -sDEVICE=jpeg -r$RES -dNOPAUSE
-sOutputFile=$TMP/$$.cmpdir/file1.%04d.jpeg $1
+
+test -z $QUIET echo Generating bitmap renderings of $2 ...
+$GS -dNOPROMPT -dBATCH -sDEVICE=jpeg -r$RES -dNOPAUSE
-sOutputFile=$TMP/$$.cmpdir/file2.%04d.jpeg $2
+
+test -z $QUIET echo Generating differences...
+for file in $TMP/$$.cmpdir/file1.*; do test -z $QUIET echo -n $file: ;
num=`echo $file | sed -e ' s/.*\.\(.*\)\..*/\1/'`; composite -compose
difference $file $TMP/$$.cmpdir/file2.$num.jpeg - | identify -format %k -; done
| $SORT
+
+if test -n $KEEP; then
+ echo Keeping temp images at $TMP/$$.cmpdir 2
+else
+rm -rf $TMP/$$.cmpdir
+fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/sortkeydlg.cxx |9 +
sc/source/ui/dbgui/tpsort.cxx | 25 +
sc/source/ui/inc/sortkeydlg.hxx |2 +-
sc/source/ui/inc/tpsort.hxx |1 +
4 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 42726853bb90eab11bf4fde8b0358ca3c3354529
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Sat Apr 13 09:34:54 2013 +0200
Calc Sort: Introducing new method AddKeyItem to avoid code duplication
Change-Id: Ic34b5958472a7d2c19ff686914309b6699e237c4
Reviewed-on: https://gerrit.libreoffice.org/3370
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 006dad5..3e09076 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -156,11 +156,12 @@ IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*,
pScrollBar )
// ---
-void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem )
+void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItemIndex )
{
-m_rVertScroll.SetRangeMax( nItem );
-m_rVertScroll.DoScroll( nItem );
-m_aSortWin.AddSortKey( nItem );
+++nItemIndex;
+m_rVertScroll.SetRangeMax( nItemIndex );
+m_rVertScroll.DoScroll( nItemIndex );
+m_aSortWin.AddSortKey( nItemIndex );
checkAutoVScroll();
}
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 6731e71..f153cf7 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -141,10 +141,7 @@ void ScTabPageSortFields::Init()
// Create three sort key dialogs by default
for ( sal_uInt16 i=0; inSortKeyCount; i++ )
-{
-maSortKeyCtrl.AddSortKey(i+1);
-maSortKeyItems[i].m_pLbSort-SetSelectHdl( LINK( this,
ScTabPageSortFields, SelectHdl ) );
-}
+AddSortKeyItem(i);
}
// ---
@@ -170,11 +167,8 @@ void ScTabPageSortFields::Reset( const SfxItemSet /*
rArgSet */ )
{
// Make sure that the all sort keys are reset
for ( sal_uInt16 i=nSortKeyCount; iaSortData.maKeyState.size(); i++ )
-{
-maSortKeyCtrl.AddSortKey(i+1);
-maSortKeyItems[i].m_pLbSort-SetSelectHdl( LINK( this,
- ScTabPageSortFields, SelectHdl ) );
-}
+AddSortKeyItem(i);
+
nSortKeyCount = aSortData.maKeyState.size();
FillFieldLists(0);
@@ -443,6 +437,15 @@ sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW
nField )
return nFieldPos;
}
+//
+
+void ScTabPageSortFields::AddSortKeyItem( sal_uInt16 nItemIndex )
+{
+maSortKeyCtrl.AddSortKey( nItemIndex );
+maSortKeyItems[nItemIndex].m_pLbSort-SetSelectHdl(
+LINK( this, ScTabPageSortFields, SelectHdl ) );
+}
+
// ---
// Handler:
//-
@@ -463,9 +466,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
// Add Sort Key Item
++nSortKeyCount;
-maSortKeyCtrl.AddSortKey( nSortKeyCount );
-maSortKeyItems[nSortKeyIndex].m_pLbSort-SetSelectHdl( LINK( this,
ScTabPageSortFields, SelectHdl ) );
-
+AddSortKeyItem( nSortKeyIndex );
FillFieldLists( nSortKeyIndex );
// Set Status
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index 060e8ad..7718663 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -99,7 +99,7 @@ private:
public:
ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems mrSortKeyItems);
void setScrollRange();
-void AddSortKey( sal_uInt16 nItem );
+void AddSortKey( sal_uInt16 nItemIndex );
};
#endif // SC_SORTKEYDLG_HXX
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 8ce4a42..e4d82c6 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -95,6 +95,7 @@ private:
voidInit();
voidFillFieldLists ( sal_uInt16 nStartField );
sal_uInt16 GetFieldSelPos ( SCCOLROW nField );
+voidAddSortKeyItem( sal_uInt16 nItemIndex );
// Handler
DECL_LINK( SelectHdl, ListBox * );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/LinkTarget.mk | 28
1 file changed, 4 insertions(+), 24 deletions(-)
New commits:
commit 6df3de95cdbed9b68ee89bcd7402c17dc62324a5
Author: Tor Lillqvist t...@iki.fi
Date: Mon Apr 15 12:02:57 2013 +0300
Revert Don't build unneccesary libraries twice
It broke cross-compilation at least for me:
No rule to make target 'cppumaker', needed by 'build-tools'
This reverts commit 4960f665194760fc913cbfb97d35c1c182bbdd0d.
Change-Id: I29c16aa2c094692c26f77164e15ed4f4b2a82dac
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0d5f24b..98964d7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -443,9 +443,7 @@ mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2))
endef
$(call gb_LinkTarget_get_target,%) : $(call
gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
- $(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call
gb_Library_get_linktargetname,$(lib,\
- $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\
- $(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) echo invalid
$@),$(call gb_LinkTarget__command,$@,$*))
+ $(call gb_LinkTarget__command,$@,$*)
$(call gb_LinkTarget__command_objectlist,$@,$*)
ifeq ($(gb_FULLDEPS),$(true))
@@ -838,26 +836,8 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
endef
-gb_BUILD_LIBS := basegfx \
- reg \
- sal \
- salhelper \
- store \
- tl \
- unoidl
-
-gb_BUILD_TOOLS := cppumaker \
- idlc \
- regmerge \
- rsc \
- svidl
-
-define gb_LinkTarget__is_build_lib
-$(if $(filter $(1),$(foreach lib,$(gb_BUILD_LIBS),$(call
gb_Library_get_linktargetname,$(lib,$(true),$(false))
-endef
-
-define gb_LinkTarget__is_build_tool
-$(if $(filter $(1),$(addprefix
Executable/,$(gb_BUILD_TOOLS))),$(true),$(false))
+define gb_Linktarget__is_build_tool
+$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge
rsc svidl)),$(true),$(false))
endef
define gb_LinkTarget_use_libraries
@@ -866,7 +846,7 @@ $$(eval $$(call gb_Output_info,currently known libraries
are: $(sort $(gb_Librar
$$(eval $$(call gb_Output_error,Cannot link against library/libraries
$$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in
Repository.mk))
endif
-ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true))
+ifeq ($(call gb_Linktarget__is_build_tool,$(1)),$(true))
$(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4))
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Calc Sort: Introducing new method AddKeyItem to avoid code d...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3370 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3370 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic34b5958472a7d2c19ff686914309b6699e237c4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/parse/sqlbison.y |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5fb4fe1b97d61f81eb85580e1b92a32ef1e35061
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Apr 15 11:51:55 2013 +0200
demote OSQLParser::RuleIDToRule failure to INFO
Change-Id: Ica2d3485c62f44311f612ade20924690bfbb2666
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index f823595..6d6c4f6 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4739,7 +4739,7 @@ OSQLParseNode::Rule OSQLParser::RuleIDToRule( sal_uInt32
_nRule )
OSQLParser::RuleIDMap::const_iterator i
(s_aReverseRuleIDLookup.find(_nRule));
if (i == s_aReverseRuleIDLookup.end())
{
-SAL_WARN(connectivity.parse,
+SAL_INFO(connectivity.parse,
connectivity::OSQLParser::RuleIDToRule cannot reverse-lookup
rule.
Reverse mapping incomplete?
_nRule=' _nRule '
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Enhancements - Getting User Input
Hi, On Sun, Apr 14, 2013 at 08:18:17PM -0700, Joel Madero wrote: We select 10-15 possible enhancements that can be completed in a reasonably short period of time (within a minor release). We blog about this (I can do this) with a simple poll. We then announce this to the user list and make some PR announcement about we are listening to what you think!. Allowing this would limit the list to enhancements that we agree can be done in a short period but open up which enhancement to the wider community. My thought is we attempt this for our next release in 4.1 Thoughts? Nope, at least not with PR or we are listening to what you think! up front. It needs to be the other way around: If you find a set of enhancements that seem to be valueable to users, the primary goals needs to be to sell those ideas to developers. Before a developer is commited to a task, there should not be any PR about it. And if its a volunteer, there should not be any PR about it before the task is _finished_. Everything else will end in tears. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Jorendc joren.libreoff...@telenet.be changed: What|Removed |Added Depends on||63547 --- Comment #11 from Jorendc joren.libreoff...@telenet.be --- I nominate Bug 63547 - Cannot scroll horizontally using trackpad (Mac OSX bug only, as far we can see) because of the regression 4.0 vs 4.1 and the fact it makes scrolling horizontally using the trackpad useless. You can only scroll in one direction. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configuration failure on Mac with 10.6 SDK in configure/gnutls when attempting build from master
Hi, On Mon, Apr 15, 2013 at 09:04:29AM +0200, Alexander Thurgood wrote: Hi all, After make clean, fresh pull from master, I am getting a persistent configuration failure in autogen.sh/configure : checking whether to use gnutls... ./configure: line 37515: syntax error near unexpected token `else' ./configure: line 37515: `else' Error running configure at /Users/Shared/Repos/LO/core/autogen.sh line 205. make: *** [/Users/Shared/Repos/LO/core/config_host.mk] Error 2 Well, have you tried to look at what autoconf generated on that line? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/createnamesdialog.ui | 181 ++ 1 file changed, 181 insertions(+) New commits: commit f9931d7bcb678a92c842fc1819b9b9940328dfe0 Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Sat Apr 13 11:24:57 2013 +0300 Converted Insert - Names - creat widget. Change-Id: I32967859db63a064a9e46a14430c125643e2bfd5 Reviewed-on: https://gerrit.libreoffice.org/3371 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui b/sc/uiconfig/scalc/ui/createnamesdialog.ui new file mode 100644 index 000..63fbc83 --- /dev/null +++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui @@ -0,0 +1,181 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=createnames +property name=can_focusFalse/property +property name=border_width6/property +property name=title translatable=yesCreate Names/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +property name=xalign0.5099046325684/property +property name=yalign0.5099046325684/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=top_padding6/property +property name=left_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkCheckButton id=checkbutton1 +property name=label translatable=yes_Top row/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultFalse/property +property name=use_underlineTrue/property +property name=xalign0/property +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c6fa764daaf80640198bc02a4c8af1f0a06f72b0 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 10:57:54 2013 +0100 Updated core Project: help 4a3bd60420f64d18d0b8e07a83f22c13b49267b5 diff --git a/helpcontent2 b/helpcontent2 index 8958c6b..4a3bd60 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8958c6b2dfdb38a7ef0a9415ab0f302cf19171df +Subproject commit 4a3bd60420f64d18d0b8e07a83f22c13b49267b5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/scalc/01/0409.xhp | 22 +++--- 2 files changed, 11 insertions(+), 18 deletions(-) New commits: commit 4a3bd60420f64d18d0b8e07a83f22c13b49267b5 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 10:57:54 2013 +0100 update helpids for external data .ui conversion Change-Id: I61e253693703e8c049f0e6c286a5209c2939e265 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e56087f..e5b0334 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3145,7 +3145,6 @@ HID_RPT_VERT_SCROLLBAR,64459, HID_RUBY_DIALOG,34187, HID_SAVE_LABEL_DLG,54919, HID_SCDLG_CONFLICTS,59023, -HID_SCDLG_LINKAREAURL,58998, HID_SCH_ALIGNMENT,63284, HID_SCH_ALIGNMENT_CTR_DIAL,63315, HID_SCH_ALIGNMENT_DEGREES,63317, @@ -6485,7 +6484,6 @@ sc_CheckBox_RID_SCDLG_INSCONT_BTN_INSSTRINGS,1493435413, sc_CheckBox_RID_SCDLG_INSCONT_BTN_LINK,1493435427, sc_CheckBox_RID_SCDLG_INSCONT_BTN_SKIP_EMPTY,1493435425, sc_CheckBox_RID_SCDLG_INSCONT_BTN_TRANSPOSE,1493435426, -sc_CheckBox_RID_SCDLG_LINKAREA_BTN_RELOAD,1495368714, sc_CheckBox_RID_SCDLG_MOVETAB_BTN_COPY,1493451781, sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_ATTRIB,1493845017, sc_CheckBox_RID_SCDLG_NEWSCENARIO_CB_COPYALL,1493845019, @@ -6562,7 +6560,6 @@ sc_ComboBox_RID_SCDLG_FILTER_ED_VAL3,2567082018, sc_ComboBox_RID_SCDLG_FILTER_ED_VAL4,2567082024, sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_FIELDSEP,1494175749, sc_ComboBox_RID_SCDLG_IMPORTOPT_ED_TEXTSEP,1494175751, -sc_ComboBox_RID_SCDLG_LINKAREA_CB_URL,1495371781, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL1,1493749792, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794, @@ -6766,7 +6763,6 @@ sc_MetricField_RID_SCPAGE_LAYOUT_MF_TAB,958208577, sc_ModalDialog_RID_SCDLG_CHARTCOLROW,1494515712, sc_ModalDialog_RID_SCDLG_COLORROW,1494368256, sc_ModalDialog_RID_SCDLG_GROUP,1493549056, -sc_ModalDialog_RID_SCDLG_LINKAREA,1495367680, sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968, sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976, @@ -6789,12 +6785,10 @@ sc_MultiLineEdit_TP_VALIDATION_INPUTHELP_EDT_INPUTHELP,548293135, sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765, sc_MultiListBox_RID_SCDLG_CONSOLIDATE_LB_CONSAREAS,2567523350, sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137, -sc_MultiListBox_RID_SCDLG_LINKAREA_LB_RANGES,1495370761, sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657, sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931, sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364, sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593, -sc_NumericField_RID_SCDLG_LINKAREA_NF_DELAY,1495373835, sc_NumericField_RID_SCDLG_SOLVER_INTEGER_NF_VALUE,1495504897, sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735, sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732, @@ -6813,7 +6807,6 @@ sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_ADD,2567524869, sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870, sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259, sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260, -sc_PushButton_RID_SCDLG_LINKAREA_BTN_BROWSE,1495372294, sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_OPTIONS,2569212417, sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_SOLVE,2569212420, sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197, diff --git a/source/text/scalc/01/0409.xhp b/source/text/scalc/01/0409.xhp index f5e378c..091bb0b 100644 --- a/source/text/scalc/01/0409.xhp +++ b/source/text/scalc/01/0409.xhp @@ -30,10 +30,10 @@ section id=extdata paragraph xml-lang=en-US id=par_id3153361 role=paragraph l10n=E oldref=1 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE id=bm_id3151041 localize=false/ -paragraph xml-lang=en-US id=par_id3153192 role=paragraph l10n=U oldref=2ahelp hid=SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE visibility=hiddenLocate the file containing the data you want to insert./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/externaldata/browse id=bm_id3151041 localize=false/ +paragraph xml-lang=en-US id=par_id3153192 role=paragraph l10n=U oldref=2ahelp hid=modules/scalc/ui/externaldata/browse visibility=hiddenLocate the file containing the data you want to insert./ahelp/paragraph bookmark xml-lang=en-US branch=hid/.uno:InsertExternalDataSource id=bm_id3748965 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:InsertExternalDataSource id=bm_id3150441 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/externaldata/ExternalDataDialog id=bm_id3150441 localize=false/ paragraph xml-lang=en-US id=hd_id3145785 role=heading level=1 l10n=CHG oldref=3link href=text/scalc/01/0409.xhp name=External DataLink to External Data/link/paragraph paragraph xml-lang=en-US
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/inc/sc.hrc |2
sc/inc/scabstdlg.hxx |3 -
sc/source/ui/attrdlg/scdlgfact.cxx| 23 +-
sc/source/ui/attrdlg/scdlgfact.hxx|3 -
sc/source/ui/inc/namecrea.hxx | 12 +
sc/source/ui/miscdlgs/namecrea.cxx| 45 +---
sc/source/ui/src/miscdlgs.src | 67 --
sc/source/ui/view/cellsh1.cxx |2
sc/uiconfig/scalc/ui/createnamesdialog.ui | 21 +
sc/uiconfig/scalc/ui/externaldata.ui | 12 +
11 files changed, 52 insertions(+), 139 deletions(-)
New commits:
commit fd2c9d360ab0b55d0100273875e469448e607751
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 15 11:14:35 2013 +0100
adapt code to create names .ui conversion
Change-Id: I276f354cd07480c8798951c14b565994c93750c2
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 4371959..fe4e049 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/cellprotectionpage \
+ sc/uiconfig/scalc/ui/createnamesdialog \
sc/uiconfig/scalc/ui/definename \
sc/uiconfig/scalc/ui/deletecells \
sc/uiconfig/scalc/ui/deletecontents \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index d131092..b0bfb20 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1002,7 +1002,7 @@
#define RID_SCPAGE_PRINT(SC_DIALOGS_START + 70)
#define RID_SCDLG_COLORROW (SC_DIALOGS_START + 71)
-#define RID_SCDLG_NAMES_CREATE (SC_DIALOGS_START + 73)
+
#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76)
#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 026a03e..4e9ffaa 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -414,7 +414,8 @@ public:
const String
rDefault,
int nId ) = 0;
-virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window *
pParent, sal_uInt16 nFlags, int nId ) = 0; //add for ScNameCreateDlg
+virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
+sal_uInt16 nFlags) = 0;
virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent,
ScDocShell* pShell, bool bInsList=true ) = 0; // add for ScNamePasteDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 83f3c23..acf411b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1041,29 +1041,12 @@ AbstractScMoveTableDlg *
ScAbstractDialogFactory_Impl::CreateScMoveTableDlg( Wi
return 0;
}
-
-
-
-AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg
( Window * pParent, sal_uInt16 nFlags, int nId )
+AbstractScNameCreateDlg *
ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(Window * pParent,
sal_uInt16 nFlags)
{
-ScNameCreateDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_NAMES_CREATE :
-pDlg = new ScNameCreateDlg( pParent, nFlags );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScNameCreateDlg_Impl( pDlg );
-return 0;
+ScNameCreateDlg * pDlg = new ScNameCreateDlg( pParent, nFlags );
+return new AbstractScNameCreateDlg_Impl( pDlg );
}
-
-
-
AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg (
Window * pParent, ScDocShell* pShell, bool bInsList )
{
ScNamePasteDlg * pDlg = new ScNamePasteDlg( pParent, pShell, bInsList );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index f88bb0e..d4ea5ef 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -481,7 +481,8 @@ public:
const String
rDefault,
int nId );
-virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window *
pParent, sal_uInt16 nFlags, int nId ); //add for ScNameCreateDlg
+virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent,
+sal_uInt16 nFlags);
virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent,
ScDocShell* pShell, bool bInsList=true ); //add for ScNamePasteDlg
diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx
index 8de83ce..dc52ae5 100644
--- a/sc/source/ui/inc/namecrea.hxx
+++ b/sc/source/ui/inc/namecrea.hxx
@@ -28,14 +28,10 @@
class ScNameCreateDlg : public ModalDialog
{
protected:
-FixedLine aFixedLine;
-CheckBox
[PUSHED] Converted Insert - Names - creat widget.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3371 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3371 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32967859db63a064a9e46a14430c125643e2bfd5 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6fe3a4a31e1cf85bc83fe3eec603b333038eb1fb Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 11:26:05 2013 +0100 Updated core Project: help 0ce9cee610e614ed3e0ba80815aee1b2c0175f10 diff --git a/helpcontent2 b/helpcontent2 index 4a3bd60..0ce9cee 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4a3bd60420f64d18d0b8e07a83f22c13b49267b5 +Subproject commit 0ce9cee610e614ed3e0ba80815aee1b2c0175f10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04070300.xhp | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 0ce9cee610e614ed3e0ba80815aee1b2c0175f10 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 11:26:05 2013 +0100 update helpids for create names .ui dialog conversion Change-Id: Ifae1d027e4ed4b0d1b8a87cd6c147cbffd2d2c62 diff --git a/source/text/scalc/01/04070300.xhp b/source/text/scalc/01/04070300.xhp index e1b44b2..b30f385 100644 --- a/source/text/scalc/01/04070300.xhp +++ b/source/text/scalc/01/04070300.xhp @@ -34,8 +34,8 @@ bookmark xml-lang=en-US branch=index id=bm_id3147264bookmark_valuecell ranges;creating names automatically/bookmark_value bookmark_valuenames; for cell ranges/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/.uno:CreateNames id=bm_id8912439 localize=false/!-- HID added by script -- -bookmark xml-lang=en-US branch=hid/.uno:CreateNames id=bm_id3150398 localize=false/ +bookmark xml-lang=en-US branch=hid/.uno:CreateNames id=bm_id8912439 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/createnamesdialog/CreateNamesDialog id=bm_id3150398 localize=false/ paragraph role=heading id=hd_id3147264 xml-lang=en-US level=1 l10n=U oldref=1Creating Names/paragraph paragraph role=paragraph id=par_id3153969 xml-lang=en-US l10n=U oldref=2variable id=namenuebernehmentextahelp hid=.uno:CreateNamesAllows you to automatically name multiple cell ranges./ahelp /variable/paragraph @@ -45,17 +45,17 @@ paragraph role=paragraph id=par_id3156280 xml-lang=en-US l10n=U oldref=13Select the area containing all the ranges that you want to name. Then choose emphInsert - Names - Create/emph. This opens the emphCreate Names/emph dialog, from which you can select the naming options that you want./paragraph paragraph role=heading id=hd_id3151116 xml-lang=en-US level=2 l10n=U oldref=3Create names from/paragraph paragraph role=paragraph id=par_id3152597 xml-lang=en-US l10n=U oldref=4Defines which part of the spreadsheet is to be used for creating the name./paragraph -bookmark xml-lang=en-US branch=hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_TOP id=bm_id3156444 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/createnamesdialog/top id=bm_id3156444 localize=false/ paragraph role=heading id=hd_id3153729 xml-lang=en-US level=3 l10n=U oldref=5Top row/paragraph -paragraph role=paragraph id=par_id3149263 xml-lang=en-US l10n=U oldref=6ahelp hid=SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_TOPCreates the range names from the header row of the selected range./ahelp Each column receives a separated name and cell reference./paragraph -bookmark xml-lang=en-US branch=hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_LEFT id=bm_id3145749 localize=false/ +paragraph role=paragraph id=par_id3149263 xml-lang=en-US l10n=U oldref=6ahelp hid=modules/scalc/ui/createnamesdialog/topCreates the range names from the header row of the selected range./ahelp Each column receives a separated name and cell reference./paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/createnamesdialog/left id=bm_id3145749 localize=false/ paragraph role=heading id=hd_id3146984 xml-lang=en-US level=3 l10n=U oldref=7Left Column/paragraph -paragraph role=paragraph id=par_id3153190 xml-lang=en-US l10n=U oldref=8ahelp hid=SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_LEFTCreates the range names from the entries in the first column of the selected sheet range./ahelp Each row receives a separated name and cell reference./paragraph -bookmark xml-lang=en-US branch=hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM id=bm_id3145645 localize=false/ +paragraph role=paragraph id=par_id3153190 xml-lang=en-US l10n=U oldref=8ahelp hid=modules/scalc/ui/createnamesdialog/leftCreates the range names from the entries in the first column of the selected sheet range./ahelp Each row receives a separated name and cell reference./paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/createnamesdialog/bottom id=bm_id3145645 localize=false/ paragraph role=heading id=hd_id3156284 xml-lang=en-US level=3 l10n=U oldref=9Bottom row/paragraph -paragraph role=paragraph id=par_id3147124 xml-lang=en-US l10n=U oldref=10ahelp hid=SC:CHECKBOX:RID_SCDLG_NAMES_CREATE:BTN_BOTTOMCreates the range names from the entries in the last row of the selected sheet range./ahelp Each column receives a separated name and cell reference./paragraph -bookmark xml-lang=en-US branch=hid/sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_RIGHT id=bm_id3145253 localize=false/ +paragraph role=paragraph id=par_id3147124 xml-lang=en-US l10n=U oldref=10ahelp hid=modules/scalc/ui/createnamesdialog/bottomCreates the range names from the entries in the last row of the selected sheet range./ahelp Each column receives a separated name and cell reference./paragraph +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/createnamesdialog/right id=bm_id3145253 localize=false/
Re: Removing C++ SDK examples, clearly encouraging Python extensions
Olivier R. wrote: There is no error report if Python crash while running. There is no error report if there is a syntax error (except when installing extension, but not if you modify the code directly in extension folder). There is no stdout for the command “print”. Hi Olivier, I wonder - would much of the pain be gone if stdout/stderr would be working? There are two tricks to achieve that, Tor recently mentioned that editbin /subsystem:console soffice.exe should do that - the other one can be found under the keyword devenv on stackexchange. Also IIRC the visual studio has a window receiving such program output. PyUno itself has various checks for a DEBUG variable, I wonder if that could not be controlled via config. If you would be willing to hack on improving our windows story here, I'd be glad to help with code pointers. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk|1
sc/inc/sc.hrc |1
sc/inc/scabstdlg.hxx|8 +-
sc/source/ui/attrdlg/scdlgfact.cxx | 20 +
sc/source/ui/attrdlg/scdlgfact.hxx |9 ++
sc/source/ui/dbgui/sortdlg.cxx | 25 +++
sc/source/ui/inc/sortdlg.hrc|7 -
sc/source/ui/inc/sortdlg.hxx|8 --
sc/source/ui/src/sortdlg.src| 48 -
sc/source/ui/view/cellsh2.cxx |2
sc/uiconfig/scalc/ui/sortwarning.ui | 127
11 files changed, 162 insertions(+), 94 deletions(-)
New commits:
commit db8b11b876ed26fb70cf90f86337395dd2e78f64
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Sun Apr 14 12:41:42 2013 +0200
Calc: converted sort warning dialog to .ui
Change-Id: I2bc44990efb62183507f46b22bfd8e09edf02eb6
Reviewed-on: https://gerrit.libreoffice.org/3380
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index fe4e049..3d3c47f 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortcriteriapage \
sc/uiconfig/scalc/ui/sortkey \
sc/uiconfig/scalc/ui/sortoptionspage \
+ sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
))
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b0bfb20..7e1 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1080,7 +1080,6 @@
#define RID_SCDLG_CONFLICTS (SC_DIALOGS_START + 145)
#define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146)
-#define RID_SCDLG_SORT_WARNING (SC_DIALOGS_START + 147)
#define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148)
#define RID_SCDLG_RETYPEPASS(SC_DIALOGS_START + 150)
#define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 151)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4e9ffaa..2e80c1c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -46,6 +46,7 @@ class SfxStyleSheetBase;
class ScDPObject;
struct ScPivotFuncData;
struct ScDPNumGroupInfo;
+class ScSortWarningDlg;
class ScTabViewShell;
class ScConditionalFormat;
class ScConditionalFormatList;
@@ -293,6 +294,10 @@ public:
virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0;
};
+class AbstractScSortWarningDlg : public VclAbstractDialog //add for
ScSortWarningDlg
+{
+};
+
class AbstractScStringInputDlg : public VclAbstractDialog //add for
ScStringInputDlg
{
public:
@@ -345,7 +350,8 @@ public:
const String rStrLabel,
int nId,
sal_Bool
bColDefault = sal_True ) = 0;
-virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent,
const String rExtendText, const String rCurrentText, int nId ) = 0; //add
for ScSortWarningDlg
+
+virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent,
const String rExtendText, const String rCurrentText ) = 0; //add for
ScSortWarningDlg
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window*
pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const
ScAddress rPos, int nId ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index acf411b..1283a3b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -109,6 +109,7 @@ IMPL_ABSTDLG_BASE(AbstractScDPDateGroupDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScDPShowDetailDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScNewScenarioDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractScSortWarningDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScStringInputDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScTabBgColorDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl);
@@ -729,23 +730,10 @@ VclAbstractDialog *
ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
return 0;
}
-
-
-VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScSortWarningDlg(
Window* pParent, const String rExtendText,
-
const String rCurrentText, int nId )
+AbstractScSortWarningDlg*
ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const
String rExtendText, const String rCurrentText )
{
-Dialog * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_SORT_WARNING:
-pDlg = new ScSortWarningDlg( pParent, rExtendText, rCurrentText );
-break;
-default:
-break;
-}
-if( pDlg )
-return new
[PUSHED] Calc: converted sort warning dialog to .ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3380 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3380 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2bc44990efb62183507f46b22bfd8e09edf02eb6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/sortwarning.ui |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2e40ebef416308adab59340cbe7f3640275b007a Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 11:45:42 2013 +0100 add title and default button to sort warning dialog Change-Id: I2f6de203e2a14e36e7baf3cbc15048b8f045eac0 diff --git a/sc/uiconfig/scalc/ui/sortwarning.ui b/sc/uiconfig/scalc/ui/sortwarning.ui index e743ad8..98a0c71 100644 --- a/sc/uiconfig/scalc/ui/sortwarning.ui +++ b/sc/uiconfig/scalc/ui/sortwarning.ui @@ -4,6 +4,7 @@ object class=GtkWindow id=SortWarning property name=can_focusFalse/property property name=valignstart/property +property name=title translatable=yesSort Range/property property name=default_height200/property property name=type_hintdialog/property child @@ -53,6 +54,8 @@ property name=label translatable=yes_Extend selection/property property name=visibleTrue/property property name=can_focusTrue/property +property name=can_defaultTrue/property +property name=has_defaultTrue/property property name=receives_defaultTrue/property property name=use_underlineTrue/property /object ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AutoInstallLibs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2011cbfab30e8b5467836820780abcac56bc6f63 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Apr 15 12:33:02 2013 +0200 scp2/autoinstall: fix _ALL variable (missing comma) Change-Id: I6be8675f4ec24ee318c2d5c84544c24a7c68c95f diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk index c26e708..52dff9c 100644 --- a/solenv/gbuild/AutoInstallLibs.mk +++ b/solenv/gbuild/AutoInstallLibs.mk @@ -19,7 +19,7 @@ $(call gb_AutoInstallLibs_get_target,%) : $(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE))) echo #define $(SCP2ID)_ALL \ $@ $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\ - echo $(SCP2ID)_$(lib) \ $@;) + echo $(SCP2ID)_$(lib), \ $@;) echo $@ $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\ echo $(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib))) $@;) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e391c61284e1a9e4cef3e2043d101013ba2e5cb Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 11:48:46 2013 +0100 Updated core Project: help 02312df0968c2d6e1aece678fab055ee59e82b07 diff --git a/helpcontent2 b/helpcontent2 index 0ce9cee..02312df 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0ce9cee610e614ed3e0ba80815aee1b2c0175f10 +Subproject commit 02312df0968c2d6e1aece678fab055ee59e82b07 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |3 --- 1 file changed, 3 deletions(-) New commits: commit 02312df0968c2d6e1aece678fab055ee59e82b07 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 11:48:46 2013 +0100 drop nonexisting RID_SCDLG_SORT_WARNING ids Change-Id: I91cdd46c5c8a0298c0dde5deae79793b7e7481eb diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e5b0334..5226366 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6766,7 +6766,6 @@ sc_ModalDialog_RID_SCDLG_GROUP,1493549056, sc_ModalDialog_RID_SCDLG_NEWSCENARIO,1493843968, sc_ModalDialog_RID_SCDLG_RETYPEPASS,1495662592, sc_ModalDialog_RID_SCDLG_RETYPEPASS_INPUT,1495678976, -sc_ModalDialog_RID_SCDLG_SORT_WARNING,1495613440, sc_ModalDialog_RID_SCDLG_STRINPUT,1493467136, sc_ModalDialog_RID_SCDLG_TABPROTECTION,1495629824, sc_ModelessDialog_RID_SCDLG_SIMPLEREF,2568994816, @@ -6818,8 +6817,6 @@ sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318, sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321, sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324, sc_PushButton_RID_SCDLG_SOLVEROPTIONS_BTN_EDIT,1495486977, -sc_PushButton_RID_SCDLG_SORT_WARNING_BTN_CURSORT,1495618052, -sc_PushButton_RID_SCDLG_SORT_WARNING_BTN_EXTSORT,1495618051, sc_PushButton_RID_SCPAGE_USERLISTS_BTN_ADD,956846594, sc_PushButton_RID_SCPAGE_USERLISTS_BTN_COPY,956846596, sc_PushButton_RID_SCPAGE_USERLISTS_BTN_NEW,956846593, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Degugging no more in make help :-)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3395 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/3395/1 Degugging no more in make help :-) Change-Id: I032f9737746b39047b2d62df6821da4b3b9e9242 --- M solenv/gbuild/gbuild.help.txt 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index 43076d6..776aeb1 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -94,10 +94,10 @@ (Note that levels higher than 2 are used only by obsolete debugging features. Use SAL_INFO/SAL_WARN with a specific area for extra debug output in new code.) - 2 = degugging information + no optimizations + extra + 2 = debugging information + no optimizations + extra debug output. OSL_TRACE starts being active on this level. - 3... = degugging information + no optimizations + extra + 3... = debugging information + no optimizations + extra debug output (usually extremely verbose). Levels 2 are not used very much. TIMELOG / timelog -- To view, visit https://gerrit.libreoffice.org/3395 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I032f9737746b39047b2d62df6821da4b3b9e9242 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configuration failure on Mac with 10.6 SDK in configure/gnutls when attempting build from master
Le 15/04/13 12:13, David Tardon a écrit :
Well, have you tried to look at what autoconf generated on that line?
37515 else
37516 GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
37517 GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
37518 { echo $as_me:$LINENO: result: yes 5
37519 echo{ECHO_T}yes 6; }
37520 :
37521 fi
37522 fi
which is quite simply gobbledygook to me.
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regadring help on the bug#42893
Janit Anjaria wrote: I have been working on this bug and would like to get some help on teh same as i am not able to get the desired output.Though i think the method/concept/logic i have used is similar to the one mentioned in the attachment on : https://bugs.freedesktop.org/show_bug.cgi?id=42893 Hi Janit, this is a very unspecific question - unless you're asking something very close to writing the patch ourselves. Have you debugged the code yet? Please ask specific, actionable questions, else you risk not getting an answer at all. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configuration failure on Mac with 10.6 SDK in configure/gnutls when attempting build from master
I can confirm this building against the 10.7 sdk the question becomes what
change is causing this. How can one see what changes were made to the
configuration scripts?
On Mon, Apr 15, 2013 at 12:53 PM, Alexander Thurgood
alex.thurg...@gmail.com wrote:
Le 15/04/13 12:13, David Tardon a écrit :
Well, have you tried to look at what autoconf generated on that line?
37515 else
37516 GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
37517 GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
37518 { echo $as_me:$LINENO: result: yes 5
37519 echo{ECHO_T}yes 6; }
37520 :
37521 fi
37522 fi
which is quite simply gobbledygook to me.
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
--
Jonathan Aquilina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit abc5c418d6c6fd53e711fc0e58d5b1f84dea5d44
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 15 13:10:51 2013 +0200
Silence false warning
Change-Id: Ie854ab8b8b7ea4d98ee33d6802ea3a1e65ef2769
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index b1e9219..d4bba55 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2245,7 +2245,7 @@ bool ConvertMacroSymbol( const String rName, String
rReference )
if( rReference.EqualsAscii( ( ) )
{
bConverted = true;
-sal_Unicode cSymbol;
+sal_Unicode cSymbol = sal_Unicode(); // silence false warning
if( rName.EqualsAscii( CheckIt ) )
cSymbol = 0xF06F;
else if( rName.EqualsAscii( UncheckIt ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Regadring help on the bug#42893
Hey Thorsten!
As i mentioned i have been following the patch attached on bugzilla posted
by Caolan :
https://bugs.freedesktop.org/attachment.cgi?id=75179action=edit
-What i have done is used the pointer pStr which moves along the string
where the capitalisation is to be taken care of.
-I have traversed the string uptil we get a fullstop and also checked if
the second to last character is a fullstop (' . ').
-The problem i have been facing is that though it gets compiled,the change
doesnt show up when i try to run it i.e. after using
./install/program/soffice.When the Writer opens and i try to play around
with the test cases,it doesnt work according to the need of the bug/feature.
-i thinki have done the code snippet right as i have also returned
sal_False where we have second last character as fullstop and sal_True in
the other cases.
This is what i have tried and i am sure the changes in the code i have made
are visible in the patch i just attached in the last email as well.
Hope to receive a positive response.
Regards,
Janit
On Mon, Apr 15, 2013 at 4:22 PM, Thorsten Behrens
t...@documentfoundation.org wrote:
Janit Anjaria wrote:
I have been working on this bug and would like to get some help on
teh same as i am not able to get the desired output.Though i think
the method/concept/logic i have used is similar to the one mentioned
in the attachment on :
https://bugs.freedesktop.org/show_bug.cgi?id=42893
Hi Janit,
this is a very unspecific question - unless you're asking something
very close to writing the patch ourselves. Have you debugged the code
yet?
Please ask specific, actionable questions, else you risk not getting
an answer at all.
Cheers,
-- Thorsten
0001-fdo-42893-Improve-Capitalize-first-letter-of-sentenc.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/datafdlg.hxx |1 +
sc/source/ui/miscdlgs/datafdlg.cxx |5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 079f21531b112f9c56b1db060caa26d4f406aeb5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Apr 15 12:15:54 2013 +0100
missing string, local resource used as if global
Change-Id: I8c256668edeb4c0475136f46103002d804ee66eb
diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 6f41ddb..3e7d92e 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -64,6 +64,7 @@ private:
PushButton aBtnClose;
ScrollBar aSlider;
FixedText aFixedText;
+OUStringsNewRecord;
ScTabViewShell* pTabViewShell;
ScDocument* pDoc;
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx
b/sc/source/ui/miscdlgs/datafdlg.cxx
index 69e03e8..c8810ac 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -54,7 +54,8 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent,
ScTabViewShell* pTabViewShellOri
aBtnNext ( this, ScResId( BTN_DATAFORM_NEXT ) ),
aBtnClose ( this, ScResId( BTN_DATAFORM_CLOSE ) ),
aSlider ( this, ScResId( WND_DATAFORM_SCROLLBAR ) ),
-aFixedText ( this, ScResId( LAB_DATAFORM_RECORDNO ) )
+aFixedText ( this, ScResId( LAB_DATAFORM_RECORDNO ) ),
+sNewRecord(SC_RESSTR(STR_NEW_RECORD))
{
pTabViewShell = pTabViewShellOri;
FreeResource();
@@ -265,7 +266,7 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
aFixedText.SetText(aBuf.makeStringAndClear());
}
else
-aFixedText.SetText(String(ScResId(STR_NEW_RECORD)));
+aFixedText.SetText(sNewRecord);
aSlider.SetThumbPos(nCurrentRow-nStartRow-1);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
