Re: replacing OUString::valueOf(static_castsal_Int32) ??
On 2013-01-09 19:58, Michael Meeks wrote: At least in my mind :-) but we're starting to bike-shed here... I didn't see anyone volunteering to do the actual batch cleanup there ;-) Regards, Michael. Created a proof-of-concept patch along with some unit tests and pushed to gerrit: https://gerrit.libreoffice.org/#/c/1625/ Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gmake: CXXFLAGS override gb_Library_add_cxxflags
On 01/09/2013 06:28 PM, Lubos Lunak wrote: On Wednesday 09 of January 2013, Stephan Bergmann wrote: On 01/09/2013 03:41 PM, Petr Mladek wrote: + openSUSE uses: CXXFLAGS=-fomit-frame-pointer ... What do you mean with openSUSE uses [that]? Is the env var preset when you run a shell? Why would openSUSE do that in the first place? It's when building RPM packages, which are supposed to be built with $RPM_OPT_FLAGS. Ah, so Petr's IMHO, it would make sense to use CXXFLAGS after the default global flags but before the source file specific flags sounds reasonable to me. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svx/source
svx/source/dialog/docrecovery.cxx |2 +- svx/source/inc/docrecovery.hxx|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fe3bcdac912580607611475bfc3b0fa478a54ec1 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 8 14:04:09 2013 + Resolves: fdo#58589 recovery dialog title area text is missing regression since efc6b840a0423099d6c3e0d33c14d34637fbba4c as that changes the order in which windows are drawn Change-Id: I37388229533127ab915bec351f094fcd4786b2a3 (cherry picked from commit f8a4ce67987e5cb47f07dc61eeb450e1d5b9c541) Reviewed-on: https://gerrit.libreoffice.org/1606 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 3f9d4de..277d9ec 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -987,8 +987,8 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent , SVX_RES( RID_SVXPAGE_DOCRECOVERY_RECOVER ) ) -, m_aTitleWin ( this , SVX_RES ( WIN_RECOV_TITLE ) ) , m_aTitleFT( this , SVX_RES ( FT_RECOV_TITLE ) ) +, m_aTitleWin ( this , SVX_RES ( WIN_RECOV_TITLE ) ) , m_aTitleFL( this , SVX_RES ( FL_RECOV_TITLE ) ) , m_aDescrFT( this , SVX_RES ( FT_RECOV_DESCR ) ) , m_aProgressFT ( this , SVX_RES ( FT_RECOV_PROGR ) ) diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index f3e47e0..171c34d 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -606,8 +606,8 @@ class RecoveryDialog : public IExtendedTabPage //--- // member private: -Window m_aTitleWin; FixedText m_aTitleFT; +Window m_aTitleWin; FixedLine m_aTitleFL; FixedText m_aDescrFT; FixedText m_aProgressFT; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: Resolves: fdo#58589 recovery dialog title area text is missi...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1606 Approvals: Tor Lillqvist: Verified; Looks good to me, approved Miklos Vajna: -- To view, visit https://gerrit.libreoffice.org/1606 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37388229533127ab915bec351f094fcd4786b2a3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-dev] - questions about calc extension
On 01/09/2013 07:41 PM, Kohei Yoshida wrote: On 01/09/2013 01:12 PM, Rai, Neeraj wrote: What is the correct way to get a handle to spreadsheet in extension code. I don't want you to look too close to this (since I no longer maintain this), bug this code of mine http://code.google.com/p/scsolver/source/browse/source/ui/xcalc.cxx may give you some hint, especially the top 3 methods, getCurrentComponent(), updateCurrentComponent(), and getServiceManager() should give you how to get the current component object from the current context object. As an extension, you are given access to the current context object, and you can reach the current component from that one way or another. Some comments on the above code, for the benefit of fresh development: Obtaining the com.sun.star.frame.Desktop service (variable xDesktop) in updateCurrentComponent can be greatly simplified through the use of so-called new-style service constructors (and Noel's ongoing work of changing existing old-style services into new-style ones in UNOIDL): Reference frame::XDesktop2 xDesktop( frame::Desktop::create(m_xCC)); - It already returns the proper interface of the service (in this case XDesktop2, derived from XDesktop), so no need for querying from XInterface to the correct type. - It directly uses the component context, no need for the service manager. (In general, demand for explicitly using the service manager should go away more and more over time.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/generic vcl/inc vcl/unx
vcl/generic/print/genprnpsp.cxx |1 +
vcl/inc/vcl/jobdata.hxx |3 ++-
vcl/unx/generic/printer/jobdata.cxx |8 +++-
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 4c93acdba9274f5571a01a7ed5738957d8ebb0cd
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 9 12:44:09 2013 +
Resolves: fdo#59131 resolve default backend on printer-setup
For setting permanent defaults via spadmin we don't want to resolve the
default backend on saving default, this happens during the print
initialization stuff.
But when we tweak the printer settings for a single print job and reset
back to
default, we need to resolve that to what backend we want
Change-Id: Iac2370624b6d248c9658fb0fbc2f2d449849d81a
(cherry picked from commit 9c4d77f22d58f5b500c95f65a431628a8d8d6e6e)
Reviewed-on: https://gerrit.libreoffice.org/1609
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 9949eae..6800e01 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -584,6 +584,7 @@ sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame,
ImplJobSetup* pJobSetup )
if( pSetupFunction( aInfo ) )
{
+aInfo.resolveDefaultBackend();
rtl_freeMemory( pJobSetup-mpDriverData );
pJobSetup-mpDriverData = NULL;
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 577e0fa..3f81877 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -68,7 +68,8 @@ struct VCL_DLLPUBLIC JobData
void setCollate( bool bCollate );
bool setPaper( int nWidth, int nHeight ); // dimensions in pt
bool setPaperBin( int nPaperBin ); // dimensions in pt
-void setDefaultBackend( bool bUsePDF );
+void resolveDefaultBackend();
+void setDefaultBackend(bool bUsePDF);
// creates a new buffer using new
// it is up to the user to delete it again
diff --git a/vcl/unx/generic/printer/jobdata.cxx
b/vcl/unx/generic/printer/jobdata.cxx
index 385ed02..c55f64a 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -18,9 +18,9 @@
*/
+#include officecfg/Office/Common.hxx
#include vcl/jobdata.hxx
#include vcl/printerinfomanager.hxx
-
#include tools/stream.hxx
#include sal/alloca.h
@@ -269,6 +269,12 @@ bool JobData::constructFromStreamBuffer( void* pData, int
bytes, JobData rJobDa
return bVersion bPrinter bOrientation bCopies bContext
bMargin bPSLevel bPDFDevice bColorDevice bColorDepth;
}
+void JobData::resolveDefaultBackend()
+{
+if (m_nPSLevel == 0 m_nPDFDevice == 0)
+
setDefaultBackend(officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get());
+}
+
void JobData::setDefaultBackend(bool bUsePDF)
{
if (bUsePDF m_nPSLevel == 0 m_nPDFDevice == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: Resolves: fdo#59131 resolve default backend on printer-setu...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1609 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1609 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac2370624b6d248c9658fb0fbc2f2d449849d81a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/unocore/unocrsrhelper.cxx | 11 ---
sw/source/core/unocore/unoobj.cxx|4
sw/source/core/unocore/unoobj2.cxx |7 ---
3 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit b58dc1b9aee370a1a2aa9d8f951cede3ae24d61d
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 9 15:45:32 2013 +0100
fdo#58242: sw: fix more crashes when not on SwTxtNode
In getCrsrPropertyValue etc.; also add a unit test for the problem.
(cherry picked from commit 68d40d2cae3700f4134375fcaf9649ac626ada7d)
Conflicts:
sw/qa/complex/writer/CheckTable.java
Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007
Reviewed-on: https://gerrit.libreoffice.org/1615
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index e41d237..aa9cc45 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -497,9 +497,9 @@ sal_Bool getCrsrPropertyValue(const
SfxItemPropertySimpleEntry rEntry
case FN_UNO_CHARFMT_SEQUENCE:
{
-SwTxtNode* pTxtNode;
-if((pTxtNode = (SwTxtNode*)rPam.GetNode( sal_True )) ==
rPam.GetNode(sal_False)
-pTxtNode-GetpSwpHints())
+SwTxtNode *const pTxtNode = rPam.GetNode()-GetTxtNode();
+if (rPam.GetNode(sal_True) == rPam.GetNode(sal_False)
+ pTxtNode pTxtNode-GetpSwpHints())
{
sal_uInt16 nPaMStart = rPam.GetPoint()-nContent.GetIndex();
sal_uInt16 nPaMEnd = rPam.GetMark() ?
rPam.GetMark()-nContent.GetIndex() : nPaMStart;
@@ -951,6 +951,11 @@ sal_Bool DocInsertStringSplitCR(
xub_StrLen nStartIdx = 0;
SwTxtNode* const pTxtNd =
rNewCursor.GetPoint()-nNode.GetNode().GetTxtNode();
+if (!pTxtNd)
+{
+SAL_INFO(sw.uno, DocInsertStringSplitCR: need a text node);
+return false;
+}
const xub_StrLen nMaxLength = ( pTxtNd )
? STRING_LEN - pTxtNd-GetTxt().Len()
: STRING_LEN;
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 3bba084..d400286 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -556,6 +556,10 @@ throw (lang::IllegalArgumentException)
{
// multi selection is not considered
SwTxtNode *const pTxtNd = rPam.GetNode()-GetTxtNode();
+if (!pTxtNd)
+{
+throw lang::IllegalArgumentException();
+}
if (FN_UNO_NUM_LEVEL == rEntry.nWID)
{
sal_Int16 nLevel = 0;
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index ea121c1..6e0bf2f 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1851,9 +1851,10 @@ lcl_FillFrame(SwClient rEnum, SwUnoCrsr rUnoCrsr,
FrameDependList_t rFrames)
{
// search for objects at the cursor - anchored at/as char
-SwTxtAttr const*const pTxtAttr =
-rUnoCrsr.GetNode()-GetTxtNode()-GetTxtAttrForCharAt(
-rUnoCrsr.GetPoint()-nContent.GetIndex(), RES_TXTATR_FLYCNT);
+SwTxtAttr const*const pTxtAttr = (rUnoCrsr.GetNode()-IsTxtNode())
+? rUnoCrsr.GetNode()-GetTxtNode()-GetTxtAttrForCharAt(
+rUnoCrsr.GetPoint()-nContent.GetIndex(), RES_TXTATR_FLYCNT)
+: 0;
if (pTxtAttr)
{
const SwFmtFlyCnt rFlyCnt = pTxtAttr-GetFlyCnt();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#58242: sw: fix more crashes when not on SwTxtNode
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1615 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1615 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd459a43393c39b4fed9fb89aae4a5f7bacff007 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Removed some RTL_* macros and rtl:: prefixes in dbaccess
Miklos Vajna has abandoned this change. Change subject: Removed some RTL_* macros and rtl:: prefixes in dbaccess .. Patch Set 2: Abandoned Uhm, sorry, when resolving the conflicts, the change-id line moved up, so gerrit didn't notice this change is pushed. So even if I technically abandon this change, it's in fact merged: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0f2a3a3bdc157d997fe1967e10300fc6fecf2bec -- To view, visit https://gerrit.libreoffice.org/1601 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I467ad9307536e6cdd32ebcdd40539bd5f8614c85 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: bridges/Module_bridges.mk Makefile.in solenv/gbuild
Makefile.in |2 +- bridges/Module_bridges.mk |2 +- solenv/gbuild/Module.mk | 17 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) New commits: commit a5838b19bc774efd261c1d6c78a2b6eb62f1b502 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Jan 9 14:24:33 2013 +0100 add rule for generating fresh pot (po template) files Moved from translations' custom makefile. Change-Id: Ife58bfa3ee607b06617d7db80408afb453b9a10c Reviewed-on: https://gerrit.libreoffice.org/1622 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/Makefile.in b/Makefile.in index 9c12258..013548b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -422,7 +422,7 @@ check: dev-install subsequentcheck subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRC_ROOT)/Makefile.post $@ -unitcheck slowcheck debugrun: +unitcheck slowcheck debugrun translations: $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRC_ROOT)/Makefile.post $@ endif # not clean or distclean diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index 118e82f..14a7255 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -96,7 +96,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ ) \ )) -ifneq (showmodules,$(MAKECMDGOALS)) +ifeq ($(gb_FULL_BUILD),$(true)) ifeq ($(strip $(bridges_SELECTED_BRIDGE)),) $(call gb_Output_error,no bridge selected for build: bailing out) endif diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index fad1821..2863be8 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -89,7 +89,7 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) \ touch $@) -.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install showmodules +.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install showmodules translations .DEFAULT_GOAL := all ifeq ($(strip $(gb_PARTIALBUILD)),) @@ -188,6 +188,17 @@ showmodules : $(info $(strip $(gb_Module_ALLMODULES))) @true +translations : $(WORKDIR)/pot.done + +$(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize transex3 \ + propex uiex ulfex xrmex treex, \ + $(call gb_Executable_get_target_for_build,$(exec))) + $(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1) + $(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot \ +find $(dir $@)/pot -type f -printf %P\n | sed -e s/\.pot/.po/ $(dir $@)/LIST \ +touch $@) + # enable if: no -MODULE/ defined AND [all defined OR MODULE/ defined] gb_Module__debug_enabled = \ $(and $(if $(filter -$(1)/,$(ENABLE_DEBUGINFO_FOR)),,$(true)),\ @@ -227,7 +238,9 @@ endif endef -ifneq (showmodules,$(MAKECMDGOALS)) +gb_FULL_BUILD := $(if $(filter showmodules translations,$(MAKECMDGOALS)),$(false),$(true)) + +ifeq ($(gb_FULL_BUILD),$(true)) define gb_Module_add_target $(call gb_Module__read_targetfile,$(1),$(2),target) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] add rule for generating fresh pot (po template) files
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1622 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1622 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife58bfa3ee607b06617d7db80408afb453b9a10c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Kill the ancient StarOffice patch concept
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1605 Approvals: Miklos Vajna: Verified Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1605 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09e949e601a969f88eff60067faa2352f4f89537 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist t...@iki.fi Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: slideshow/README
slideshow/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3d5e78dd78390513021b46bc44036cdde2f1b45 Author: Tor Lillqvist t...@iki.fi Date: Thu Jan 10 11:38:19 2013 +0200 It's not that new any longer;) Change-Id: Ide189c5f3ace0a5a7478ae1a70c315fe3e461667 diff --git a/slideshow/README b/slideshow/README index 54a1994..f6d19bb 100644 --- a/slideshow/README +++ b/slideshow/README @@ -1 +1 @@ -Contains the new impress slideshow engine introduced in OO.o 2.0 +The Impress slideshow engine ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - odk/cfgWin.js
odk/cfgWin.js | 50 +-
1 file changed, 1 insertion(+), 49 deletions(-)
New commits:
commit fc2b654da5482f6d8c202c9fd30e1a1812c5b8c2
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 9 17:45:09 2013 +0100
Fix oo_sdk_ure_home calculation in SDK's cfgWin.js
This appears to be broken at least since
bde5b815873450dc9520c4dd300829eb5bd72daa INTEGRATION: CWS jsc21 (1.11.2);
FILE
MERGED: 2008/05/27 16:59:34 jsc 1.11.2.1: #i88797# adapt for new structure?
Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d
(cherry picked from commit 0c22641b4c44938924187ddfb945f494a183ba47)
Reviewed-on: https://gerrit.libreoffice.org/1620
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index b6dd4e7..fa1c081 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -53,7 +53,7 @@ var oo_user_sdk_dir=WshSysEnv(APPDATA) + \\ + oo_sdk_name;
var oo_user_sdk_env_script=oo_user_sdk_dir + \\setsdkenv_windows.bat;
var office_home=getOfficeHome();
-var oo_sdk_ure_home=getUreHome();
+var oo_sdk_ure_home=office_home + \\URE;
var oo_sdk_make_home=getMakeHome();
var oo_sdk_zip_home=getZipHome();
@@ -140,23 +140,6 @@ function getSdkHome()
}
}
-function getOfficeOrUre()
-{
-var suggestion = Office;
-var choice;
-while (choice != office choice != ure) {
-stdout.Write(
-\n Use an installed Office or an installed UNO Runtime
-+ Environment (Office/URE) [ + suggestion + ]:);
-choice = stdin.ReadLine();
-if (choice == ) {
-choice = suggestion;
-}
-choice = choice.toLowerCase();
-}
-return choice;
-}
-
function getOfficeHome()
{
var sSuggestedHome = WshSysEnv(OFFICE_HOME);
@@ -239,37 +222,6 @@ function searchOffice()
return ;
}
-
-function getUreHome()
-{
- var tmpure = oo_sdk_home;
- var ure = ;
-
-if (aFileSystemObject.FileExists(tmpure + \\URE\\bin\\uno.exe)) {
- ure = tmpure + \URE;
- }
-
- return ure;
-
-/*
-var suggestion = WshSysEnv(OO_SDK_URE_HOME);
-var choice;
-for (;;) {
-stdout.Write(
-\n Enter the URE installation directory [ + suggestion + ]:);
-choice = stdin.ReadLine();
-if (choice == ) {
-choice = suggestion;
-}
-if (aFileSystemObject.FileExists(choice + \\bin\\uno.exe)) {
-break;
-}
-stdout.WriteLine(\n Error: A valid URE installation is required.);
-}
-return choice;
-*/
-}
-
function getMakeHome()
{
var sSuggestedHome = WshSysEnv(OO_SDK_MAKE_HOME);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: Fix oo_sdk_ure_home calculation in SDK's cfgWin.js
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1620 Approvals: Tor Lillqvist: Looks good to me, approved Miklos Vajna: Verified -- To view, visit https://gerrit.libreoffice.org/1620 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/control/thumbnailview.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 96633bf2d11b375a608240d1c1e83fd6e627fd75 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Wed Jan 9 10:57:44 2013 +0100 Template Manager: double click on the whole item instead of only thumbnail Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1 Reviewed-on: https://gerrit.libreoffice.org/1610 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index c3957f0..62324a7 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -517,7 +517,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent rMEvt ) maItemStateHdl.Call(pItem); Rectangle aRect(pItem-getDrawArea()); -aRect.SetSize(Size(mnItemWidth,mnThumbnailHeight)); if (aRect.IsInside(rMEvt.GetPosPixel())) OnItemDblClicked(pItem); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 62dc5dfcf2af93a35beb96bebe63b7e8ac652fb5
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Jan 9 11:58:39 2013 +0100
Template Manager: don't deselect item after setting default template
Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc
Reviewed-on: https://gerrit.libreoffice.org/1611
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 282372d..bff2dc1 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1069,19 +1069,17 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
void SfxTemplateManagerDlg::OnTemplateAsDefault ()
{
-assert(!maSelTemplates.empty());
-
-const TemplateViewItem *pItem = static_castconst
TemplateViewItem*(*(maSelTemplates.begin()));
-
-OUString aServiceName;
-if (lcl_getServiceName(pItem-getPath(),aServiceName))
+if (!maSelTemplates.empty())
{
-SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
+const TemplateViewItem *pItem = static_castconst
TemplateViewItem*(*(maSelTemplates.begin()));
-createDefaultTemplateMenu();
+OUString aServiceName;
+if (lcl_getServiceName(pItem-getPath(),aServiceName))
+{
+
SfxObjectFactory::SetStandardTemplate(aServiceName,pItem-getPath());
-// clear selection and display view/action toolbars
-maView-deselectOverlayItem(pItem-mnId);
+createDefaultTemplateMenu();
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: Template Manager: double click on the whole item instead of ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1610 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1610 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie07d41e5dcb09977d89752e724fcbabd6c5d7df1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: Template Manager: don't deselect item after setting default ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1611 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1611 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I860fb2c91d6843a1d5345ab2cf9270473f73f5bc Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [libreoffice-dev] - questions about calc extension
On Wed, 2013-01-09 at 23:18 +, Rai, Neeraj wrote: I looked a little more into your code and copied the getactiveSheet function. Now it takes 12s. I am happy. Sorry for the spam - you have good code sitting there. 12s sounds like a long time to me ;- If you can run your macro under callgrind: export OOO_DISABLE_RECOVERY=1 valgrind --tool=callgrind --simulate-cache=yes \ --dump-instr=yes ./soffice.bin -writer --splash-pipe=0 (needs write-permission to the installed libreoffice directory to drop it's callgrind.12345.txt file) Then perhaps kcachegrind will show you something interesting for your use-case. 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-commits] .: Branch 'libreoffice-3-6' - odk/cfgWin.js
odk/cfgWin.js | 50 +-
1 file changed, 1 insertion(+), 49 deletions(-)
New commits:
commit 89964f8e4f439bcd4b023ef8fd45bfacff01bd5d
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 9 17:45:09 2013 +0100
Fix oo_sdk_ure_home calculation in SDK's cfgWin.js
This appears to be broken at least since
bde5b815873450dc9520c4dd300829eb5bd72daa INTEGRATION: CWS jsc21 (1.11.2);
FILE
MERGED: 2008/05/27 16:59:34 jsc 1.11.2.1: #i88797# adapt for new structure?
Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d
(cherry picked from commit 0c22641b4c44938924187ddfb945f494a183ba47)
Reviewed-on: https://gerrit.libreoffice.org/1619
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 81fed05..f333a85 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -36,7 +36,7 @@ var oo_user_sdk_dir=WshSysEnv(APPDATA) + \\ + oo_sdk_name;
var oo_user_sdk_env_script=oo_user_sdk_dir + \\setsdkenv_windows.bat;
var office_home=getOfficeHome();
-var oo_sdk_ure_home=getUreHome();
+var oo_sdk_ure_home=office_home + \\URE;
var oo_sdk_make_home=getMakeHome();
var oo_sdk_zip_home=getZipHome();
@@ -123,23 +123,6 @@ function getSdkHome()
}
}
-function getOfficeOrUre()
-{
-var suggestion = Office;
-var choice;
-while (choice != office choice != ure) {
-stdout.Write(
-\n Use an installed Office or an installed UNO Runtime
-+ Environment (Office/URE) [ + suggestion + ]:);
-choice = stdin.ReadLine();
-if (choice == ) {
-choice = suggestion;
-}
-choice = choice.toLowerCase();
-}
-return choice;
-}
-
function getOfficeHome()
{
var sSuggestedHome = WshSysEnv(OFFICE_HOME);
@@ -222,37 +205,6 @@ function searchOffice()
return ;
}
-
-function getUreHome()
-{
- var tmpure = oo_sdk_home;
- var ure = ;
-
-if (aFileSystemObject.FileExists(tmpure + \\URE\\bin\\uno.exe)) {
- ure = tmpure + \URE;
- }
-
- return ure;
-
-/*
-var suggestion = WshSysEnv(OO_SDK_URE_HOME);
-var choice;
-for (;;) {
-stdout.Write(
-\n Enter the URE installation directory [ + suggestion + ]:);
-choice = stdin.ReadLine();
-if (choice == ) {
-choice = suggestion;
-}
-if (aFileSystemObject.FileExists(choice + \\bin\\uno.exe)) {
-break;
-}
-stdout.WriteLine(\n Error: A valid URE installation is required.);
-}
-return choice;
-*/
-}
-
function getMakeHome()
{
var sSuggestedHome = WshSysEnv(OO_SDK_MAKE_HOME);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Fix oo_sdk_ure_home calculation in SDK's cfgWin.js
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1619 Approvals: Tor Lillqvist: Looks good to me, approved Miklos Vajna: Verified -- To view, visit https://gerrit.libreoffice.org/1619 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FYI: Make for faster windows build
On Wed, 2013-01-09 at 20:01 +0100, Lubos Lunak wrote: Looks what I found under the tree! Faster make for Cygwin. Granted, I had put it there first, but still nice. Nice work ! :-) I'd love to see a configure option: --with-custom-gnumake that does the git clone, pre-builds, and uses our own gnumake (with the speedups). Did you have any joy getting the fixes up-stream to gnumake ? ;-) Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Need confirmation about non-clearing of Character Styles
Sinds all or editors use LO 3.6.2 (before OO3.3) We have complains about the fact that parts of the text, who are formated with a Character Style, can not been cleared to no-formating, not by Clear formating not by Clear Direct Formating (cntrl+M) There is a dirty work-around by applying the Default character style Paragraph Styles can been cleared Is this intentional behavior or a regression open for a issue ? Greetz Fernand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |5 +++--
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx |2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 72980e72a2d380d5e5a9c7b56a8df0a3ac1e93d0
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 11:46:50 2012 +0100
Resolves: fdo#45911 rhbz#846775 Clipboard must be disposed before Selection
(cherry picked from commit 7887a4e0adb0d60e6b013808dc27eccddd1c0324)
Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee
Reviewed-on: https://gerrit.libreoffice.org/1612
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 2932e20..7ab51b4 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -110,10 +110,10 @@ SlideSorterController::SlideSorterController
(SlideSorter rSlideSorter)
mpPageSelector(),
mpFocusManager(),
mpSlotManager(),
- mpClipboard(),
mpScrollBarManager(),
mpCurrentSlideManager(),
mpSelectionManager(),
+ mpClipboard(),
mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)),
mpAnimator(new Animator(rSlideSorter)),
mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)),
@@ -156,9 +156,9 @@ void SlideSorterController::Init (void)
mpPageSelector.reset(new PageSelector(mrSlideSorter));
mpFocusManager.reset(new FocusManager(mrSlideSorter));
mpSlotManager.reset(new SlotManager(mrSlideSorter));
-mpClipboard.reset(new Clipboard(mrSlideSorter));
mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter));
mpSelectionManager.reset(new SelectionManager(mrSlideSorter));
+mpClipboard.reset(new Clipboard(mrSlideSorter));
mpScrollBarManager-LateInitialization();
@@ -202,6 +202,7 @@ SlideSorterController::~SlideSorterController (void)
void SlideSorterController::Dispose (void)
{
mpInsertionIndicatorHandler-End(Animator::AM_Immediate);
+mpClipboard.reset();
mpSelectionManager.reset();
mpAnimator-Dispose();
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index e962623..c515480 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -245,10 +245,10 @@ private:
::boost::scoped_ptrPageSelector mpPageSelector;
::boost::scoped_ptrFocusManager mpFocusManager;
::boost::shared_ptrSlotManager mpSlotManager;
-::boost::scoped_ptrcontroller::Clipboard mpClipboard;
::boost::scoped_ptrScrollBarManager mpScrollBarManager;
mutable ::boost::shared_ptrCurrentSlideManager mpCurrentSlideManager;
::boost::shared_ptrSelectionManager mpSelectionManager;
+::boost::scoped_ptrcontroller::Clipboard mpClipboard;
::boost::shared_ptrInsertionIndicatorHandler mpInsertionIndicatorHandler;
::boost::shared_ptrAnimator mpAnimator;
::boost::scoped_ptrVisibleAreaManager mpVisibleAreaManager;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.ac solenv/gbuild
config_host.mk.in |1 + configure.ac| 19 +++ solenv/gbuild/gbuild.mk |4 3 files changed, 24 insertions(+) New commits: commit 6af200ec0cbc78fee7b835de06a1588c7645fdc7 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Dec 10 10:41:35 2012 +0100 Add configure switch that allows hardlink deliver This switch just makes possible to configure in ln delivery instead of cp based one. The feature was already in the place, we just make it visible as configure option now. Change-Id: I778ef3b03e6b9a57057e66ff6307e7da46bcd935 diff --git a/config_host.mk.in b/config_host.mk.in index 1c98744..55d0fa0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -218,6 +218,7 @@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export GUI=@GUI@ export GUIBASE=@GUIBASE@ export GUI_FOR_BUILD=@GUI_FOR_BUILD@ +export HARDLINKDELIVER=@HARDLINKDELIVER@ export HAVE_CXX0X=@HAVE_CXX0X@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ diff --git a/configure.ac b/configure.ac index 2fa044f..688f2e4 100644 --- a/configure.ac +++ b/configure.ac @@ -678,6 +678,12 @@ AC_ARG_ENABLE(ext-wiki-publisher, dnl -- *** -- +AC_ARG_ENABLE([hardlink-deliver], +AS_HELP_STRING([--enable-hardlink-deliver], +[Put files into deliver folder as hardlinks instead of copying them +over. Saves space and speeds up build.]) +) + AC_ARG_ENABLE(mergelibs, AS_HELP_STRING([--enable-mergelibs], [Enables linking of big, merged, library. Experimental feature tested @@ -12240,6 +12246,19 @@ else fi AC_SUBST(MERGELIBS) +# === +# Create hardlinks on deliver instead of copying for smaller size and speed up +# === +AC_MSG_CHECKING([whether to create hardlinks for delivering files]) +HARDLINKDELIVER= +if test $enable_hardlink_deliver = yes; then +HARDLINKDELIVER=TRUE +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) +fi +AC_SUBST(HARDLINKDELIVER) + dnl === dnl icerun is a wrapper that stops us spawning tens of processes dnl locally - for tools that can't be executed on the compile cluster diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d7b804d..eebcfe9 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -133,6 +133,10 @@ ENABLE_DEBUGINFO_FOR := all endif endif +ifeq ($(HARDLINKDELIVER),TRUE) +gb_Deliver_HARDLINK := $(true) +endif + ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) gb_SYMBOL := $(false) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source
svx/source/dialog/docrecovery.cxx |2 +- svx/source/inc/docrecovery.hxx|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 26b0cacbceb39974fee8c974edb73c3428d9b137 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 8 14:04:09 2013 + Resolves: fdo#58589 recovery dialog title area text is missing regression since efc6b840a0423099d6c3e0d33c14d34637fbba4c as that changes the order in which windows are drawn Change-Id: I37388229533127ab915bec351f094fcd4786b2a3 (cherry picked from commit f8a4ce67987e5cb47f07dc61eeb450e1d5b9c541) Reviewed-on: https://gerrit.libreoffice.org/1607 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 4c0c96a..412c938 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -998,8 +998,8 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent , SVX_RES( RID_SVXPAGE_DOCRECOVERY_RECOVER ) ) -, m_aTitleWin ( this , SVX_RES ( WIN_RECOV_TITLE ) ) , m_aTitleFT( this , SVX_RES ( FT_RECOV_TITLE ) ) +, m_aTitleWin ( this , SVX_RES ( WIN_RECOV_TITLE ) ) , m_aTitleFL( this , SVX_RES ( FL_RECOV_TITLE ) ) , m_aDescrFT( this , SVX_RES ( FT_RECOV_DESCR ) ) , m_aProgressFT ( this , SVX_RES ( FT_RECOV_PROGR ) ) diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 1159f01..9eeb3c3 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -631,8 +631,8 @@ class RecoveryDialog : public IExtendedTabPage //--- // member private: -Window m_aTitleWin; FixedText m_aTitleFT; +Window m_aTitleWin; FixedLine m_aTitleFL; FixedText m_aDescrFT; FixedText m_aProgressFT; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Resolves: fdo#58589 recovery dialog title area text is missi...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1607 Approvals: Tor Lillqvist: Verified; Looks good to me, approved Miklos Vajna: -- To view, visit https://gerrit.libreoffice.org/1607 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37388229533127ab915bec351f094fcd4786b2a3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: Resolves: fdo#45911 rhbz#846775 Clipboard must be disposed b...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1612 Approvals: Tor Lillqvist: Verified; Looks good to me, approved Miklos Vajna: -- To view, visit https://gerrit.libreoffice.org/1612 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Add configure switch that allows hardlink deliver
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1283 -- To view, visit https://gerrit.libreoffice.org/1283 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I778ef3b03e6b9a57057e66ff6307e7da46bcd935 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tomáš Chvátal tchva...@suse.cz Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/appuno.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4f6cd9a3dc5e83e7394dfb35161abb94699e59fb
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jan 10 10:52:18 2013 +0100
fdo#58328: fixed items types made versioning work again
Change-Id: Ib74f8f1a79ca04c42db9bd2c35ae6c4729edad69
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 2e6ba66..fb16aad 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -130,8 +130,8 @@ SfxFormalArgument aFormalArgs[] = {
SFX_ARGUMENT(SID_DEFAULTFILENAME,SuggestedSaveAsName,SfxStringItem),
SFX_ARGUMENT(SID_DEFAULTFILEPATH,SuggestedSaveAsDir,SfxStringItem),
SFX_ARGUMENT(SID_DOCINFO_AUTHOR,VersionAuthor,SfxStringItem),
-SFX_ARGUMENT(SID_DOCINFO_COMMENTS,VersionComment,SfxBoolItem),
-SFX_ARGUMENT(SID_DOCINFO_MAJOR,VersionMajor,SfxStringItem),
+SFX_ARGUMENT(SID_DOCINFO_COMMENTS,VersionComment,SfxStringItem),
+SFX_ARGUMENT(SID_DOCINFO_MAJOR,VersionMajor,SfxBoolItem),
SFX_ARGUMENT(SID_FILE_FILTEROPTIONS,FilterOptions,SfxStringItem),
SFX_ARGUMENT(SID_FILTER_NAME,FilterName,SfxStringItem),
//SFX_ARGUMENT(SID_FILE_NAME,FileName,SfxStringItem),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit db67dad3065e3578f1321822ffb63eef83fe5377
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 10 00:43:12 2013 +0100
fdo#58327: writerfilter: RemoveLastParagraph is tricky:
What happens here is that the xCursor-goLeft( 1, true ) selects the
entire inserted table, which is then deleted. That causes annoyances,
such as an assertion from ~SwIndexReg because as collateral damage the
SwTxtNode that SwReader::Read's pUndoPam points to is also deleted, as
well as missing tables in the document.
DomainMapper_Impl::RemoveLastParagraph() can avoid this by not using
setString() but instead disposing the paragraph, like it already does in
other cases. But don't do it for new (loaded) documents, because it may
kill flys in that case, which i strangely couldn't reproduce when
pasting as RTF.
Change-Id: I87302b8916e39ca42bc4fedfee40ac38fadd0939
(cherry picked from commit e521930ea1c855c236efb67793e540d07c201d35)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ef16af5..f8730b9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -283,7 +283,13 @@ void DomainMapper_Impl::RemoveLastParagraph( )
// Keep the character properties of the last but one paragraph, even if
// it's empty. This works for headers/footers, and maybe in other cases
// as well, but surely not in textboxes.
-if (m_bInHeaderFooterImport xEnumerationAccess.is())
+// fdo#58327: also do this at the end of the document: when pasting,
+// a table before the cursor position would be deleted
+// (but only for paste/insert, not load; otherwise it can happen that
+// flys anchored at the disposed paragraph are deleted (fdo47036.rtf))
+bool const bEndOfDocument(m_aTextAppendStack.size() == 1);
+if ((m_bInHeaderFooterImport || (bEndOfDocument !m_bIsNewDoc))
+ xEnumerationAccess.is())
{
uno::Referencecontainer::XEnumeration xEnumeration =
xEnumerationAccess-createEnumeration();
uno::Referencelang::XComponent
xParagraph(xEnumeration-nextElement(), uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/appl/appuno.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6bfd791162fa392600ef8b8df6c1ac04bb4d4099
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Jan 10 10:52:18 2013 +0100
fdo#58328: fixed items types made versioning work again
Change-Id: Ib74f8f1a79ca04c42db9bd2c35ae6c4729edad69
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 2e6ba66..fb16aad 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -130,8 +130,8 @@ SfxFormalArgument aFormalArgs[] = {
SFX_ARGUMENT(SID_DEFAULTFILENAME,SuggestedSaveAsName,SfxStringItem),
SFX_ARGUMENT(SID_DEFAULTFILEPATH,SuggestedSaveAsDir,SfxStringItem),
SFX_ARGUMENT(SID_DOCINFO_AUTHOR,VersionAuthor,SfxStringItem),
-SFX_ARGUMENT(SID_DOCINFO_COMMENTS,VersionComment,SfxBoolItem),
-SFX_ARGUMENT(SID_DOCINFO_MAJOR,VersionMajor,SfxStringItem),
+SFX_ARGUMENT(SID_DOCINFO_COMMENTS,VersionComment,SfxStringItem),
+SFX_ARGUMENT(SID_DOCINFO_MAJOR,VersionMajor,SfxBoolItem),
SFX_ARGUMENT(SID_FILE_FILTEROPTIONS,FilterOptions,SfxStringItem),
SFX_ARGUMENT(SID_FILTER_NAME,FilterName,SfxStringItem),
//SFX_ARGUMENT(SID_FILE_NAME,FileName,SfxStringItem),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58328, which changed state. Bug 58328 Summary: FILESAVE: Creating a new document version no longer working https://bugs.freedesktop.org/show_bug.cgi?id=58328 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||58819 -- 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
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on|58819 | -- 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] .: CustomTarget_translate.mk .gitignore localization_present.mk Makefile Module_translations.mk prj/build.lst prj/d.lst prj/makefile.mk
.gitignore| 11 --- CustomTarget_translate.mk | 44 Makefile | 11 --- Module_translations.mk| 38 -- localization_present.mk |1 - prj/build.lst |2 -- prj/makefile.mk |1 - 7 files changed, 108 deletions(-) New commits: commit 620e5cb6954b4fdb1be1cf38b83844ae319600d8 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Jan 8 22:20:14 2013 +0100 remove unused files, now that we don't build translations module Rule for generating .pot files moved to core repo. Change-Id: I56aca0ad9a469407d1bc8c7b0dd0e34a5395cf26 Reviewed-on: https://gerrit.libreoffice.org/1621 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ebc0c42..000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -# backup and temporary files -*~ -.*.sw[op] - -# the build directories -/unxlng?? -/unxlng??.pro -/wntmsc??? -/wntmsc???.pro -/unxmac??.pro -/unxmac?? diff --git a/CustomTarget_translate.mk b/CustomTarget_translate.mk deleted file mode 100644 index 562b6b3..000 --- a/CustomTarget_translate.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- 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 Matúš Kukan matus.ku...@gmail.com (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_CustomTarget_CustomTarget,translations/translate)) - -translations_DIR := $(call gb_CustomTarget_get_workdir,translations/translate) - -$(call gb_CustomTarget_get_target,translations/translate) : \ - $(translations_DIR)/pot.done - -$(translations_DIR)/pot.done : $(foreach exec,cfgex helpex localize transex3 \ - propex uiex ulfex xrmex treex, \ - $(call gb_Executable_get_target_for_build,$(exec))) - $(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1) - $(call gb_Helper_abbreviate_dirs, \ - mkdir -p $(dir $@) $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot) \ -find $(dir $@)/pot -type f -printf %P\n | sed -e s/\.pot/.po/ $(dir $@)/LIST \ -touch $@ - -# vim: set noet sw=4 ts=4: diff --git a/Makefile b/Makefile deleted file mode 100644 index 6b38ac5..000 --- a/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory=$(dir $(realpath $(firstword $(MAKEFILE_LIST - -ifeq ($(origin SRC_ROOT),undefined) -SRC_ROOT=$(module_directory)../../.. -endif - -include $(SRC_ROOT)/solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/Module_translations.mk b/Module_translations.mk deleted file mode 100644 index df8c839..000 --- a/Module_translations.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- 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 Matúš Kukan matus.ku...@gmail.com (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+),
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c85fa091125330f0764ac7b58b79a3b0dcef41ca Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Jan 8 22:20:14 2013 +0100 Updated core Project: translations 620e5cb6954b4fdb1be1cf38b83844ae319600d8 remove unused files, now that we don't build translations module Rule for generating .pot files moved to core repo. Change-Id: I56aca0ad9a469407d1bc8c7b0dd0e34a5395cf26 Reviewed-on: https://gerrit.libreoffice.org/1621 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/translations b/translations index e5f69f7..620e5cb 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e5f69f7b241f21f0b85f7a62ccff9de841875828 +Subproject commit 620e5cb6954b4fdb1be1cf38b83844ae319600d8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.0.0 RC1 test builds available
Hi *, for the upcoming new version 4.0.0, the RC1 builds now start to be available on pre-releases. This build is slated to be first release candidate build on the way towards 4.0.0, please refer to our release plan timings here: http://wiki.documentfoundation.org/ReleasePlan#4.0_release Builds are now being uploaded to a public (but non-mirrored - so don't spread news too widely!) place, as soon as they're available. Grab them here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report *critical* bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. NOTE: This build is in a release configuration and _will_ replace your existing LibreOffice install on Windows. The list of fixed bugs relative to 3.6.3 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-release-4.0.0.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failure to build 3.6 branch
Le 09/01/13 23:19, Lubos Lunak a écrit :
Hi Lubos,
Should be fixed now.
This still fails for me on Mac today with a fresh pull and complete
clean. First few lines of error message below :
/Users/Shared/Repos/LO/core/unotools/source/misc/fontcvt.cxx:1535:
internal compiler error: Segmentation fault: 11
Please submit a full bug report,
with preprocessed source if appropriate.
See URL:http://developer.apple.com/bugreporter for instructions.
{standard input}:4636:non-relocatable subtraction expression,
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr minus L011$pb
{standard input}:4636:symbol:
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr can't be undefined in a
subtraction expression
{standard input}:1842:non-relocatable subtraction expression,
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr minus L004$pb
{standard input}:1842:symbol:
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr can't be undefined in a
subtraction expression
{standard input}:1814:non-relocatable subtraction expression,
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr minus L003$pb
{standard input}:1814:symbol:
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr can't be undefined in a
subtraction expression
{standard input}:8747:non-relocatable subtraction expression,
L___gxx_personality_v0$non_lazy_ptr minus L0
{standard input}:8747:symbol: L___gxx_personality_v0$non_lazy_ptr
can't be undefined in a subtraction expression
{standard input}:unknown:Undefined local symbol
L__ZTV23StarSymbolToMSMultiFont$non_lazy_ptr
{standard input}:unknown:Undefined local symbol
L___gxx_personality_v0$non_lazy_ptr
{standard input}:unknown:Undefined local symbol LASF0
{standard input}:unknown:Undefined local symbol LASF1
{standard input}:unknown:Undefined local symbol LASF2
{standard input}:unknown:Undefined local symbol LASF3
{standard input}:unknown:Undefined local symbol LASF4...ad nauseam
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failure to build 3.6 branch
Le 09/01/13 23:19, Lubos Lunak a écrit : Ooops, forgot to mention that I'm building from master, sorry. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bcd01e43810272e7219c44bafb3d40e6914c911d Author: Petr Mladek pmla...@suse.cz Date: Thu Jan 10 11:44:14 2013 +0100 Add Swedish hyphen dictionary provided by Niklas Johansson Change-Id: I0a425c066726e0364dce414f622106e954aa29d3 diff --git a/dictionaries b/dictionaries index f310b73..9cfd428 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit f310b731bbbaf968b513bea1dd460e5d96b0c61c +Subproject commit 9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .:
0 files changed New commits: commit fbd9b4b9977fc12d826a00f6c4b2c4563eb74ff7 Author: Petr Mladek pmla...@suse.cz Date: Thu Jan 10 11:28:41 2013 +0100 Updated core Project: dictionaries 9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/androidapp' - vcl/android
vcl/android/androidinst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b5956d061735306bd9b49d7aa99f3ecc98efa189
Author: Michael Meeks michael.me...@suse.com
Date: Thu Jan 10 11:14:33 2013 +
increase random default window size.
Change-Id: I960d11c6098681356fea0634970545aa9af9bacb
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index d7b5ea4..6bc7754 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -385,7 +385,7 @@ void AndroidSalInstance::GetWorkArea( Rectangle rRect )
{
if (!mpApp || !mpApp-window)
rRect = Rectangle( Point( 0, 0 ),
- Size( 800, 600 ) );
+ Size( 1280, 750 ) );
else
rRect = Rectangle( Point( 0, 0 ),
Size( ANativeWindow_getWidth( mpApp-window ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source scp2/source
desktop/source/deployment/manager/dp_manager.cxx |2 +-
scp2/source/ooo/common_brand.scp |8
scp2/source/ooo/profileitem_ooo.scp |9 +
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 8dd405d32cb331818dc8f9bd1af3c5a074100f0f
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 10 11:54:28 2013 +0100
fdo#58909: Missing BAK_EXTENSIONS bootstrap variable
daeed90f4586eb9533041fb89bee163a5193596c re-base on ALv2 code had
incorporated
from http://svn.apache.org/viewvc?view=revisionrevision=1172102 imported
patch extensions_i117681.patch the parts using BAK_EXTENSIONS in
desktop/source/deployment/manager/, but not the parts setting
BAK_EXTENSIONS in
scp2/source/ooo/.
Also, setting the stamp for bak in PackageManagerImpl::create needed to be
adapted to bee742eb7a0d5dfe23e61d9ee49a29286de90256 Fix sense of r/o
detection
code, and clean up and 61eeb689d7605a23c3e71c652b57ee65cf5b28dc fix
smoketest
- need to check read-only-ness of non-existent paths.
Change-Id: If7cc363b3cf21fd13fb467f5f672eda5312515c8
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 89e46c9..87c107c 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -379,7 +379,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
that-m_activePackages =
vnd.sun.star.expand:$BAK_EXTENSIONS/extensions;
that-m_registrationData = vnd.sun.star.expand:$BAK_EXTENSIONS;
that-m_registryCache = vnd.sun.star.expand:$BAK_EXTENSIONS/registry;
-stamp = vnd.sun.star.expand:$BAK_EXTENSIONS/stamp.sys;
+stamp = $BAK_EXTENSIONS;
}
else if (! context.match(vnd.sun.star.tdoc:/)) {
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index eae79e7..025ad7f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1180,6 +1180,14 @@ ProfileItem
gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
Value = ${$ORIGIN/ PROFILENAME(uno) :TMP_EXTENSIONS};
End
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
+ModuleID = gid_Module_Root_Brand;
+ProfileID = gid_Brand_Profile_Fundamental_Ini;
+Section = Bootstrap;
+Key = BAK_EXTENSIONS;
+Value = ${$ORIGIN/ PROFILENAME(uno) :TMP_EXTENSIONS};
+End
+
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
diff --git a/scp2/source/ooo/profileitem_ooo.scp
b/scp2/source/ooo/profileitem_ooo.scp
index 69ca5c6..abe5df4 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -166,6 +166,15 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
Value = ${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap)
:UserInstallation}/user/extensions/tmp;
End
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
+ProfileID = gid_Profile_Uno_Ini;
+ModuleID = gid_Module_Root;
+Section = Bootstrap;
+Order = 1;
+Key = BAK_EXTENSIONS;
+Value = ${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap)
:UserInstallation}/user/extensions/bak;
+End
+
ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - lingucomponent/source linguistic/inc linguistic/source linguistic/workben
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |8 +-
lingucomponent/source/lingutil/lingutil.cxx|2
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm|4 -
lingucomponent/source/spellcheck/spell/sspellimp.cxx |4 -
lingucomponent/source/thesaurus/libnth/nthesimp.cxx|4 -
linguistic/inc/linguistic/misc.hxx | 18
linguistic/source/convdic.cxx |2
linguistic/source/convdiclist.cxx |2
linguistic/source/dicimp.cxx |7 +
linguistic/source/dlistimp.cxx |6 -
linguistic/source/gciterator.cxx |6 -
linguistic/source/hyphdsp.cxx | 18 ++--
linguistic/source/lngsvcmgr.cxx| 10 +-
linguistic/source/misc.cxx | 38
--
linguistic/source/spelldsp.cxx | 14 +--
linguistic/source/spelldta.cxx |4 -
linguistic/source/thesdsp.cxx | 10 +-
linguistic/workben/sspellimp.cxx |4 -
18 files changed, 106 insertions(+), 55 deletions(-)
New commits:
commit f4078cb3a2366263227328a53e6cab4631e04bd6
Author: Eike Rathke er...@redhat.com
Date: Wed Jan 9 16:48:52 2013 +0100
resolved fdo#58503 restore awkward handling of empty locale for legacy
Partly reverts d7a5ec62e91ce3dc5b784815254218f16181f676
An empty locale was treated as LANGUAGE_NONE, effectively being
interpreted as absence or undetermined or multiple or all depending on
context. Restore this behavior as it was an undocumented feature of the
API.
Change-Id: I256b352961f09e41cadb3e44c9ef01ee7677fd31
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index e7fe7a4..990b45b 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -485,13 +485,13 @@ Reference XHyphenatedWord SAL_CALL
Hyphenator::hyphenate( const ::rtl::OUStri
sal_Int16 nPos = (sal_Int16) ((nHyphenationPosAltHyph
nHyphenationPos) ?
nHyphenationPosAltHyph : nHyphenationPos);
// dicretionary hyphenation
-xRes = HyphenatedWord::CreateHyphenatedWord( aWord,
LanguageTag( aLocale ).getLanguageType(), nPos,
+xRes = HyphenatedWord::CreateHyphenatedWord( aWord,
LinguLocaleToLanguage( aLocale ), nPos,
aWord.replaceAt(nHyphenationPosAlt + 1,
cut[nHyphenationPos], repHyph),
(sal_Int16) nHyphenationPosAltHyph);
}
else
{
-xRes = HyphenatedWord::CreateHyphenatedWord( aWord,
LanguageTag( aLocale ).getLanguageType(),
+xRes = HyphenatedWord::CreateHyphenatedWord( aWord,
LinguLocaleToLanguage( aLocale ),
(sal_Int16)nHyphenationPos, aWord, (sal_Int16)
nHyphenationPos);
}
}
@@ -542,7 +542,7 @@ Reference XPossibleHyphens SAL_CALL
Hyphenator::createPossibleHyphens( const
//well as hyphenate
if (aWord.getLength() minLen)
{
-return PossibleHyphens::CreatePossibleHyphens( aWord, LanguageTag(
aLocale ).getLanguageType(),
+return PossibleHyphens::CreatePossibleHyphens( aWord,
LinguLocaleToLanguage( aLocale ),
aWord, Sequence sal_Int16 () );
}
@@ -689,7 +689,7 @@ Reference XPossibleHyphens SAL_CALL
Hyphenator::createPossibleHyphens( const
OUString hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
Reference XPossibleHyphens xRes =
PossibleHyphens::CreatePossibleHyphens(
-aWord, LanguageTag( aLocale ).getLanguageType(), hyphenatedWord,
aHyphPos);
+aWord, LinguLocaleToLanguage( aLocale ), hyphenatedWord, aHyphPos);
delete[] hyphens;
delete[] lcword;
diff --git a/lingucomponent/source/lingutil/lingutil.cxx
b/lingucomponent/source/lingutil/lingutil.cxx
index 194f0b7..8754442 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -216,7 +216,7 @@ void MergeNewStyleDicsAndOldStyleDics(
{
LanguageType nLang = LanguageTag( aIt2-aLocaleNames[0]
).getLanguageType();
-if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
+if (nLang == LANGUAGE_DONTKNOW || linguistic::LinguIsUnspecified(
nLang))
{
OSL_FAIL( old
[REVIEW 4-0] Re: Adding hyphenation patterns for Swedish
Hi Niklas, I have added the dictionary into master, see http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b We need one review to get it into 4-0 branch. Thanks for the nice improvement. Best Regards, Petr Niklas Johansson píše v Po 07. 01. 2013 v 20:02 +0100: What would be the easiest way to add the hyphenation patterns bundled with LibreOffice? I've updated the hyphenation extension on the LibreOffice extension site: http://extensions.libreoffice.org/extension-center/swedish-hyphenation Regards, Niklas Johansson Petr Mladek skrev 2012-12-03 12:25: Niklas Johansson píše v Ne 02. 12. 2012 v 21:07 +0100: I thought I would add Swedish hyphenation patterns to the next release of LibreOffice. The plan was to do it together with an update of the spelling dictionary that is planed in mid January. Sounds great. Since Swedish doesn't have any patterns bundled today, will there be any problems with the feature freeze? Or will it be possible to add it together with the update of the spelling dictionary? It should not be a problem. We are less strict in this area. I am not aware about any breakage or regression caused by updating or adding a dictionary. We are looking forward to update and add the dictionary. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: resolved fdo#58503 restore awkward handling of empty locale ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1616 -- To view, visit https://gerrit.libreoffice.org/1616 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I256b352961f09e41cadb3e44c9ef01ee7677fd31 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||45600 --- Comment #194 from Michael Meeks michael.me...@novell.com --- Added - missing jump-list in Windows 7 - apparently a rather annoying regression. -- 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: Failure to build 3.6 branch
On Thu, 2013-01-10 at 11:38 +0100, Alexander Thurgood wrote: /Users/Shared/Repos/LO/core/unotools/source/misc/fontcvt.cxx:1535: internal compiler error: Segmentation fault: 11 Please submit a full bug report, I wonder if that file has grown too big for your toolchain. Try splitting up the file into two and see if you can get it to compile that way. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5af51534d0bca3fdf5b9758287ce9e23a89ff117 Author: Petr Mladek pmla...@suse.cz Date: Thu Jan 10 11:28:41 2013 +0100 Updated core Project: dictionaries 5cf7cd4323ac7ff01c317951c6cb9d35f5647235 diff --git a/dictionaries b/dictionaries index 7e895dc..5cf7cd4 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7e895dc439c87d229b7396076fdd8945b3b51f3f +Subproject commit 5cf7cd4323ac7ff01c317951c6cb9d35f5647235 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58909, which changed state. Bug 58909 Summary: Extension upgrade fails with error Cannot create folder https://bugs.freedesktop.org/show_bug.cgi?id=58909 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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: Failure to build 3.6 branch
Le 10/01/13 12:24, Caolán McNamara a écrit : Hi Caolán, I wonder if that file has grown too big for your toolchain. Try splitting up the file into two and see if you can get it to compile that way. Hmm, if I try and build just unotools, I get the following error when building unotools_inc : gb_Deliver-deliver : file does not exist in solver, and cannot be delivered : /Users/Shared/Repos/LO/core/solver/unxmacxi.pro/lib/libcomphelpgcc3.dylib It appears that libcomphelpgcc3.dylib is in /solver/unxmacxi and not unxmacxi.pro. Copying that file to unxmacxi and re-attempting make in unotools then throws another error that libtllo.dylib does not exist in solver. Sorry, but I'm a bit lost here. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docstream.py
src/docrecord.py | 27 +++ src/docstream.py |5 - 2 files changed, 31 insertions(+), 1 deletion(-) New commits: commit 81b1156dba0f77787ad0171be85e4f5c59b751de Author: Miklos Vajna vmik...@suse.cz Date: Thu Jan 10 12:32:25 2013 +0100 dump PlcfGram diff --git a/src/docrecord.py b/src/docrecord.py index 6dccd2d..d5742f7 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -2358,4 +2358,31 @@ class PlcfSpl(DOCDirStream, PLC): print '/aCP' print '/plcfSpl' +class PlcfGram(DOCDirStream, PLC): +The PlcfGram structure is a Plc structure whose data elements are GrammarSpls structures. +def __init__(self, mainStream): +DOCDirStream.__init__(self, mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream = mainStream) +PLC.__init__(self, mainStream.lcbPlcfGram, 2) # 2 is defined by 2.8.21 +self.pos = mainStream.fcPlcfGram +self.size = mainStream.lcbPlcfGram + +def dump(self): +print 'plcfGram type=PlcfGram offset=%d size=%d bytes' % (self.pos, self.size) +offset = self.mainStream.fcMin +pos = self.pos +for i in range(self.getElements()): +# aCp +start = self.getuInt32(pos = pos) +end = self.getuInt32(pos = pos + 4) +print 'aCP index=%d start=%d end=%d' % (i, start, end) +pos += 4 + +# aGrammarSpls +aGrammarSpls = SPLS(GrammarSpls, self, self.getOffset(self.pos, i)) +aGrammarSpls.dump() + +print 'transformed value=%s/' % self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end, logicalLength = True)) +print '/aCP' +print '/plcfGram' + # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: diff --git a/src/docstream.py b/src/docstream.py index a690b8d..c5c9fcc 100644 --- a/src/docstream.py +++ b/src/docstream.py @@ -384,7 +384,7 @@ class WordDocumentStream(DOCDirStream): [fcPlcfAsumy], [lcbPlcfAsumy], [fcPlcfGram], -[lcbPlcfGram], +[lcbPlcfGram, self.handleLcbPlcfGram], [fcSttbListNames], [lcbSttbListNames], [fcSttbfUssr], @@ -515,6 +515,9 @@ class WordDocumentStream(DOCDirStream): def handleLcbPlcfSpl(self): docrecord.PlcfSpl(self).dump() +def handleLcbPlcfGram(self): +docrecord.PlcfGram(self).dump() + def dumpFibRgFcLcb97(self, name): print '%s type=FibRgFcLcb97 size=744 bytes' % name self.__dumpFibRgFcLcb97() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Joren De Cuyper joren.libreoff...@telenet.be changed: What|Removed |Added Depends on|59141 | -- 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: Failure to build 3.6 branch
On Thursday 10 of January 2013, Alexander Thurgood wrote: Le 10/01/13 12:24, Caolán McNamara a écrit : Hi Caolán, I wonder if that file has grown too big for your toolchain. Try splitting up the file into two and see if you can get it to compile that way. Hmm, if I try and build just unotools, I get the following error when building unotools_inc : gb_Deliver-deliver : file does not exist in solver, and cannot be delivered : /Users/Shared/Repos/LO/core/solver/unxmacxi.pro/lib/libcomphelpgcc3.dylib make unotools.all -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - desktop/source scp2/source
desktop/source/deployment/manager/dp_manager.cxx |2 +-
scp2/source/ooo/common_brand.scp |8
scp2/source/ooo/profileitem_ooo.scp |9 +
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 147ce2ebeeac686d0a8e9e3d6d804aeba0fcbcdc
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 10 11:54:28 2013 +0100
fdo#58909: Missing BAK_EXTENSIONS bootstrap variable
daeed90f4586eb9533041fb89bee163a5193596c re-base on ALv2 code had
incorporated
from http://svn.apache.org/viewvc?view=revisionrevision=1172102 imported
patch extensions_i117681.patch the parts using BAK_EXTENSIONS in
desktop/source/deployment/manager/, but not the parts setting
BAK_EXTENSIONS in
scp2/source/ooo/.
Also, setting the stamp for bak in PackageManagerImpl::create needed to be
adapted to bee742eb7a0d5dfe23e61d9ee49a29286de90256 Fix sense of r/o
detection
code, and clean up and 61eeb689d7605a23c3e71c652b57ee65cf5b28dc fix
smoketest
- need to check read-only-ness of non-existent paths.
(cherry picked from commit 8dd405d32cb331818dc8f9bd1af3c5a074100f0f)
Conflicts:
desktop/source/deployment/manager/dp_manager.cxx
Change-Id: Ie73ce50b6c26bbee6f3b7230a4d163715180ef52
Reviewed-on: https://gerrit.libreoffice.org/1626
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index ba67f9e..b9949df 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -398,7 +398,7 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
vnd.sun.star.expand:$BAK_EXTENSIONS);
that-m_registryCache = OUSTR(
vnd.sun.star.expand:$BAK_EXTENSIONS/registry);
-stamp = OUSTR(vnd.sun.star.expand:$BAK_EXTENSIONS/stamp.sys);
+stamp = OUSTR($BAK_EXTENSIONS);
}
else if (! context.matchAsciiL(
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7ba7e76..0c21df8 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1198,6 +1198,14 @@ ProfileItem
gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
Value = ${$ORIGIN/ PROFILENAME(uno) :TMP_EXTENSIONS};
End
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
+ModuleID = gid_Module_Root_Brand;
+ProfileID = gid_Brand_Profile_Fundamental_Ini;
+Section = Bootstrap;
+Key = BAK_EXTENSIONS;
+Value = ${$ORIGIN/ PROFILENAME(uno) :TMP_EXTENSIONS};
+End
+
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
diff --git a/scp2/source/ooo/profileitem_ooo.scp
b/scp2/source/ooo/profileitem_ooo.scp
index 69ca5c6..abe5df4 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -166,6 +166,15 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
Value = ${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap)
:UserInstallation}/user/extensions/tmp;
End
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
+ProfileID = gid_Profile_Uno_Ini;
+ModuleID = gid_Module_Root;
+Section = Bootstrap;
+Order = 1;
+Key = BAK_EXTENSIONS;
+Value = ${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap)
:UserInstallation}/user/extensions/bak;
+End
+
ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#58909: Missing BAK_EXTENSIONS bootstrap variable
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1626 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1626 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie73ce50b6c26bbee6f3b7230a4d163715180ef52 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Added Table Properties 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/1511 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1511 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I019b99e6194458b8b311b0cc3f2e231ef898ece0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@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] .: Branch 'libreoffice-4-0' - setup_native/source
setup_native/source/packinfo/spellchecker_selection.pl |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9299707ce09077f10c49ec836e26f6197ed20a1a
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 9 15:09:58 2013 +0100
Always default-select English dictionary
It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary. This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 fdo#53009: For msi
installer, only default-select a subset of dictionaries only those
dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list en even though an
English dictionary should always be default-installed.
Quoting Andras Timar ati...@suse.com: AFAIK en-US localization with
English
dictionaries is always installed in all 3 supported platforms by default.
On
Windows default install should always select en-US and English
dictionaries. If
it does not do so under certain circumstances, then it is a bug in my
opinion.
We removed en-US entry from the spellchecker selection file for this very
reason. It would have only bloated Mac and Linux langpacks.
So this fix simply makes sure that en is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine
which
dictionaries to select by default.
Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
(cherry picked from commit d8385c2cfc63b25414f37699faf0143ee9f5ded9)
Reviewed-on: https://gerrit.libreoffice.org/1614
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/setup_native/source/packinfo/spellchecker_selection.pl
b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@ while () {
@{$map{$lang}} = ();
} else {
@{$map{$lang}} = split(/,/, $dicts);
-$max = max($max, scalar(@{$map{$lang}}));
}
+push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+$max = max($max, scalar(@{$map{$lang}}));
}
++$max;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - setup_native/source
setup_native/source/packinfo/spellchecker_selection.pl |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 86ca8cfe7ff5bfb889f3d65b1647839965fc88a7
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 9 15:09:58 2013 +0100
Always default-select English dictionary
It was discovered that on a Russian Windows, by default only Russian and
German dictionaries would be installed, but no English dictionary. This is
because since e2fac98819c00b4fb50f9de9d0f32d20092f3191 fdo#53009: For msi
installer, only default-select a subset of dictionaries only those
dictionaries
mentioned in setup_native/source/packinfo/spellchecker_selection.txt were
default-selected, but it apparently was a misunderstanding that
spellcheker_selection.txt for many locales does not list en even though an
English dictionary should always be default-installed.
Quoting Andras Timar ati...@suse.com: AFAIK en-US localization with
English
dictionaries is always installed in all 3 supported platforms by default.
On
Windows default install should always select en-US and English
dictionaries. If
it does not do so under certain circumstances, then it is a bug in my
opinion.
We removed en-US entry from the spellchecker selection file for this very
reason. It would have only bloated Mac and Linux langpacks.
So this fix simply makes sure that en is included in every line of the
generated spellchecker_selection.hxx that is used by
setup_native/source/win32/customactions/sellang/sellang.cxx to determine
which
dictionaries to select by default.
Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8
(cherry picked from commit d8385c2cfc63b25414f37699faf0143ee9f5ded9)
Reviewed-on: https://gerrit.libreoffice.org/1613
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/setup_native/source/packinfo/spellchecker_selection.pl
b/setup_native/source/packinfo/spellchecker_selection.pl
index b30a843..87f7cc2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.pl
+++ b/setup_native/source/packinfo/spellchecker_selection.pl
@@ -27,8 +27,9 @@ while () {
@{$map{$lang}} = ();
} else {
@{$map{$lang}} = split(/,/, $dicts);
-$max = max($max, scalar(@{$map{$lang}}));
}
+push(@{$map{$lang}}, ('en')) unless grep($_ eq 'en', @{$map{$lang}});
+$max = max($max, scalar(@{$map{$lang}}));
}
++$max;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: Always default-select English dictionary
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1614 Approvals: Caolán McNamara: Verified; Looks good to me, approved Eike Rathke: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1614 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: Always default-select English dictionary
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1613 Approvals: Caolán McNamara: Verified; Looks good to me, approved Eike Rathke: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1613 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3db68585dc6269a7db2f6cbf6b79796dc09d05e8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dcd974c3ca70065ba1d984ad6bd5514848cd58a9 Author: Rob Snelders programm...@ertai.nl Date: Thu Dec 20 21:40:22 2012 +0100 - fdo#46460 - Missing Circles and Ovals toolbar Change-Id: I08f2cef9c16ac998663f634653dad37a201f50c5 Reviewed-on: https://gerrit.libreoffice.org/1456 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index b035510..42358d2d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -252,7 +252,7 @@ valuefalse/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean -valuetrue/value +valuefalse/value /prop /node node oor:name=private:resource/toolbar/fontworkobjectbar oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: - fdo#46460 - Missing Circles and Ovals toolbar
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1627 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/1627/1 - fdo#46460 - Missing Circles and Ovals toolbar Change-Id: I08f2cef9c16ac998663f634653dad37a201f50c5 Reviewed-on: https://gerrit.libreoffice.org/1456 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit dcd974c3ca70065ba1d984ad6bd5514848cd58a9) --- M officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu index b035510..42358d2d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu @@ -252,7 +252,7 @@ valuefalse/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean -valuetrue/value +valuefalse/value /prop /node node oor:name=private:resource/toolbar/fontworkobjectbar oor:op=replace -- To view, visit https://gerrit.libreoffice.org/1627 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08f2cef9c16ac998663f634653dad37a201f50c5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Rob Snelders libreoff...@ertai.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] - fdo#46460 - Missing Circles and Ovals toolbar
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1456 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1456 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08f2cef9c16ac998663f634653dad37a201f50c5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: slideshow/Library_OGLTrans.mk slideshow/source
slideshow/Library_OGLTrans.mk |2
slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.cxx | 142 --
2 files changed, 1 insertion(+), 143 deletions(-)
New commits:
commit 6312695ad694598951f2cdd4ac26c53457fedb79
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 10 14:55:33 2013 +0200
The unx and win OGLTrans_Shaders.cxx files were effectively identical
Just some OSL_TRACE/SAL_INFO changes in the unx one. And it isn't
like the win one would actually compile for Windows as is anyway, as
it unconditionally uses glX stuff. So certainly it is better to have
just one copy, and if we want to make the OpenGL transitions build on
Windows then add ifdefs for Windows to it.
Change-Id: If6887e24a0fc03c7e0e77f003d08feb51c264f30
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index bae4d99..44db60b 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -86,7 +86,7 @@ $(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\
))
$(eval $(call gb_Library_add_exception_objects,OGLTrans,\
-slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders \
+slideshow/source/engine/OGLTrans/unx/OGLTrans_Shaders \
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl \
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl \
))
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.cxx
b/slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.cxx
deleted file mode 100644
index c1beae1..000
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders.cxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include osl/diagnose.hxx
-
-#include OGLTrans_Shaders.hxx
-
-namespace unx
-{
-#include GL/glx.h
-#include GL/glxext.h
-}
-
-bool OGLShaders::cbInitialized = false;
-
-#ifdef GL_VERSION_2_0
-
-PFNGLCREATESHADERPROC OGLShaders::glCreateShader = NULL;
-PFNGLSHADERSOURCEPROC OGLShaders::glShaderSource = NULL;
-PFNGLCOMPILESHADERPROC OGLShaders::glCompileShader = NULL;
-PFNGLGETSHADERIVPROC OGLShaders::glGetShaderiv = NULL;
-PFNGLGETSHADERINFOLOGPROC OGLShaders::glGetShaderInfoLog = NULL;
-PFNGLDELETESHADERPROC OGLShaders::glDeleteShader = NULL;
-PFNGLCREATEPROGRAMPROC OGLShaders::glCreateProgram = NULL;
-PFNGLATTACHSHADERPROC OGLShaders::glAttachShader = NULL;
-PFNGLLINKPROGRAMPROC OGLShaders::glLinkProgram = NULL;
-PFNGLGETPROGRAMIVPROC OGLShaders::glGetProgramiv = NULL;
-PFNGLGETPROGRAMINFOLOGPROC OGLShaders::glGetProgramInfoLog = NULL;
-PFNGLUSEPROGRAMPROC OGLShaders::glUseProgram = NULL;
-PFNGLDELETEPROGRAMPROC OGLShaders::glDeleteProgram = NULL;
-PFNGLGETUNIFORMLOCATIONPROC OGLShaders::glGetUniformLocation = NULL;
-PFNGLUNIFORM1IPROC OGLShaders::glUniform1i = NULL;
-PFNGLUNIFORM1FPROC OGLShaders::glUniform1f = NULL;
-#endif
-
-bool OGLShaders::Initialize()
-{
-#ifdef GL_VERSION_2_0
-if( !cbInitialized ) {
-glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress(
(unsigned char *) glCreateShader );
-glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress(
(unsigned char *) glShaderSource );
-glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress(
(unsigned char *) glCompileShader );
-glGetShaderiv = (PFNGLGETSHADERIVPROC) unx::glXGetProcAddress(
(unsigned char *) glGetShaderiv );
-glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)
unx::glXGetProcAddress( (unsigned char *) glGetShaderInfoLog );
-glDeleteShader = (PFNGLDELETESHADERPROC) unx::glXGetProcAddress(
(unsigned char *) glDeleteShader );
-glCreateProgram = (PFNGLCREATEPROGRAMPROC) unx::glXGetProcAddress(
(unsigned char *) glCreateProgram );
-glAttachShader = (PFNGLATTACHSHADERPROC)
WITH_MOZAB4WIN needing msvc?80.dll
Hello, as far as I understand it, the current problem with W2008R2_20-With-Symbol-Bytemark-Hosting [*] , is caused by needing specifically *80 msvc dlls for WITH_MOZAB4WIN (grep under scp2 for the only 'msvcp' there). Does somebody have any idea why it's specifically this version and if it's really needed this way? It dates back to 2009, so repo history is as usually useless. [*] ERROR: The following files could not be found: ERROR: File not found: Microsoft.VC80.CRT.manifest ERROR: File not found: msvcp80.dll ERROR: File not found: msvcr80.dll -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] Translation of the names of the keys on Windows
Hi,
here is the Slovenian replacement table, please add it to the code:
static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
{
{ KEY_ESC, Ubežnica },
{ KEY_BACK, Vračalka },
{ KEY_ENTER, Vnašalka },
{ KEY_SPACEBAR, Preslednica },
{ KEY_HOME, Začetek },
{ KEY_UP, Navzgor },
{ KEY_PAGEUP, Prejšnja stran },
{ KEY_LEFT, Levo },
{ KEY_RIGHT, Desno },
{ KEY_END, Konec },
{ KEY_DOWN, Navzdol },
{ KEY_PAGEDOWN, Naslednja stran },
{ KEY_INSERT, Vrivalka },
{ KEY_DELETE, Brisalka },
{ KEY_CONTROL, Krmilka },
{ KEY_SHIFT, Dvigalka },
{ KEY_ALT, Izmenjalka },
};
Please also add the following line to the aKeyboards[]:
{ sl, aImplReplacements_Slovenian,
SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
Please notify when this is in, so I can check that special characters look ok.
Thanks, m.
2013/1/8 Jesús Corrius je...@softcatala.org:
Hi all,
Since today it's possible to provide custom translations of the names of
the keys on Windows. This is useful because Windows gets the name of the
key from the keyboard layout and, in some cases, they don't match properly.
For example, Catalan users don't have a proper keyboard layout (well, they
do have one but it's just an alias for the Spanish keyboard) so if a user
uses the Spanish or French keyboard, the name of the keys in the UI will be
in Spanish or French, but never in Catalan. I am sure other languages have
this problem too.
So it's now possible to provide custom names for keys for Windows using the
same way we do for Linux. The file to modify is the following one and the
process is exactly the same:
http://cgit.freedesktop.org/libreoffice/core/tree/vcl/win/source/window/keynames.cxx
If you want to implement this, but you are not a developer, just send me
the name of the keys with its translation and I will apply the changes
myself.
Thanks and Happy 2013 to everybody!
--
Jesús Corrius je...@softcatala.org
--
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] .: sdext/source
sdext/source/presenter/PresenterSlideSorter.cxx |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit eb0d07d3f2937315700dabf72d366f5ef4d4200d Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Wed Dec 12 13:26:55 2012 +0300 fdo#57422 - presenter console RTL support needs completion This patch will fix the text direction of the text that appears when the mouse come over the slide in Slide sorter view. Change-Id: I2d3c5563b22dcd40ae4f70ed0ed06ad17f6c4132 Change-Id: I812e011b4e0aaeeb7ec6114a655240effc8c606a Reviewed-on: https://gerrit.libreoffice.org/1284 Reviewed-by: Faisal al-otaibi fmalota...@kacst.edu.sa Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index eb0ce72..4148152 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -1583,12 +1583,10 @@ Referencerendering::XBitmap PresenterSlideSorter::MouseOverManager::CreateBitm rendering::CompositeOperation::SOURCE); PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont-mnColor); -xBitmapCanvas-drawText( -aContext, -mpFont-mxFont, +xBitmapCanvas-drawTextLayout ( +xLayout, aViewState, -aRenderState, -rendering::TextDirection::WEAK_LEFT_TO_RIGHT); +aRenderState); } return xBitmap; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterToolBar.cxx | 162 +++-
1 file changed, 41 insertions(+), 121 deletions(-)
New commits:
commit b0a827aa839afefd580c438ea72a7e5ca0b88aea
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Sun Dec 23 12:18:20 2012 +0300
Fix some errors and remove duplicate code on Presenter
Fix the toolbar text if the interface were RTL.
Remove duplicate code from PresenterToolBar.cxx
Change-Id: Icd6f71ce2daa896494c8efe76779d49e16c547bf
Reviewed-on: https://gerrit.libreoffice.org/1474
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sdext/source/presenter/PresenterToolBar.cxx
b/sdext/source/presenter/PresenterToolBar.cxx
index ac69c76..34dfb7e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1760,47 +1760,21 @@ void Text::Paint (
aContext,
rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
0));
-/** this responsible of the toolbar and the zoom
-that in the note mode.
-check whether RTL interface or not. */
-if(!Application::GetSettings().GetLayoutRTL()){
-geometry::RealRectangle2D aBox (xLayout-queryTextBounds());
-const double nTextWidth = aBox.X2 - aBox.X1;
-const double nY = rBoundingBox.Y + rBoundingBox.Height - aBox.Y2;
-const double nX = rBoundingBox.X + (rBoundingBox.Width - nTextWidth)/2;
-
-rendering::RenderState aRenderState(
-geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
-NULL,
-Sequencedouble(4),
-rendering::CompositeOperation::SOURCE);
-PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont-mnColor);
-rxCanvas-drawText(
-aContext,
-mpFont-mxFont,
-rViewState,
-aRenderState,
-rendering::TextDirection::WEAK_LEFT_TO_RIGHT);
-}
-else {
-geometry::RealRectangle2D aBox (xLayout-queryTextBounds());
-const double nTextWidth = aBox.X2 - aBox.X1;
-const double nY = rBoundingBox.Y + rBoundingBox.Height - aBox.Y2;
-const double nX = rBoundingBox.X + (rBoundingBox.Width + nTextWidth)/2;
-
-rendering::RenderState aRenderState(
-geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
-NULL,
-Sequencedouble(4),
-rendering::CompositeOperation::SOURCE);
-PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont-mnColor);
-rxCanvas-drawText(
-aContext,
-mpFont-mxFont,
-rViewState,
-aRenderState,
-rendering::TextDirection::WEAK_RIGHT_TO_LEFT);
-}
+geometry::RealRectangle2D aBox (xLayout-queryTextBounds());
+const double nTextWidth = aBox.X2 - aBox.X1;
+const double nY = rBoundingBox.Y + rBoundingBox.Height - aBox.Y2;
+const double nX = rBoundingBox.X + (rBoundingBox.Width - nTextWidth)/2;
+
+rendering::RenderState aRenderState(
+geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
+NULL,
+Sequencedouble(4),
+rendering::CompositeOperation::SOURCE);
+PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont-mnColor);
+rxCanvas-drawTextLayout(
+xLayout,
+rViewState,
+aRenderState);
}
geometry::RealRectangle2D Text::GetBoundingBox (const
Referencerendering::XCanvas rxCanvas)
@@ -1811,25 +1785,13 @@ geometry::RealRectangle2D Text::GetBoundingBox (const
Referencerendering::XCanv
mpFont-PrepareFont(rxCanvas);
if (mpFont-mxFont.is())
{
-/// check whether RTL interface or not
-if(!Application::GetSettings().GetLayoutRTL()){
-rendering::StringContext aContext (msText, 0,
msText.getLength());
-Referencerendering::XTextLayout xLayout (
-mpFont-mxFont-createTextLayout(
-aContext,
-rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
-0));
-return xLayout-queryTextBounds();
-}
-else {
-rendering::StringContext aContext (msText, 0,
msText.getLength());
-Referencerendering::XTextLayout xLayout (
-mpFont-mxFont-createTextLayout(
-aContext,
-rendering::TextDirection::WEAK_RIGHT_TO_LEFT,
-0));
-return xLayout-queryTextBounds();
-}
+rendering::StringContext aContext (msText, 0, msText.getLength());
+Referencerendering::XTextLayout xLayout (
+mpFont-mxFont-createTextLayout(
+aContext,
+rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
+0));
+return xLayout-queryTextBounds();
}
}
[PUSHED] fdo#57422 - presenter console RTL support needs completion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1284 Approvals: Faisal al-otaibi: Looks good to me, but someone else must approve Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1284 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I812e011b4e0aaeeb7ec6114a655240effc8c606a Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulelah Alarifi asalar...@kacst.edu.sa Gerrit-Reviewer: Abdulelah Alarifi asalar...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Faisal al-otaibi fmalota...@kacst.edu.sa Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix some errors and remove duplicate code on Presenter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1474 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1474 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd6f71ce2daa896494c8efe76779d49e16c547bf Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Faisal al-otaibi fmalota...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: WITH_MOZAB4WIN needing msvc?80.dll
On 10/01/13 14:01, Lubos Lunak wrote: Hello, as far as I understand it, the current problem with W2008R2_20-With-Symbol-Bytemark-Hosting [*] , is caused by needing specifically *80 msvc dlls for WITH_MOZAB4WIN (grep under scp2 for the only 'msvcp' there). Does somebody have any idea why it's specifically this version and if it's really needed this way? It dates back to 2009, so repo history is as usually useless. AFAIK the Mozilla stuff (moz/) does not build with MSVC 2008, only with MSVC2005; that's why it has the unique distinction of allowing a binary zip file containing all mozilla libraries to be used instead of building it (--disable-build-mozilla); actually i've never built moz on windows so i don't even know what you would need. since it's built with MSVC 2005 and every release of MSVC brings a new incompatible version of msvcrt libraries, the installer wants to bundles these ones if you don't disable mozilla completely: [*] ERROR: The following files could not be found: ERROR: File not found: Microsoft.VC80.CRT.manifest ERROR: File not found: msvcp80.dll ERROR: File not found: msvcr80.dll ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FYI: Make for faster windows build
On Thursday 10 of January 2013, Noel Grandin wrote: I think the WINDOWS32 #define is for building a native windows binary. (There is also stuff in there for building under AmigaOS and DOS, the gnumake code is pretty grotty) The cywin stuff is probably using a #ifdef CYGWIN. I don't see anything cygwin-specific there, except for handling the cygwin shell. And I expect the WINDOWS32 code should work just fine for cygwin make as well. You can't use the Win32 API as-is under cygwin, because you need to call cygpath() on the path argument first to convert from the cygwin filesystem structure to the Win32 representation. i.e. from /cygdrive/C/libo to C:\libo I have not done this, apparently make always gets windows paths when building LO, or does somebody have a problem with this (builtins have (Built-in) prefix when doing verbose make)? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FYI: Make for faster windows build
On Thursday 10 of January 2013, Michael Meeks wrote: On Wed, 2013-01-09 at 20:01 +0100, Lubos Lunak wrote: Looks what I found under the tree! Faster make for Cygwin. Granted, I had put it there first, but still nice. Nice work ! :-) I'd love to see a configure option: --with-custom-gnumake that does the git clone, pre-builds, and uses our own gnumake (with the speedups). If I'm not mistaken, we need our custom make on Windows anyway, since LO build fails with the cygwin one for some reason (may or may not be our fault, I don't know). Moreover, this is most probably not going to work anyway, since it's the developer who runs the make, not the buildsystem (eventually, after we get rid of dmake). And Makefile.top has shown that make forwarding does not quite work as it should. Did you have any joy getting the fixes up-stream to gnumake ? ;-) I have not tried, the commands are rather LO-specific in some cases, so we need a patch anyway. I also consider it to be a bit of an ugly hack. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need confirmation about non-clearing of Character Styles
On Thu, 2013-01-10 at 10:55 +0100, Fernand Vanrie wrote: Sinds all or editors use LO 3.6.2 (before OO3.3) We have complains about the fact that parts of the text, who are formated with a Character Style, can not been cleared to no-formating, not by Clear Direct Formating (cntrl+M) There is a dirty work-around by applying the Default character style Paragraph Styles can been cleared Is this intentional behavior or a regression open for a issue ? My understanding is a) that its intentional, see http://lists.freedesktop.org/archives/ooo-build/2010-February/000540.html and the commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=6e690e0909459d46c53d17e7939891abea11e566 b) that paragraph styles are not cleared, i.e. the text should remain using the original paragraph and character styles, but any additional properties applied on top of that is reset to the underlying paragraph and character styles properties. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - configure.ac
configure.ac | 109 +--
1 file changed, 61 insertions(+), 48 deletions(-)
New commits:
commit 417943f071cc6c7ebe4dad69dfdec411cc7de975
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Jan 10 15:41:02 2013 +0200
Get rid of last actual TABs in this file
Change-Id: Ic92c47834add4f5d0350343e6b7ea8294477b495
diff --git a/configure.ac b/configure.ac
index 7267536..2ef61b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4575,6 +4575,8 @@ if test -z $GNUMAKE; then
AC_MSG_ERROR([not found. install GNU make.])
fi
+TAB=`printf '\t'`
+
AC_MSG_CHECKING([the GNU make version])
_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e
's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*1+\$2*100+\$3
}'`
@@ -4596,16 +4598,16 @@ elif test $_make_longver -ge 038100; then
fi
AC_MSG_CHECKING([for GNU make bug 20033])
TESTGMAKEBUG20033=`mktemp -d tmp.XX`
-cat $TESTGMAKEBUG20033/Makefile EOF
+$SED -e s/TAB/$TAB/ $TESTGMAKEBUG20033/Makefile EOF
A := \$(wildcard *.a)
.PHONY: all
all: \$(A:.a=.b)
- @echo survived bug20033. #dont kill these tabs, you will break the
Makefile
+TAB@echo survived bug20033. #dont kill these tabs, you will break the
Makefile
.PHONY: setup
setup:
- @touch 1.a 2.a 3.a 4.a 5.a 6.a
+TAB@touch 1.a 2.a 3.a 4.a 5.a 6.a
define d1
@echo lala \$(1)
@@ -4618,9 +4620,9 @@ define d2
endef
%.b : %.a
- \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
- \$(call d1,\$(CHECKSUM)),\
- \$(call d2,\$(CHECKSUM)))
+TAB\$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+TAB\$(call d1,\$(CHECKSUM)),\
+TAB\$(call d2,\$(CHECKSUM)))
EOF
if test -z `(cd $TESTGMAKEBUG20033 $GNUMAKE setup $GNUMAKE -j)|grep
survived`; then
no_parallelism_make=YES
@@ -4636,12 +4638,12 @@ fi
# find if gnumake support file function
AC_MSG_CHECKING([whether GNU make supports the 'file' function])
TESTGMAKEFILEFUNC=`mktemp -d -t tst.XX`
-cat $TESTGMAKEFILEFUNC/Makefile EOF
+$SED -e s/TAB/$TAB/ $TESTGMAKEFILEFUNC/Makefile EOF
\$(file test.txt,Success )
.PHONY: all
all:
- @cat test.txt
+TAB@cat test.txt
EOF
$GNUMAKE -C $TESTGMAKEFILEFUNC 2/dev/null 12
commit f340cbb6af86c7046d34202d2781a68b0d991001
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Jan 10 15:13:49 2013 +0200
De-tab
Change-Id: If0e93181affadd7c608625c494daf6da78ba9bbc
diff --git a/configure.ac b/configure.ac
index 60daa23..7267536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8293,9 +8293,9 @@ if test $with_system_nss = yes; then
libo_MINGW_CHECK_DLL([SSL3], [ssl3])
else
SYSTEM_NSS=NO
- NSS_MAJOR=3
- NSS_MINOR=13
- NSS_PATCH=5
+NSS_MAJOR=3
+NSS_MINOR=13
+NSS_PATCH=5
BUILD_TYPE=$BUILD_TYPE NSS
AC_MSG_RESULT([internal])
fi # system nss
commit dc7e074fc89677d87194b2836c18755788c22f1c
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Jan 10 15:09:46 2013 +0200
Make it possible to even try building the OpenGL transitions for Windows
Change-Id: Id9b688a22518aedb8959120f909832f0cd84b324
diff --git a/configure.ac b/configure.ac
index 688f2e4..60daa23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,8 +867,7 @@ AC_ARG_ENABLE(cairo-canvas,
AC_ARG_ENABLE(opengl,
AS_HELP_STRING([--disable-opengl],
-[Determines whether to build the OpenGL 3D slide transitions
component.]),
-,enable_opengl=yes)
+[Determines whether to build the OpenGL 3D slide transitions
component.]))
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
@@ -9702,47 +9701,59 @@ dnl
===
AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
ENABLE_OPENGL=
-if test $_os = Darwin; then
+if test -z $enable_opengl; then
+if test $_os = WINNT; then
+# By default disable the OpenGL transitions for Windows (the code
doesn't even compile
+# currently). In other words, use --enable-opengl only if you plan to
hack on that code for
+# Windows.
+enable_opengl=no
+else
+enable_opengl=yes
+fi
+fi
+
+if test x$enable_opengl = xno; then
+AC_MSG_RESULT([no])
+elif test $_os = Darwin; then
# We use frameworks on Mac OS X, no need for detail checks
ENABLE_OPENGL=TRUE
SYSTEM_MESA_HEADERS=YES
AC_MSG_RESULT([yes])
+elif test $_os = WINNT; then
+# Experimental: try to use OpenGL on Windows
+ENABLE_OPENGL=TRUE
+# We need the internal Mesa headers.
+SYSTEM_MESA_HEADERS=NO
+BUILD_TYPE=$BUILD_TYPE MESA
+AC_MSG_RESULT([yes])
else
-if test x$enable_opengl != xno; then
-if test $_os != WINNT; then
-save_LDFLAGS=$LDFLAGS
-
[Libreoffice-commits] .: 4 commits - bridges/Module_bridges.mk cross_tail_build/Makefile Makefile.in solenv/bin solenv/gbuild tail_build/Makefile
Makefile.in | 11 ++-- bridges/Module_bridges.mk |2 cross_tail_build/Makefile |1 solenv/bin/build.pl |2 solenv/gbuild/Module.mk | 61 +--- solenv/gbuild/extensions/post_SpeedUpTargets.mk | 38 +++--- solenv/gbuild/gbuild.mk | 10 --- solenv/gbuild/partial_build.mk |3 - tail_build/Makefile |1 9 files changed, 30 insertions(+), 99 deletions(-) New commits: commit ca6aefe0839286515c6874b917e980eaa6d03282 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jan 10 14:42:07 2013 +0100 these are phony targets Change-Id: I6de7842d5f03c6df5bffefdf77a90b5efee2fc78 diff --git a/Makefile.in b/Makefile.in index 3ed0cdd..d114d81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -422,6 +422,7 @@ check: dev-install subsequentcheck subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f $(SRC_ROOT)/Makefile.post $@ +.PHONY : unitcheck slowcheck debugrun translations unitcheck slowcheck debugrun translations: $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRC_ROOT)/Makefile.post $@ commit 26637fe8f241c6ae00f8fdcd5d2a647c7c3cb411 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Jan 9 21:37:10 2013 +0100 optimize for build targets in one place Change-Id: Ib886a323c1ade6dcd455a44d3dfc6702086416e3 diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index 14a7255..c1dbcef 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -96,7 +96,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ ) \ )) -ifeq ($(gb_FULL_BUILD),$(true)) +ifeq (,$(gb_STRIPPED_BUILD)) ifeq ($(strip $(bridges_SELECTED_BRIDGE)),) $(call gb_Output_error,no bridge selected for build: bailing out) endif diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 0f985bb..d20176a 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -89,7 +89,7 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) \ touch $@) -.PHONY : build all clean unitcheck slowcheck subsequentcheck showmodules translations +.PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations .DEFAULT_GOAL := all all : build unitcheck @@ -130,6 +130,9 @@ check : unitcheck slowcheck debugrun : $(call gb_Module_DEBUGRUNCOMMAND) +help : + @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt + showmodules : $(info $(strip $(gb_Module_ALLMODULES))) @true @@ -184,9 +187,6 @@ endif endef -gb_FULL_BUILD := $(if $(filter showmodules translations,$(MAKECMDGOALS)),$(false),$(true)) - -ifeq ($(gb_FULL_BUILD),$(true)) define gb_Module_add_target $(call gb_Module__read_targetfile,$(1),$(2),target) @@ -220,7 +220,6 @@ $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -endif define gb_Module_add_moduledir include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 6175cbc..406a69e 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -25,23 +25,31 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. - -# speed up if no target need to parse all modules -gb_SpeedUpTargets_WRAPPEDBUILD:= ifneq ($(strip $(MAKECMDGOALS)),) -ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/config_host.mk,$(MAKECMDGOALS)),) -gb_SpeedUpTargets_WRAPPEDBUILD:=T +# speed up depending on the target +gb_SpeedUpTargets_LEVEL_3 := debugrun help translations +gb_SpeedUpTargets_LEVEL_2 := showmodules $(gb_SpeedUpTargets_LEVEL_3) +gb_SpeedUpTargets_LEVEL_1 := clean showdeliverables $(gb_SpeedUpTargets_LEVEL_2) + +ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T)) +gb_FULLDEPS := + +ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_2),$(MAKECMDGOALS)),,T)) +gb_Module_add_target := +gb_Module_add_check_target := +gb_Module_add_slowcheck_target := +gb_Module_add_subsequentcheck_target := + +# Turns of check in bridges/Module_bridges.mk: +gb_STRIPPED_BUILD := $(true) + +ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_3),$(MAKECMDGOALS)),,T)) +gb_Module_add_moduledir := + +endif endif endif -ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),) -gb_Module_add_target= -gb_Module_add_check_target= -gb_Module_add_slowcheck_target= -gb_Module_add_subsequentcheck_target= -gb_Module_add_moduledir=
gb_COMPILERNOOPTFLAGS does not even obey the user passed CFLAGS
Hi guys, As written in subject the variable is used on multiple targets and it ignores the user defined cflags/cxxflags. This should never happen and all our targets should take into effect the user defined options too. I am not sure which variable I should append there, so could anyone check if the diff in attachment is right? Cheers Tom cxxflags.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/dbgui/sortkeydlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2c403c7f36561410418ebb9f86664e46a8c1c968 Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 10 13:49:20 2013 + Resolves: fdo#59112 re-scroll to current entry when dialog resized Change-Id: I96486f6edad11520bf9bb43b700b1716d9b2f170 diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 76a8747..211afcc 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -126,6 +126,7 @@ void ScSortKeyCtrl::setScrollRange() sal_Int32 nVisibleItems = m_rScrolledWindow.getVisibleChildSize().Height() / nScrollOffset; m_rVertScroll.SetPageSize( nVisibleItems - 1 ); m_rVertScroll.SetVisibleSize( nVisibleItems ); +m_rVertScroll.Scroll(); } // --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#59112 re-scroll to current entry when dialog r...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1628 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/1628/1 Resolves: fdo#59112 re-scroll to current entry when dialog resized Change-Id: I96486f6edad11520bf9bb43b700b1716d9b2f170 (cherry picked from commit 2c403c7f36561410418ebb9f86664e46a8c1c968) --- M sc/source/ui/dbgui/sortkeydlg.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 45d65ca..e71a48f 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -127,6 +127,7 @@ sal_Int32 nVisibleItems = m_rScrolledWindow.getVisibleChildSize().Height() / nScrollOffset; m_rVertScroll.SetPageSize( nVisibleItems - 1 ); m_rVertScroll.SetVisibleSize( nVisibleItems ); +m_rVertScroll.Scroll(); } // --- -- To view, visit https://gerrit.libreoffice.org/1628 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96486f6edad11520bf9bb43b700b1716d9b2f170 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On Thursday 10 of January 2013, Noel Grandin wrote: On 2013-01-09 19:58, Michael Meeks wrote: At least in my mind :-) but we're starting to bike-shed here... I didn't see anyone volunteering to do the actual batch cleanup there ;-) Regards, Michael. Created a proof-of-concept patch along with some unit tests and pushed to gerrit: https://gerrit.libreoffice.org/#/c/1625/ Can we please keep the discussion still here? Gerrit may be fine for pointing out technical details in the code, but it's not very suitable for discussions about anything beyond that. - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. - It's a question if we really need 'OUString::valueOfBool( foo )' instead of simply 'foo ? OUString( true ) : OUString( false )' (such a pity the string literals handling doesn't allow foo ? true : false' ). I wonder how many places in the code really need to convert a boolean to the hardcoded english string representation. - When more or less deprecating valueOf() this way, it has also float overloads, so something should be created for those too. - I'm still not sold on the naming, OUString::valueInt() doesn't say much and OUString::valueOfInt() feels cryptic. Can we please use something obvious that doesn't need decyphering, such as OUString::number() or OUString::fromInt() (as much as I still don't like the idea of harcoding the irrelevant type information in the name)? On Thursday 10 of January 2013, Noel Grandin wrote: On Wed, Jan 9, 2013 at 7:58 PM, Michael Meeks michael.me...@suse.comwrote: At least in my mind :-) but we're starting to bike-shed here... I didn't see anyone volunteering to do the actual batch cleanup there ;-) Doesn't sound that hard - some regular expression magic will do most of the work. I expect it won't, regular expressions can't tell what foo is in valueOf( foo ). Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gb_COMPILERNOOPTFLAGS does not even obey the user passed CFLAGS
On Thursday 10 of January 2013, Tomáš Chvátal wrote: Hi guys, As written in subject the variable is used on multiple targets and it ignores the user defined cflags/cxxflags. This should never happen and all our targets should take into effect the user defined options too. I am not sure which variable I should append there, so could anyone check if the diff in attachment is right? It doesn't look right. CXXFLAGS should always get used for building .cxx sources, so this should have no effect, moreover gb_COMPILERNOOPTFLAGS is simply the default noopt flag to use when doing debug build. And I don't quite understand why you'd want this change, what problem are you trying to solve? -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On 2013-01-10 15:55, Lubos Lunak wrote: On Thursday 10 of January 2013, Noel Grandin wrote: Created a proof-of-concept patch along with some unit tests and pushed to gerrit: https://gerrit.libreoffice.org/#/c/1625/ Can we please keep the discussion still here? Gerrit may be fine for pointing out technical details in the code, but it's not very suitable for discussions about anything beyond that. That's why it said proof of concept. Mostly, I did it to point that someone was willing to do the work :-) - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. Which doesn't help with overload resolution problems. - When more or less deprecating valueOf() this way, it has also float overloads, so something should be created for those too. If those also suffer from overload resolution problems, then sure. But git grep String::valueOf.*static_cast.*double doesn't find anything that looks like it needs help. - I'm still not sold on the naming, OUString::valueInt() doesn't say much and OUString::valueOfInt() feels cryptic. Can we please use something obvious that doesn't need decyphering, such as OUString::number() or OUString::fromInt() (as much as I still don't like the idea of harcoding the irrelevant type information in the name)? Which would be inconsistent with the existing method names. I expect it won't, regular expressions can't tell what foo is in valueOf( foo ). Actually, regex can. It's called capturing groups. http://www.regular-expressions.info/brackets.html Doesn't work very well with complex expressions, but it can handle the simple cases. Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need confirmation about non-clearing of Character Styles
On 10/01/13 14:25, Caolán McNamara wrote: On Thu, 2013-01-10 at 10:55 +0100, Fernand Vanrie wrote: Sinds all or editors use LO 3.6.2 (before OO3.3) We have complains about the fact that parts of the text, who are formated with a Character Style, can not been cleared to no-formating, not by Clear Direct Formating (cntrl+M) There is a dirty work-around by applying the Default character style Paragraph Styles can been cleared Is this intentional behavior or a regression open for a issue ? My understanding is a) that its intentional, see http://lists.freedesktop.org/archives/ooo-build/2010-February/000540.html and the commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=6e690e0909459d46c53d17e7939891abea11e566 the corresponding issues are an interesting read: https://issues.apache.org/ooo/show_bug.cgi?id=47893 - patch author arguing for the change https://issues.apache.org/ooo/show_bug.cgi?id=85464 - a certain Cor reporting the change as regression :) i definitely think that there should be some button to reset formatting that leaves character styles intact, and that should be the most easily accessible option. but i wouldn't object to a second button to reset all formatting, including styles. resetting the character styles should be as easy as setting Default char style on the whole document, so i'm not sure if another option is worth the additional clutter. but hyperlinks should not be touched by any reset formatting since they are not formatting, but content entities (the reset feature also doesn't convert fields to plain text). also i'm thinking that ruby text should also not be touched by reset formatting, and this has not yet been changed (i.e. it is reset currently); the reset will actually throw away the ruby text. i'm already sitting on a patch to remove ruby from the reset list... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On 01/10/2013 02:55 PM, Lubos Lunak wrote: On Thursday 10 of January 2013, Noel Grandin wrote: https://gerrit.libreoffice.org/#/c/1625/ Can we please keep the discussion still here? Gerrit may be fine for pointing out technical details in the code, but it's not very suitable for discussions about anything beyond that. - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. - It's a question if we really need 'OUString::valueOfBool( foo )' instead of simply 'foo ? OUString( true ) : OUString( false )' (such a pity the string literals handling doesn't allow foo ? true : false' ). I wonder how many places in the code really need to convert a boolean to the hardcoded english string representation. - When more or less deprecating valueOf() this way, it has also float overloads, so something should be created for those too. - I'm still not sold on the naming, OUString::valueInt() doesn't say much and OUString::valueOfInt() feels cryptic. Can we please use something obvious that doesn't need decyphering, such as OUString::number() or OUString::fromInt() (as much as I still don't like the idea of harcoding the irrelevant type information in the name)? Btw, the name valueOf and the idea of overloading it for all conceivable (sal) types comes from the -- somewhat misguided -- attempt at modelling rtll::OUString after java.lang.String. The fromInt etc. names look OK to me, too. Re dropping valueOfBool, I'm not sure how many places actually use it; for i in solver/*/lib/*.so*; do nm $i -D --undef | grep -F _valueOfBoolean; done does indicate its not completely unused. Also, we have rtl_ustr_valueOfBoolean around anyway. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-marketing] Latest Hardware and OS
Tom Davies schrieb: At the moment those devices are probably not seen as good things to use to edit documents. Hi all, of course (nearby) nobody will use an Android Handy to write a Novel or similar; nevertheless, yesterday in the omnibus, I watched a young woman and was fascinated concerning the speed she wrote on a handy only using her thumbs. I'm afraid she was faster than me here typing with 10 fingers. But I think an android tablet or even a smartphone can be quite a nice ODF document viewer, may be with smaller edits in the documents or so, you can use LibO for creation of simple documents from Templates (timesheet, directly signed by the customer on the screen in a DRAW OLE object ...). And LibO seems not to be the spear head there, please see http://softmaker.com/english/ofacomp_en.htm! On my Android tablet I use a different ODF viewer (forgot the name, result is not satisfying), because Versions from daily/master/Android-... crashed during installation). So we need to interest more new additional Hackers helping to create a LibO Android suite based on the current Master, including Documentation, Project info, ... . Best regards Rainer Bielefeld ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac solenv/gbuild
config_host.mk.in |1 + configure.ac| 19 +++ solenv/gbuild/gbuild.mk |4 3 files changed, 24 insertions(+) New commits: commit f0fd3bd8f8a13f6cbe2a27018b83eee24a694c09 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Dec 10 10:41:35 2012 +0100 Add configure switch that allows hardlink deliver This switch just makes possible to configure in ln delivery instead of cp based one. The feature was already in the place, we just make it visible as configure option now. Change-Id: I778ef3b03e6b9a57057e66ff6307e7da46bcd935 diff --git a/config_host.mk.in b/config_host.mk.in index 6ffd0fe..d7ede5a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -215,6 +215,7 @@ export GUI=@GUI@ export GUIBASE=@GUIBASE@ export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@ export GUI_FOR_BUILD=@GUI_FOR_BUILD@ +export HARDLINKDELIVER=@HARDLINKDELIVER@ export HAVE_CXX0X=@HAVE_CXX0X@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ diff --git a/configure.ac b/configure.ac index b028e39..9da5b39 100644 --- a/configure.ac +++ b/configure.ac @@ -651,6 +651,12 @@ AC_ARG_ENABLE(ext-wiki-publisher, dnl -- *** -- +AC_ARG_ENABLE([hardlink-deliver], +AS_HELP_STRING([--enable-hardlink-deliver], +[Put files into deliver folder as hardlinks instead of copying them +over. Saves space and speeds up build.]) +) + AC_ARG_ENABLE(mergelibs, AS_HELP_STRING([--enable-mergelibs], [Enables linking of big, merged, library. Experimental feature tested @@ -11986,6 +11992,19 @@ else fi AC_SUBST(MERGELIBS) +# === +# Create hardlinks on deliver instead of copying for smaller size and speed up +# === +AC_MSG_CHECKING([whether to create hardlinks for delivering files]) +HARDLINKDELIVER= +if test $enable_hardlink_deliver = yes; then +HARDLINKDELIVER=TRUE +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) +fi +AC_SUBST(HARDLINKDELIVER) + dnl === dnl icerun is a wrapper that stops us spawning tens of processes dnl locally - for tools that can't be executed on the compile cluster diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 321d42c..173222f 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -132,6 +132,10 @@ ENABLE_DEBUGINFO_FOR := all endif endif +ifeq ($(HARDLINKDELIVER),TRUE) +gb_Deliver_HARDLINK := $(true) +endif + ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) gb_SYMBOL := $(false) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 45 +++
1 file changed, 45 insertions(+)
New commits:
commit da09115cffeca384ab91ffe4d7af4d8eab6cee82
Author: Radek Doulik r...@novell.com
Date: Thu Jan 10 15:58:30 2013 +0100
implemented EmfPlusRecordTypeFillPie record
Change-Id: I15e7464a6a295bb4c1313c0a65ee33b6443c61c8
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 3c791d4..f1b0eff 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -29,6 +29,7 @@
#include basegfx/range/b2drange.hxx
#include basegfx/range/b2drectangle.hxx
#include basegfx/polygon/b2dpolygon.hxx
+#include basegfx/polygon/b2dpolygontools.hxx
#include basegfx/polygon/b2dpolypolygon.hxx
#include basegfx/polygon/b2dpolypolygontools.hxx
#include vcl/canvastools.hxx
@@ -52,6 +53,7 @@
#define EmfPlusRecordTypeFillRects 16394
#define EmfPlusRecordTypeFillPolygon 16396
#define EmfPlusRecordTypeDrawLines 16397
+#define EmfPlusRecordTypeFillPie 16400
#define EmfPlusRecordTypeFillPath 16404
#define EmfPlusRecordTypeDrawPath 16405
#define EmfPlusRecordTypeDrawImage 16410
@@ -93,6 +95,7 @@
#endif
using namespace ::com::sun::star;
+using namespace ::basegfx;
namespace cppcanvas
{
@@ -1234,6 +1237,48 @@ namespace cppcanvas
case EmfPlusRecordTypeObject:
processObjectRecord (rMF, flags);
break;
+case EmfPlusRecordTypeFillPie:
+{
+sal_uInt32 brushIndexOrColor;
+float startAngle, sweepAngle;
+
+rMF brushIndexOrColor startAngle sweepAngle;
+
+EMFP_DEBUG (printf (EMF+ FillPie colorOrIndex: %x
startAngle: %f sweepAngle: %f\n, (unsigned int)brushIndexOrColor, startAngle,
sweepAngle));
+
+float dx, dy, dw, dh;
+
+ReadRectangle (rMF, dx, dy, dw, dh, flags 0x4000);
+
+EMFP_DEBUG (printf (EMF+ RectData: %f,%f %fx%f\n,
dx, dy, dw, dh));
+
+startAngle = 2*M_PI*startAngle/360;
+sweepAngle = 2*M_PI*sweepAngle/360;
+
+B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2));
+B2DSize mappedSize( MapSize (dw/2, dh/2));
+
+double endAngle = startAngle + sweepAngle;
+if (endAngle 0)
+endAngle += M_PI*2;
+endAngle = fmod (endAngle, M_PI*2);
+
+if (sweepAngle 0) {
+double tmp = startAngle;
+startAngle = endAngle;
+endAngle = tmp;
+}
+
+EMFP_DEBUG (printf (EMF+ angles: %f,%f ---
%f,%f\n, startAngle, sweepAngle, startAngle, endAngle));
+
+B2DPolygon polygon =
tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (),
mappedSize.getY (), startAngle, endAngle);
+polygon.append (mappedCenter);
+polygon.setClosed (true);
+
+B2DPolyPolygon polyPolygon (polygon);
+EMFPPlusFillPolygon (polyPolygon, rFactoryParms,
rState, rCanvas, flags 0x8000, brushIndexOrColor);
+}
+break;
case EmfPlusRecordTypeFillPath:
{
sal_uInt32 index = flags 0xff;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-l10n] Translation of the names of the keys on Windows
On Tue, Jan 8, 2013 at 7:44 AM, Jesús Corrius je...@softcatala.org wrote:
If you want to implement this, but you are not a developer, just send me
the name of the keys with its translation and I will apply the changes
myself.
Hi, I was wondering if you could add a Spanish translation:
static const struct KeysNameReplacement aImplReplacements_Spanish[] =
{
{ KEY_BACK, Retroceso },
{ KEY_ENTER, Intro },
{ KEY_SPACEBAR, Espacio },
{ KEY_HOME, Inicio },
{ KEY_UP, Arriba },
{ KEY_PAGEUP, Re Pág },
{ KEY_LEFT, Izquierda },
{ KEY_RIGHT, Derecha },
{ KEY_END, Fin },
{ KEY_DOWN, Abajo },
{ KEY_PAGEDOWN, Av Pág },
{ KEY_INSERT, Ins },
{ KEY_DELETE, Supr },
{ KEY_SHIFT, Mayús },
};
Thanks!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/crsr/pam.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit fd0da52d371ca13d66be3b04d89f9d9cf73baddd
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jan 10 16:21:55 2013 +0100
fdo#57938 SwPaM::HasReadonlySel: commented text ranges are not read-only
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index e9b7802..852 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -686,6 +686,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
sw::mark::IMark* pA = NULL;
sw::mark::IMark* pB = NULL;
bool bUnhandledMark = false;
+bool bCommentrangeMark = false;
if ( pDoc )
{
const IDocumentMarkAccess* pMarksAccess =
pDoc-getIDocumentMarkAccess( );
@@ -694,7 +695,11 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
sw::mark::IFieldmark* pFieldmark = pMarksAccess-getFieldmarkFor(
*GetPoint() );
if ( pFieldmark )
+{
bUnhandledMark = pFieldmark-GetFieldname( ) == ODF_UNHANDLED;
+if (!bUnhandledMark)
+bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
+}
}
if (!bRet)
@@ -702,7 +707,8 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
// Unhandled fieldmarks case shouldn't be edited manually to avoid
breaking anything
if ( ( pA == pB ) bUnhandledMark )
bRet = sal_True;
-else
+// Allow editing of commented ranges.
+else if (!((pA == pB) bCommentrangeMark))
{
// Form protection case
bool bAtStartA = pA != NULL pA-GetMarkStart() == *GetPoint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On Thursday 10 of January 2013, Noel Grandin wrote: On 2013-01-10 15:55, Lubos Lunak wrote: - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. Which doesn't help with overload resolution problems. It does. If you say it's wrong to use valueOfWhatever() for char-string conversion, there either will not be problems, or it will be wrong. If you want to fix an existing problem by introducing a new function, how does that make anything better than using an already existing function that does the job? - When more or less deprecating valueOf() this way, it has also float overloads, so something should be created for those too. If those also suffer from overload resolution problems, then sure. But git grep String::valueOf.*static_cast.*double doesn't find anything that looks like it needs help. - I'm still not sold on the naming, OUString::valueInt() doesn't say much and OUString::valueOfInt() feels cryptic. Can we please use something obvious that doesn't need decyphering, such as OUString::number() or OUString::fromInt() (as much as I still don't like the idea of harcoding the irrelevant type information in the name)? Which would be inconsistent with the existing method names. Oh. I think we may be talking past each others because we have different goals. Am I correct in the assumption that you merely want to add another set of functions that people can use whenever the originals don't work? I do not think it is a good idea to just do a quick hack to paper over a problem. The strings are one of the most basic classes in the LO code, and if we are going to do changes there, we may as well try to do them properly. Base classes are not something we should randomly throw changes at, and we can still spend ages fixing up all the design decisions in the string classes that already are there and could have been done better. So while I appreciate it that you're willing to write a kludge that'll help avoid a problem, I kind of consider it a waste of your time, when with just little more effort a proper solution could be created. If you just add another set of functions, it will be confusing which one to use. And people will still sometimes use the old one out of habbit or for whatever reason, and still the problem will occassionally show up, and then the code will need to be changed to the new function, which is not really that different to just adding a cast. And if you say that people should always directly use the new one, then you may as well remove the old one (except keep it for extensions backwards compatibility), and then all I've said applies (no need for char function, float function needed, use a good name, etc.). Or did I misunderstand the intent of your patch? I expect it won't, regular expressions can't tell what foo is in valueOf( foo ). Actually, regex can. It's called capturing groups. Capturing groups may tell you that foo is foo, but it won't tell you it's a float. So how will you know to which of your proposed valueX() functions you should change it? Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Actually, I'd prefer to write a howto about that first, whenever I get to doing that, so that I don't have to write every single plugin. Such a plugin will be still much simpler than a regexp or any other way. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [libreoffice-dev] - questions about calc extension
Hi Stephan, I am unable to find XDesktop2. Your sample below looks really simple and right way to go. I am working with release version 3.6.4.3 - built it from tar files. I don't mind upgrading to latest tip, but I had trouble building the git checkout version. Being fairly new to this large and comprehensive product, I decided to take the easy way to begin. I would also be curious to know how to find out about such api - unfortunately, right now I am reading only specific emails on dev group and unable to follow conversations on other topics. Is reading docs the best way ? Is it possible to find some sample code ? Kohei seems to have a working version with source below. I had trouble finding source for the other calc extensions listed on site. I understand that situation is complicated with taking over working code and existing docs. It may take some time to get those things in order. I am a user of LO api and don't want to look like demanding regime change (like LO spring driven by nabble instead of facebook :-)) If it is feasible to dedicate space for source of extensions, I have a feeling space requirements there might grow quickly. That said, I know it may take time getting these one off things done with everyone having current deadlines and some of you are working on this part time. The current examples that come bundled are all great. They focus on single feature and demonstrate it well. All the ones I tried, compiled. Thanks Neeraj -Original Message- From: libreoffice-bounces+neeraj.rai=citi@lists.freedesktop.org [mailto:libreoffice-bounces+neeraj.rai=citi@lists.freedesktop.org] On Behalf Of Stephan Bergmann Sent: Thursday, January 10, 2013 3:45 AM To: libreoffice@lists.freedesktop.org Subject: Re: [libreoffice-dev] - questions about calc extension On 01/09/2013 07:41 PM, Kohei Yoshida wrote: On 01/09/2013 01:12 PM, Rai, Neeraj wrote: What is the correct way to get a handle to spreadsheet in extension code. I don't want you to look too close to this (since I no longer maintain this), bug this code of mine http://code.google.com/p/scsolver/source/browse/source/ui/xcalc.cxx may give you some hint, especially the top 3 methods, getCurrentComponent(), updateCurrentComponent(), and getServiceManager() should give you how to get the current component object from the current context object. As an extension, you are given access to the current context object, and you can reach the current component from that one way or another. Some comments on the above code, for the benefit of fresh development: Obtaining the com.sun.star.frame.Desktop service (variable xDesktop) in updateCurrentComponent can be greatly simplified through the use of so-called new-style service constructors (and Noel's ongoing work of changing existing old-style services into new-style ones in UNOIDL): Reference frame::XDesktop2 xDesktop( frame::Desktop::create(m_xCC)); - It already returns the proper interface of the service (in this case XDesktop2, derived from XDesktop), so no need for querying from XInterface to the correct type. - It directly uses the component context, no need for the service manager. (In general, demand for explicitly using the service manager should go away more and more over time.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#57938 SwPaM::HasReadonlySel: commented text ranges are n...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1629
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/1629/1
fdo#57938 SwPaM::HasReadonlySel: commented text ranges are not read-only
(cherry picked from commit fd0da52d371ca13d66be3b04d89f9d9cf73baddd)
Change-Id: I8191ed6383c4c636be67b8d42654dbba0a5c8b6f
---
M sw/source/core/crsr/pam.cxx
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index baf62ad..6d7f07a 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -685,6 +685,7 @@
sw::mark::IMark* pA = NULL;
sw::mark::IMark* pB = NULL;
bool bUnhandledMark = false;
+bool bCommentrangeMark = false;
if ( pDoc )
{
const IDocumentMarkAccess* pMarksAccess =
pDoc-getIDocumentMarkAccess( );
@@ -693,7 +694,11 @@
sw::mark::IFieldmark* pFieldmark = pMarksAccess-getFieldmarkFor(
*GetPoint() );
if ( pFieldmark )
+{
bUnhandledMark = pFieldmark-GetFieldname( ) == ODF_UNHANDLED;
+if (!bUnhandledMark)
+bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
+}
}
if (!bRet)
@@ -701,7 +706,8 @@
// Unhandled fieldmarks case shouldn't be edited manually to avoid
breaking anything
if ( ( pA == pB ) bUnhandledMark )
bRet = sal_True;
-else
+// Allow editing of commented ranges.
+else if (!((pA == pB) bCommentrangeMark))
{
// Form protection case
bool bAtStartA = pA != NULL pA-GetMarkStart() == *GetPoint();
--
To view, visit https://gerrit.libreoffice.org/1629
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8191ed6383c4c636be67b8d42654dbba0a5c8b6f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: gb_COMPILERNOOPTFLAGS does not even obey the user passed CFLAGS
On Thursday 10 of January 2013, Tomáš Chvátal wrote: 2013/1/10 Lubos Lunak l.lu...@suse.cz: As written in subject the variable is used on multiple targets and it ignores the user defined cflags/cxxflags. This should never happen and all our targets should take into effect the user defined options too. I am not sure which variable I should append there, so could anyone check if the diff in attachment is right? It doesn't look right. CXXFLAGS should always get used for building .cxx sources, so this should have no effect, moreover gb_COMPILERNOOPTFLAGS is simply the default noopt flag to use when doing debug build. And I don't quite understand why you'd want this change, what problem are you trying to solve? See how bridgetests are build, they fail on old systems because they just specify the -O0 and nothing else, not even march So Petr used this patch in build service [1] but i think we should make this respected everywhere. Reading this patch, your change looks to me like putting the CXXFLAGS in some random place where it will incidentally work, but the moment somebody doesn't include gb_COMPILERNOOPTFLAGS in the flags passed to add_cxxobject, the problem is back again. If add_cxxobject doesn't include CXXFLAGS, why not fix it to ensure that (which possibly may need others like add_noexception_object to delegate to add_cxxobject_internal instead of add_cxxobject)? [1] https://build.opensuse.org/package/view_file?file=bridges-missing-cxxflags. diffpackage=libreofficeproject=LibreOffice%3AUnstablerev=157 -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Extending Dictionaries
Samuel Mehrbrodt píše v Čt 03. 01. 2013 v 23:30 +0100: I just sent you a list of words directly. Can we document this somewhere in the Wiki, how to add new words to a dictionary? I guess there are more people wanting to do this. I have created https://wiki.documentfoundation.org/Development/Dictionaries Feel free to update it or ask if anything is unclear. Also, are there any guidelines which words are accepted in the dictionary? The preferred way is to contact author of the dictionary and get the words accepted by him. He is usually an expert for the given language and the best person for decision making. Also it helps to make sure that the new words are not lost within further updates. By other words, LO git repository includes just a copy of the dictionary. It is better to change in on the original location where it come from. Best Regards, Petr Thanks Samuel Am 03.01.2013 22:30, schrieb Bjoern Jacke: On 2013-01-03 at 17:30 +0100 Samuel Mehrbrodt sent off: If there are no objections from the plugin authors, I'll create a patch against the dictionaries file. please jsut send me the list of words. Patching dictionaries doesn't make much sense for getting that upstream. The dictionary is a compiled version of the dictionaries of igerman98. Cheers Björn ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#58301 make sure ScrollBar OptimalSize is up to...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1630
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/1630/1
Resolves: fdo#58301 make sure ScrollBar OptimalSize is up to date
if the scrollbar sizes haven't been calculated yet then the optimalsize will be
wrong, so it's necessary to enforce calculating them in that case.
(cherry picked from commit f41a2804dd4a23352b7af2dd28c03df02debfb13)
Change-Id: I12e95c3594ffbb508c7f79bd512e07aaf44a6eab
---
M vcl/inc/vcl/scrbar.hxx
M vcl/source/control/scrbar.cxx
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 8dbe270..7c62d94 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -83,8 +83,9 @@
SAL_DLLPRIVATE long ImplDoAction( sal_Bool bCallEndScroll );
SAL_DLLPRIVATE void ImplDoMouseAction( const Point rPos, sal_Bool
bCallAction = sal_True );
SAL_DLLPRIVATE void ImplInvert();
-SAL_DLLPRIVATE sal_Bool ImplDrawNative( sal_uInt16 nDrawFlags );
+SAL_DLLPRIVATE sal_Bool ImplDrawNative( sal_uInt16 nDrawFlags );
SAL_DLLPRIVATE void ImplDragThumb( const Point rMousePos );
+SAL_DLLPRIVATE Size getCurrentCalcSize() const;
DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* );
DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* );
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 9e90362..b99ff26 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -323,7 +323,7 @@
Rectangle maTrackRect = mpData-maTrackRect; // TODO: remove when
maTrackRect is no longer in mpData
if ( mbCalcSize )
{
-Size aOldSize = GetOptimalSize(WINDOWSIZE_PREFERRED);
+Size aOldSize = getCurrentCalcSize();
const Rectangle aControlRegion( Point(0,0), aSize );
Rectangle aBtn1Region, aBtn2Region, aTrackRegion, aBoundingRegion;
@@ -416,7 +416,7 @@
mbCalcSize = sal_False;
-Size aNewSize = GetOptimalSize(WINDOWSIZE_PREFERRED);
+Size aNewSize = getCurrentCalcSize();
if (aOldSize != aNewSize)
{
queue_resize();
@@ -1509,6 +1509,13 @@
Size ScrollBar::GetOptimalSize(WindowSizeType) const
{
+if (mbCalcSize)
+const_castScrollBar*(this)-ImplCalc(sal_False);
+return getCurrentCalcSize();
+}
+
+Size ScrollBar::getCurrentCalcSize() const
+{
Rectangle aCtrlRegion;
aCtrlRegion.Union(maBtn1Rect);
aCtrlRegion.Union(maBtn2Rect);
--
To view, visit https://gerrit.libreoffice.org/1630
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12e95c3594ffbb508c7f79bd512e07aaf44a6eab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-dev] - questions about calc extension
On 01/10/2013 10:50 AM, Rai, Neeraj wrote:
Hi Michael,
Appreciate your feedback.
I ran callgrind but no output on screen and 0 bytes files generated. I can run
it on non-LO exe.
I'll compile LO with --enable-debug and see if situation improves. Please
advise if other steps might be needed.
What's your hunch about how long it should take to update 60K cells with
{getCellByPosition(ii,jj) and setValue() } ?
Two things you might try.
1) Try getDataArray() and setDataArray() to update multiple contiguous
cells. Doing it this way is much much faster than updating one cell at
a time. These methods are available for cell range object.
2) Try lockControllers() and unlockControllers() to disable/enable
repainting while updating cell values. The example of these methods
should be in my xcalc.cxx file I referenced earlier.
HTH,
Kohei
--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
