Password Protection (source file)
Hi All, Trying to find the location and the manner in which libreoffice protects files. Anyone know where I can locate the appropriate source file, what the object names are that I should look for, and if possible direct me to the documentation. Thanks in advance Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need hint about finding the relevant code in "chart2"
On 05/25/2012 08:22 AM, Kohei Yoshida wrote: > Hi Walt, > > On Fri, May 25, 2012 at 9:00 AM, walt wrote: > >> I need to find the code that parses my choice of "Data Ranges" for >> the horizontal axis of a stock chart -- and now refuses to let me >> do what I've always done -- leave blank space at the right end of >> the chart, to allow for fresh samples to be added each day as I get >> them. > > I assume you are doing this in Calc? If yes, then the code that > handles data range parsing is actually not in chart2, but in sc. Go > search for chart2uno.hxx and chart2uno.cxx inside sc, and that's > probably the code you are looking for. Thank you! I could never find that code without your help. I was hoping that my patch (below) would fix my problem while honoring the spirit of your code, but it turns out to have no effect at all, either good or bad. I hope you can see what I was trying to do and explain why it fails. Keep in mind that I'm not a c(++) programmer, so my error might be as trivial as incorrect syntax. (I can't afford the hours it took me to test the patch, just to experiment with syntax :) Many thanks! diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 03028fc..2060b5a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1426,8 +1426,8 @@ public: s.nCol = nMinCol; if (s.nRow < nMinRow) s.nRow = nMinRow; -if (e.nCol > nMaxCol) -e.nCol = nMaxCol; +if (e.nCol > nMaxCol + 100) +e.nCol = nMaxCol + 100; if (e.nRow > nMaxRow) e.nRow = nMaxRow; } ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: http://openoffice.org/bugzilla/show_bug.cgi?id=3959 -- Outline view
Caolán McNamara writes: > > On Sat, 2011-03-05 at 02:50 -0500, Marc Paré wrote: > > I am just re-reading my to-do list of LibreOffice in Academia and one of > > the oldest feature request is this one. I believe 8 years in request. Do > > you think that this feature request will ever have a chance at being > > accepted? > > As with anything, someone needs to actually do it. There are gadzillions > of requests for implementation of things, so if you're in a position to > have a stab at it, then that's the thing to try and do. Even a partial > starter implementation is likely sufficient to get the ball rolling on > any particular topic. > > C. > > Outlining is the most commonly quoted reason for people not giving up using MSWORD. It really is that important. In any forum where this subject is brought up, there are loads of responses from people who say the same thing. I can't really switch from MSWORD until Outline view is added. and no, the navigator in Libre office doesn't even come close to doing what Outline view does in MSWORD. I believe this is a feature, that when implemented, will causes thousands of people to switch to linux full timepretty much immediately. In fact, many are just waiting for that feature. I filed several bugs for this in OOffice, and every time was able to present enough evidence as to the demand for this feature. Then, they'd assign it to someone who had never used MSWORD, and then, this person would see that there were several bugs related to this feature and say "this was already dealt with in bug xyz", which of course it wasn't. So, it's like walking in a red-tape circle where nothing ever can get done related to it. Just accept it.MSOFFICE is superior in every way to Libre and OOffice because of the lack of Outline view in the word processor. The features wanted are: 1. Outline numbering. 2. Collapsing and expanding of text inside headers at any level specified. 3. Single buttons to demote and promote a header withing the outline view. 4. Table of contents generation from the outline view. Thank you -Donald ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - testtools/CustomTarget_bridgetest_climaker.mk
testtools/CustomTarget_bridgetest_climaker.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32615a6be25f5ba08c204bc75e69e6de0efee535 Author: Matúš Kukan Date: Sun May 27 00:43:26 2012 +0200 testtools: superfluous dependency Change-Id: Id57d40f2b6cdaa9934a885764d986d581d149a59 diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index b66d8a3..56c7f79 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -31,7 +31,7 @@ climaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ $(climaker_DIR)/cli_types_bridgetest.dll -$(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \ +$(climaker_DIR)/cli_types_bridgetest.dll : \ $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ $(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: feature/gbuild_merge needs testing
On 26 May 2012 06:25, David Tardon wrote: > On Fri, May 25, 2012 at 12:43:45PM -0500, Norbert Thiebaud wrote: >> On Fri, May 25, 2012 at 11:58 AM, Norbert Thiebaud >> wrote: >> > On Fri, May 25, 2012 at 11:05 AM, Matúš Kukan >> > wrote: >> >> On 25 May 2012 14:20, Noel Grandin wrote: >> >>> Build error log attached for a cygwin build (i.e. on Windows). >> >>> >> >> I've ignored testtools, it needs more love. >> >> >> >> Then I've just removed unregistered libraries from RepositoryExternal.mk >> >> : 1288 >> >> to see the linking fail. >> >> >> >> And after >> >> http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/gbuild_merge&id=cd3559f0b2483fa6655df5711ae207853f7ce8ee >> >> actually that one was fixed with >> 87f63318d858aaa81836a8406d23a77442973c0f in gbuild_scp2 >> >> It seems there are some missing patches... >> >> I've cherry picked them and is running a MacOSX test... > > Thanks. I wonder where I lost them... > It's getting better but still not complete. At least scp2 and reportbuilder builds now on Windows. Problems: shell - missing exported symbols in ooofilt library from shell/source/win32/shlxthandler/ooofilt/exports.dxp Something like 156202b06270a90a4b73370d04401486145076d2 could help. testtools - CustomTarget_bridgetest_climaker.mk error: .NET exception occured: System.AccesViolationException: Attempted to read or write protected memory. This is often an indication that other memory is corrupt. at ?A0x393b8821.sal_main() no idea ^ connectivity - unresolved symbol __imp__SHGetFolderPath in Library_postgresql-sdbc-impl.mk I will continue later if nobody will fix these, though I should prolly do something else. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk |3 ++- solenv/gbuild/platform/WNT_INTEL_MSC.mk |1 - 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c7c7f8eafdd026a10190f25be52108d456d174db Author: Matúš Kukan Date: Sun May 27 00:21:12 2012 +0200 no openssl library on Windows Change-Id: I40df9611be87830e4938ee20a4e3be19767ddfad diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 25a6749..b38b038 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1285,8 +1285,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ ) ifeq ($(GUI)$(COM),WNTMSC) +$(call gb_LinkTarget_use_external,$(1),openssl) + $(call gb_LinkTarget_use_libraries,$(1),\ - openssl \ secur32 \ ws2_32 \ $(if $(filter YES,$(WITH_LDAP)),ldap) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index fb833f7..3882327 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -407,7 +407,6 @@ gb_Library_PLAINLIBS_NONE += \ $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \ - openssl \ propsys \ secur32 \ shell32 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - 5 commits - Makefile.top RepositoryExternal.mk shell/CustomTarget_shlxthdl_res.mk solenv/gbuild testtools/CustomTarget_bridgetest_climaker.mk t
Makefile.top |2 +- RepositoryExternal.mk |4 ++-- shell/CustomTarget_shlxthdl_res.mk|2 +- solenv/gbuild/InstallModuleTarget.mk |5 + testtools/CustomTarget_bridgetest.mk | 25 +++-- testtools/CustomTarget_bridgetest_climaker.mk |2 +- 6 files changed, 13 insertions(+), 27 deletions(-) New commits: commit c774d2bea6f0549d09b04d288505371011bb4633 Author: Matúš Kukan Date: Sat May 26 23:47:05 2012 +0200 scp2: fix Windows build Change-Id: I6662bfca925f9dae99b3f70fd81dba04d36ac9c8 diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index db8aa61..1b717a7 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -73,15 +73,12 @@ endef # ScpPreprocessTarget class -gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc) -gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET) - gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp define gb_ScpPreprocessTarget__command $(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpPreprocessTarget_COMMAND) \ + $(call gb_Helper_execute,cpp.lcc) \ -+ -P \ $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ commit 46a222798acfc508e10ddb8ff470771eabbf8b3c Author: Matúš Kukan Date: Sat May 26 23:38:34 2012 +0200 pq's name is different on Windows Change-Id: I63731a1114edcf60a19083e6ceafaae1b402e716 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b1c1f11..25a6749 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - pq \ + $(if $(filter MSC,$(COM)),lib)pq \ ) ifeq ($(GUI)$(COM),WNTMSC) @@ -1296,7 +1296,7 @@ endif endef $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - pq \ + $(if $(filter MSC,$(COM)),lib)pq \ )) endif # SYSTEM_POSTGRESQL commit a2dc0d67c4fcd25510a497b45c5dfe37df5208fe Author: Matúš Kukan Date: Sat May 26 23:12:53 2012 +0200 shell is gbuildified Change-Id: Ia40e317a69883c578a349035604afb5a5dad4c86 diff --git a/Makefile.top b/Makefile.top index 5bd62f0..192ddbd 100644 --- a/Makefile.top +++ b/Makefile.top @@ -111,6 +111,7 @@ scripting\ sd\ sdext\ sfx2\ +shell\ slideshow\ smoketest\ solenv\ @@ -231,7 +232,6 @@ remotebridges\ rhino\ saxon\ setup_native\ -shell\ soltools\ stax\ stlport\ commit 70477ab82e2d7657f7aed527649d89d9a5d4cff7 Author: Matúš Kukan Date: Sat May 26 22:41:54 2012 +0200 testttools: tweak makefiles, fix typos Change-Id: I4e7c7f2d79641772479924f8efc479beaf137f8f diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index a4237d3..473613d 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -43,14 +43,12 @@ bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \ ifneq ($(SOLAR_JAVA),) bridgetest_TARGET := $(bridgetest_TARGET) \ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \ - $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) + $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) endif $(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET) -# which other prerequisites do we need here? -$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ - $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir +$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Helper_abbreviate_dirs,\ echo "$(UNO_EXE)" \ @@ -62,26 +60,20 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ "--singleaccept" > $@) $(GIVE_EXEC_RIGHTS) $@ -ifneq ($(SOLAR_JAVA),) -# how to do it more elegantly? -MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar +testtools_MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar -# which other prerequisites do we need here? -$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \ - $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir +$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Helper_abbreviate_dirs,\
Re: [PATCH] Don't make tab headers bold by default
Hi Norbert, thanks... here's an updated version. Astron. 0001-Use-normal-font-in-tab-headers.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#34772 Word count / statistics in the status bar
On 26.05.2012 22:06, Ivan Timofeev wrote: this patch makes scrolling in writer impossible :( it always brings the view back to the cursor Oops, wait. That happens only if a document contains the Page Count field (Insert -> Fields -> Page Count). WTF? Why it causes a recount every second?... So this is a bug in Writer, not in this patch... Will file it / poke about in bugzilla. Sorry, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - connectivity/Library_postgresql-sdbc-impl.mk
connectivity/Library_postgresql-sdbc-impl.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 7eccbbb6a94a7eef64f4a0ba5eaba3e3e25231ed Author: David Ostrovsky Date: Sat May 26 20:55:40 2012 +0200 dl library added Change-Id: I9afb1e2cd82ab02c456735282a6ef0b0be15cfbc diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 9de5dc4..b634b58 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -58,6 +58,7 @@ include $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ $(if $(filter-out MACOSX,$(OS)),-Wl,--as-needed) \ $(LIBPQ_DEP_LIBS) \ + $(if $(filter-out MACOSX,$(OS)),-ldl) \ $(if $(filter-out MACOSX,$(OS)),-Wl,--no-as-needed) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#34772 Word count / statistics in the status bar
Hi all,
this patch makes scrolling in writer impossible :( it always brings the
view back to the cursor (btw so does Tools -> Word Count, but only once
it is invoked).
It looks like the cause is the following lines:
@@ -1197,6 +1198,25 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
}
}
break;
+
+case FN_STAT_WORDCOUNT:
+{
+SwDocStat selectionStats;
+SwDocStat documentStats;
+{
+SwWait aWait( *GetDocShell(), sal_True );
+rShell.StartAction();
+rShell.CountWords(selectionStats);
+documentStats = rShell.GetUpdatedDocStat();
+rShell.EndAction();
+}
+rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT,
rtl::OUStringBuffer("Words: ")
+
.append(rtl::OUString::valueOf(static_cast(selectionStats.nWord)))
+.append('/')
+
.append(rtl::OUString::valueOf(static_cast(documentStats.nWord))).makeStringAndClear()));
+}
+break;
Any idea? How to count words without changing a viewpoint?
Regards,
Ivan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - connectivity/prj
connectivity/prj/d.lst | 54 - 1 file changed, 54 deletions(-) New commits: commit b5d67389269ecd42b5422c2cb8f17bac496d6176 Author: Norbert Thiebaud Date: Sat May 26 12:02:57 2012 -0500 connectivity is a gbuild module now, clean-up d.lst Change-Id: I30965c09fdc96ec984c18b5e55a8edb69bdcba17 diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 86533a2..e69de29 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -1,54 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\bin\*.res %_DEST%\bin\*.res -..\%__SRC%\lib\*.so %_DEST%\lib\*.so -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib -..\%__SRC%\lib\*.jnilib %_DEST%\lib\*.jnilib -..\%__SRC%\lib\*.a %_DEST%\lib\*.a -..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.* -..\%__SRC%\lib\idbt* %_DEST%\lib\idbt* -..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt -..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt -..\source\cpool\*.xml %_DEST%\xml\*.xml -..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml -..\source\drivers\ado\*.xml %_DEST%\xml\*.xml -..\source\drivers\tdeab\*.xml %_DEST%\xml\*.xml -..\source\drivers\kab\*.xml %_DEST%\xml\*.xml -..\source\drivers\macab\*.xml %_DEST%\xml\*.xml -..\source\drivers\file\*.xml %_DEST%\xml\*.xml -..\source\drivers\flat\*.xml %_DEST%\xml\*.xml -..\source\drivers\dbase\*.xml %_DEST%\xml\*.xml -..\source\drivers\jdbc\*.xml %_DEST%\xml\*.xml -..\source\drivers\odbc\*.xml %_DEST%\xml\*.xml -..\source\drivers\mozab\*.xml %_DEST%\xml\*.xml -..\source\drivers\evoab2\*.xml %_DEST%\xml\*.xml -..\source\drivers\calc\*.xml %_DEST%\xml\*.xml -..\source\drivers\mysql\*.xml %_DEST%\xml\*.xml -..\%__SRC%\class\*.jar %_DEST%\bin\*.jar - -mkdir: %_DEST%\xml\registry\spool\DataAccess - -..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc\connectivity\sqlbison.hxx -..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml\registry\spool\DataAccess\*.xcu -..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck\fcfg_drivers_*.zip -..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck\fcfg_drivers_*.zip -..\%__SRC%\misc\adabas.component %_DEST%\xml\adabas.component -..\%__SRC%\misc\ado.component %_DEST%\xml\ado.component -..\%__SRC%\misc\calc.component %_DEST%\xml\calc.component -..\%__SRC%\misc\dbase.component %_DEST%\xml\dbase.component -..\%__SRC%\misc\dbpool2.component %_DEST%\xml\dbpool2.component -..\%__SRC%\misc\dbtools.component %_DEST%\xml\dbtools.component -..\%__SRC%\misc\evoab.component %_DEST%\xml\evoab.component -..\%__SRC%\misc\flat.component %_DEST%\xml\flat.component -..\%__SRC%\misc\hsqldb.component %_DEST%\xml\hsqldb.component -..\%__SRC%\misc\jdbc.component %_DEST%\xml\jdbc.component -..\%__SRC%\misc\tdeab1.component %_DEST%\xml\tdeab1.component -..\%__SRC%\misc\kab1.component %_DEST%\xml\kab1.component -..\%__SRC%\misc\macab1.component %_DEST%\xml\macab1.component -..\%__SRC%\misc\mozab.component %_DEST%\xml\mozab.component -..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml\mozbootstrap.component -..\%__SRC%\misc\mysql.component %_DEST%\xml\mysql.component -..\%__SRC%\misc\odbc.component %_DEST%\xml\odbc.component -..\%__SRC%\misc\sdbc2.component %_DEST%\xml\sdbc2.component - -..\%__SRC%\misc\postgresql-sdbc.rdb %_DEST%\xml\postgresql-sdbc.rdb -..\source\drivers\postgresql\postgresql-sdbc.ini %_DEST%\bin\postgresql-sdbc.ini ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extras/source
extras/source/templates/layout/lyt-metropolis.otp |binary 1 file changed New commits: commit d1dd475389b798e99d09f2dd9f1b52341bb610a0 Author: Alexander Wilms Date: Sat May 26 14:42:04 2012 +0200 added the metropolis master page diff --git a/extras/source/templates/layout/lyt-metropolis.otp b/extras/source/templates/layout/lyt-metropolis.otp new file mode 100644 index 000..a1aaf7d Binary files /dev/null and b/extras/source/templates/layout/lyt-metropolis.otp differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] GTK theme toolbar button rendering
Hello, Current GTK theming plugin renders toolbar buttons as non-flat unconditionally. But some themes, e.g. oxygen-gtk expect toolbuttons to be flat, and the desktop integration fails. I'm attaching a patch to fix this. The patch has been tested with oxygen-gtk(current master), QtCurve-GTK, Glossy and Simple themes. Regards, Ruslan 0001-GTK-theming-fix-rendering-of-toolbuttons.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_merge needs testing
On Fri, May 25, 2012 at 6:28 AM, David Tardon wrote: > Hi all, > > The number of modules newly added to tail_build is not as good as I > expected--only 9, if I counted correctly. I ran module_dep on gbuild_merge... for postprocess the parent list looks like (note: (*) indicate a gbuild module) n_th@tpamac /Volumes/TBRAM/core $/Volumes/Raid0/dev-tools/modules_dep/modules_dep -p postprocess -u Error: dependency helpcontent2 of module postprocess does not have a known build.lst associated to it (I did not have helpcontent2 hence the message) postprocess + tail_build (*) + xsltml + external + soltools + solenv (*) + xmlreader (*) + sal (*) + cppunit + boost + xml2cmp (*) + offapi (*) + idlc (*) + registry (*) + store (*) + salhelper (*) + udkapi (*) + codemaker (*) + cppu (*) + ure (*) + stoc (*) + libxslt + libxml2 + jvmfwk (*) + comphelper (*) + officecfg (*) + ucbhelper (*) + cppuhelper (*) + jvmaccess (*) + ridljar (*) + rdbmaker (*) + remotebridges + javaunohelper (*) + unoil (*) + cli_ure + bridges + jurt (*) + io (*) + binaryurp (*) + unotest (*) + qadevOOo (*) + tools (*) + i18npool (*) + cpputools (*) + regexp (*) + i18nutil (*) + icu + sax (*) + expat + basegfx (*) + o3tl (*) + zlib + sysui + setup_native + l10ntools (*) + clucene (*) + berkeleydb + rhino + readlicense_oo + icc + xpdf + vigra + twain (*) + saxon + stax + sane (*) + redland + openssl + python + postgresql + moz + nss + neon + mythes + hunspell + mdds + lpsolve + libvisio + libwpg + libwpd + libwps + libxmlsec + libexttextcat + libcmis + curl + libcdr + lcms2 + jpeg + jfreereport + apache-commons + tomcat + hyphen + hsqldb + graphite + freetype + fontconfig + cairo + libpng + beanshell + afms + stlport + nlpsolver (*) + mysqlc + mysqlcppconn + languagetool + pyuno + dictionaries + more_fonts + testtools (*) + odk + unodevtools (*) + autodoc + udm + cosv + librsvg + gettext + glib + gdk-pixbuf + libgsf + libcroco + pango + extras + epm + embedserv (*) + ct2n + crashrep + shell (*) + binfilter unotest parents give: n_th@tpamac /Volumes/TBRAM/core $/Volumes/Raid0/dev-tools/modules_dep/modules_dep -c unotest -u | grep -v "(\*)" Error: dependency helpcontent2 of module postprocess does not have a known build.lst associated to it + postprocess + instsetoo_native + binfilter + crashrep + pyuno + cross_toolset since binfilter is already treated separately (i.e wait for tail_build to finish) unotest can be integrated... on the other hand it seems quite a few module use it without telling their build.lst they do... so their can be partial build issue twain: twain (*) + tail_build (*) + postprocess + packimages (*) + instsetoo_native + binfilter + extensions (*) ditto for sane. so they can be merged in tail_build I think nlpsolver, embedserv and testttols are directly dep of postprocess and nothing else.. they can be put in tail_build. -- module_dep is in contrib/dev-tools/module_dep ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_merge needs testing
Hi, On Sat, May 26, 2012 at 03:36:54PM +0100, Michael Meeks wrote: > Hi David, > > On Fri, 2012-05-25 at 13:28 +0200, David Tardon wrote: > > There is experimental branch feature/tail_build that adds 19 more, but > > it requires a change to build.pl, so I do not intend to push it into 3.6. > > Of course, if people who actually know something about the build.pl > > script look at commit 726ac115a981567b3f41613d0e0163bd010e6b17 and tell > > me that I am not a total idiot, or even that it might work at the right > > phase of moon, I can be convinced otherwise :-) > > I had the misfortune to hack on build.pl before :-) and your patch > looks reasonable to me. I'd love to have it in for 3.6 ... I didn't > checkout the branch and/or I couldn't make the make command that dumps > the deps work but I assume the parsing logic is fine. We may have some > explicit \r\n removal nonsense on windows (chomp has never worked well > for me there for some - prolly cygwin related reason) - but lets see. Let's hope the branch is going to get some testing on Windows, then. > > -my $modcount = %modules; > > return %modules; > > seems redundant in get_tail_build_modules. Right, it is a forgotten remnant of a debug print. There is also a print in filter_tail_build_dependencies that I plan to remove before merging the branch on master. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
On Sat, May 26, 2012 at 5:59 AM, Francois Tigeot wrote: > Hi, > > I don't think there's any good reason to have wildly different OUTPATH names > for each specific platform variant. > > The various names also lead to unnecessary work when packaging, just to > correctly handle LD_LIBRARY_PATH. > > The attached patch reduces OUTPATH to two possible values: unx and wnt. Since > it is potentially intrusive, I prefer to show it here for review instead of > committing it directly. Francois, That would fatally break at least cross-compile. I'm afraid that cannot be merged in that form. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Don't make tab headers bold by default
On Fri, May 25, 2012 at 12:07 PM, Stefan Knorr (Astron) wrote: > Hi there, > > I've always wondered why LibreOffice (and before it Ooo) would make > the selected tab header bold, because no OS I know does that natively. > While there is an option with which backends could turn this behaviour > off, if there's no need for that we probably should remove it, I > guess. > Attached patch does that and even works. Can I push or is there > something that seems wrong? I'm confused: @@ -723,9 +705,7 @@ void TabControl::ImplShowFocus() // make sure the focussed item rect is computed using a bold font // the font may have changed meanwhile due to mouse over -Font aOldFont( GetFont() ); -Font aFont( aOldFont ); -aFont.SetWeight( (!ImplGetSVData()->maNWFData.mbNoBoldTabFocus) ? WEIGHT_BOLD : WEIGHT_LIGHT ); +Font aFont( GetFont() ); SetFont( aFont ); ^^^ you are setting the Font to the same thing it used to have here no (since you remove the code that used to potentially alter it)? sal_uInt16 nCurPos = GetPagePos( mnCurPageId ); @@ -771,8 +751,7 @@ void TabControl::ImplShowFocus() aRect.Bottom() = aRect.Top() + aImageSize.Height() + 4; } ShowFocus( aRect ); - -SetFont( aOldFont ); +SetFont( aFont ); } Why the last SetFont() ? you are not messing with the font anymore right ? so it has not changed... no need to restore it, no? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ODS import with merged cells
On 05/26/2012 10:58 AM, Michael Meeks wrote: On Sat, 2012-05-26 at 17:24 +0200, Markus Mohrhard wrote: That is not planned. Only during import all the code in ScDocFunc does not make much sense. We neither need to repaint areas nor do we need undo/redo code. Cool - yes, it's a nonsense to be doing all that pointless non-work on import :-) We did not plan to replace ScDocFunc calls in any other place in calc. Good stuff - thanks ! Michael. However, here is a message of doom to all UNO or ScDocFunc calls during import: Your days are numbered because I'm coming for you! >:-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: remotebridges/InternalUnoApi_uuresolver.mk remotebridges/Library_uuresolver.mk remotebridges/Makefile remotebridges/Module_remotebridges.mk remotebridges/prj remotebridges/sou
Repository.mk|1 remotebridges/InternalUnoApi_uuresolver.mk | 32 ++ remotebridges/Library_uuresolver.mk | 47 +++ remotebridges/Makefile |7 ++ remotebridges/Module_remotebridges.mk| 35 +++ remotebridges/prj/build.lst |2 remotebridges/prj/d.lst |4 - remotebridges/source/unourl_resolver/makefile.mk | 72 --- ure/Rdb_ure.mk |2 9 files changed, 124 insertions(+), 78 deletions(-) New commits: commit e726638eb8bd9e8fab3268259ddee9de88c56a39 Author: David Tardon Date: Sat May 26 16:06:33 2012 +0200 gbuildize remotebridges Change-Id: I01e97df2f9f098719e3de578526cb1d13d2db6fa diff --git a/Repository.mk b/Repository.mk index ebefb94..a8cb169 100644 --- a/Repository.mk +++ b/Repository.mk @@ -561,6 +561,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ streams \ textinstream \ textoutstream \ +uuresolver \ )) $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ diff --git a/remotebridges/InternalUnoApi_uuresolver.mk b/remotebridges/InternalUnoApi_uuresolver.mk new file mode 100644 index 000..2ac538e --- /dev/null +++ b/remotebridges/InternalUnoApi_uuresolver.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,uuresolver)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk new file mode 100644 index 000..15fa64e --- /dev/null +++ b/remotebridges/Library_uuresolver.mk @@ -0,0 +1,47 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,uuresolver)) + +$(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver)) + +$(eval $(call gb_Library_use_internal_api,uuresolver,\ + uuresolver \ +)) + +$(eval $(call gb_Library_use_libraries,uuresolver,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,uuresolver,\ + remotebridges/source/unourl_resolver/unourl_resolver \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/remotebridges/Makefile b/remotebridges/Makefile new file mode 100644 index 000..ccb1c85 --- /dev/null +++ b/remotebridges/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST + +includ
Re: ODS import with merged cells
On Sat, 2012-05-26 at 17:24 +0200, Markus Mohrhard wrote: > That is not planned. Only during import all the code in ScDocFunc does > not make much sense. We neither need to repaint areas nor do we need > undo/redo code. Cool - yes, it's a nonsense to be doing all that pointless non-work on import :-) > We did not plan to replace ScDocFunc calls in any other place in calc. Good stuff - thanks ! Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#45830 - Language/User Interface: current choice indicated as default
Hi All, I saw this bug and I found where the change needs to be for this bug. The problem is that the default-value for the "locale setting" is in the list the current setting, not the locale of the system. But can I solve this or should this be asked to the usability-mailinglist? And what is the emailaddress of that mailinglist? -- Greetings, Rob Snelders ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ODS import with merged cells
Hey Michael, > Oh - hmm. So - for the collaborative editing work we need a clean > interface between user input (controller) and the model. So far we're > using the ScDocFunc for that, and at least we need to intercept all UI > editing at some suitably granular level through there. > > Of course for file-filters we don't want people to go through there so > - that's fine ;-) but it'd be good not to start a "get rid of ScDocFunc" > jihad in general [IMHO etc.]. That is not planned. Only during import all the code in ScDocFunc does not make much sense. We neither need to repaint areas nor do we need undo/redo code. We did not plan to replace ScDocFunc calls in any other place in calc. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ODS import with merged cells
Hey Daniel, 2012/5/26 Daniel Bankston : > Hi, Kohei and Markus, > > I pushed my changes to ScXMLTableRowCellContext::DoMerge() where I have > removed the ScDocFunc layer and simplified the whole method in general. Great. I will have a look at it on Tuesday. > > As I mentioned to Kohei at some point, when I was originally removing the > UNO calls from the code, I was trying not to question the logic too much and > just focus on direct conversion to equivalent Sc calls. I went back through > the ScXMLTableRowCellContext merge methods closely following what occurs in > the code and thinking about what is actually trying to be accomplished. > > It seems that the only thing that is actually needed here during import is a > call to ScDocument::DoMerge(). As far as I could tell, everything else was > unnecessary in the ScDocFunc layer. Also, > ScXMLTableRowCellContext::IsMerged() and the unmerge portion of > ScXMLTableRowCellContext::DoMerge() that existed before this latest commit > seem to have no purpose during import. Whether a cell is merged or not is > decided before ScXMLTableRowCellContext::DoMerge() is called (member > bIsMerged), otherwise it wouldn't be called. And unmerging a cell on import > doesn't make sense, right? I'm not 100% sure about that. If I recall correctly we need to unmerge cells before we can merge bigger areas. But without having a closer look at the code I can only speculate that it is for this. > > After these changes, I can still successfully compile and pass sc unit > tests. Also, when I manually run calc and open a spreadsheet with merged > cells, I see that the file is imported correctly. That our tests pass doe not mean much. It is always a good diea to check if one of the featurres that you convert is covered by our import tests. and even if it is it has often just some basic test cases like in the merge case. In such cases it would be great if you could add some more test cases especially for the corner cases you saw in the code. > > Can you see anything that I might have missed or incorrectly removed? No. From what you say it seems all reasonable. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_merge needs testing
Hi David,
On Fri, 2012-05-25 at 13:28 +0200, David Tardon wrote:
> There is experimental branch feature/tail_build that adds 19 more, but
> it requires a change to build.pl, so I do not intend to push it into 3.6.
> Of course, if people who actually know something about the build.pl
> script look at commit 726ac115a981567b3f41613d0e0163bd010e6b17 and tell
> me that I am not a total idiot, or even that it might work at the right
> phase of moon, I can be convinced otherwise :-)
I had the misfortune to hack on build.pl before :-) and your patch
looks reasonable to me. I'd love to have it in for 3.6 ... I didn't
checkout the branch and/or I couldn't make the make command that dumps
the deps work but I assume the parsing logic is fine. We may have some
explicit \r\n removal nonsense on windows (chomp has never worked well
for me there for some - prolly cygwin related reason) - but lets see.
-my $modcount = %modules;
return %modules;
seems redundant in get_tail_build_modules.
# insert dep. on tail_build, if necessary
if (@tail_build_deps && !defined $$deps{$tail_build_prj}) {
$$deps{$tail_build_prj} = 1;
}
The !defined looks redundant until you read get_parent_deps which has a
count of the deps in there.
So - it all looks fine really :-) [ at least to me ]
Thanks !
Michael.
--
michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix name in the package description (fr)
Hi *, A tiny fix in a description file: http://nabble.documentfoundation.org/file/n3986158/0001-fix-name-in-the-package-description-fr.patch 0001-fix-name-in-the-package-description-fr.patch Olivier -- View this message in context: http://nabble.documentfoundation.org/PATCH-fix-name-in-the-package-description-fr-tp3986158.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
On Sat, 2012-05-26 at 13:47 +0200, Francois Tigeot wrote: > I didn't think cross-compiling could be done this way; in my mind, separate > git clones were used for each destination platform. Right; but currently we build both the native platform tools necessary for doing the cross-compiling, and also the target platform tools into the same source tree :-) There are other ways to imagine doing it of course, but - this one works as of now. > The names are suspiciously close to 8.3 ms-dos names. Probably another dark > remnant from the past ;) :-) So, sadly I don't think this flies as of now, Regards, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_merge needs testing
On 25.05.2012 14:20, Noel Grandin wrote: make[2]: *** No rule to make target `D:/workdir/wntmsci12.pro/CustomTarget/testtools/bridgetest/bridgetest_javaserver.bat', needed by `D:/workdir/wntmsci12.pro/CustomTarget/testtools/bridgetest.done'. Stop. should be fixed now (with --without-java) Ciao David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 3ae36ad5b5b9e81a4ab208138e91ec463ec0c2a6 Author: David Tardon Date: Sat May 26 14:04:25 2012 +0200 register additional libs required by postgressql Change-Id: I223122d9f99c8068af21c80f9b52642c762c79af diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 0676ea7..fb833f7 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -396,6 +396,7 @@ gb_Library_PLAINLIBS_NONE += \ imm32\ kernel32 \ jawt \ + ldap \ libcmt \ libcmtd \ mpr \ @@ -406,7 +407,9 @@ gb_Library_PLAINLIBS_NONE += \ $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \ + openssl \ propsys \ + secur32 \ shell32 \ shlwapi \ urlmon \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: feature/gbuild_merge needs testing
On Fri, May 25, 2012 at 02:20:42PM +0200, Noel Grandin wrote: > Build error log attached for a cygwin build (i.e. on Windows). > > /cygdrive/c/LibreOffice/libo/connectivity/Library_postgresql-sdbc-impl.mk:49: > *** Cannot link against library/libraries openssl secur32 ldap. Libraries > must be registered in Repository.mk. Stop. Should be fixed now. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
Hey Michael, On Sat, May 26, 2012 at 12:15:51PM +0100, Michael Meeks wrote: > > On Sat, 2012-05-26 at 12:59 +0200, Francois Tigeot wrote: > > The attached patch reduces OUTPATH to two possible values: unx and wnt. > > Since > > it is potentially intrusive, I prefer to show it here for review instead of > > committing it directly. > > Just to check; I cross compile from unix-linux to unix-android, and > have to have both native and remote toolchains eg. > > $ ls /opt/libreoffice/devel/soltools > adjustvisibility checkdll cpp giparser inc javadep ldump mkdepend > prj support testhxx unxandr.pro unxlngi6.pro util winunistd > > Would your change make that more difficult ? With the patch, there would only be one unx.pro directory. I didn't think cross-compiling could be done this way; in my mind, separate git clones were used for each destination platform. > [ admittedly the names are > highly non-intuitive, and hard to write when explaining to others, and I > don't believe the parallel .pro / non-pro distinctions is necessary ;-) The names are suspiciously close to 8.3 ms-dos names. Probably another dark remnant from the past ;) The .pro extension may not be present in all cases; iirc it disappears when some debug options are enabled. -- Francois Tigeot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #1
On Sat, 26 May 2012 13:09:09 +0200, Marco Cecchetti wrote: skip You can download a sample presentation here: https://docs.google.com/open?id=0BwS_9-CU4098UFhHSm1BYWE3Q0k In order to download the zip file click on the Download item under the File menu. Sorry, the right link is the following one: https://docs.google.com/open?id=0BwS_9-CU4098bk5QMjNtS2IzZzQ -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Unify OUTPATH values
Hi Francois, On Sat, 2012-05-26 at 12:59 +0200, Francois Tigeot wrote: > I don't think there's any good reason to have wildly different OUTPATH names > for each specific platform variant. :-) > The various names also lead to unnecessary work when packaging, just to > correctly handle LD_LIBRARY_PATH. Heh. > The attached patch reduces OUTPATH to two possible values: unx and wnt. Since > it is potentially intrusive, I prefer to show it here for review instead of > committing it directly. Just to check; I cross compile from unix-linux to unix-android, and have to have both native and remote toolchains eg. $ ls /opt/libreoffice/devel/soltools adjustvisibility checkdll cpp giparser inc javadep ldump mkdepend prj support testhxx unxandr.pro unxlngi6.pro util winunistd Would your change make that more difficult ? [ admittedly the names are highly non-intuitive, and hard to write when explaining to others, and I don't believe the parallel .pro / non-pro distinctions is necessary ;-) ] HTH, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [GSoC 2012][svg export filter] Weekly Report #1
Hi everybody, it follows my weekly report: Report #1 - In order to enable future support for slide transitions has been needed to modify the part of the presentation engine handling the slides navigation feature. A new structure for slide and master page elements has been designed. In order to simplify and speed up testing the new slide and master page structures are created in JavaScript by transforming the current exported elements. In case the new design will lead to a good implementation these structures will be created directly in C++ (except for the master page view group and its sub-elements that are generated on-the-fly). A MasterPageView class has been implemented in order to create a master page view element and its sub-elements; it is also responsible for updating the content of the included text fields. A sub-element (both or a clone) is created only if the related exported visibility property, parsed by the MetaSlide instance the master page view object belongs to, is set to true. This strategy simplify visibility handling. Modified Thumbnail class implementation, now the thumbnail element structure in the index page is simplified. Modification to the index mode implementation has been needed in order to get the index mode working with the new slide and master page structure, moreover Firefox performance in index mode has been improved. Tested the new implementation on the following browsers: - Firefox 3.6, 4, 10, latest, aurora; - IE 9, 10; - Chrome 10, latest; - Opera 11.50, 11.62, Next; - Safari 5.1.5 - Fennec, Opera Mobile. The last two through emulators. All work correctly. Add a lot of comments to the source code. Added documentation comments to classes and methods. --- You can read more details on my project log book: https://docs.google.com/document/d/1GSLPSIWRGSDTSi69dT9Te8tRyTJcAekxT7scoCoGO2M/edit?pli=1#heading=h.zd4f29g9qeoc You can download a sample presentation here: https://docs.google.com/open?id=0BwS_9-CU4098UFhHSm1BYWE3Q0k In order to download the zip file click on the Download item under the File menu. Indeed all new features are under the hood, for something more exciting to watch you have to wait until the first slide transitions will be available. You can look at the source code in the feature branch: feature/svg-export. Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: mentor gsoc
Hi Robert, On Fri, 2012-05-25 at 19:42 -0400, Robert Sink wrote: > I recently applied and accidently withdrew my request to be a mentor > [was actually going to resubmit something more specific]. :-) > I am an Android hobbyist with six HTC phones [G1, G2, Droid Eris, > Evo 4G, and two Wildfire S [gsm/cdma]; all various adreno gpus] and > two tablets [Nook Color and HP Touchpad]. I enjoy mostly rom cooking > and perfecting, but I see a need for an open source office tool. So, > I'd like to pitch in some time.. call me a collaborator as I'm > hesitant to think of myself in mentor terms. Sounds good to me. > I know xml, java and c++ and have the aforementioned testing > platforms for Android if I may be of service. Thank you for your > time. It'd be great to have you hacking on the project alongside the GSOC student, that should present no problems I'm aware of - indeed, it might encourage more open interactive development. So - IIWY I'd just poke the existing developer & mentor for some code pointers and get stuck in. Great to have you around, ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Unify OUTPATH values
Hi,
I don't think there's any good reason to have wildly different OUTPATH names
for each specific platform variant.
The various names also lead to unnecessary work when packaging, just to
correctly handle LD_LIBRARY_PATH.
The attached patch reduces OUTPATH to two possible values: unx and wnt. Since
it is potentially intrusive, I prefer to show it here for review instead of
committing it directly.
--
Francois Tigeot
>From d726ef2fca9430395010f0e6d34469f34583c78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?=
Date: Sat, 26 May 2012 12:48:42 +0200
Subject: [PATCH] Unify OUTPATH values
* unx for Unix platforms, wnt for Windows ones
* this move reduces path lengths and simplifies packaging
Change-Id: I480a729c5bd25518dab09d89d52c104054d461c0
---
configure.in | 48 ++--
1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/configure.in b/configure.in
index 2382c83..ffa75d5 100644
--- a/configure.in
+++ b/configure.in
@@ -2994,7 +2994,7 @@ aix*)
OS=AIX
RTL_OS=AIX
RTL_ARCH=PowerPC
-OUTPATH=unxaigppc
+OUTPATH=unx
P_SEP=:
SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
@@ -3008,6 +3008,7 @@ cygwin*)
OS=WNT
RTL_OS=Windows
P_SEP=";"
+OUTPATH=wnt
case "$host_cpu" in
i*86|x86_64)
@@ -3016,12 +3017,10 @@ cygwin*)
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib/x64"
-OUTPATH=wntmscx$COMEX
else
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
-OUTPATH=wntmsci$COMEX
fi
;;
*)
@@ -3048,20 +3047,20 @@ darwin*)
CPUNAME=ARM
RTL_ARCH=ARM_EABI
GUIBASE=cocoatouch
-OUTPATH=unxiosr
+OUTPATH=unx
OS=IOS;
;;
powerpc*)
CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
-OUTPATH=unxmacxp
+OUTPATH=unx
;;
i*86|x86_64)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
-OUTPATH=unxmacxi
+OUTPATH=unx
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3076,7 +3075,7 @@ dragonfly*)
GUIBASE=unx
OS=DRAGONFLY
RTL_OS=DragonFly
-OUTPATH=unxdfly
+OUTPATH=unx
P_SEP=:
case "$host_cpu" in
@@ -3105,7 +3104,7 @@ freebsd*)
GUIBASE=unx
RTL_OS=FreeBSD
OS=FREEBSD
-OUTPATH=unxfbsd
+OUTPATH=unx
P_SEP=:
case "$host_cpu" in
@@ -3113,7 +3112,6 @@ freebsd*)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
-OUTPATH=unxfbsdi
;;
x86_64)
CPU=X
@@ -3135,20 +3133,19 @@ kfreebsd*)
GUIBASE=unx
OS=LINUX
RTL_OS=kFreeBSD
+OUTPATH=unx
case "$host_cpu" in
i*86)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
-OUTPATH=unxkfgi6
;;
x86_64)
CPU=X
CPUNAME=X86_64
RTL_ARCH=X86_64
LIB64="lib64"
-OUTPATH=unxkfgx6
;;
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3166,6 +3163,7 @@ linux-gnu*)
OS=LINUX
RTL_OS=Linux
P_SEP=:
+OUTPATH=unx
case "$host_cpu" in
@@ -3173,13 +3171,11 @@ linux-gnu*)
CPU=L
CPUNAME=AXP
RTL_ARCH=ALPHA
-OUTPATH=unxlngaxp
;;
arm*)
CPU=R
CPUNAME=ARM
EPM_FLAGS="-a arm"
-OUTPATH=unxlngr
RTL_ARCH=ARM_EABI
case "$host_cpu" in
arm*-linux)
@@ -3192,92 +3188,78 @@ linux-gnu*)
CPUNAME=HPPA
RTL_ARCH=HPPA
EPM_FLAGS="-a hppa"
-OUTPATH=unxlnghppa
;;
i*86)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
-OUTPATH=unxlngi6
;;
ia64)
CPU=A
CPUNAME=IA64
RTL_ARCH=IA64
-OUTPATH=unxlnga
;;
mips)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips"
-OUTPATH=unxlngmips
;;
mips64)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EB
EPM_FLAGS="-a mips64"
-OUTPATH=unxlngmips
;;
mips64el)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mips64el"
-OUTPATH=unxlngmips
;;
mipsel)
CPU=M
CPUNAME=GODSON
RTL_ARCH=MIPS_EL
EPM_FLAGS="-a mipsel"
-OUTPATH=unxlngmips
;;
m68k)
CPU=6
CPUNAME=M68K
RTL_ARCH=M68K
-OUTPATH=unxlngm68k
;;
powerpc)
CPU=P
CPUNAME=POWERPC
RTL_ARCH=PowerPC
-OUTPATH=unxlngppc
;;
powerpc64)
CPU=P
CPUNAME=POWERPC64
RTL_ARCH=PowerPC_64
LIB64="lib64"
-OUTPATH=unxlngppc64
;;
spar
Re: ODS import with merged cells
Hi Daniel, On Sat, 2012-05-26 at 03:36 -0500, Daniel Bankston wrote: > I pushed my changes to ScXMLTableRowCellContext::DoMerge() where I have > removed the ScDocFunc layer and simplified the whole method in general. Oh - hmm. So - for the collaborative editing work we need a clean interface between user input (controller) and the model. So far we're using the ScDocFunc for that, and at least we need to intercept all UI editing at some suitably granular level through there. Of course for file-filters we don't want people to go through there so - that's fine ;-) but it'd be good not to start a "get rid of ScDocFunc" jihad in general [IMHO etc.]. > Also, ScXMLTableRowCellContext::IsMerged() and the unmerge portion of > ScXMLTableRowCellContext::DoMerge() that existed before this latest > commit seem to have no purpose during import. :-) > After these changes, I can still successfully compile and pass sc unit > tests. Also, when I manually run calc and open a spreadsheet with > merged cells, I see that the file is imported correctly. Sounds lovely to me. All the best, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build time optimization
On Thu, 2012-05-24 at 09:23 +0200, David Ostrovsky wrote: > I'm trying to accelerate LO (developer) build on linux_x86-64 system. :-) one systematic approach to this might be to try to unwind which complex[1] headers are most included and see if, in fact, with some more strategic forward definitions we can avoid that. For the gnumake world the workdir/*/*.d files have all those deps that can easily be sedded / sorted / uniq -c'd / sorted etc. into a list of the top includes. That of course has the benefit of creating a long-term speedup for all of us that won't involve custom tweaking the system. IIRC there was some easy hack related to that too. ATB, Michael. [1] - where complex is presumably defined by 'slow to parse' (perhaps we could time a compile of include in a .cxx) -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - testtools/CustomTarget_bridgetest.mk
testtools/CustomTarget_bridgetest.mk | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit b17a8fb79f44327fbb30be8301029c15a6962aa4 Author: David Ostrovsky Date: Sat May 26 09:50:26 2012 +0200 fixed build error with --without-java parameter Change-Id: Id383a2cd8bdaa14e6d991ee971a6b26230922b10 diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index 4452c8e..a4237d3 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -37,11 +37,16 @@ BATCH_SUFFIX := GIVE_EXEC_RIGHTS=chmod +x endif -$(call gb_CustomTarget_get_target,testtools/bridgetest) : \ - $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \ +bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \ + $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) + +ifneq ($(SOLAR_JAVA),) +bridgetest_TARGET := $(bridgetest_TARGET) \ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \ - $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \ - $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \ + $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) +endif + +$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET) # which other prerequisites do we need here? $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/treeopt.hrc |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit eb0a1da770161a7d680061eaa3d79f8ea8eef6ac Author: David Tardon Date: Fri May 25 10:50:54 2012 +0200 resize options dialog to fit to increased tab height Change-Id: I6255eba78aa4e012e6d29b7faed5f3bbc5302d25 diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc index 46572f4..fc4e55f 100644 --- a/cui/source/options/treeopt.hrc +++ b/cui/source/options/treeopt.hrc @@ -25,6 +25,8 @@ * / +#include + #include #define PB_OK 1 @@ -55,8 +57,8 @@ // metrics -#define WIDTH_PAGEFRAME 263 -#define HEIGHT_PAGEFRAME191 +#define WIDTH_PAGEFRAME (TP_WIDTH + 3) +#define HEIGHT_PAGEFRAME(TP_HEIGHT + 6) #define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) #define COL_2 (COL_1+0) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ODS import with merged cells
Hi, Kohei and Markus, I pushed my changes to ScXMLTableRowCellContext::DoMerge() where I have removed the ScDocFunc layer and simplified the whole method in general. As I mentioned to Kohei at some point, when I was originally removing the UNO calls from the code, I was trying not to question the logic too much and just focus on direct conversion to equivalent Sc calls. I went back through the ScXMLTableRowCellContext merge methods closely following what occurs in the code and thinking about what is actually trying to be accomplished. It seems that the only thing that is actually needed here during import is a call to ScDocument::DoMerge(). As far as I could tell, everything else was unnecessary in the ScDocFunc layer. Also, ScXMLTableRowCellContext::IsMerged() and the unmerge portion of ScXMLTableRowCellContext::DoMerge() that existed before this latest commit seem to have no purpose during import. Whether a cell is merged or not is decided before ScXMLTableRowCellContext::DoMerge() is called (member bIsMerged), otherwise it wouldn't be called. And unmerging a cell on import doesn't make sense, right? After these changes, I can still successfully compile and pass sc unit tests. Also, when I manually run calc and open a spreadsheet with merged cells, I see that the file is imported correctly. Can you see anything that I might have missed or incorrectly removed? Thanks. Respectfully, Daniel Bankston ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source
sc/source/filter/xml/xmlcelli.cxx | 71 --
sc/source/filter/xml/xmlcelli.hxx |1
2 files changed, 8 insertions(+), 64 deletions(-)
New commits:
commit c827d7b23bdccc1adfb8b44ec04ea2b6503d57f5
Author: Daniel Bankston
Date: Sat May 26 02:54:41 2012 -0500
Remove ScDocFunc calls and unnecessary checks from ODS import for merged
cells
It seems only one line was actually needed from ScDocFunc::MergeCells()
during
ODS import, which was the call to ScDocument::DoMerge(). Also, IsMerged()
and unmerging is not needed during ODS import.
Change-Id: Ieec5abf8c4c8ce52df16cece77ffe1a1574e6397
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 305a478..25f8f17 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -41,9 +41,7 @@
#include "unonames.hxx"
#include "postit.hxx"
#include "sheetdata.hxx"
-#include "cellmergeoption.hxx"
#include "docsh.hxx"
-#include "docfunc.hxx"
#include "XMLTableShapeImportHelper.hxx"
#include "XMLTextPContext.hxx"
@@ -455,69 +453,16 @@ SvXMLImportContext
*ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPr
return pContext;
}
-namespace {
-
-static bool ScCellExists( const ScAddress& rScAddress )
-{
-return( rScAddress.Col() <= MAXCOL && rScAddress.Row() <= MAXROW );
-}
-
-void merge( ScDocShell* pDocSh, const ScRange& rScRange, const bool bMerge )
-{
-if( pDocSh )
-{
-ScCellMergeOption aMergeOption(
-rScRange.aStart.Col(), rScRange.aStart.Row(),
-rScRange.aEnd.Col(), rScRange.aEnd.Row(), false
-);
-aMergeOption.maTabs.insert( rScRange.aStart.Tab() );
-if ( bMerge )
-pDocSh->GetDocFunc().MergeCells( aMergeOption, false, true, true );
-else
-pDocSh->GetDocFunc().UnmergeCells( aMergeOption, true, true );
-}
-}
-
-} //anonymous namespace
-
-bool ScXMLTableRowCellContext::IsMerged( ScRange& rScRange, const ScAddress&
rScCell ) const
+void ScXMLTableRowCellContext::DoMerge( const ScAddress& rScAddress, const
SCCOL nCols, const SCROW nRows )
{
-if( ScCellExists(rScCell) )
+SCCOL mergeToCol = rScAddress.Col() + nCols;
+SCROW mergeToRow = rScAddress.Row() + nRows;
+bool bInBounds = rScAddress.Col() <= MAXCOL && rScAddress.Row() <= MAXROW
&&
+ mergeToCol <= MAXCOL && mergeToRow <= MAXROW;
+if( bInBounds )
{
-ScDocument* pDoc = rXMLImport.GetDocument();
-pDoc->ExtendOverlapped( rScRange );
-pDoc->ExtendMerge( rScRange );
-rScRange.Justify();
-if( rScRange.aStart.Col() == rScCell.Col() && rScRange.aEnd.Col() ==
rScCell.Col() &&
-rScRange.aStart.Row() == rScCell.Row() && rScRange.aEnd.Row() ==
rScCell.Row() )
-return false;
-else
-return true;
-}
-return false;
-}
-
-void ScXMLTableRowCellContext::DoMerge( const ScAddress& rScCellPos, const
SCCOL nCols, const SCROW nRows )
-{
-if( ScCellExists(rScCellPos) )
-{
-SCTAB nCurrentSheet = GetScImport().GetTables().GetCurrentSheet();
-ScRange aScRange(
-rScCellPos.Col(), rScCellPos.Row(), nCurrentSheet,
-rScCellPos.Col(), rScCellPos.Row(), nCurrentSheet
-);
-ScDocShell* pDocSh = static_cast< ScDocShell* >(
rXMLImport.GetDocument()->GetDocumentShell() );
-if( IsMerged(aScRange, rScCellPos) )
-{
-//unmerge
-merge( pDocSh, aScRange, false );
-}
-//merge
-SCCOL newEndCol = aScRange.aStart.Col() + nCols;
-SCROW newEndRow = aScRange.aStart.Row() + nRows;
-aScRange.aEnd.SetCol( newEndCol );
-aScRange.aEnd.SetRow( newEndRow );
-merge( pDocSh, aScRange, true );
+rXMLImport.GetDocument()->DoMerge( rScAddress.Tab(),
+rScAddress.Col(), rScAddress.Row(), mergeToCol, mergeToRow );
}
}
diff --git a/sc/source/filter/xml/xmlcelli.hxx
b/sc/source/filter/xml/xmlcelli.hxx
index 9cdcac5..70137f0 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -82,7 +82,6 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
sal_Int16 GetCellType(const rtl::OUString& sOUValue) const;
-bool IsMerged(ScRange& rScRange, const ScAddress& rScCell) const;
void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW
nRows);
void
SetContentValidation(com::sun::star::uno::Reference&
xPropSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
