[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 34548, which changed state.

Bug 34548 Summary: EDITING: CRASH in action after Undo
https://bugs.freedesktop.org/show_bug.cgi?id=34548

   What|Removed |Added

 Status|RESOLVED|REOPENED
 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

[ANN] Impress Sprint Dresden - March 22nd-24th 2013

[Thorsten Behrens]

Hi there,

TDF was offered the opportunity to hold an Impress Sprint at Dresden
Technical University at the above date. I'm still currently hashing
out details, but we'll have lodging and limited travel bursaries
covered it seems.

Initial wiki page is here:

 https://wiki.documentfoundation.org/Marketing/Events/ImpressSprint2013

, stay tuned for when more details get added.

Both hacker and QA participation appreciated - you'll need a laptop or
netbook with LibreOffice installed / built, and TU Dresden will
provide a range of projectors for playing / bug hunting. We will
provide mentoring and some introductory code walk-throughs - and if
you need inspiration, a short-list of easy hacks. :)

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: wizards/Pyuno_agenda.mk

[Xisco Fauli]

 wizards/Pyuno_agenda.mk |   45 +
 1 file changed, 45 insertions(+)

New commits:
commit 2b9394f0c009b385756a0c5d75e3c1cd412f7236
Author: Xisco Fauli 
Date:   Thu Feb 14 00:57:02 2013 +0100

pyagenda: forgot this file

Change-Id: I7542a7c9ac3ab9d48251f0f5d39dbec17b5c475c

diff --git a/wizards/Pyuno_agenda.mk b/wizards/Pyuno_agenda.mk
new file mode 100644
index 000..f844303
--- /dev/null
+++ b/wizards/Pyuno_agenda.mk
@@ -0,0 +1,45 @@
+# -*- 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) 2011 Red Hat, Inc., David Tardon 
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call 
gb_Pyuno_Pyuno,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda))
+
+$(eval $(call gb_Pyuno_add_files,agenda,\
+AgendaDocument.py \
+AgendaWizardDialogConst.py \
+AgendaWizardDialogImpl.py \
+AgendaWizardDialog.py \
+AgendaWizardDialogResources.py \
+CallWizard.py \
+CGAgenda.py \
+CGTopic.py \
+__init__.py \
+TemplateConsts.py \
+TopicsControl.py \
+))
+$(eval $(call 
gb_Pyuno_set_componentfile_full,agenda,wizards/com/sun/star/wizards/agenda/agenda,vnd.openoffice.pymodule:wizards.agenda,.CallWizard))
+
+# vim:set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |   10 --
 source/text/shared/optionen/01030300.xhp |   16 +++-
 2 files changed, 7 insertions(+), 19 deletions(-)

New commits:
commit cfb84454cfafb8a06957230bc3ead85816ca624c
Author: Caolán McNamara 
Date:   Wed Feb 13 23:40:05 2013 +

update help ids for security options page .ui conversion

Change-Id: I725807a7b6b9ab109f880796cd7352751fdaad41

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d44f0d3..c0792ac 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7636,10 +7636,6 @@ svx_CheckBox_RID_SVXPAGE_HEADER_CB_SHARED,701154324,
 svx_CheckBox_RID_SVXPAGE_HEADER_CB_TURNON,701154314,
 svx_CheckBox_RID_SVXPAGE_HYPERLINK_INTERNET_CBX_ANONYMOUS,704447499,
 svx_CheckBox_RID_SVXPAGE_INET_MOZPLUGIN_CB_MOZPLUGIN_CODE,736117762,
-svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_MASTERPASSWORD,703988752,
-svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECOMMREADONLY,703988759,
-svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_RECORDCHANGES,703988760,
-svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SAVEPASSWORDS,703988750,
 svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_MIDDLE_DOT,714474700,
 svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_PUNCTUATION,714474697,
 svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_WHITESPACES,714474698,
@@ -8388,11 +8384,6 @@ svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_ADD,703337015,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_CHANGE,703337013,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_DELETE,703337014,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_NEW,703337016,
-svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_CONNECTIONS,703992335,
-svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MACROSEC,703992341,
-svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_MASTERPASSWORD,703992338,
-svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_PROTRECORDS,703992345,
-svx_PushButton_RID_SVXPAGE_INET_SECURITY_PB_SEC_SECURITYOPTIONS,703992332,
 svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_ACC_CHANGE,705516035,
 svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_ACC_REMOVE,705516036,
 svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_LOAD,705516072,
@@ -8532,7 +8523,6 @@ svx_TabPage_RID_SFXPAGE_DBREGISTER,809222144,
 svx_TabPage_RID_SVXPAGE_EVENTASSIGN,705675264,
 svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880,
 svx_TabPage_RID_SVXPAGE_INET_MOZPLUGIN,736116736,
-svx_TabPage_RID_SVXPAGE_INET_SECURITY,703987712,
 svx_TabPage_RID_SVXPAGE_MACROASSIGN,705560576,
 svx_TabPage_RID_SVXPAGE_TEXTANIMATION,703725568,
 svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320,
diff --git a/source/text/shared/optionen/01030300.xhp 
b/source/text/shared/optionen/01030300.xhp
index d440886..81f7b79 100644
--- a/source/text/shared/optionen/01030300.xhp
+++ b/source/text/shared/optionen/01030300.xhp
@@ -32,18 +32,16 @@
 
 macros;selecting security 
warnings
 security;options for documents with macros
-
-
 macros;security
-
-ufi moved 4 entries to new file shared/01/01100600.xhp - 
cws tl79mw corrected a typo in "file ..." and changed 
"read-only documents;..."
+
+
 Security
 Defines the security options for saving documents, 
for web connections, and for opening documents that contain 
macros.
 
 
   
 
-Options
+Options
 Opens the "Security options and warning" 
dialog.
 The 
Security options and warnings dialog contains the following 
controls:
 
@@ -68,14 +66,14 @@
 If enabled, you must hold down the Ctrl key while 
clicking a hyperlink to follow that link. If not enabled, a click opens the 
hyperlink.
 Passwords for web connections
 You 
can enter a master password to enable easy access to sites that require a user 
name and password.
-Persistently save passwords protected by 
a master password
+Persistently save passwords protected by 
a master password
 If enabled, %PRODUCTNAME will securely store all 
passwords that you use to access files from web servers. You can retrieve the 
passwords from the list after you enter the master password.
-Master Password
+Master Password
 Opens the Enter Master Password 
dialog.
 Enter the master password.
 Enter the master password again.
 Enter the master 
password to continue.
-Connections
+Connections
 Asks for the master password. If master password is 
correct, shows the Stored Web Connection Information dialog.
 The 
Stored Web Connection Information dialog shows a list of web sites and user 
names that you entered previously. You can select any entry and remove it from 
the list. You can view the password for the selected 
entry.Remove
 Removes the selected entry from the 
list.Remove All
@@ -83,7 +81,7 @@
 Opens a dialog where you can view and change the password 
for the selected entry.
 Macro security
 Adjust the security level for executing macros and specify trusted 
macro authors.
-
+
 Macro Security
 Opens the Macro Security 
dialog.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/list

[Libreoffice-commits] core.git: 2 commits - cui/uiconfig helpcontent2 sw/uiconfig

[Caolán McNamara]

 cui/uiconfig/ui/colorpage.ui   |   11 -
 cui/uiconfig/ui/optaccessibilitypage.ui|1 
 cui/uiconfig/ui/optadvancedpage.ui |1 
 cui/uiconfig/ui/optappearancepage.ui   |1 
 cui/uiconfig/ui/optfontspage.ui|   11 -
 cui/uiconfig/ui/optpathspage.ui|1 
 helpcontent2   |2 -
 sw/uiconfig/swriter/ui/printoptionspage.ui |   35 ++---
 8 files changed, 20 insertions(+), 43 deletions(-)

New commits:
commit 9e1f5d5bf1bcc8a7ccfd48a6731ed5763bc0b4dc
Author: Caolán McNamara 
Date:   Wed Feb 13 20:41:52 2013 +

consistent 6 pixels borders around all option pages

and center middle column of writer print options

Change-Id: I344d114ec0dd87ef5de5a920acea9f39e0e89dfe

diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 59db9a5..72f8b9c 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -6,11 +6,17 @@
 1
 10
   
+  
+255
+1
+10
+  
   
 True
 False
 True
 True
+6
 vertical
 
   
@@ -635,11 +641,6 @@
   
 
   
-  
-255
-1
-10
-  
   
 True
 False
diff --git a/cui/uiconfig/ui/optaccessibilitypage.ui 
b/cui/uiconfig/ui/optaccessibilitypage.ui
index 10758b6..cdff5cf 100644
--- a/cui/uiconfig/ui/optaccessibilitypage.ui
+++ b/cui/uiconfig/ui/optaccessibilitypage.ui
@@ -11,6 +11,7 @@
   
 True
 False
+6
 vertical
 12
 
diff --git a/cui/uiconfig/ui/optadvancedpage.ui 
b/cui/uiconfig/ui/optadvancedpage.ui
index 9b3a76e..85c2dd7 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -4,6 +4,7 @@
   
 True
 False
+6
 vertical
 18
 
diff --git a/cui/uiconfig/ui/optappearancepage.ui 
b/cui/uiconfig/ui/optappearancepage.ui
index 4277ced..2357088 100644
--- a/cui/uiconfig/ui/optappearancepage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -4,6 +4,7 @@
   
 True
 False
+6
 vertical
 12
 
diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui
index 2cc9e49..20da64e 100644
--- a/cui/uiconfig/ui/optfontspage.ui
+++ b/cui/uiconfig/ui/optfontspage.ui
@@ -1,6 +1,11 @@
 
 
   
+  
+True
+False
+svx/res/nu01.png
+  
   
 True
 False
@@ -9,6 +14,7 @@
   
 True
 False
+6
 vertical
 12
 
@@ -377,9 +383,4 @@
   
 
   
-  
-True
-False
-svx/res/nu01.png
-  
 
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index e3f8091..d4c6957 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
@@ -6,6 +6,7 @@
 False
 True
 True
+6
 vertical
 12
 
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui 
b/sw/uiconfig/swriter/ui/printoptionspage.ui
index 4f5119b..ad81a5f 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -4,6 +4,7 @@
   
 True
 False
+6
 vertical
 12
 
@@ -12,6 +13,7 @@
 False
 6
 6
+True
 
   
 True
@@ -32,11 +34,9 @@
 
   
 Pictures and 
objects
-False
 True
 True
 False
-False
 0
 True
   
@@ -50,11 +50,9 @@
 
   
 Form 
controls
-False
 True
 True
 False
-False
 0
 True
   
@@ -68,11 +66,9 @@
 
   
 Page 
background
-False
 True
 True
 False
-False
 0
 True
   
@@ -86,11 +82,9 @@
 
   
 Print text 
in black
-False
 True
 True
 False
-False
 0
 True
   
@@ -104,11 +98,9 @@
 
   
 Hidden 
text
-False
 True
 True
 False
-False
 0
 True
   
@@ -122,11 +114,9 @@
 

[SOLVED] Re: convert setup_native to gbuild and add to tail_build

[Niko Rönkkö]

Peter,


Can you see if it works now?


Yes, it works now, thanks.

--
RN

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - sc/inc sc/Library_sc.mk sc/source

[Kohei Yoshida]

 sc/Library_sc.mk|1 
 sc/inc/dpfilteredcache.hxx  |4 +--
 sc/inc/dpglobal.hxx |   12 ++
 sc/inc/dpitemdata.hxx   |3 +-
 sc/inc/dptabdat.hxx |   20 
 sc/inc/dptabres.hxx |   14 +--
 sc/inc/subtotal.hxx |9 +++
 sc/source/core/data/dpfilteredcache.cxx |8 +++---
 sc/source/core/data/dpglobal.cxx|   20 
 sc/source/core/data/dpitemdata.cxx  |   10 
 sc/source/core/data/dptabdat.cxx|4 +--
 sc/source/core/data/dptabres.cxx|   38 
 sc/source/core/tool/subtotal.cxx|   14 +--
 13 files changed, 85 insertions(+), 72 deletions(-)

New commits:
commit 603262b7d19da53eeb7235f6fa460777825c0ddf
Author: Kohei Yoshida 
Date:   Wed Feb 13 17:45:26 2013 -0500

sal_Bool to bool.

Change-Id: I2599e12a9072a0ea34c62a9fd7982dd4630c329f

diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 4432868..379bf10 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -25,10 +25,9 @@
 class SubTotal
 {
 public:
-
-static  sal_Bool SafePlus( double& fVal1, double fVal2);
-static  sal_Bool SafeMult( double& fVal1, double fVal2);
-static  sal_Bool SafeDiv( double& fVal1, double fVal2);
+static bool SafePlus( double& fVal1, double fVal2);
+static bool SafeMult( double& fVal1, double fVal2);
+static bool SafeDiv( double& fVal1, double fVal2);
 };
 
 
@@ -37,7 +36,7 @@ struct ScFunctionData   // to calculate 
single functions
 ScSubTotalFunc  eFunc;
 double  nVal;
 longnCount;
-sal_BoolbError;
+boolbError;
 
 ScFunctionData( ScSubTotalFunc eFn ) :
 eFunc(eFn), nVal(0.0), nCount(0), bError(false) {}
diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx
index 659369d..b5d2539 100644
--- a/sc/source/core/tool/subtotal.cxx
+++ b/sc/source/core/tool/subtotal.cxx
@@ -20,11 +20,9 @@
 #include "subtotal.hxx"
 #include "interpre.hxx"
 
-// ---
-
-sal_Bool SubTotal::SafePlus(double& fVal1, double fVal2)
+bool SubTotal::SafePlus(double& fVal1, double fVal2)
 {
-sal_Bool bOk = sal_True;
+bool bOk = true;
 SAL_MATH_FPEXCEPTIONS_OFF();
 fVal1 += fVal2;
 if (!::rtl::math::isFinite(fVal1))
@@ -39,9 +37,9 @@ sal_Bool SubTotal::SafePlus(double& fVal1, double fVal2)
 }
 
 
-sal_Bool SubTotal::SafeMult(double& fVal1, double fVal2)
+bool SubTotal::SafeMult(double& fVal1, double fVal2)
 {
-sal_Bool bOk = sal_True;
+bool bOk = true;
 SAL_MATH_FPEXCEPTIONS_OFF();
 fVal1 *= fVal2;
 if (!::rtl::math::isFinite(fVal1))
@@ -53,9 +51,9 @@ sal_Bool SubTotal::SafeMult(double& fVal1, double fVal2)
 }
 
 
-sal_Bool SubTotal::SafeDiv(double& fVal1, double fVal2)
+bool SubTotal::SafeDiv(double& fVal1, double fVal2)
 {
-sal_Bool bOk = sal_True;
+bool bOk = true;
 SAL_MATH_FPEXCEPTIONS_OFF();
 fVal1 /= fVal2;
 if (!::rtl::math::isFinite(fVal1))
commit 623253418b3fc18a8122ea1f71e86628208000ff
Author: Kohei Yoshida 
Date:   Wed Feb 13 17:40:27 2013 -0500

ScDPValueData->ScDPValue. The last 'Data' sounds very redundant.

Change-Id: I218315a0583ce6b0f10969b364a7a717ad309212

diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 9caa2f8..206b6ba 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -36,7 +36,7 @@ class ScDPItemData;
 class ScDPCache;
 class ScDocument;
 class ScRange;
-struct ScDPValueData;
+struct ScDPValue;
 struct ScQueryParam;
 
 /**
@@ -123,7 +123,7 @@ public:
 that the data grid doesn't include the header row.  Don't delete the
 returned object! */
 const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) 
const;
-void  getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool 
bRepeatIfEmpty) const;
+void  getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool 
bRepeatIfEmpty) const;
 rtl::OUString getFieldName(SCCOL nIndex) const;
 
/** Get the unique entries for a field specified by index.  The caller must
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 6fffc64..74250a6 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -35,14 +35,14 @@
 #define PIVOT_FUNC_STD_VARP 0x0400
 #define PIVOT_FUNC_AUTO 0x1000
 
-struct ScDPValueData
+struct ScDPValue
 {
 enum Type { Empty = 0, Value, String, Error };
 
 double mfValue;
 Type meType;
 
-ScDPValueData();
+ScDPValue();
 
 void Set( double fV, Type eT );
 };
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index bd33607..e064d25 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -110,7 +110,7 @@ public:
 GroupValueAttr GetGroupValue() const;

[Libreoffice-commits] core.git: Makefile.in

[Peter Foley]

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2aaa83660316b9c0ad01017ba3cee71a89176c5
Author: Peter Foley 
Date:   Wed Feb 13 17:19:59 2013 -0500

dont echo ./g -z every time make is run

Change-Id: Id680d868ee77a8c52a030baddc8af97041d5a569

diff --git a/Makefile.in b/Makefile.in
index 8cd01fc..445daa0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -232,7 +232,7 @@ else # space-saving clone from another local workdir
git submodule update $(GIT_NEEDED_SUBMODULES)
 endif
 endif
-   cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enven if 
no submodules are needed
+   @cd $(SRCDIR) && ./g -z # make sure the git hooks are in place enen if 
no submodules are needed
 
 else # these sources are from a tarball, so get the other source tarballs
 gb_LO_VER := $(shell . $(SRCDIR)/sources.ver && echo $$lo_sources_ver)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/CustomTarget_mac.mk

[Peter Foley]

 setup_native/CustomTarget_mac.mk |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e8f09adf5bdd415278b63a055c12dd0f33cd1ba2
Author: Peter Foley 
Date:   Wed Feb 13 17:13:31 2013 -0500

fix setup_native localization for mac

Change-Id: Ifcd3a96e1e0d53bb7dabb3e8cda1846ca2d262be

diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk
index 2746dfc..57f92f8 100644
--- a/setup_native/CustomTarget_mac.mk
+++ b/setup_native/CustomTarget_mac.mk
@@ -13,13 +13,12 @@ $(eval $(call 
gb_CustomTarget_register_target,setup_native/mac,macinstall.ulf))
 
 #FIXME: generalize rule? ripped off from ScpMergeTarget
 ifneq ($(WITH_LANG),)
-$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: 
mac_POFILES := $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po)
 $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: 
$(SRCDIR)/setup_native/source/mac/macinstall.ulf | $(call 
gb_Executable_get_runtime_dependencies,ulfex)
$(call gb_Output_announce,$@,$(true),SUM,1)
MERGEINPUT=`$(gb_MKTEMP)` && \
-   echo $(mac_POFILES) > $${MERGEINPUT} && \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) 
> $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\
-   $(call gb_Executable_get_command,ulfconv) -p setup_native -i $< -o $@ 
-m $${MERGEINPUT} -l all ) && \
+   $(call gb_Executable_get_command,ulfex) -p setup_native -i $< -o $@ -m 
$${MERGEINPUT} -l all ) && \
rm -rf $${MERGEINPUT}
 else
 $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: 
$(SRCDIR)/setup_native/source/mac/macinstall.ulf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

3.5 MAB Meta Tracker

[Joel Madero]

The 3.5 most annoying bugs meta tracker (FDO#37361) is officially CLOSED.

Thank to all who helped get this done in such a short period of time :-D


Best Regards,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/ui/index/swuiidxmrk.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d1ea9ef689390ac6098e30105f1956f255799a1d
Author: Michael Stahl 
Date:   Wed Feb 13 22:49:04 2013 +0100

SwIndexMarkPane::UpdateDialog: should use && instead of &

Change-Id: I6c03ed4acba570b8ff222a59aae95444f50c536b

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 1766632..7339ae7 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -967,10 +967,10 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, 
pBox )
 boolbKey1HasText= (!m_pKey1DCB->GetText().isEmpty());
 boolbKey2HasText= (!m_pKey2DCB->GetText().isEmpty());
 
-m_pPhoneticFT1->Enable(bKey1HasText&&bIsPhoneticReadingEnabled);
-m_pPhoneticED1->Enable(bKey1HasText&bIsPhoneticReadingEnabled);
-m_pPhoneticFT2->Enable(bKey2HasText&bIsPhoneticReadingEnabled);
-m_pPhoneticED2->Enable(bKey2HasText&bIsPhoneticReadingEnabled);
+m_pPhoneticFT1->Enable(bKey1HasText && bIsPhoneticReadingEnabled);
+m_pPhoneticED1->Enable(bKey1HasText && bIsPhoneticReadingEnabled);
+m_pPhoneticFT2->Enable(bKey2HasText && bIsPhoneticReadingEnabled);
+m_pPhoneticED2->Enable(bKey2HasText && bIsPhoneticReadingEnabled);
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #405 from Joel Madero  ---
And with that last bug removed from 3.5 MAB --

Set status to CLOSED/FIXED, in order to make it really obvious (especially for
beginners) that no more bugs should be added to this tracking bug.

-- 
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Joel Madero  changed:

   What|Removed |Added

 Depends on||52433

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Depends on|52433   |

-- 
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Joel Madero  changed:

   What|Removed |Added

 Depends on||45019

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Depends on|45019   |

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Depends on|52170   |

-- 
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: patch removing Labels.xcu out of configuration

[Michael Meeks]

Hi Matus,

On Wed, 2013-02-13 at 21:04 +0100, Matúš Kukan wrote:
> I've finished my first patch on reducing configuration data and
> decided to send it this way.

It looks lovely ! :-) thanks for that.

> It seems to work, although not as I was expecting.
> You still can't save modified labels, not sure why, but that's nothing new.
> Please, feel free to comment anything.

I've got a few cleanups here to misc. warnings etc. and I'm doing a
from-clean build - I hope to push tomorrow morning.

Have you tested that it's still possible to add a manufacturer in the
configuration ? [ the code looks fine but always worth a check ;-].

Wrt. the saving issue - it'd be interesting to see what happens in
SwLabelConfig::SaveLabel as you step through that when clicking 'Ok' in
the relevant dialog. Are we failing to add the node ? are we somehow not
committing it or something ?

Anyhow - great work,

Thanks,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: filter/source

[Julien Nabet]

 filter/source/graphicfilter/idxf/dxf2mtf.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9a8281f05871b86bac15c54bcee01f3c40f7ee0d
Author: Julien Nabet 
Date:   Wed Feb 13 21:26:44 2013 +0100

Fix scope + member variables not initialized

Change-Id: I0a2c14246a814859c9752f96aaad9f28f6d59c75

diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx 
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index c22e0a4..be2732c 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -115,7 +115,6 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char 
* sLineType)
 DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE)
 {
 DXFLineInfo aDXFLineInfo;
-const DXFLayer * pLayer;
 
 aDXFLineInfo.eStyle = LINE_SOLID;
 aDXFLineInfo.fWidth = 0;
@@ -128,7 +127,7 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const 
DXFBasicEntity & rE)
 if (strcmp(rE.sLineType,"BYLAYER")==0) {
 if (rE.sLayer[0]=='0' && rE.sLayer[1]==0) 
aDXFLineInfo=aParentLayerDXFLineInfo;
 else {
-pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
+const DXFLayer * pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
 if (pLayer!=NULL) 
aDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
 else aDXFLineInfo=aParentLayerDXFLineInfo;
 }
@@ -746,7 +745,7 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities & 
rEntities,
 }
 
 
-DXF2GDIMetaFile::DXF2GDIMetaFile()
+DXF2GDIMetaFile::DXF2GDIMetaFile():pVirDev(NULL), pDXF(NULL), nBlockColor(0), 
nParentLayerColor(0)
 {
 }
 
___
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Peter Lehmkuhle  changed:

   What|Removed |Added

 Depends on||35785

--- Comment #108 from Peter Lehmkuhle  ---
I would like to add bug 35785 (LibreOffice's support of the "recent documents"
feature of the Windows 7 Start menu broken) because it is a regression
introduced by 3.6. It broke a most covenient way to work with the Windows 7
start menu.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 7 commits - l10ntools/source sfx2/source svtools/source sw/source tools/bootstrp tools/source ucbhelper/source

[Julien Nabet]

 l10ntools/source/xrmmerge.cxx |6 ++
 sfx2/source/appl/module.cxx   |2 +-
 svtools/source/control/roadmap.cxx|   15 ---
 sw/source/filter/ww8/rtfsdrexport.cxx |1 +
 tools/bootstrp/rscdep.cxx |2 +-
 tools/source/stream/stream.cxx|3 +--
 ucbhelper/source/provider/registerucb.cxx |3 ++-
 7 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit e52792c9e0aec6e095137cf8d2f68d1cbec90e80
Author: Julien Nabet 
Date:   Wed Feb 13 20:54:58 2013 +0100

Fix member variable 'RoadmapImpl::InCompleteHyperLabel' not initialized in 
CTR

+ replace '<' by '!=' when comparing current it with end iterator

Change-Id: Iea8416a5143aafdea863397c78b58512bb54b427

diff --git a/svtools/source/control/roadmap.cxx 
b/svtools/source/control/roadmap.cxx
index 6a23688..7d7e2b4 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -138,6 +138,7 @@ namespace svt
 ,m_iCurItemID( -1 )
 ,m_bInteractive( sal_True )
 ,m_bComplete( sal_True )
+,InCompleteHyperLabel ( NULL )
 {
 }
 
@@ -238,7 +239,7 @@ namespace svt
 {
 HL_Vector aItemsCopy = m_pImpl->getHyperLabels();
 m_pImpl->getHyperLabels().clear();
-for ( HL_Vector::iterator i = aItemsCopy.begin(); i< aItemsCopy.end(); 
++i )
+for ( HL_Vector::iterator i = aItemsCopy.begin(); i != 
aItemsCopy.end(); ++i )
 {
 delete *i;
 }
@@ -309,7 +310,7 @@ namespace svt
 
 const HL_Vector& rItems = m_pImpl->getHyperLabels();
 for (   HL_Vector::const_iterator i = rItems.begin();
-i < rItems.end();
+i != rItems.end();
 ++i
 )
 {
@@ -348,7 +349,7 @@ namespace svt
 {
 RoadmapItem* pItem = NULL;
 for (   HL_Vector::const_iterator i = rItems.begin() + _nIndex;
-i< rItems.end();
+i != rItems.end();
 ++i, ++_nIndex
 )
 {
@@ -435,7 +436,7 @@ namespace svt
 
 const HL_Vector& rItems = m_pImpl->getHyperLabels();
 for (   HL_Vector::const_iterator i = rItems.begin() + 
_nStartIndex;
-i < rItems.end();
+i != rItems.end();
 ++i
 )
 {
@@ -458,7 +459,7 @@ namespace svt
 ItemId nLocID = 0;
 const HL_Vector& rItems = m_pImpl->getHyperLabels();
 for (   HL_Vector::const_iterator i = rItems.begin() + _nStartIndex;
-i < rItems.end();
+i != rItems.end();
 ++i
 )
 {
@@ -530,7 +531,7 @@ namespace svt
 {
 const HL_Vector& rItems = m_pImpl->getHyperLabels();
 for (   HL_Vector::const_iterator i = rItems.begin();
-i < rItems.end();
+i != rItems.end();
 ++i
 )
 {
@@ -630,7 +631,7 @@ namespace svt
 {
 const HL_Vector& rItems = m_pImpl->getHyperLabels();
 for (   HL_Vector::const_iterator i = rItems.begin();
-i < rItems.end();
+i != rItems.end();
 ++i
 )
 {
commit 0787dc99aa546f68f4003afd5e60cdcca56cad1d
Author: Julien Nabet 
Date:   Wed Feb 13 20:45:52 2013 +0100

Add parenthesis to calm down cppcheck

Change-Id: If62959d80c9a7e207291fff05b5e085b0c84866f

diff --git a/ucbhelper/source/provider/registerucb.cxx 
b/ucbhelper/source/provider/registerucb.cxx
index 6d4bf3e..8b2e5e0 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.cxx
@@ -116,6 +116,7 @@ registerAtUcb(
 
 bool bSuccess = false;
 if (rManager.is() && xProvider.is())
+{
 try
 {
 rManager->registerContentProvider(xProvider, rTemplate, true);
@@ -143,7 +144,7 @@ registerAtUcb(
 catch (uno::RuntimeException const &) {}
 throw;
 }
-
+}
 if (bSuccess && pInfo)
 {
 pInfo->m_xProvider = xOriginalProvider;
commit c7e65b12ff3e7a795a583bf655784126e886289f
Author: Julien Nabet 
Date:   Wed Feb 13 20:43:00 2013 +0100

Reduce scope xrmmerge.cxx

Change-Id: I70018ce13dc5dc45d59fdb339e9d0a14348a4195

diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 5871948..680f0ca 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -400,12 +400,10 @@ void XRMResExport::WorkOnDesc(
 rtl::OString sDescFileName(
 sInputFileName.replaceAll("description.xml", rtl::OString()));
 sDescFileName += GetAttribute( rOpenTag, "xlink:href" );
-int size;
-char * memblock;
 ifstream file (sDescFileName.getStr(), ios::in|ios::binary|ios::ate);
 if (file.is_open()) {
-size = static_

[Libreoffice-commits] core.git: oox/source

[Michael Stahl]

 oox/source/export/chartexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45d1b0331bf65de11b77e97e15d50ad20c6a3c81
Author: Michael Stahl 
Date:   Wed Feb 13 20:32:45 2013 +0100

oox: MSVC complains that nPlacement may be uninitialized

Change-Id: If80b550af5e3dac9ae0601bd9ce0e9e5e877b254

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index ff207d3..ebeafc2 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2325,7 +2325,7 @@ void ChartExport::exportDataLabels(
mAny >>= aLabel;
 
namespace csscd = 
::com::sun::star::chart::DataLabelPlacement;
-   sal_Int32 nPlacement;
+   sal_Int32 nPlacement(csscd::AVOID_OVERLAP);
const char *aPlacement = NULL;
 
if (GetProperty( xPropSet, "LabelPlacement"))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fwd: [Bug 34965] Make Impress slides editable during presentation

[Samuel Mehrbrodt]

Forwarding this to the Mailing list

*Comment # 12  
on bug 34965  from 
Janit Anjaria  *


Hey!
I want to work on this bug,can someone provide me a codepointer ???

Regards,
Janit


You are receiving this mail because:

 * You are on the CC list for the bug.



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac odk/pack

[Rene Engelhard]

 config_host.mk.in|1 +
 configure.ac |5 +
 odk/pack/gendocu/makefile.mk |5 -
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a45b42b8018834e8b6a1dd54a2ab91b51fbc02a6
Author: Rene Engelhard 
Date:   Wed Feb 13 20:21:44 2013 +0100

don't use -notimestanp when using gjdoc as javadoc

Change-Id: Ie729aaeaeff41838a435a043dec10c5016355187

diff --git a/config_host.mk.in b/config_host.mk.in
index 4f5d2e4..803be08 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -267,6 +267,7 @@ export JAVACISGCJ=@JAVACISGCJ@
 export JAVACISKAFFE=@JAVACISKAFFE@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
+export JAVADOCISGJDOC=@JAVADOCISGJDOC@
 export JAVAIFLAGS=@JAVAIFLAGS@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
diff --git a/configure.ac b/configure.ac
index c906e0e..1355f3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6354,7 +6354,12 @@ if test "$SOLAR_JAVA" != ""; then
 JAVADOC=`cygpath -d "$JAVADOC"`
 JAVADOC=`cygpath -u "$JAVADOC"`
 fi
+
+if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
+   JAVADOCISGJDOC="yes"
+fi
 fi
+AC_SUBST(JAVADOCISGJDOC)
 
 if test "$SOLAR_JAVA" != ""; then
 # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 0e51d1c..f3e5b08 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
 $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
 $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
 
-JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime 
Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath 
$(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline 
../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api 
./java $(JAVA_PACKAGES)
+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" 
-header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) 
-classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno 
-linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
+.IF "$(JAVADOCISGJDOC)" != "yes"
+JAVADOCPARAMS+= -notimestamp
+.ENDIF
 
 JAVADOCLOG = $(MISC)$/javadoc_log.txt
 
commit 61f518fdc04e9ca4c691e46d7e7b0247532f19b0
Author: Rene Engelhard 
Date:   Wed Feb 13 20:20:05 2013 +0100

link to java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ in the odk java 
docs

... as /1.4.1/ redirects to the generic Oracle Java page. 1.5 works.

Change-Id: I4f721840bc0bb8146b42a4d91dac8b3621b4bf7e

diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 7345e72..0e51d1c 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -59,7 +59,7 @@ JAVA_BEAN_SRC_FILES=\
 $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
 $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
 
-JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime 
Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath 
$(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline 
../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api 
./java $(JAVA_PACKAGES)
+JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime 
Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath 
$(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline 
../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api 
./java $(JAVA_PACKAGES)
 
 JAVADOCLOG = $(MISC)$/javadoc_log.txt
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source

[Michael Stahl]

 oox/source/export/chartexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d90e0768fc6a4829e586a9b43187011944d9be87
Author: Michael Stahl 
Date:   Wed Feb 13 20:03:54 2013 +0100

oox: fix build breaker: stop using some non-existent "S"

Change-Id: I06124875ad7b4a995010be26f29a16df0b3bd072

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index df2400d..ff207d3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2320,7 +2320,7 @@ void ChartExport::exportDataLabels(
 {
namespace cssc2 = ::com::sun::star::chart2;
cssc2::DataPointLabel aLabel;
-   if( GetProperty( xPropSet, S( "Label" ) ) )
+   if (GetProperty( xPropSet, "Label"))
{
mAny >>= aLabel;
 
@@ -2328,7 +2328,7 @@ void ChartExport::exportDataLabels(
sal_Int32 nPlacement;
const char *aPlacement = NULL;
 
-   if( GetProperty( xPropSet, S( "LabelPlacement" ) ) )
+   if (GetProperty( xPropSet, "LabelPlacement"))
mAny >>= nPlacement;
 
switch( nPlacement )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Need Help for Bug 47302 - Adding a new field in "Insert->Fields"

[Vishv Brahmbhatt]

Hi,
I need help for this bug https://bugs.freedesktop.org/show_bug.cgi?id=47302 .I
am little inexperienced at scripting(xml). So I want help for my Query.

As per  *comment#1* at the above link.I have done following steps:

1)Added a menuitem with label "*~Slide Name*" at
http://opengrok.libreoffice.org/xref/core/scripting/workben/bindings/impressmenubar.xml#190
.

2)Added a node oor:name=".uno:*InsertSlideField*" with value="*~Slide Name*"
at
http://opengrok.libreoffice.org/xref/core/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu#534

3)Added a menuitem with menu:id="*.uno:InsertSlideField*" at
http://opengrok.libreoffice.org/xref/core/sd/uiconfig/simpress/menubar/menubar.xml#147

4)Define *SID_INSERT_FLD_SLIDE* at
http://opengrok.libreoffice.org/xref/core/sd/inc/app.hrc#379

5)Added a function *SfxVoidItem InsertSlideField SID_INSERT_FLD_SLIDE* at
http://opengrok.libreoffice.org/xref/core/sd/sdi/sdraw.sdi#3472


Using above procedure I am able to get "~*Slide Name*" option in
*Insert->Fields->Slide
Name*.But it is not active/working.

*So here is my Query:*

(1)Do I need to use some helper functions for viewing & getting "*Slide Name
*" ?

If yes ,then which function do I have to use and where can I use it to make
"*Slide Name*" option active?

Or I have to make some *changes* in the above given steps?


Eagerly waiting to get some answers in this query.

Regards,
Vishv
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: [libreoffice-dev] -calling a service function from BASIC macro

[Rai, Neeraj]

Hi Michael,

The links clear up some doubts in my mind.
I am still having trouble with having 2 buttons to act on the same service 
(this is a new problem report).
I created 2 buttons which calls startThr() and stopThr() on my service.
The start works as expected. However, the stop call seems to create a new 
service and fails to stop it.

I tried using a global service variable (button.macros attached), but it is 
giving me syntax error on line 1 "expected Sub ".
I used the attached burger_samples.macros as sample for my macro but I might 
have made some obvious mistakes as this is my 1st macro.
I have also found a book on macros by Andrew Pitonyak and going through it.
Are there are any other resources I could use?

thanks
Neeraj
> please read this chapter: 
> http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/C%2B%2B_Language_Binding
> and especially: 
> http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/Mapping_of_Interface_Types

> it is generally unsound to retain a plain C++ pointer to an object after
> the first uno::Reference for it has been constructed.  (you may retain a
> rtl::Reference however, which is often convenient because it can contain
> your implementation class directly and not just some UNO interface).



burger_samples.macros
Description: burger_samples.macros


button.macros
Description: button.macros
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[SOLVED] Re: Cppcheck: 'bMark' is assigned a value never used (sc module)

[Julien Nabet]

On 13/02/2013 17:52, Eike Rathke wrote:

Hi julien2412,

On Wednesday, 2013-02-13 06:24:20 -0800, julien2412 wrote:


Cppcheck reported this:
sc/source/ui/view/tabview2.cxx
970 unreadVariable  style   Variable 'bMark' is assigned a value that is 
never
...
See
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/tabview2.cxx#950

Is line 970 can be removed or is something lacking?

It can be removed. However, I suggest to also remove line 955 and change
line 957

-if (bMark || bMulti)
+if (rMark.IsMarked() || bMulti)

So no one accidentally assumes bMark would be valid after that scope.

Thank you for your feedback Eike!
I pushed the patch on master, see 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c3aad7456adb8a24e2350c9b50778adefb2d1444


Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - rsc/source sc/source

[Julien Nabet]

 rsc/source/res/rscclass.cxx|2 +-
 sc/source/ui/view/tabview2.cxx |5 +
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit c3aad7456adb8a24e2350c9b50778adefb2d1444
Author: Julien Nabet 
Date:   Wed Feb 13 18:44:30 2013 +0100

Fix Variable 'bMark' assigned a value never used

See 
http://nabble.documentfoundation.org/Cppcheck-bMark-is-assigned-a-value-never-used-sc-module-td4037118.html

Change-Id: Ib2c39c3d38d3a34336e9af0e8389c9ab2f8d5df0

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 59eec9b..888e27c 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -952,9 +952,8 @@ void ScTabView::PaintBlock( bool bReset )
 {
 ScMarkData& rMark = aViewData.GetMarkData();
 SCTAB nTab = aViewData.GetTabNo();
-bool bMark = rMark.IsMarked();
 bool bMulti = rMark.IsMultiMarked();
-if (bMark || bMulti)
+if (rMark.IsMarked() || bMulti)
 {
 ScRange aMarkRange;
 HideAllCursors();
@@ -966,8 +965,6 @@ void ScTabView::PaintBlock( bool bReset )
 rMark.GetMultiMarkArea(aMarkRange);
 rMark.MarkToSimple();
 rMark.SetMarking(bFlag);
-
-bMark = rMark.IsMarked();
 }
 else
 rMark.GetMarkArea(aMarkRange);
commit e25cdb40dff8615b5881750e197715c17a55df58
Author: Julien Nabet 
Date:   Wed Feb 13 18:08:36 2013 +0100

Reduce scope

Change-Id: I8e62de343021942fd80ed6846bfa5c0b0ee4a347

diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 648989a..ec2fb11 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -205,7 +205,6 @@ RSCINST RscClass::Create
 )
 {
 sal_uInt32  i;
-CLASS_DATA  * ppData;
 RSCINST aInst;
 RSCINST aMemInst, aDfltI;
 
@@ -234,6 +233,7 @@ RSCINST RscClass::Create
 if( (VAR_POINTER & pVarTypeList[ i ].nVarType)
   && !(VAR_NODATAINST & pVarTypeList[ i ].nVarType) )
 {
+CLASS_DATA  * ppData;
 if( VAR_EXTENDABLE & pVarTypeList[ i ].nVarType )
 {
 RSCINST * pInstance = (RSCINST *)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Joel Madero  changed:

   What|Removed |Added

 Depends on||46393

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Depends on|46393   |

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Depends on|44135   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: oox/inc oox/source

[Katarina Behrens]

 oox/inc/oox/export/chartexport.hxx |3 +
 oox/source/export/chartexport.cxx  |   81 -
 2 files changed, 83 insertions(+), 1 deletion(-)

New commits:
commit 32edd34a2056f0eba1a44fd01743908b1a4729b5
Author: Katarina Behrens 
Date:   Wed Feb 13 15:44:34 2013 +0100

fdo#59789: xlsx export of data point labels, first cut

Change-Id: I4a9d893ce770a559851ce2faac50b3d01b6e

diff --git a/oox/inc/oox/export/chartexport.hxx 
b/oox/inc/oox/export/chartexport.hxx
index f801fc3..83b2ef1 100644
--- a/oox/inc/oox/export/chartexport.hxx
+++ b/oox/inc/oox/export/chartexport.hxx
@@ -159,6 +159,9 @@ private:
 void exportDataPoints(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet >& xSeriesProperties,
 sal_Int32 nSeriesLength );
+void exportDataLabels(
+const ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet >& xSeriesProperties,
+sal_Int32 nSeriesLength );
 void exportGrouping( sal_Bool isBar = sal_False );
 void exportMarker();
 void exportSmooth();
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 6b53159..df2400d 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -51,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1546,7 +1548,8 @@ void ChartExport::exportSeries( Reference< 
chart2::XChartType > xChartType, sal_
 }
 }
 
-// TODO: Data Labels: show data lables
+// export data labels
+exportDataLabels( uno::Reference< beans::XPropertySet >( 
aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
 
 // export data points
 exportDataPoints( uno::Reference< beans::XPropertySet >( 
aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
@@ -2284,6 +2287,82 @@ void ChartExport::_exportAxis(
 pFS->endElement( FSNS( XML_c, nAxisType ) );
 }
 
+void ChartExport::exportDataLabels(
+const uno::Reference< beans::XPropertySet > & xSeriesProperties,
+sal_Int32 nSeriesLength )
+{
+// TODO: export field separators, missing flag vs. showing series name or 
not
+uno::Reference< chart2::XDataSeries > xSeries( xSeriesProperties, 
uno::UNO_QUERY );
+Sequence< sal_Int32 > aDataPointSeq;
+if( xSeriesProperties.is())
+{
+FSHelperPtr pFS = GetFS();
+pFS->startElement( FSNS( XML_c, XML_dLbls ),
+FSEND );
+sal_Int32 nElem;
+for( nElem = 0; nElem < nSeriesLength; ++nElem)
+{
+uno::Reference< beans::XPropertySet > xPropSet;
+
+try
+{
+xPropSet = 
SchXMLSeriesHelper::createOldAPIDataPointPropertySet(
+xSeries, nElem, getModel() );
+}
+catch( const uno::Exception & rEx )
+{
+(void)rEx; // avoid warning for pro build
+OSL_TRACE( "Exception caught during Export of data label: %s",
+rtl::OUStringToOString( rEx.Message, 
RTL_TEXTENCODING_ASCII_US ).getStr() );
+}
+
+if( xPropSet.is() )
+{
+   namespace cssc2 = ::com::sun::star::chart2;
+   cssc2::DataPointLabel aLabel;
+   if( GetProperty( xPropSet, S( "Label" ) ) )
+   {
+   mAny >>= aLabel;
+
+   namespace csscd = 
::com::sun::star::chart::DataLabelPlacement;
+   sal_Int32 nPlacement;
+   const char *aPlacement = NULL;
+
+   if( GetProperty( xPropSet, S( "LabelPlacement" ) ) )
+   mAny >>= nPlacement;
+
+   switch( nPlacement )
+   {
+   case csscd::OUTSIDE:   aPlacement = "outEnd";  
break;
+   case csscd::INSIDE:aPlacement = "inEnd";   
break;
+   case csscd::CENTER:aPlacement = "ctr"; 
break;
+   case csscd::NEAR_ORIGIN:   aPlacement = "inBase";  
break;
+   case csscd::TOP:   aPlacement = "t";   
break;
+   case csscd::BOTTOM:aPlacement = "b";   
break;
+   case csscd::LEFT:  aPlacement = "l";   
break;
+   case csscd::RIGHT: aPlacement = "r";   
break;
+   case csscd::AVOID_OVERLAP: aPlacement = "bestFit";  
break;
+   }
+
+   pFS->startElement( FSNS( XML_c, XML_dLbl ), FSEND);
+   pFS->singleElement( FSNS( XML_c, XML_idx), XML_val, 
I32S(nElem), FSEND);
+   pFS->singleElement( FSNS( XML_c, XML_dLblPos)

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Joel Madero  changed:

   What|Removed |Added

 Depends on||40788

-- 
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 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Joel Madero  changed:

   What|Removed |Added

 Depends on|40788   |

-- 
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: Cppcheck: 'bMark' is assigned a value never used (sc module)

[Eike Rathke]

Hi julien2412,

On Wednesday, 2013-02-13 06:24:20 -0800, julien2412 wrote:

> Cppcheck reported this:
> sc/source/ui/view/tabview2.cxx
> 970   unreadVariable  style   Variable 'bMark' is assigned a value that is 
> never
> used.951 void ScTabView::PaintBlock( bool bReset )
> 952 {
> 953 ScMarkData& rMark = aViewData.GetMarkData();
> 954 SCTAB nTab = aViewData.GetTabNo();
> 955 bool bMark = rMark.IsMarked();
> 956 bool bMulti = rMark.IsMultiMarked();
> 957 if (bMark || bMulti)
> 958 {
> 959 ScRange aMarkRange;
> 960 HideAllCursors();
> 961 if (bMulti)
> 962 {
> 963 bool bFlag = rMark.GetMarkingFlag();
> 964 rMark.SetMarking(false);
> 965 rMark.MarkToMulti();
> 966 rMark.GetMultiMarkArea(aMarkRange);
> 967 rMark.MarkToSimple();
> 968 rMark.SetMarking(bFlag);
> 969 
> 970 bMark = rMark.IsMarked();
> 
> See
> http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/tabview2.cxx#950
> 
> Is line 970 can be removed or is something lacking?

It can be removed. However, I suggest to also remove line 955 and change
line 957

-if (bMark || bMulti)
+if (rMark.IsMarked() || bMulti)

So no one accidentally assumes bMark would be valid after that scope.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpCoodKYs97e.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Laurent Godard]

 sc/source/ui/view/tabvwshf.cxx |   37 +++--
 1 file changed, 15 insertions(+), 22 deletions(-)

New commits:
commit 30862ca42c6b548a2dce99c0f2a0c2886f059dfa
Author: Laurent Godard 
Date:   Fri Feb 8 18:49:05 2013 +0100

calc : multiple tabs can be hidden at once

- enables the "Format > Sheet > Hide" menu  when mutiple tabs are selected
provided there remain one tab at least at the end
- loops over selected tabs to hide them
- does nothing if the command leads to no visible tabs.

Change-Id: I445eccc188f1817006cb425dc9a0e92a25350ec8
Reviewed-on: https://gerrit.libreoffice.org/2053
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 89585dd..c8320ba 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -109,33 +109,26 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 ScMarkData& rMark = pViewData->GetMarkData();
 SCTAB nTabSelCount = rMark.GetSelectCount();
 sal_uInt16 nVis = 0;
-for ( SCTAB i=0; i < nTabCount && nVis<2; i++ )
+
+// check to make sure we won't hide all sheets. we need at 
least one visible at all times.
+for ( SCTAB i=0; i < nTabCount && nVisIsVisible(i))
 ++nVis;
-if ( nVis<2 || !pDoc->IsDocEditable() || nTabSelCount > 1 )
+if ( nVis<=nTabSelCount || !pDoc->IsDocEditable() )
 break;
 
-
 rtl::OUString aName;
-if( pReqArgs != NULL )
-{
-const SfxPoolItem* pItem;
-if( pReqArgs->HasItem( FID_TABLE_HIDE, &pItem ) )
-aName = ((const SfxStringItem*)pItem)->GetValue();
-}
+SCTAB nHideTab;
+ScMarkData::MarkedTabsType::const_iterator it;
+
+ScMarkData::MarkedTabsType selectedTabs = 
rMark.GetSelectedTabs();
 
-if (aName.isEmpty())
+for (it=selectedTabs.begin(); it!=selectedTabs.end(); ++it)
 {
-pDoc->GetName( nCurrentTab, aName );// aktuelle 
Tabelle
-rReq.AppendItem( SfxStringItem( FID_TABLE_HIDE, aName ) );
+nHideTab = *it;
+if (pDoc->IsVisible( nHideTab ))
+HideTable( nHideTab );
 }
-
-SCTAB nHideTab;
-if (pDoc->GetTable( aName, nHideTab ))
-HideTable( nHideTab );
-
-if( ! rReq.IsAPI() )
-rReq.Done();
 }
 break;
 
@@ -841,11 +834,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 case FID_TABLE_HIDE:
 {
 sal_uInt16 nVis = 0;
-for ( SCTAB i=0; i < nTabCount && nVis<2; i++ )
+// enable menu : check to make sure we won't hide all 
sheets. we need at least one visible at all times.
+for ( SCTAB i=0; i < nTabCount && nVisIsVisible(i))
 ++nVis;
-
-if ( nVis<2 || !pDoc->IsDocEditable() || nTabSelCount > 1 )
+if ( nVis<=nTabSelCount || !pDoc->IsDocEditable() )
 rSet.DisableItem( nWhich );
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About macro VALIDTAB (sc module)

[Eike Rathke]

Hi Kohei,

On Tuesday, 2013-02-12 20:09:55 -0500, Kohei Yoshida wrote:

> > 124 #define VALIDCOL(nCol)  (ValidCol(nCol))
> > 125 #define VALIDROW(nRow)  (ValidRow(nRow))
> > 126 #define VALIDTAB(nTab)  (ValidTab(nTab))
> > 127 #define VALIDCOLROW(nCol,nRow)  (ValidColRow(nCol,nRow))
> >
> >I suppose there's a reason for these macros but I must recognize I don't get
> >it :-(
> 
> Actually I don't get the purpose of those macros either.  Anyway,
> I'm pretty sure that those macros are there for none other than some
> weird historical reasons.

Indeed, first there were the macros and later the proper inline methods
were introduced when increasing the row limit from 32k to 64k rows (CWS
rowlimit). Probably because back at those times it took ~2 hours to
recompile only Calc no one felt the urge to change everything at the end
;-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpw6G6rr1v0O.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: InteractiveAugmentedIOException in CUT sc_ucalc

[Stephan Bergmann]

On 02/13/2013 04:46 PM, Tor Lillqvist wrote:

so that some catch block that should match doesn't.


Isn't one typical problem that two type_infos are compared for
equality by comparing the name string pointers instead of comparing
the name strings with strcmp? I have seen stuff like that both in the
Android and iOS ports, I think. Unfortunately it is such a complex
topic that I don't recall the details. But yeah, there must be
something special in his toolchain compared to that on "normal" Linux.


Comparing just pointers is indeed how the g++ runtime traditionally 
behaved---though that's been changed in more recent times, to actually 
compare the strings.  That's the reason why LO has traditionally been 
careful to export all the weak _ZTI* and _ZTS* symbols from all libraries.


Stephan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cppcheck: 'bMark' is assigned a value never used (sc module)

[Riccardo Magliocchetti]

Hello,

Il 13/02/2013 15:24, julien2412 ha scritto:

Hello,

Cppcheck reported this:
sc/source/ui/view/tabview2.cxx
970 unreadVariable  style   Variable 'bMark' is assigned a value that is 
never
used.951 void ScTabView::PaintBlock( bool bReset )

[snip]


See
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/tabview2.cxx#950

Is line 970 can be removed or is something lacking?


It looks to me like this and other cppcheck errors you have reported on 
list follow the pattern "let's update the variable because in theory if 
i ever need to use it again the old value would be wrong". But practice 
is a different matter :)


Also while we are speaking about code checkers is anyone looking at 
coverity scan? On a couple of projects I've found it reporting ten time 
the errors reported by cppcheck.


thanks,
riccardo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Luboš Luňák]

 sc/source/ui/inc/anyrefdg.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7275f45369ac50ae1eec2688147126052cf27889
Author: Luboš Luňák 
Date:   Wed Feb 13 17:07:26 2013 +0100

avoid MSVC C4150 , caused by 55b39ff42e

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 8901fb5..2040767 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include "address.hxx"
+#include "cell.hxx"
 #include "compiler.hxx"
 #include "formula/funcutl.hxx"
 #include "IAnyRefDialog.hxx"
@@ -40,7 +41,6 @@ class ScDocument;
 class ScTabViewShell;
 class ScRefHandler;
 class ScRangeList;
-class ScFormulaCell;
 
 class ScFormulaReferenceHelper
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Michael Meeks]

 sw/source/core/doc/doc.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a128bea5dda1d74426dae62b032d5af52f431fe2
Author: Michael Meeks 
Date:   Wed Feb 13 16:04:01 2013 +

cancel asynchronous word-count on sync. word-count.

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 0470ef3..b9bc7d2 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1792,7 +1792,10 @@ void SwDoc::UpdateDocStat( bool bCompleteAsync )
 if( pDocStat->bModified )
 {
 if (!bCompleteAsync)
+{
 while (IncrementalDocStatCalculate()) {}
+aStatsUpdateTimer.Stop();
+}
 else if (IncrementalDocStatCalculate())
 aStatsUpdateTimer.Start();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] calc/rich-text-cell-content.ods

[Libreoffice Gerrit user]

 calc/rich-text-cell-content.ods |binary
 1 file changed

New commits:
commit d83d4e8475acfd305dadb385685fbaf7e7594c5a
Author: Kohei Yoshida 
Date:   Wed Feb 13 10:48:17 2013 -0500

New file to test import of rich-text cell contents.

diff --git a/calc/rich-text-cell-content.ods b/calc/rich-text-cell-content.ods
new file mode 100644
index 000..b7941b9
Binary files /dev/null and b/calc/rich-text-cell-content.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: InteractiveAugmentedIOException in CUT sc_ucalc

[Tor Lillqvist]

> so that some catch block that should match doesn't.

Isn't one typical problem that two type_infos are compared for
equality by comparing the name string pointers instead of comparing
the name strings with strcmp? I have seen stuff like that both in the
Android and iOS ports, I think. Unfortunately it is such a complex
topic that I don't recall the details. But yeah, there must be
something special in his toolchain compared to that on "normal" Linux.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/text

[Miklos Vajna]

 source/text/shared/01/05030600.xhp |9 +
 1 file changed, 9 insertions(+)

New commits:
commit aab9e2b7e799b6246caa6c40ca3d46e6220d
Author: Miklos Vajna 
Date:   Wed Feb 13 16:37:39 2013 +0100

help for sw textframe gradient background UI

Change-Id: I10f7c03dadd68b665dd921f66060d7e6903916a5

diff --git a/source/text/shared/01/05030600.xhp 
b/source/text/shared/01/05030600.xhp
index c221172..2385a5c 100644
--- a/source/text/shared/01/05030600.xhp
+++ b/source/text/shared/01/05030600.xhp
@@ -81,6 +81,15 @@
 This option is only available when you edit the background of a 
table or a paragraph style.
 
 
+
+
+Using a Gradient as a Background
+Background gradient
+Click the gradient that 
you want to use as a background. To remove a background gradient, set 
As to Color, then click No 
Fill.
+Preview field
+Displays a preview of 
the currently selected gradient.
+
+
 Using a Graphic as a Background
   http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Miklos Vajna]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5df28325e71fef3cb8557bf670959f9adc71421e
Author: Miklos Vajna 
Date:   Wed Feb 13 16:37:39 2013 +0100

Updated core
Project: help  aab9e2b7e799b6246caa6c40ca3d46e6220d

diff --git a/helpcontent2 b/helpcontent2
index cbf9ca8..aab9e88 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cbf9ca859ce3381e1598201bfba2423b919633cc
+Subproject commit aab9e2b7e799b6246caa6c40ca3d46e6220d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 46393, which changed state.

Bug 46393 Summary: PRINTING result for cell borders of particular document.xls 
unsatisfying
https://bugs.freedesktop.org/show_bug.cgi?id=46393

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcompiler/inc helpcompiler/source xmlhelp/Package_xsl.mk xmlhelp/util

[Andras Timar]

 helpcompiler/inc/HelpCompiler.hxx|3 ++
 helpcompiler/inc/HelpLinker.hxx  |1 
 helpcompiler/source/HelpCompiler.cxx |   29 +
 helpcompiler/source/HelpLinker.cxx   |   14 +-
 xmlhelp/Package_xsl.mk   |1 
 xmlhelp/util/compact.xsl |   47 +++
 6 files changed, 89 insertions(+), 6 deletions(-)

New commits:
commit a775aa57f7b1d5f0f69b8faa5277d1914455ba38
Author: Andras Timar 
Date:   Wed Feb 13 16:28:16 2013 +0100

compact help xml files with xslt which removes the cruft

Change-Id: Iee923174169d6ba9961a9cee14115c9a4bf7ba09

diff --git a/helpcompiler/inc/HelpCompiler.hxx 
b/helpcompiler/inc/HelpCompiler.hxx
index 8a5dda1..0ee2801 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -230,6 +230,7 @@ public:
 const fs::path &in_inputFile,
 const fs::path &in_src,
 const fs::path &in_zipdir,
+const fs::path &in_resCompactStylesheet,
 const fs::path &in_resEmbStylesheet,
 const std::string &in_module,
 const std::string &in_lang,
@@ -246,11 +247,13 @@ public:
 private:
 xmlDocPtr getSourceDocument(const fs::path &filePath);
 void tagBasicCodeExamples(xmlDocPtr doc);
+xmlDocPtr compactXhpForJar(xmlDocPtr doc);
 void saveXhpForJar(xmlDocPtr doc, const fs::path &filePath);
 xmlNodePtr clone(xmlNodePtr node, const std::string& appl);
 StreamTable &streamTable;
 const fs::path inputFile, src, zipdir;
 const std::string module, lang;
+const fs::path resCompactStylesheet;
 const fs::path resEmbStylesheet;
 bool bExtensionMode;
 std::string gui;
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index 57e21a5..5e2e88d 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -66,6 +66,7 @@ private:
 Stringtable additionalFiles;
 HashSet helpFiles;
 fs::path sourceRoot;
+fs::path compactStylesheet;
 fs::path embeddStylesheet;
 fs::path idxCaptionStylesheet;
 fs::path idxContentStylesheet;
diff --git a/helpcompiler/source/HelpCompiler.cxx 
b/helpcompiler/source/HelpCompiler.cxx
index 3983f16..eedc7fd 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -38,11 +38,12 @@ static void impl_sleep( sal_uInt32 nSec )
 osl::Thread::wait( aTime );
 }
 HelpCompiler::HelpCompiler(StreamTable &in_streamTable, const fs::path 
&in_inputFile,
-const fs::path &in_src, const fs::path &in_zipdir, const fs::path 
&in_resEmbStylesheet,
-const std::string &in_module, const std::string &in_lang, bool 
in_bExtensionMode)
+const fs::path &in_src, const fs::path &in_zipdir, const fs::path 
&in_resCompactStylesheet,
+const fs::path &in_resEmbStylesheet, const std::string &in_module, const 
std::string &in_lang,
+bool in_bExtensionMode)
 : streamTable(in_streamTable), inputFile(in_inputFile),
-src(in_src), zipdir(in_zipdir), module(in_module), lang(in_lang), 
resEmbStylesheet(in_resEmbStylesheet),
-bExtensionMode( in_bExtensionMode )
+src(in_src), zipdir(in_zipdir), module(in_module), lang(in_lang), 
resCompactStylesheet(in_resCompactStylesheet),
+resEmbStylesheet(in_resEmbStylesheet), bExtensionMode( in_bExtensionMode )
 {
 xmlKeepBlanksDefaultValue = 0;
 char* guitmp = getenv("GUI");
@@ -68,6 +69,22 @@ void HelpCompiler::tagBasicCodeExamples( xmlDocPtr doc )
 }
 }
 
+xmlDocPtr HelpCompiler::compactXhpForJar( xmlDocPtr doc )
+{
+static xsltStylesheetPtr compact = NULL;
+static const char *params[2 + 1];
+params[0] = NULL;
+xmlDocPtr compacted;
+
+if (!compact)
+{
+compact = xsltParseStylesheetFile((const xmlChar 
*)resCompactStylesheet.native_file_string().c_str());
+}
+
+compacted = xsltApplyStylesheet(compact, doc, params);
+return compacted;
+}
+
 void HelpCompiler::saveXhpForJar( xmlDocPtr doc, const fs::path &filePath )
 {
 //save processed xhp document in ziptmp_/text directory
@@ -90,9 +107,11 @@ void HelpCompiler::saveXhpForJar( xmlDocPtr doc, const 
fs::path &filePath )
 size_t pos = zipdirPath.find( "ziptmp" ) + 6;
 zipdirPath.replace( pos, module.length(), "shared" );
 }
+xmlDocPtr compacted = compactXhpForJar( doc );
 fs::create_directory( fs::path( zipdirPath + jarXhpPath, fs::native ) );
-if ( -1 == xmlSaveFormatFileEnc( (zipdirPath + jarXhpPath + pathSep + 
xhpFileName).c_str(), doc, "utf-8", 0 ) )
+if ( -1 == xmlSaveFormatFileEnc( (zipdirPath + jarXhpPath + pathSep + 
xhpFileName).c_str(), compacted, "utf-8", 0 ) )
 std::cerr << "Error saving file to " << (zipdirPath + jarXhpPath + 
pathSep + xhpFileName).c_str() << std::endl;
+xmlFreeDoc(compacted);
 }
 
 
diff --git a/helpcompiler/source/HelpLinker.cxx 
b/helpcompiler/source/HelpLinker.cxx
index 4bbe2

[Libreoffice-commits] help.git: util/target.pmk

[Andras Timar]

 util/target.pmk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cbf9ca859ce3381e1598201bfba2423b919633cc
Author: Andras Timar 
Date:   Wed Feb 13 16:22:37 2013 +0100

compact help xml files with xslt which removes the cruft

Change-Id: I7dfea1d7fd42a5e7aeed96db508a606982530b7f

diff --git a/util/target.pmk b/util/target.pmk
index 0430239..63e15ce 100644
--- a/util/target.pmk
+++ b/util/target.pmk
@@ -24,7 +24,7 @@ ALLTAR : $(LINKALLTARGETS)
 XSL_DIR*:=$(SOLARBINDIR)
 
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) 
$(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) 
$(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) 
$(COMMONMISC)$/xhp_changed.flag
-$(COMMAND_ECHO)$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -src $(COMMONMISC) 
-sty $(XSL_DIR)/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption 
$(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl -lang 
{$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, 
$(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) 
$(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH))
+$(COMMAND_ECHO)$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -src $(COMMONMISC) 
-compact $(XSL_DIR)/compact.xsl -sty $(XSL_DIR)/embed.xsl -zipdir 
$(MISC)$/ziptmp$(@:b) -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent 
$(XSL_DIR)/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} 
$(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) 
$(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) 
-o $@.$(INPATH))
 $(COMMAND_ECHO)$(HELPINDEXER) -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) 
-dir $(MISC)$/ziptmp$(@:b)
 @echo [ building ZIP ] $(@:f)
 .IF "$(LINKNAME)"=="sdatabase"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4552bd5a7c61c4f9428ad73e19bbee5b78e510ab
Author: Andras Timar 
Date:   Wed Feb 13 16:22:37 2013 +0100

Updated core
Project: help  cbf9ca859ce3381e1598201bfba2423b919633cc

diff --git a/helpcontent2 b/helpcontent2
index 7a051b0..cbf9ca8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7a051b06eee9561a19aa1248ec5dfde655c624e7
+Subproject commit cbf9ca859ce3381e1598201bfba2423b919633cc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: convert setup_native to gbuild and add to tail_build

[Niko Rönkkö]

Hi!

This commit breaks my Mac build with error message:
Unrecognized option: -p
Usage: ulfconv [-o ] [-t ] []

Problem seems to be on line 22 in CustomTarget_mac.mk:
http://opengrok.libreoffice.org/xref/core/setup_native/CustomTarget_mac.mk#22

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Unpublishing API post 4.0

[Wols Lists]

On 13/02/13 09:02, Stephan Bergmann wrote:
> On 02/08/2013 06:01 PM, Kohei Yoshida wrote:
>> 1) Try to limit API changes to the major releases (4.0, 5.0, 6.0 etc).
>>
>> 2) API changes in minor and micro releases are still considered only if
>> it's really really necessary. Otherwise, wait until the next major
>> release.
> 
> I would weaken that to just one "really" for minor releases.
> 
> (Also, considering just major and minor releases, we do not have the
> mismatch problem between lexicographical order of release numbers and
> chronological order of releases.  At least that is my understanding of
> how we plan releases.)
> 
> Stephan

And if you want to avoid hiccups like it going in 4.0.1 and 4.1 and not
knowing which is later, then just adopt the kernel approach.

Which is that ALL changes have to go in the latest development release,
and then and only then are back-ported to currently supported releases.

Which also has the useful side-effect that bugfixes etc can't get lost.

(Okay, it could have a failure mode if 4.2 is the development version
and 4.0.x and 4.1.x are still both supported, but that's probably
liveable with, especially if dependencies can be specified as "4.1.2+ or
4.0.6+" style.)

Cheers,
Wol
(Making a re-appearance after a difficult while of home-life...)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] Let's try to enable compiling the Bluetooth code for Windows

[Michael Meeks (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2129

Approvals:
  Michael Meeks: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2129
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist 
Gerrit-Reviewer: Michael Meeks 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] minimal change to fix fdo#57908 for backport

[Luke Deller (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2137

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2137/1

minimal change to fix fdo#57908 for backport

wwSectionManager::GetPageULData adjusts margins and header/footer
heights according to whether there is a header/footer or not.
It could be confused into thinking there was no header/footer when
indeed there was, in the case where a first page header/footer was
inherited from a previous section which contained but did not actually
show that header.

Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
---
M sw/source/filter/ww8/ww8par6.cxx
1 file changed, 7 insertions(+), 3 deletions(-)



diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 761a68a..691b8f7 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1115,10 +1115,14 @@
 aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, eVer <= ww::eWW2 ? 128 : 
153, 0);
 else if (mrReader.pHdFt)
 {
-aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD;
+aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD
+| WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
 
-if (aNewSection.HasTitlePage())
-aNewSection.maSep.grpfIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST;
+// It is possible for a first page header to be provided
+// for this section, but not actually shown in this section.  In this
+// case (aNewSection.maSep.grpfIhdt & WW8_HEADER_FIRST) will be nonzero
+// but aNewSection.HasTitlePage() will be false.
+// Likewise for first page footer.
 
 if (mrReader.pWDop->fFacingPages)
 aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN;

-- 
To view, visit https://gerrit.libreoffice.org/2137
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7258bdc7bd004ab2b7fb0ac9090256b4028030c4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-3-6] fdo#60386 fix l10n of windows shell extension

[Andras Timar (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2136

Approvals:
  Andras Timar: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2136
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: Andras Timar 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60386 fix l10n of windows shell extension

[Andras Timar (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2135

Approvals:
  Andras Timar: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2135
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: Andras Timar 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-3-6] fdo#60386 fix l10n of windows shell extension

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2136

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/2136/1

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
---
M shell/CustomTarget_shlxthdl_res.mk
1 file changed, 11 insertions(+), 2 deletions(-)



diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 67e27a6..5a3bcb5 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -43,10 +43,19 @@
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $< \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)` && \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $< -o $@ 
-m $${MERGEINPUT} -l all && \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

-- 
To view, visit https://gerrit.libreoffice.org/2136
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: David Tardon 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#60386 fix l10n of windows shell extension

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2135

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2135/1

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
---
M shell/CustomTarget_shlxthdl_res.mk
1 file changed, 11 insertions(+), 2 deletions(-)



diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 77a3358..9b48e47 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -44,10 +44,19 @@
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
BRAND_BASE_DIR=$(call 
gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $< \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)` && \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $< -o $@ 
-m $${MERGEINPUT} -l all && \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

-- 
To view, visit https://gerrit.libreoffice.org/2135
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-3-6] fdo#60668: filter out fieldmark chars from Index entries:

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2134

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/2134/1

fdo#60668: filter out fieldmark chars from Index entries:

SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.

(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)

Conflicts:
sw/source/core/txtnode/ndtxt.cxx

Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
---
M sw/source/core/txtnode/ndtxt.cxx
1 file changed, 31 insertions(+), 14 deletions(-)



diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e9e30a7..46ef849 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2965,9 +2965,8 @@
 sTmpText.SearchAndReplaceAll('\t', ' ');
 
 // mask hidden characters
-const xub_Unicode cChar = CH_TXTATR_BREAKWORD;
-sal_uInt16 nHiddenChrs =
-SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), 
cChar );
+const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
+SwScriptInfo::MaskHiddenRanges(*this, sTmpText, 0, sTmpText.Len(), cChar);
 
 sTmpText = sTmpText.Copy( nIdx, nLen );
 rDestNd.InsertText( sTmpText, aDestIdx );
@@ -3070,22 +3069,40 @@
 rDestNd.InsertText( GetNumString(), aDestIdx );
 }
 
-if ( nHiddenChrs > 0 )
+aDestIdx = 0;
+sal_Int32 nStartDelete(-1);
+while (aDestIdx < rDestNd.GetTxt().Len())
 {
-aDestIdx = 0;
-while ( aDestIdx < rDestNd.GetTxt().Len() )
+sal_Unicode const cur(rDestNd.GetTxt().GetChar(aDestIdx.GetIndex()));
+if (   (cChar == cur) // filter substituted hidden text
+|| (CH_TXT_ATR_FIELDSTART  == cur) // filter all fieldmarks
+|| (CH_TXT_ATR_FIELDEND== cur)
+|| (CH_TXT_ATR_FORMELEMENT == cur))
 {
-if ( cChar == rDestNd.GetTxt().GetChar( aDestIdx.GetIndex() ) )
+if (-1 == nStartDelete)
 {
-xub_StrLen nIndex = aDestIdx.GetIndex();
-while ( nIndex < rDestNd.GetTxt().Len() &&
-cChar == rDestNd.GetTxt().GetChar( ++nIndex ) )
-;
-rDestNd.EraseText( aDestIdx, nIndex - aDestIdx.GetIndex() );
+nStartDelete = aDestIdx.GetIndex(); // start deletion range
 }
-else
-++aDestIdx;
+++aDestIdx;
+if (aDestIdx < rDestNd.GetTxt().Len())
+{
+continue;
+} // else: end of paragraph => delete, see below
 }
+else
+{
+if (-1 == nStartDelete)
+{
+++aDestIdx;
+continue;
+} // else: delete, see below
+}
+assert(-1 != nStartDelete); // without delete range, would have 
contined
+rDestNd.EraseText(
+SwIndex(&rDestNd, static_cast(nStartDelete)),
+aDestIdx.GetIndex() - nStartDelete);
+assert(aDestIdx.GetIndex() == nStartDelete);
+nStartDelete = -1; // reset
 }
 
 return sal_True;

-- 
To view, visit https://gerrit.libreoffice.org/2134
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#43105: apply old sw-nested-positionned-tables-ww8-import...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2133

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/2133/1

fdo#43105: apply old sw-nested-positionned-tables-ww8-import-fix.diff

- replaced the really ugly goto hack though

Change-Id: I14dfbe414dc16b634fbaca0a365e2e9ec37ab08e
---
M sw/source/filter/ww8/ww8par.cxx
1 file changed, 107 insertions(+), 103 deletions(-)



diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e71b6c0..fb93ac5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2196,113 +2196,117 @@
 if (!nCellLevel)
 nCellLevel = 0 != pPlcxMan->HasParaSprm(0x244B);
 }
-
-WW8_TablePos *pTabPos=0;
-WW8_TablePos aTabPos;
-if (nCellLevel && !bVer67)
+do
 {
-WW8PLCFxSave1 aSave;
-pPlcxMan->GetPap()->Save( aSave );
-rbReSync = true;
-WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF();
-WW8_CP nMyStartCp=nStartCp;
-
-if (const sal_uInt8 *pLevel = pPlcxMan->HasParaSprm(0x6649))
-nCellLevel = *pLevel;
-
-bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
-
-//Bad Table, remain unchanged in level, e.g. #i19667#
-if (!bHasRowEnd)
-nCellLevel = static_cast< sal_uInt8 >(nInTable);
-
-if (bHasRowEnd && ParseTabPos(&aTabPos,pPap))
-pTabPos = &aTabPos;
-
-pPlcxMan->GetPap()->Restore( aSave );
-}
-
-//  then look if we are in an Apo
-
-ApoTestResults aApo = TestApo(nCellLevel, bTableRowEnd, pTabPos);
-
-//look to see if we are in a Table, but Table in foot/end note not allowed
-bool bStartTab = (nInTable < nCellLevel) && !bFtnEdn;
-
-bool bStopTab = bWasTabRowEnd && (nInTable > nCellLevel) && !bFtnEdn;
-
-bWasTabRowEnd = false;  // must be deactivated right here to prevent next
-// WW8TabDesc::TableCellEnd() from making nonsense
-
-if (nInTable && !bTableRowEnd && !bStopTab && (nInTable == nCellLevel && 
aApo.HasStartStop()))
-bStopTab = bStartTab = true;// Required to stop and start table
-
-//  Dann auf Anl (Nummerierung) testen
-//  und dann alle Ereignisse in der richtigen Reihenfolge bearbeiten
-
-if( bAnl && !bTableRowEnd )
-{
-const sal_uInt8* pSprm13 = pPlcxMan->HasParaSprm( 13 );
-if( pSprm13 )
-{   // Noch Anl ?
-sal_uInt8 nT = static_cast< sal_uInt8 >(GetNumType( *pSprm13 ));
-if( ( nT != WW8_Pause && nT != nWwNumType ) // Anl-Wechsel
-|| aApo.HasStartStop()  // erzwungenes Anl-Ende
-|| bStopTab || bStartTab )
-{
-StopAnlToRestart(nT);  // Anl-Restart ( = Wechsel ) ueber sprms
-}
-else
-{
-NextAnlLine( pSprm13 ); // naechste Anl-Zeile
-}
-}
-else
-{   // Anl normal zuende
-StopAllAnl();  // Wirkliches Ende
-}
-}
-if (bStopTab)
-{
-StopTable();
-maApos.pop_back();
---nInTable;
-}
-if (aApo.mbStopApo)
-{
-StopApo();
-maApos[nInTable] = false;
-}
-
-if (aApo.mbStartApo)
-{
-maApos[nInTable] = StartApo(aApo, pTabPos);
-// nach StartApo ist ein ReSync noetig ( eigentlich nur, falls die Apo
-// ueber eine FKP-Grenze geht
-rbReSync = true;
-}
-if (bStartTab)
-{
-WW8PLCFxSave1 aSave;
-pPlcxMan->GetPap()->Save( aSave );
-
-if (bAnl)   // Nummerierung ueber Zellengrenzen
-StopAllAnl();   // fuehrt zu Absturz -> keine Anls
-// in Tabellen
-while (nInTable < nCellLevel)
+WW8_TablePos *pTabPos=0;
+WW8_TablePos aTabPos;
+if(nCellLevel && !bVer67)
 {
-if (StartTable(nStartCp))
-++nInTable;
-else
-break;
+WW8PLCFxSave1 aSave;
+pPlcxMan->GetPap()->Save( aSave );
+rbReSync = true;
+WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF();
+WW8_CP nMyStartCp=nStartCp;
 
-maApos.push_back(false);
+if (const sal_uInt8 *pLevel = pPlcxMan->HasParaSprm(0x6649))
+nCellLevel = *pLevel;
+
+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTable(nInTable);
+
+if (bHasRowEnd && ParseTabPos(&aTabPos,pPap))
+pTabPos = &aTabPos;
+
+pPlcxMan->GetPap()->Restore( aSave );
 }
-// nach StartTable ist ein ReSync noetig ( eigentlich nur, falls die
-// Tabelle ueber eine FKP-Grenze geht
-rbReSync = tru

[PUSHED libreoffice-4-0] fdo#60491: embeddedobj: catch exception in fallback path

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2096

Approvals:
  Miklos Vajna: Verified
  Eike Rathke: Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2096
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Miklos Vajna 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60092: fix STL regression in SwInsertDBColAutoPilot::Dat...

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2119

Approvals:
  Miklos Vajna: Verified
  Eike Rathke: Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2119
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida92854efe6ddb8fe10e5ef1f42c53747f40
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Miklos Vajna 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] Templates Manager: if the title can't be edited, don't updat...

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2109

Approvals:
  Tor Lillqvist: Looks good to me, approved
  Miklos Vajna: Verified


-- 
To view, visit https://gerrit.libreoffice.org/2109
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id16431fb3517c831a5e81ff72fafaa8569f99ef1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric 
Gerrit-Reviewer: Miklos Vajna 
Gerrit-Reviewer: Tor Lillqvist 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] Templates Manager: UI for renaming templates and folders, fd...

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2108

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2108
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e4a89c2e68f7e04b0fca3fc161920505ac715b4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric 
Gerrit-Reviewer: Miklos Vajna 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-0] fdo#60668: filter out fieldmark chars from Index entries:

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2122

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2122
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#46808, Adapt UNO services to new style, Part 1

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2132

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/2132/1

fdo#46808, Adapt UNO services to new style, Part 1

Updated the AccessBridge.idl file in offapi to the new style. This is my first 
patch.

fdo#46808, Adapt UNO services to new style, Part 1

Updated Accessible.idl file in offapi to the new style.

Change-Id: I4d512d74542285e0a7321f8251193bf33dfb878b
---
M offapi/com/sun/star/accessibility/AccessBridge.idl
M offapi/com/sun/star/accessibility/Accessible.idl
2 files changed, 2 insertions(+), 9 deletions(-)



diff --git a/offapi/com/sun/star/accessibility/AccessBridge.idl 
b/offapi/com/sun/star/accessibility/AccessBridge.idl
index 44703ed..7d28f9c 100644
--- a/offapi/com/sun/star/accessibility/AccessBridge.idl
+++ b/offapi/com/sun/star/accessibility/AccessBridge.idl
@@ -35,11 +35,7 @@
 @since OOo 1.1.2
 */
 
-service AccessBridge
-{
-/** Expects and instance of XExtendedToolkit as first parameter */
-interface ::com::sun::star::lang::XInitialization;
-};
+service AccessBridge : com::sun::star::lang::XInitialization;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/accessibility/Accessible.idl 
b/offapi/com/sun/star/accessibility/Accessible.idl
index a3b5e5b..1c860cb 100644
--- a/offapi/com/sun/star/accessibility/Accessible.idl
+++ b/offapi/com/sun/star/accessibility/Accessible.idl
@@ -38,10 +38,7 @@
 
 @since OOo 1.1.2
 */
-service Accessible
-{
-interface XAccessible;
-};
+service Accessible : XAccessible;
 
 }; }; }; };
 

-- 
To view, visit https://gerrit.libreoffice.org/2132
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d512d74542285e0a7321f8251193bf33dfb878b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Gergő Mocsi 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Converted Insert -> Names -> insert widget.

[Abdulelah Alarifi (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2131

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/2131/1

Converted Insert -> Names -> insert widget.

Change-Id: I903d329cffd77daa9987cfc6079d9cfd10d98fc5
---
A sc/uiconfig/scalc/ui/insertname.ui
1 file changed, 184 insertions(+), 0 deletions(-)



diff --git a/sc/uiconfig/scalc/ui/insertname.ui 
b/sc/uiconfig/scalc/ui/insertname.ui
new file mode 100644
index 000..5986ec7
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/insertname.ui
@@ -0,0 +1,184 @@
+
+
+  
+  
+  
+False
+
+  
+True
+False
+vertical
+6
+
+  
+True
+False
+vertical
+
+  
+True
+False
+100
+
+  
+True
+False
+0
+Name
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+0
+Range
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+Scope
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+in
+
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+
+  
+_Paste All
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-paste
+True
+True
+True
+True
+  
+  
+False
+True
+end
+1
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+False
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-close
+True
+True
+True
+True
+  
+  
+False
+True
+end
+1
+  
+
+  
+  
+False
+True
+3
+  
+
+  
+
+  
+

-- 
To view, visit https://gerrit.libreoffice.org/2131
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I903d329cffd77daa9987cfc6079d9cfd10d98fc5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Converted Insert -> Names -> Define widget.

[Abdulelah Alarifi (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2130

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/2130/1

Converted Insert -> Names -> Define widget.

Change-Id: I1772da085487358854ae5cc41fb0a802fd761786
---
A sc/uiconfig/scalc/ui/definename.ui
1 file changed, 301 insertions(+), 0 deletions(-)



diff --git a/sc/uiconfig/scalc/ui/definename.ui 
b/sc/uiconfig/scalc/ui/definename.ui
new file mode 100644
index 000..b217086
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/definename.ui
@@ -0,0 +1,301 @@
+
+
+  
+  
+  
+  
+False
+5
+dialog
+
+  
+False
+vertical
+2
+
+  
+False
+end
+
+  
+gtk-add
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+False
+vertical
+10
+
+  
+True
+False
+0
+Define the name and 
range or formula expression.
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+6
+15
+
+  
+True
+False
+0
+Name
+  
+  
+0
+0
+1
+1
+  
+
+
+  
+True
+False
+0
+Range
+  
+  
+0
+1
+1
+1
+  
+
+
+  
+True
+False
+0
+Scope
+  
+  
+0
+2
+1
+1
+  
+
+
+  
+True
+True
+•
+  
+  
+1
+0
+1
+1
+  
+
+
+  
+True
+False
+
+  
+True
+True
+•
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+gtk-missing-image
+  
+  
+False
+True
+1
+  
+
+  
+  
+1
+1
+1
+1
+  
+
+
+  
+True
+False
+0
+1
+  
+  
+1
+2
+1
+1
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+True
+
+  
+True
+False
+6
+15
+
+  
+_Print 
range
+True
+True
+False
+True
+0
+True
+  
+  
+  

[PATCH libreoffice-4-0] Let's try to enable compiling the Bluetooth code for Windows

[Tor Lillqvist (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2129

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/2129/1

Let's try to enable compiling the Bluetooth code for Windows

(cherry picked from commit 17f7ee8442472e3ef743891b4d4f1a6a8c063472)

Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
---
M configure.ac
1 file changed, 24 insertions(+), 10 deletions(-)



diff --git a/configure.ac b/configure.ac
index e7c06f2..bb3f96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,9 +862,8 @@
 
 AC_ARG_ENABLE(sdremote-bluetooth,
 AS_HELP_STRING([--disable-sdremote-bluetooth],
-[Determines whether to build sdremote with bluetooth support
- Requires: dbus]),
-,enable_sdremote_bluetooth=yes)
+[Determines whether to build sdremote with bluetooth support.
+ Requires dbus on Linux.]))
 
 AC_ARG_ENABLE(gconf,
 AS_HELP_STRING([--disable-gconf],
@@ -9298,12 +9297,28 @@
 fi
 AC_SUBST(ENABLE_PACKAGEKIT)
 
-AC_MSG_CHECKING([whether to enable sd remotecontrol])
+AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE=YES
-AC_MSG_CHECKING([whether to enable bluetooth support in sdremote])
-if test -n "$enable_sdremote_bluetooth" -a "$enable_sdremote_bluetooth" != 
"no"; then
+AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
+
+# If not explicitly enabled or disabled, default
+if test -z "$enable_sdremote_bluetooth"; then
+case "$OS" in
+LINUX|WNT)
+# Default to yes for these
+enable_sdremote_bluetooth=yes
+;;
+*)
+# otherwise no
+enable_sdremote_bluetooth=no
+;;
+esac
+fi
+# $enable_sdremote_bluetooth is guaranteed non-empty now
+
+if test "$enable_sdremote_bluetooth" != "no"; then
 if test "$OS" = "LINUX"; then
 if test "$ENABLE_DBUS" = "TRUE"; then
 AC_MSG_RESULT([yes])
@@ -9311,7 +9326,7 @@
 dnl 
===
 dnl Check for system bluez
 dnl 
===
-AC_MSG_CHECKING([which bluetooth header to use])
+AC_MSG_CHECKING([which Bluetooth header to use])
 if test "$with_system_bluez" = "yes"; then
 AC_MSG_RESULT([external])
 AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
@@ -9325,9 +9340,8 @@
 ENABLE_SDREMOTE_BLUETOOTH=NO
 fi
 else
-# FIXME: should this really be disabled in everything non-Linux?
-AC_MSG_RESULT([no])
-ENABLE_SDREMOTE_BLUETOOTH=NO
+AC_MSG_RESULT([yes])
+ENABLE_SDREMOTE_BLUETOOTH=YES
 fi
 else
 AC_MSG_RESULT([no])

-- 
To view, visit https://gerrit.libreoffice.org/2129
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Tor Lillqvist 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] bnc#802350: Cell validation is not a special (cell) content.

[Kohei Yoshida (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2128

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/2128/1

bnc#802350: Cell validation is not a special (cell) content.

Cell validation is stored as cell attributes which are stored with
columns not with cells.  When HasSpecialContent() is true, it flags
the *cell* not empty, which in turns causes AddTextAndValueCell to
iterate over every single cell position for all repeated columns
and rows.  That can very very slow when the number of repeated rows
is very high.

Since cell validation is stored with columns, skipping empty cells
even when they have cell validation settings set won't cause any
issues, and all cell validation settings are imported correctly even
after this change.

With the test document I have (confidential), this change alone reduces
the load time from 30 seconds to 0.3 seconds.

(cherry picked from commit f6acfb5fe41fb166b5b588ec73e2e9331489c632)

Conflicts:
sc/source/filter/xml/xmlcelli.cxx

Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73
---
M sc/source/filter/xml/xmlcelli.cxx
1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 42714a1..e9776ec 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -956,8 +956,7 @@
 
 bool ScXMLTableRowCellContext::HasSpecialContent() const
 {
-return ( (pContentValidationName && !pContentValidationName->isEmpty()) ||
-  mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource );
+return (mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource);
 }
 
 bool ScXMLTableRowCellContext::CellsAreRepeated() const

-- 
To view, visit https://gerrit.libreoffice.org/2128
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Add findbar close icons to other icon-themes as well

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2127

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/2127/1

Add findbar close icons to other icon-themes as well

So far I only add an icon to the galaxy theme.
Therefore I add now the other icons on the other themes as well.

Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f
---
A icon-themes/crystal/cmd/lc_exitsearch.png
A icon-themes/crystal/cmd/sc_exitsearch.png
A icon-themes/galaxy/cmd/sc_exitsearch.png
A icon-themes/hicontrast/cmd/lc_exitsearch.png
A icon-themes/hicontrast/cmd/sc_exitsearch.png
A icon-themes/human/cmd/lc_exitsearch.png
A icon-themes/human/cmd/sc_exitsearch.png
A icon-themes/industrial/cmd/lc_exitsearch.png
A icon-themes/industrial/cmd/sc_exitsearch.png
A icon-themes/oxygen/cmd/lc_exitsearch.png
A icon-themes/oxygen/cmd/sc_exitsearch.png
A icon-themes/tango/cmd/lc_exitsearch.png
A icon-themes/tango/cmd/sc_exitsearch.png
13 files changed, 0 insertions(+), 0 deletions(-)



diff --git a/icon-themes/crystal/cmd/lc_exitsearch.png 
b/icon-themes/crystal/cmd/lc_exitsearch.png
new file mode 100644
index 000..38d7e4e
--- /dev/null
+++ b/icon-themes/crystal/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/crystal/cmd/sc_exitsearch.png 
b/icon-themes/crystal/cmd/sc_exitsearch.png
new file mode 100644
index 000..853548d
--- /dev/null
+++ b/icon-themes/crystal/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/galaxy/cmd/sc_exitsearch.png 
b/icon-themes/galaxy/cmd/sc_exitsearch.png
new file mode 100644
index 000..0030208
--- /dev/null
+++ b/icon-themes/galaxy/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/lc_exitsearch.png 
b/icon-themes/hicontrast/cmd/lc_exitsearch.png
new file mode 100644
index 000..3d54090
--- /dev/null
+++ b/icon-themes/hicontrast/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/sc_exitsearch.png 
b/icon-themes/hicontrast/cmd/sc_exitsearch.png
new file mode 100644
index 000..deedf75
--- /dev/null
+++ b/icon-themes/hicontrast/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/human/cmd/lc_exitsearch.png 
b/icon-themes/human/cmd/lc_exitsearch.png
new file mode 100644
index 000..f795224
--- /dev/null
+++ b/icon-themes/human/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/human/cmd/sc_exitsearch.png 
b/icon-themes/human/cmd/sc_exitsearch.png
new file mode 100644
index 000..2fdc737
--- /dev/null
+++ b/icon-themes/human/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/industrial/cmd/lc_exitsearch.png 
b/icon-themes/industrial/cmd/lc_exitsearch.png
new file mode 100644
index 000..98b099d
--- /dev/null
+++ b/icon-themes/industrial/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/industrial/cmd/sc_exitsearch.png 
b/icon-themes/industrial/cmd/sc_exitsearch.png
new file mode 100644
index 000..a2f58e9
--- /dev/null
+++ b/icon-themes/industrial/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/oxygen/cmd/lc_exitsearch.png 
b/icon-themes/oxygen/cmd/lc_exitsearch.png
new file mode 100644
index 000..ed5f8b2
--- /dev/null
+++ b/icon-themes/oxygen/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/oxygen/cmd/sc_exitsearch.png 
b/icon-themes/oxygen/cmd/sc_exitsearch.png
new file mode 100644
index 000..4839c61
--- /dev/null
+++ b/icon-themes/oxygen/cmd/sc_exitsearch.png
Binary files differ
diff --git a/icon-themes/tango/cmd/lc_exitsearch.png 
b/icon-themes/tango/cmd/lc_exitsearch.png
new file mode 100644
index 000..18958f3
--- /dev/null
+++ b/icon-themes/tango/cmd/lc_exitsearch.png
Binary files differ
diff --git a/icon-themes/tango/cmd/sc_exitsearch.png 
b/icon-themes/tango/cmd/sc_exitsearch.png
new file mode 100644
index 000..0030208
--- /dev/null
+++ b/icon-themes/tango/cmd/sc_exitsearch.png
Binary files differ

-- 
To view, visit https://gerrit.libreoffice.org/2127
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id852d1adb87c31ee45187a0a7b4bfead56c7b19f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] MODKEY_BigOrtho is never defined

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2126

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/2126/1

MODKEY_BigOrtho is never defined

Change-Id: Ifd7c7f634860ced0021bf6c6b99d1e0ea0615a7c
---
M svx/source/svdraw/svdview.cxx
1 file changed, 0 insertions(+), 3 deletions(-)



diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 39b0e99..b9c9f99 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -770,9 +770,6 @@
 #ifdef MODKEY_Ortho
 SetOrtho(MODKEY_Ortho!=IsOrthoDesired());
 #endif
-#ifdef MODKEY_BigOrtho
-SetBigOrtho(MODKEY_BigOrtho);
-#endif
 #ifdef MODKEY_AngleSnap
 SetAngleSnapEnabled(MODKEY_AngleSnap);
 #endif

-- 
To view, visit https://gerrit.libreoffice.org/2126
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7c7f634860ced0021bf6c6b99d1e0ea0615a7c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] add copy() and toInt32() to OUStringBuffer

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2125

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/2125/1

add copy() and toInt32() to OUStringBuffer

Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
---
M sal/inc/rtl/ustrbuf.hxx
1 file changed, 57 insertions(+), 0 deletions(-)



diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a7d5748..c222e4d 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -1309,6 +1309,56 @@
 {
 return stripStart(c) + stripEnd(c);
 }
+/**
+  Returns the int32 value from this string buffer.
+
+  This function can't be used for language specific conversion.
+
+  @paramradix   the radix (between 2 and 36)
+  @return   the int32 represented from this string.
+0 if this string represents no number.
+  @since LibreOffice 4.1
+*/
+sal_Int32 toInt32( sal_Int16 radix = 10 ) const SAL_THROW(())
+{
+return rtl_ustr_toInt32( pData->buffer, radix );
+}
+/**
+  Returns a new string buffer that is a substring of this string.
+
+  The substring begins at the specified beginIndex. If
+  beginIndex is negative or be greater than the length of
+  this string, behaviour is undefined.
+
+  @param beginIndex   the beginning index, inclusive.
+  @returnthe specified substring.
+  @since LibreOffice 4.1
+*/
+OUStringBuffer copy( sal_Int32 beginIndex ) const SAL_THROW(())
+{
+rtl_uString *pNew = 0;
+rtl_uString_newFromSubString( &pNew, pData, beginIndex, getLength() - 
beginIndex );
+return OUStringBuffer( pNew, (DO_NOT_ACQUIRE*)0 );
+}
+/**
+  Returns a new string buffer that is a substring of this string.
+
+  The substring begins at the specified beginIndex and contains count
+  characters.  If either beginIndex or count are negative,
+  or beginIndex + count are greater than the length of this string
+  then behaviour is undefined.
+
+  @param beginIndex   the beginning index, inclusive.
+  @param countthe number of characters.
+  @returnthe specified substring.
+  @since LibreOffice 4.1
+*/
+OUStringBuffer copy( sal_Int32 beginIndex, sal_Int32 count ) const 
SAL_THROW(())
+{
+rtl_uString *pNew = 0;
+rtl_uString_newFromSubString( &pNew, pData, beginIndex, count );
+return OUStringBuffer( pNew, (DO_NOT_ACQUIRE*)0 );
+}
 
 #ifdef LIBO_INTERNAL_ONLY
 // This is to complement the RTL_FAST_STRING operator+, which allows any 
combination of valid operands,
@@ -1326,6 +1376,13 @@
 #endif
 
 private:
+class DO_NOT_ACQUIRE{};
+
+OUStringBuffer( rtl_uString * value, SAL_UNUSED_PARAMETER DO_NOT_ACQUIRE * 
)
+{
+pData = value;
+}
+
 /**
 A pointer to the data structur which contains the data.
  */

-- 
To view, visit https://gerrit.libreoffice.org/2125
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Comment translation german - english

[Matthias Freund (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2124

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/2124/1

Comment translation german - english

Change-Id: I606ed122f3761bd8a3ee84030bee5975b0b78801
---
M sw/source/core/draw/dcontact.cxx
1 file changed, 17 insertions(+), 16 deletions(-)



diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 3449521..e1a5b53 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -89,11 +89,11 @@
 }
 
 
-//Der Umgekehrte Weg: Sucht das Format zum angegebenen Objekt.
-//Wenn das Object ein SwVirtFlyDrawObj ist so wird das Format von
-//selbigem besorgt.
-//Anderfalls ist es eben ein einfaches Zeichenobjekt. Diese hat einen
-//UserCall und der ist Client vom gesuchten Format.
+// The Get reverse way: seeks the format to the specified object.
+// If the object is a SwVirtFlyDrawObj then the format of this
+// will be acquired.
+// Otherwise it is just a simple drawing object. This has a
+// UserCall and is the client of the searched format.
 
 SwFrmFmt *FindFrmFmt( SdrObject *pObj )
 {
@@ -130,7 +130,7 @@
 
 /*
  *
- * GetBoundRect liefert das BoundRect _inklusive_ Abstand des Objekts.
+ * GetBoundRect returns the BoundRect _inclusive_ distance of the object.
  *
  */
 
@@ -151,7 +151,7 @@
 return aRet;
 }
 
-//Liefert den UserCall ggf. vom Gruppenobjekt
+// Returns the UserCall if applicable from the group object
 // OD 2004-03-31 #i26791# - change return type
 SwContact* GetUserCall( const SdrObject* pObj )
 {
@@ -163,7 +163,7 @@
 return static_cast(pObj->GetUserCall());
 }
 
-// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist
+// Returns sal_True if the SrdObject is a Marquee-Object (scrolling text)
 sal_Bool IsMarqueeTextObj( const SdrObject& rObj )
 {
 SdrTextAniKind eTKind;
@@ -175,7 +175,7 @@
 
 /*
 |*
-|*  SwContact, Ctor und Dtor
+|*  SwContact, Ctor and Dtor
 |*
 |*/
 
@@ -643,8 +643,8 @@
 InsertObject( pObj, pObj->GetOrdNumDirect() );
 }
 
-//Controls muessen immer im Control-Layer liegen. Das gilt auch fuer
-//Gruppenobjekte, wenn diese Controls enthalten.
+//Controls have to be always in the Control-Layer. This is also true for
+//group objects, if they contain controls.
 if ( ::CheckControlLayer( pObj ) )
 {
 // set layer of object to corresponding invisible layer.
@@ -1105,7 +1105,8 @@
 return;
 }
 
-//Action aufsetzen, aber nicht wenn gerade irgendwo eine Action laeuft.
+//Put on Action, but not if presently anywhere an action runs.
+aber nicht wenn gerade irgendwo eine Action laeuft.
 ViewShell *pSh = 0, *pOrg;
 SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317
 if ( pTmpRoot && pTmpRoot->IsCallbackActionEnabled() )
@@ -1125,7 +1126,7 @@
 pTmpRoot->StartAllAction();
 }
 SdrObjUserCall::Changed( rObj, eType, rOldBoundRect );
-_Changed( rObj, eType, &rOldBoundRect );//Achtung, ggf. Suizid!
+_Changed( rObj, eType, &rOldBoundRect );//Attention, possibly suicidal!
 
 if ( pSh )
 pTmpRoot->EndAllAction();
@@ -1203,7 +1204,7 @@
 };
 
 //
-// !!!ACHTUNG!!! The object may commit suicide!!!
+// !!!ATTENTION!!! The object may commit suicide!!!
 //
 void SwDrawContact::_Changed( const SdrObject& rObj,
   SdrUserCallType eType,
@@ -1485,7 +1486,7 @@
 
 if ( pNewAnchorFmt )
 {
-// nicht auf ein Reset Anchor reagieren !
+// Do not respond to a Reset Anchor !
 if ( SFX_ITEM_SET ==
 GetFmt()->GetAttrSet().GetItemState( RES_ANCHOR, sal_False ) )
 {
@@ -1812,7 +1813,7 @@
 pPage->AppendDrawObj( maAnchoredDrawObj );
 }
 else
-//Sieht doof aus, ist aber erlaubt (vlg. 
SwFEShell::SetPageObjsNewPage)
+//Looks stupid but is allowed (compare 
SwFEShell::SetPageObjsNewPage)
 pRoot->SetAssertFlyPages();
 }
 break;

-- 
To view, visit https://gerrit.libreoffice.org/2124
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606ed122f3761bd8a3ee84030bee5975b0b78801
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License Statement

[Mathias Hasselmann]

All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

Change I73297209f0410db607c1ae4787ba15c3ac08133f was contributed on
private basis, without any affiliation.

Future contributions will carry a clear indication ownership, making
clear if that work is a personal contribution, or if it results from
work for my employer or one of its customers. Please notify me during
review already if the commit message is missing such indication.

Thank you for this awesome project,
Mathias


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Comment translation german - english - some corrections and ...

[Matthias Freund (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2123

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/2123/1

Comment translation german - english - some corrections and improvements :-)

Change-Id: I9ad07188f2addad3369e070836b34151bf8ef9d5
---
M sw/source/core/draw/dpage.cxx
M sw/source/core/draw/drawdoc.cxx
M sw/source/filter/writer/writer.cxx
3 files changed, 10 insertions(+), 10 deletions(-)



diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 72cf1be..dbb61e2 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -111,7 +111,7 @@
 
 if ( pRect )
 {
-//The drawing demands all sides which overlap with the rest.
+//The drawing demands all pages which overlap with the rest.
 const SwRect aRect( *pRect );
 const SwFrm *pPg = pSh->GetLayout()->Lower();
 do
@@ -122,7 +122,7 @@
 }
 else
 {
-//The drawing demands all visible sides
+//The drawing demands all visible pages
 const SwFrm *pPg = pSh->Imp()->GetFirstVisPage();
 if ( pPg )
 do
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 000ef8e..ee35d1e9 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -137,9 +137,9 @@
 /*
 |*
 |* This method creates a new page (SdPage) and thereupon returns a pointer
-|* back. The drawing engine is unsing this method while loading for the
-|* creating of pages (whose type it not even know, because they are
-|* derivations of the SdrPage).
+|* to it back. The drawing engine is using this method while loading for
+|* the creating of pages (whose type it not even know, because they are
+|* inherited from SdrPage).
 |*
 \/
 
diff --git a/sw/source/filter/writer/writer.cxx 
b/sw/source/filter/writer/writer.cxx
index 1cca958..828614c 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -268,7 +268,7 @@
 
 // Copy PaM, so that it can be modified
 pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// for comparison secure to the act. Pam
+// for comparison secure to the current Pam
 pOrigPam = &rPaM;
 
 sal_uLong nRet = WriteStream();
@@ -353,7 +353,7 @@
 void Writer::PutNumFmtFontsInAttrPool()
 {
 // then there are a few fonts in the NumRules
-// These putt into the Pool. After this does they have a RefCount > 1
+// These put into the Pool. After this does they have a RefCount > 1
 // it can be removed - it is already in the Pool
 SfxItemPool& rPool = pDoc->GetAttrPool();
 const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
@@ -452,7 +452,7 @@
 sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt,
 xub_StrLen nEnd, std::vector< const ::sw::mark::IMark* >& rArr)
 {
-OSL_ENSURE( rArr.empty(), "there are entries available" );
+OSL_ENSURE( rArr.empty(), "there are still entries available" );
 
 sal_uLong nNd = rNd.GetIndex();
 std::pair aIterPair 
@@ -508,7 +508,7 @@
 
 // Copy PaM, so that it can be modified
 pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// for comparison secure to the act. Pam
+// for comparison secure to the current Pam
 pOrigPam = &rPaM;
 
 sal_uLong nRet = WriteStorage();
@@ -529,7 +529,7 @@
 
 // Copy PaM, so that it can be modified
 pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
-// for comparison secure to the act. Pam
+// for comparison secure to the current Pam
 pOrigPam = &rPaM;
 
 sal_uLong nRet = pMedium ? WriteMedium( *pMedium ) : WriteStorage();

-- 
To view, visit https://gerrit.libreoffice.org/2123
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad07188f2addad3369e070836b34151bf8ef9d5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#60668: filter out fieldmark chars from Index entries:

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2122

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/2122/1

fdo#60668: filter out fieldmark chars from Index entries:

SwTxtNode::GetExpandTxt must filter out all dummy characters used to
represent fields, footnotes, field marks, etc.

Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
(cherry picked from commit e31807c83009655c342c929a118f0d28a8f63ddc)
---
M sw/source/core/txtnode/ndtxt.cxx
1 file changed, 30 insertions(+), 13 deletions(-)



diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4fedcfa..eb2dd25 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2959,8 +2959,7 @@
 
 // mask hidden characters
 const sal_Unicode cChar = CH_TXTATR_BREAKWORD;
-sal_uInt16 nHiddenChrs =
-SwScriptInfo::MaskHiddenRanges( *this, sTmpText, 0, sTmpText.Len(), 
cChar );
+SwScriptInfo::MaskHiddenRanges(*this, sTmpText, 0, sTmpText.Len(), cChar);
 
 sTmpText = sTmpText.Copy( nIdx, nLen );
 rDestNd.InsertText( sTmpText, aDestIdx );
@@ -3063,22 +3062,40 @@
 rDestNd.InsertText( GetNumString(), aDestIdx );
 }
 
-if ( nHiddenChrs > 0 )
+aDestIdx = 0;
+sal_Int32 nStartDelete(-1);
+while (aDestIdx < rDestNd.GetTxt().Len())
 {
-aDestIdx = 0;
-while ( aDestIdx < rDestNd.GetTxt().Len() )
+sal_Unicode const cur(rDestNd.GetTxt().GetChar(aDestIdx.GetIndex()));
+if (   (cChar == cur) // filter substituted hidden text
+|| (CH_TXT_ATR_FIELDSTART  == cur) // filter all fieldmarks
+|| (CH_TXT_ATR_FIELDEND== cur)
+|| (CH_TXT_ATR_FORMELEMENT == cur))
 {
-if ( cChar == rDestNd.GetTxt().GetChar( aDestIdx.GetIndex() ) )
+if (-1 == nStartDelete)
 {
-xub_StrLen nIndex = aDestIdx.GetIndex();
-while ( nIndex < rDestNd.GetTxt().Len() &&
-cChar == rDestNd.GetTxt().GetChar( ++nIndex ) )
-;
-rDestNd.EraseText( aDestIdx, nIndex - aDestIdx.GetIndex() );
+nStartDelete = aDestIdx.GetIndex(); // start deletion range
 }
-else
-++aDestIdx;
+++aDestIdx;
+if (aDestIdx < rDestNd.GetTxt().Len())
+{
+continue;
+} // else: end of paragraph => delete, see below
 }
+else
+{
+if (-1 == nStartDelete)
+{
+++aDestIdx;
+continue;
+} // else: delete, see below
+}
+assert(-1 != nStartDelete); // without delete range, would have 
contined
+rDestNd.EraseText(
+SwIndex(&rDestNd, static_cast(nStartDelete)),
+aDestIdx.GetIndex() - nStartDelete);
+assert(aDestIdx.GetIndex() == nStartDelete);
+nStartDelete = -1; // reset
 }
 
 return sal_True;

-- 
To view, visit https://gerrit.libreoffice.org/2122
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ae2a82da9a6618bb451efabfd38769c495cc93
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 4 commits - filter/source sal/inc sax/source svgio/source svx/inc svx/source

[Michael Stahl]

 filter/source/svg/svgreader.cxx  |6 +++-
 sal/inc/sal/log-areas.dox|1 
 sax/source/expatwrap/sax_expat.cxx   |   48 +--
 sax/source/fastparser/fastparser.cxx |   15 +-
 svgio/source/svguno/xsvgparser.cxx   |9 ++
 svx/inc/svx/svdundo.hxx  |9 --
 svx/source/svdraw/svdundo.cxx|   20 --
 7 files changed, 58 insertions(+), 50 deletions(-)

New commits:
commit fcb1e4d8433b49686cd8e53c699dd5d6503ea314
Author: Michael Stahl 
Date:   Wed Feb 13 15:59:38 2013 +0100

fdo#60471: svgio, sax: enable internal entity declarations for SVG

Change-Id: I147acac61dfe0b626268fe1e600dcf641ca63a0c

diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 7d4d792..b9ce821 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -24,7 +24,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -32,8 +32,7 @@
 
 #include 
 #include 
-#include 
-#include 
+#include 
 
 #include 
 
@@ -45,7 +44,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::io;
 
 #include "factory.hxx"
@@ -136,11 +134,10 @@ class SaxExpatParser_Impl;
 
 
 // This class implements the external Parser interface
-class SaxExpatParser :
-public WeakImplHelper2<
-XParser,
-XServiceInfo
-  >
+class SaxExpatParser
+: public WeakImplHelper3< XInitialization
+, XServiceInfo
+, XParser >
 {
 
 public:
@@ -153,6 +150,10 @@ public:
 static Sequence< OUString > getSupportedServiceNames_Static(void) 
throw ();
 
 public:
+// ::com::sun::star::lang::XInitialization:
+virtual void SAL_CALL initialize(Sequence const& rArguments)
+throw (RuntimeException, Exception);
+
 // The SAX-Parser-Interface
 virtual void SAL_CALL parseStream(  const InputSource& structSource)
 throw ( SAXException,
@@ -222,6 +223,7 @@ class SaxExpatParser_Impl
 public: // module scope
 Mutex   aMutex;
 OUStringsCDATA;
+bool m_bEnableDoS; // fdo#60471 thank you Adobe Illustrator
 
 Reference< XDocumentHandler >   rDocumentHandler;
 Reference< XExtendedDocumentHandler > rExtendedDocumentHandler;
@@ -257,6 +259,7 @@ public: // module scope
 public:
 SaxExpatParser_Impl()
 : sCDATA("CDATA")
+, m_bEnableDoS(false)
 {
 }
 
@@ -452,6 +455,22 @@ SaxExpatParser::~SaxExpatParser()
 delete m_pImpl;
 }
 
+// ::com::sun::star::lang::XInitialization:
+void SAL_CALL
+SaxExpatParser::initialize(Sequence< Any > const& rArguments)
+throw (RuntimeException, Exception)
+{
+// possible arguments: a string "DoSmeplease"
+if (rArguments.getLength())
+{
+OUString str;
+if ((rArguments[0] >>= str) && "DoSmeplease" == str)
+{
+MutexGuard guard( m_pImpl->aMutex );
+m_pImpl->m_bEnableDoS = true;
+}
+}
+}
 
 /***
 *
@@ -500,7 +519,10 @@ void SaxExpatParser::parseStream(   const InputSource& 
structSource)
 XML_SetCharacterDataHandler( entity.pParser , call_callbackCharacters );
 XML_SetProcessingInstructionHandler(entity.pParser ,
 call_callbackProcessingInstruction );
-XML_SetEntityDeclHandler(entity.pParser, call_callbackEntityDecl);
+if (!m_pImpl->m_bEnableDoS)
+{
+XML_SetEntityDeclHandler(entity.pParser, call_callbackEntityDecl);
+}
 XML_SetNotationDeclHandler( entity.pParser, call_callbackNotationDecl );
 XML_SetExternalEntityRefHandler(entity.pParser,
 call_callbackExternalEntityRef);
diff --git a/svgio/source/svguno/xsvgparser.cxx 
b/svgio/source/svguno/xsvgparser.cxx
index 26a81c0..1b12d9ad 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -131,6 +132,14 @@ namespace svgio
 // get parser
 uno::Reference< xml::sax::XParser > xParser(
 xml::sax::Parser::create(context_));
+// fdo#60471 need to enable internal entities because
+// certain ... popular proprietary products write SVG files
+// that use entities to define XML namespaces.
+uno::Reference const xInit(xParser,
+uno::UNO_QUERY_THROW);
+uno::Sequence args(1);
+args[0] <<= OUString("DoSmeplease");
+xInit->initialize(args);
 
 // connect parser

Re: InteractiveAugmentedIOException in CUT sc_ucalc

[Stephan Bergmann]

On 02/09/2013 10:04 PM, Henrik /KaarPoSoft wrote:

Program received signal SIGABRT, Aborted.
0x76fcaf65 in __GI_raise (sig=sig@entry=6) at 
../nptl/sysdeps/unix/sysv/linux/raise.c:63
63  ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
#0  0x76fcaf65 in __GI_raise (sig=sig@entry=6) at 
../nptl/sysdeps/unix/sysv/linux/raise.c:63
#1  0x76fcc3e8 in __GI_abort () at abort.c:90
#2  0x778a8edd in __gnu_cxx::__verbose_terminate_handler () at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/vterminate.cc:95
#3  0x778a6fd6 in __cxxabiv1::__terminate (handler=) at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/eh_terminate.cc:40
#4  0x778a7003 in std::terminate () at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/eh_terminate.cc:50
#5  0x778a722e in __cxxabiv1::__cxa_throw (obj=0x49f270, tinfo=, dest=) at 
../../../../gcc-4.7.2/libstdc++-v3/libsupc++/eh_throw.cc:83
#6  0x756ef5fa in 
cpp2uno_call(bridges::cpp_uno::shared::CppInterfaceProxy*, 
_typelib_TypeDescription const*, _typelib_TypeDescriptionReference*, int, 
_typelib_MethodParameter*, void**, void**, void**, unsigned long*) [clone 
.3078] () from 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/solver/unxlngx6.pro/lib/libgcc3_uno.so
#7  0x756eb31c in cpp_vtable_call () from 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/solver/unxlngx6.pro/lib/libgcc3_uno.so
#8  0x756f0a1e in privateSnippetExecutor () at 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s:56
#9  0x77eacf1e in cppu::throwException(com::sun::star::uno::Any const&) 
() from 
/home/kaarpux/kaarpux/linux/build/opt/libreoffice-4.0.0.3/solver/unxlngx6.pro/lib/libuno_cppuhelpergcc3.so.3


cppu::throwException is "dirty" in that it synthesizes a C++ throw 
expression, by using the bridge between C++ and binary UNO 
(bridges/source/cpp_uno/).  __cxxabiv1::__cxa_throw calling 
std::terminate can either mean that the synthesized stuff LO passes into 
the C++ runtime is not acceptable at all, or that the synthesized RTTI 
is bad, so that some catch block that should match doesn't.


Looks like the C++ UNO bridge is not working well with your toolchain, 
for whatever reason.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-4-0] sdremote cherry-picks ...

[Michael Meeks]

Hi there,

I picked all of Tor's nice work to -4-0 which should make things work
well on Windows. We discussed and sorted out the UI issue on IRC - there
were some bits that needed reverting and pushing it seems around colors.

That leaves a couple of fixes I'd like cherry-picked:

Andras Tor had a couple of string changes:
056968fae7fa598e8cb528fb6b45c999de33a102
ea264f0c8165eb0c62bf624af5f450b20898469f

To make the UI much more clear wrt. adding a server that this was an
TCP/IP thing only. Can we get those in past the l10n freeze ? and/or
would translators help out there ?

I'd also like to pick:

03b941e9ae63626a3336aabdb6a3485835ec6f9d

Which fixes a random crash (in a rather bad bit of code which now has
an easy-hack associated with it ;-).

I'd also like to kill the "menu item of extreme pointlessness" which
confuses ~everyone trying to use bluetooth - and relegate the TCP/IP /
Wifi remote to an also-ran "Experimental" feature in the UI. There
should be no need for that dialog otherwise, so I'd love to see:

sdremote: hide TCP/IP server selection dialog menu item
13cb088a2d8902822e3eb5607ba4cac81ad4d2f2

Cherry-picked to 4-0 as well.

Otherwise, I think we're in increasingly good shape there - the last
major thing on my TODO is to re-work the dbus / bluez code so we can
cope with suspend/resume and dynamic enable/disable of bluetooth.

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] core.git: 2 commits - officecfg/registry sd/source

[Michael Meeks]

 officecfg/registry/cppheader.xsl |   12 ++--
 sd/source/ui/view/drviews7.cxx   |   26 ++
 2 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 13cb088a2d8902822e3eb5607ba4cac81ad4d2f2
Author: Michael Meeks 
Date:   Wed Feb 13 14:35:40 2013 +

sdremote: hide TCP/IP server selection dialog menu item

Now shown only in experimental mode (ie. when TCP/IP is enabled)
to reduce user-confusion. Said dialog is not needed for bluetooth.

diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f2d69be..f077d30 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -51,7 +52,6 @@
 #include 
 #include 
 
-
 #include 
 #include 
 #include 
@@ -996,15 +996,25 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_ZOOM_PREV);
 }
 
-bool bDisableSdremoteForGood = false;
+if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REMOTE_DLG ) )
+{
+
+bool bDisableSdremoteForGood = false;
 #ifndef ENABLE_SDREMOTE
-bDisableSdremoteForGood = true;
+bDisableSdremoteForGood = true;
 #endif
-uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
-if ( bDisableSdremoteForGood || ( xContext.is() && 
!officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) ) )
-{
-rSet.ClearItem(SID_REMOTE_DLG);
-rSet.DisableItem(SID_REMOTE_DLG);
+uno::Reference< uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+if ( xContext.is() )
+bDisableSdremoteForGood |= ! ( 
officecfg::Office::Common::Misc::ExperimentalMode::get( xContext ) &&
+
+   
officecfg::Office::Impress::Misc::Start::EnableSdremote::get( xContext ) );
+
+// This dialog is only useful for TCP/IP remote control
+// which is unusual, under-tested and a security issue.
+if ( bDisableSdremoteForGood )
+{
+rSet.Put(SfxVisibilityItem(SID_REMOTE_DLG, false));
+}
 }
 
 // EditText aktiv
commit 90d42440eeaf7994f3ad57ebfdc8edb129c8faff
Author: Michael Meeks 
Date:   Wed Feb 13 14:24:26 2013 +

cleanup generated config includes to make them more readable.

diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index 372876e..9bdce8e 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/officecfg/registry/cppheader.xsl
@@ -149,11 +149,11 @@
   
   > {

   static rtl::OUString path() { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("
+  -->"
   
   /
   
-  ")); }

+  "); }

   

   
 
@@ -183,11 +183,11 @@
 
 > {

 static rtl::OUString path() { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("
+-->"
 
 /
 
-")); }

+"); }

 private:

 
 
@@ -272,11 +272,11 @@
 
 > {

 static rtl::OUString path() { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("
+-->"
 
 /
 
-")); }

+"); }

 private:

 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [SOLVED]Re: About macro VALIDTAB (sc module)

[Kohei Yoshida]

On 02/13/2013 07:45 AM, julien2412 wrote:

I pushed a patch to remove all these macros, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b5fedb54a7f9569b817c24c1a9b16c17c09cfd9.


Excellent!  Thanks for this.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Cppcheck: 'bMark' is assigned a value never used (sc module)

[julien2412]

Hello,

Cppcheck reported this:
sc/source/ui/view/tabview2.cxx
970 unreadVariable  style   Variable 'bMark' is assigned a value that is 
never
used.951 void ScTabView::PaintBlock( bool bReset )
952 {
953 ScMarkData& rMark = aViewData.GetMarkData();
954 SCTAB nTab = aViewData.GetTabNo();
955 bool bMark = rMark.IsMarked();
956 bool bMulti = rMark.IsMultiMarked();
957 if (bMark || bMulti)
958 {
959 ScRange aMarkRange;
960 HideAllCursors();
961 if (bMulti)
962 {
963 bool bFlag = rMark.GetMarkingFlag();
964 rMark.SetMarking(false);
965 rMark.MarkToMulti();
966 rMark.GetMultiMarkArea(aMarkRange);
967 rMark.MarkToSimple();
968 rMark.SetMarking(bFlag);
969 
970 bMark = rMark.IsMarked();

See
http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/tabview2.cxx#950

Is line 970 can be removed or is something lacking?

Julien




--
View this message in context: 
http://nabble.documentfoundation.org/Cppcheck-bMark-is-assigned-a-value-never-used-sc-module-tp4037118.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

[Michael Meeks]

 android/sdremote/res/values/styles.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f477a88b743ee3cb8835463cc5cd5e3f0c800dba
Author: Michael Meeks 
Date:   Wed Feb 13 14:16:18 2013 +

Revert "resolve fdo#60379 Impress Remote: Options look disabled"

Actually revert it as Thorsten mentioned on the list.
This reverts commit 23e6ac150b217be70a80d42deb5b253059030783.

Change-Id: Ib387017225040272095aff54d51a9767c73c7d1f

diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index c88c947..80a4b4a 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -72,9 +72,9 @@
 @style/Theme.ImpressRemote.ActionBarMenu
 @color/light_grey
 @drawable/up_indicator_white
-@color/light_grey
+@color/text_grey
 @style/Theme.ImpressRemote.Dialog
 
 
 
-
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

useless definition of _SV_RULER_CXX ?

[Rodolfo]

While working on a patch, I saw this #define inside a .cxx file... [1]

Some (private) methods of class Ruler are declared inside an #ifdef of
it [2]. But that can be only triggered inside ruler.cxx file [1] : a
trick by defining _SV_RULER_CXX right before including the header
file.

Is it really necessary? Shouldn't SVT_DLLPRIVATE do this
completely-"private"-thing?

Note there's some "using namespace" inside it.

$ git grep _SV_RULER_CXX
svtools/inc/svtools/ruler.hxx:#ifdef _SV_RULER_CXX
svtools/source/control/ruler.cxx:#define _SV_RULER_CXX
svtools/source/control/ruler.cxx:#ifdef _SV_RULER_CXX

[1] 
http://opengrok.libreoffice.org/xref/core/svtools/source/control/ruler.cxx#27
[2] http://opengrok.libreoffice.org/xref/core/svtools/inc/svtools/ruler.hxx#647
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - android/sdremote

[Michael Meeks]

 android/sdremote/res/values/styles.xml |   56 +++--
 1 file changed, 54 insertions(+), 2 deletions(-)

New commits:
commit 31eeb79521b952212e3018f262e25e6b3f4599e7
Author: Michael Meeks 
Date:   Wed Feb 13 14:12:00 2013 +

Revert "resolve fdo#60379 Impress Remote: Options look disabled"

This reverts commit 23e6ac150b217be70a80d42deb5b253059030783.

diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index c88c947..80a4b4a 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -72,9 +72,9 @@
 @style/Theme.ImpressRemote.ActionBarMenu
 @color/light_grey
 @drawable/up_indicator_white
-@color/light_grey
+@color/text_grey
 @style/Theme.ImpressRemote.Dialog
 
 
 
-
+
\ No newline at end of file
commit c922df9814c85c080272fc4962584133fa6f5316
Author: Michael Meeks 
Date:   Wed Feb 13 14:09:02 2013 +

Revert "Just use default colours until proven they don't work;)"

Colors should be orange by design.

This reverts commit ab0bbe53ae02361d521c133dd5c0b6db3423b0cb.

diff --git a/android/sdremote/res/values/styles.xml 
b/android/sdremote/res/values/styles.xml
index 683114f..c88c947 100644
--- a/android/sdremote/res/values/styles.xml
+++ b/android/sdremote/res/values/styles.xml
@@ -14,15 +14,67 @@
 #B4B4B4
 #EE4400
 
+
+@color/white
+18dp
+
+
+
+@color/orange
+@color/orange
+@style/Theme.ImpressRemote.ActionBar.Title
+@style/Theme.ImpressRemote.ActionBar.Title
+@color/text_grey
+@color/text_grey
+
+
+
+@color/orange
+@color/white
+22dp
+
+
+
+@color/grey
+
+
+
 
+@color/grey
+@color/white
 16dp
 
 
+
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/light_grey
+@color/grey
+
+
+
+@color/grey
+
+
 
+@style/Theme.ImpressRemote.ActionBar
+@style/Theme.ImpressRemote.ActionBar
+@style/Theme.ImpressRemote.ActionBarMenu
 @style/Theme.ImpressRemote.ActionBarMenuItem
-@style/Theme.ImpressRemote.ActionBarMenuItem
+@style/Theme.ImpressRemote.ActionBarMenuItem
 
+@style/Theme.ImpressRemote.ActionBarMenu
+@color/light_grey
 @drawable/up_indicator_white
+@color/light_grey
 @style/Theme.ImpressRemote.Dialog
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/test idlc/source svtools/bmpmaker ucb/source

[Julien Nabet]

 extensions/test/ole/OleConverterVar1/smartarray.h |3 -
 idlc/source/astscope.cxx  |3 -
 svtools/bmpmaker/bmpcore.cxx  |2 -
 ucb/source/ucp/ftp/test_ftpurl.cxx|   40 ++
 4 files changed, 29 insertions(+), 19 deletions(-)

New commits:
commit 814ae45d4b968c95a49fb35c47f4c813fa2dc026
Author: Julien Nabet 
Date:   Wed Feb 13 15:08:01 2013 +0100

Some cppcheck cleaning

Change-Id: I099171d85a51095f0ff6d592c1260d931f9769b2

diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h 
b/extensions/test/ole/OleConverterVar1/smartarray.h
index 01b0e69..f501892 100644
--- a/extensions/test/ole/OleConverterVar1/smartarray.h
+++ b/extensions/test/ole/OleConverterVar1/smartarray.h
@@ -205,9 +205,6 @@ template <> SmartArray ::SmartArray(sourceType * 
parParams, int count
 {
 ATLTRACE("SmartArray");
 HRESULT hr= S_OK;
-SAFEARRAYBOUND rgsabound[1];
-rgsabound[0].cElements= count;
-rgsabound[0].lLbound= 0;
 m_array= SafeArrayCreateVector( VT_UNKNOWN, 0, count);
 SafeArrayLock( m_array);
 
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 3d26b3a..1c0d4fd 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -259,7 +259,6 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
 {
 AstDeclaration* pDecl = NULL;
 AstScope*   pScope = NULL;
-AstBaseType*pBaseType = NULL;
 OString typeName;
 pDecl = scopeAsDecl(this);
 if ( !pDecl )
@@ -324,7 +323,7 @@ AstDeclaration* AstScope::lookupPrimitiveType(ExprType type)
 
 if ( pDecl && (pDecl->getNodeType() == NT_predefined) )
 {
-pBaseType = (AstBaseType*)pDecl;
+AstBaseType* pBaseType = (AstBaseType*)pDecl;
 
 if ( pBaseType->getExprType() == type )
 return pDecl;
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index f5366ff..50ae293 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -51,7 +51,7 @@ static String ImplGetSystemFileName( const String& rFileName )
 // - BmpCreator -
 // --
 
-BmpCreator::BmpCreator()
+BmpCreator::BmpCreator():pSRS(NULL)
 {
 }
 
diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx 
b/ucb/source/ucp/ftp/test_ftpurl.cxx
index bb9fa02..d37ce90 100644
--- a/ucb/source/ucp/ftp/test_ftpurl.cxx
+++ b/ucb/source/ucp/ftp/test_ftpurl.cxx
@@ -25,12 +25,6 @@
 #include "debughelper.hxx"
 #include 
 
-#define TESTEVAL \
-if(number_of_errors)   \
-fprintf(stderr,"errors in %s: %d\n",name,number_of_errors);  \
-return number_of_errors
-
-
 struct ServerInfo {
 rtl::OUString host;
 rtl::OUString port;
@@ -138,7 +132,11 @@ int test_ftpurl(void) {
 ascii = "ftp://host/bla/../../test/";, n = "anonymous", p = "";
 TESTURL;
 
-TESTEVAL;
+if(number_of_errors)
+{
+fprintf(stderr,"errors in %s: %d\n",name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
@@ -161,7 +159,11 @@ int test_ftplist(void) {
 if(!(vec[0].m_aName == "dir1" && vec[1].m_aName == "dir2" && 
vec[2].m_aName == "file1" ))
++number_of_errors;
 
-TESTEVAL;
+if(number_of_errors)
+{
+fprintf(stderr,"errors in %s: %d\n",name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
@@ -202,13 +204,16 @@ int test_ftpparent(void) {
 expect = "ftp://abi:psswd@abi-1/..";;
 TESTPARENT;
 
-TESTEVAL;
+if(number_of_errors)
+{
+fprintf(stderr,"errors in %s: %d\n",name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
 int test_ftpproperties(void) {
 int number_of_errors = 0;
-const char* name = "test_ftpproperties";
 FTPHandleProviderI provider;
 
 ftp::FTPURL url(
@@ -220,14 +225,18 @@ int test_ftpproperties(void) {
 if(!(ade.m_aName == "file" && ade.isFile()))
 ++number_of_errors;
 
-TESTEVAL;
+if(number_of_errors)
+{
+const char* name = "test_ftpproperties";
+fprintf(stderr,"errors in %s: %d\n",name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
 int test_ftpopen(void)
 {
 int number_of_errors = 0;
-const char* name = "test_ftpopen";
 
 FTPHandleProviderI provider;
 ftp::FTPURL url(
@@ -258,7 +267,12 @@ int test_ftpopen(void)
 } else
 ++number_of_errors;
 
-TESTEVAL;
+if(number_of_errors)
+{
+const char* name = "test_ftpopen";
+fprintf(stderr,"errors in %s: %d\n",name,number_of_errors);
+}
+return number_of_errors;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

[Tor Lillqvist]

 configure.ac |   34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 185e1be6cd1954b8cc5a302c879384f2549cd060
Author: Tor Lillqvist 
Date:   Tue Dec 4 11:26:39 2012 +0200

Let's try to enable compiling the Bluetooth code for Windows

(cherry picked from commit 17f7ee8442472e3ef743891b4d4f1a6a8c063472)

Change-Id: Ic761c6c7dd17b42098adc44f7f4435b83ed3d009
Reviewed-on: https://gerrit.libreoffice.org/2129
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/configure.ac b/configure.ac
index e7c06f2..bb3f96c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,9 +862,8 @@ AC_ARG_ENABLE(sdremote,
 
 AC_ARG_ENABLE(sdremote-bluetooth,
 AS_HELP_STRING([--disable-sdremote-bluetooth],
-[Determines whether to build sdremote with bluetooth support
- Requires: dbus]),
-,enable_sdremote_bluetooth=yes)
+[Determines whether to build sdremote with bluetooth support.
+ Requires dbus on Linux.]))
 
 AC_ARG_ENABLE(gconf,
 AS_HELP_STRING([--disable-gconf],
@@ -9298,12 +9297,28 @@ else
 fi
 AC_SUBST(ENABLE_PACKAGEKIT)
 
-AC_MSG_CHECKING([whether to enable sd remotecontrol])
+AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
 AC_MSG_RESULT([yes])
 ENABLE_SDREMOTE=YES
-AC_MSG_CHECKING([whether to enable bluetooth support in sdremote])
-if test -n "$enable_sdremote_bluetooth" -a "$enable_sdremote_bluetooth" != 
"no"; then
+AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
+
+# If not explicitly enabled or disabled, default
+if test -z "$enable_sdremote_bluetooth"; then
+case "$OS" in
+LINUX|WNT)
+# Default to yes for these
+enable_sdremote_bluetooth=yes
+;;
+*)
+# otherwise no
+enable_sdremote_bluetooth=no
+;;
+esac
+fi
+# $enable_sdremote_bluetooth is guaranteed non-empty now
+
+if test "$enable_sdremote_bluetooth" != "no"; then
 if test "$OS" = "LINUX"; then
 if test "$ENABLE_DBUS" = "TRUE"; then
 AC_MSG_RESULT([yes])
@@ -9311,7 +9326,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 dnl 
===
 dnl Check for system bluez
 dnl 
===
-AC_MSG_CHECKING([which bluetooth header to use])
+AC_MSG_CHECKING([which Bluetooth header to use])
 if test "$with_system_bluez" = "yes"; then
 AC_MSG_RESULT([external])
 AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
@@ -9325,9 +9340,8 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 ENABLE_SDREMOTE_BLUETOOTH=NO
 fi
 else
-# FIXME: should this really be disabled in everything non-Linux?
-AC_MSG_RESULT([no])
-ENABLE_SDREMOTE_BLUETOOTH=NO
+AC_MSG_RESULT([yes])
+ENABLE_SDREMOTE_BLUETOOTH=YES
 fi
 else
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/sdremote

[Michael Meeks]

 android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java | 
   2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03b941e9ae63626a3336aabdb6a3485835ec6f9d
Author: Michael Meeks 
Date:   Wed Feb 13 13:51:08 2013 +

sdremote: avoid crash when fiddling with elapsed time.

diff --git 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 0de6b32..d3a0352 100644
--- 
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++ 
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -485,7 +485,7 @@ public class PresentationActivity extends 
SherlockFragmentActivity {
 
 @Override
 public boolean onEditorAction(TextView tv, int aID, KeyEvent aEvent) {
-if (aEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+if (aEvent != null && aEvent.getKeyCode() == 
KeyEvent.KEYCODE_ENTER) {
 
 long aTime = 0;
 try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Luboš Luňák]

 sd/source/ui/slideshow/slideshow.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 005729c78705434efd2a5f46901eb63a5618b5ce
Author: Luboš Luňák 
Date:   Wed Feb 13 14:49:45 2013 +0100

fix ambiguity in pch build

Change-Id: I1a1638d9a5ad6bea002336d20c93c450d4bc1650

diff --git a/sd/source/ui/slideshow/slideshow.cxx 
b/sd/source/ui/slideshow/slideshow.cxx
index af2033e..99e7efc 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -63,7 +63,6 @@ using namespace ::sd;
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
@@ -1312,9 +1311,9 @@ bool SlideShow::dependsOn( ViewShellBase* pViewShellBase )
 
 // -
 
-Reference< XPresentation2 > CreatePresentation( const SdDrawDocument& 
rDocument )
+Reference< presentation::XPresentation2 > CreatePresentation( const 
SdDrawDocument& rDocument )
 {
-return Reference< XPresentation2 >( SlideShow::Create( const_cast< 
SdDrawDocument* >( &rDocument ) ).get() );
+return Reference< presentation::XPresentation2 >( SlideShow::Create( 
const_cast< SdDrawDocument* >( &rDocument ) ).get() );
 }
 
 // -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Strange loop in vcl/source/control/combobox

[Jean-Noël Rouvignac]

2013/2/13 julien2412 

> About STRING_NOTFOUND, you can take a look to "getToken" function in
> tools/source/string/tustring.cxx since this function is called line 388:
> 385 while ( nIndex != STRING_NOTFOUND )
> 386 {
> 387 xub_StrLen  nPrevIndex = nIndex;
> 388 XubString   aToken = aText.GetToken( 0, mcMultiSep,
> nIndex );
>

Pass by ref! Coming from Java, I did not think about it.
It makes sense now.

Thank you!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[SOLVED]Re: About macro VALIDTAB (sc module)

[julien2412]

I pushed a patch to remove all these macros, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=2b5fedb54a7f9569b817c24c1a9b16c17c09cfd9.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-macro-VALIDTAB-sc-module-tp4036946p4037097.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/inc sc/source

[Julien Nabet]

 sc/inc/address.hxx   |5 --
 sc/source/core/data/attarray.cxx |   10 ++--
 sc/source/core/data/column3.cxx  |4 -
 sc/source/core/data/documen2.cxx |   10 ++--
 sc/source/core/data/documen3.cxx |   36 -
 sc/source/core/data/documen4.cxx |   10 ++--
 sc/source/core/data/documen5.cxx |2 
 sc/source/core/data/documen7.cxx |4 -
 sc/source/core/data/document.cxx |   80 +++
 sc/source/core/data/markarr.cxx  |2 
 sc/source/core/data/table1.cxx   |8 +--
 sc/source/core/data/table2.cxx   |   48 +++
 sc/source/core/data/table6.cxx   |4 -
 sc/source/core/tool/refdata.cxx  |6 +-
 sc/source/ui/view/tabview3.cxx   |4 -
 15 files changed, 115 insertions(+), 118 deletions(-)

New commits:
commit 2b5fedb54a7f9569b817c24c1a9b16c17c09cfd9
Author: Julien Nabet 
Date:   Wed Feb 13 13:39:27 2013 +0100

Remove VALIDTAB and other similar macros

Change-Id: I57e4ca031553bfeb2abfbf48a7cb024b6d8b0b5b

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 5f7c83f..a45b346 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -121,11 +121,6 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1;
 #define MAXROW  W16MAXROW
 #endif
 
-#define VALIDCOL(nCol)  (ValidCol(nCol))
-#define VALIDROW(nRow)  (ValidRow(nRow))
-#define VALIDTAB(nTab)  (ValidTab(nTab))
-#define VALIDCOLROW(nCol,nRow)  (ValidColRow(nCol,nRow))
-
 // === old stuff defines end =
 
 inline bool ValidCol( SCCOL nCol )
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index c450509..f8f982a 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -240,7 +240,7 @@ const ScPatternAttr* ScAttrArray::GetPatternRange( SCROW& 
rStartRow,
 
 void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 
nIndex )
 {
-if(!VALIDROW(nStartRow) || !VALIDROW(nEndRow))
+if(!ValidRow(nStartRow) || !ValidRow(nEndRow))
 return;
 
 if(nEndRow < nStartRow)
@@ -291,7 +291,7 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 nInd
 
 void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 
nIndex )
 {
-if(!VALIDROW(nStartRow) || !VALIDROW(nEndRow))
+if(!ValidRow(nStartRow) || !ValidRow(nEndRow))
 return;
 
 if(nEndRow < nStartRow)
@@ -1670,7 +1670,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW 
nEndRow, bool bIncrement
 SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, bool bUp ) const
 {
 long nRet = nRow;
-if (VALIDROW(nRow))
+if (ValidRow(nRow))
 {
 SCSIZE nIndex;
 Search(nRow, nIndex);
@@ -2309,7 +2309,7 @@ SCsROW ScAttrArray::SearchStyle(
 if (pMarkArray)
 {
 nRow = pMarkArray->GetNextMarked( nRow, bUp );
-if (!VALIDROW(nRow))
+if (!ValidRow(nRow))
 return nRow;
 }
 
@@ -2369,7 +2369,7 @@ bool ScAttrArray::SearchStyleRange(
 const ScMarkArray* pMarkArray) const
 {
 SCsROW nStartRow = SearchStyle( rRow, pSearchStyle, bUp, pMarkArray );
-if (VALIDROW(nStartRow))
+if (ValidRow(nStartRow))
 {
 SCSIZE nIndex;
 Search(nStartRow,nIndex);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 043cec9..7976996 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1643,7 +1643,7 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW 
nEndRow )
 
 void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError)
 {
-if (VALIDROW(nRow))
+if (ValidRow(nRow))
 {
 ScFormulaCell* pCell = new ScFormulaCell
 ( pDocument, ScAddress( nCol, nRow, nTab ) );
@@ -1655,7 +1655,7 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16 
nError)
 
 void ScColumn::SetValue( SCROW nRow, const double& rVal)
 {
-if (VALIDROW(nRow))
+if (ValidRow(nRow))
 {
 ScBaseCell* pCell = new ScValueCell(rVal);
 Insert( nRow, pCell );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f182316..a995d12 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -576,7 +576,7 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB 
nTab )
 void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
   ScBaseCell* pCell, sal_uLong nFormatIndex, bool 
bForceTab )
 {
-if (VALIDTAB(nTab))
+if (ValidTab(nTab))
 {
 if ( bForceTab && ( nTab >= static_cast(maTabs.size()) || 
!maTabs[nTab] ) )
 {
@@ -697,7 +697,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, 
ScProgress* pProgress )
 return false;
 
 bool bValid = false;
-if (VALIDTAB(nOldPos) && nOldPos < nTabCount )
+if (ValidTab(nOldPos) && nOldPos < nTabCount )
 {
 if (maT

Re: [libreoffice-dev] -calling a service function from BASIC macro

[Michael Stahl]

On 12/02/13 16:31, Rai, Neeraj wrote:
> Hi Stephan,
> 
> Is there any example of using uno calls from the forms bundled with LO ?
> I am not very familiar with the Reference <> and googling uno::Reference is 
> not helping me either.
> I also couldn't find usage in sdk dir and examples dir. Would it be possible 
> to point out a dir/file or a web link.

please read this chapter:

http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/C%2B%2B_Language_Binding

and especially:

http://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/C%2B%2B/Mapping_of_Interface_Types

> I  also wanted to understand the lifetime of uno objects .
> Does the CalcAddimThr_impl object live for the life of open doc ?
> I tried to keep my object without reference counting as there is only one 
> instance of it and I am unfamiliar with Reference.
> The runThread was passed the same pointer that I assumed with live for the 
> life of open scalc doc.
> But you seem to be suggesting that some other reference counted object is 
> going out of scope making the pointer dangling.

it is generally unsound to retain a plain C++ pointer to an object after
the first uno::Reference for it has been constructed.  (you may retain a
rtl::Reference however, which is often convenient because it can contain
your implementation class directly and not just some UNO interface).

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - shell/CustomTarget_shlxthdl_res.mk

[David Tardon]

 shell/CustomTarget_shlxthdl_res.mk |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d13a9d558b5f5bf4c0c29787160878ab5ac9918d
Author: David Tardon 
Date:   Wed Feb 13 10:59:09 2013 +0100

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Reviewed-on: https://gerrit.libreoffice.org/2136
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 67e27a6..5a3bcb5 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@ $(call 
gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -43,10 +43,19 @@ $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $< \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)` && \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $< -o $@ 
-m $${MERGEINPUT} -l all && \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - shell/CustomTarget_shlxthdl_res.mk

[David Tardon]

 shell/CustomTarget_shlxthdl_res.mk |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a648103cfc0c4d51f2ad929d9514561e47106a9e
Author: David Tardon 
Date:   Wed Feb 13 10:59:09 2013 +0100

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Reviewed-on: https://gerrit.libreoffice.org/2135
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/shell/CustomTarget_shlxthdl_res.mk 
b/shell/CustomTarget_shlxthdl_res.mk
index 77a3358..9b48e47 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@ $(call 
gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 : \
+   $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -44,10 +44,19 @@ $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
BRAND_BASE_DIR=$(call 
gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_target_for_build,lngconvex) \
-   -ulf shlxthdl.ulf \
+   -ulf $< \
-rc $@ \
-rct rctmpl.txt \
-rch rcheader.txt \
-rcf rcfooter.txt)
 
+$(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : 
\
+   $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+   $(call gb_Executable_get_target_for_build,ulfex) \
+   | $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+   MERGEINPUT=`$(gb_MKTEMP)` && \
+   echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst 
$(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
+   $(call gb_Executable_get_target_for_build,ulfex) -p shell -i $< -o $@ 
-m $${MERGEINPUT} -l all && \
+   rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libxml2/ExternalProject_xml2.mk

[Michael Stahl]

 libxml2/ExternalProject_xml2.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 75ce51026e699d74e3f5bc5f7e19e24ae3fd20ea
Author: Michael Stahl 
Date:   Wed Feb 13 12:57:02 2013 +0100

libxml2: do not use --with-mem-debug

it prints millions of lines of output.

Change-Id: I99039f9039a7928f47d4a1d3f9bc36634240888c

diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index cce11cd..b687736 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_use_unpacked,xml2,xml2))
 $(eval $(call gb_ExternalProject_register_targets,xml2,\
build \
 ))
+
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(call gb_ExternalProject_get_state_target,xml2,build):
@@ -39,7 +40,7 @@ else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,xml2,build):
cd $(EXTERNAL_WORKDIR) \
&& ./configure --disable-ipv6 --without-python --without-zlib 
--with-sax1 \
-   $(if $(debug),--with-mem-debug --with-run-debug) \
+   $(if $(debug),--with-run-debug) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
@@ -48,4 +49,5 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
&& $(MAKE) \
&& touch $@
 endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |   20 
 source/text/shared/optionen/01010900.xhp |   71 +++
 2 files changed, 36 insertions(+), 55 deletions(-)

New commits:
commit 7a051b06eee9561a19aa1248ec5dfde655c624e7
Author: Caolán McNamara 
Date:   Wed Feb 13 12:20:40 2013 +

update help ids for print options page .ui conversion

Change-Id: Ic5ea2c6acc4a157d726331ddc7ef826350df5fcc

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 825b0b2..d44f0d3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4001,7 +4001,6 @@ HID_TPROTATION_CTRL2,33995,
 HID_TPSHADOW_CTRL,33990,
 HID_TPSIZE_CTRL,33993,
 HID_TP_BUSINESS_DATA,53248,
-HID_TP_COMMONPRINTOPTIONS,33343,
 HID_TP_CUSTOMPROPERTIES,33392,
 HID_TP_MAILCONFIG,54978,
 HID_TP_PRIVATE_DATA,53247,
@@ -7332,14 +7331,6 @@ sfx2_CheckBox_RID_DLG_SEARCH_CB_MATCHCASE,2187084814,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_WHOLEWORDS,2187084813,
 sfx2_CheckBox_RID_DLG_SEARCH_CB_WRAPAROUND,2187084815,
 sfx2_CheckBox_RID_WARN_PRINTTRANSPARENCY_CBX_NOPRINTTRANSWARN,1113048129,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_CONVERTTOGREYSCALES,576160808,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_PAPERORIENTATION,576160820,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_PAPERSIZE,576160819,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS,576160798,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCEBITMAPS_TRANSPARENCY,576160802,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCEGRADIENTS,576160788,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_REDUCETRANSPARENCY,576160778,
-sfx2_CheckBox_TP_COMMONPRINTOPTIONS_CB_TRANSPARENCY,576160821,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_FULLWORDS,546997262,
 sfx2_CheckBox_TP_HELP_SEARCH_CB_SCOPE,546997263,
 sfx2_CheckBox_TP_MANAGE_STYLES_CB_AUTO,541246476,
@@ -7364,7 +7355,6 @@ sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
 sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION,576163363,
 sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203,
 sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ListBox_TP_MANAGE_STYLES_LB_BASE,541249030,
@@ -7380,7 +7370,6 @@ sfx2_MoreButton_DLG_NEW_FILE_BT_MORE,1107391008,
 sfx2_MultiLineEdit_DLG_COMMENTS_ME_VERSIONS,1112705550,
 sfx2_MultiLineEdit_DLG_NEW_FILE_ED_DESC,1107380807,
 sfx2_MultiLineEdit_TP_MANAGE_STYLES_ED_DESC,541248011,
-sfx2_NumericField_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT,576165911,
 sfx2_PushButton_DLG_COMMENTS_PB_CLOSE,1112707592,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
 sfx2_PushButton_DLG_VERSIONS_PB_COMPARE,1112691217,
@@ -7395,15 +7384,6 @@ sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228,
 sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_PRINTEROUTPUT,576160259,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_PRINTFILEOUTPUT,576160260,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_NORMAL,576160288,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_OPTIMAL,576160287,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEBITMAPS_RESOLUTION,576160289,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_COLOR,576160278,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCEGRADIENTS_STRIPES,576160277,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_AUTO,576160267,
-sfx2_RadioButton_TP_COMMONPRINTOPTIONS_RB_REDUCETRANSPARENCY_NONE,576160268,
 starmath_CheckBox_RID_DISTANCEDIALOG_1,1401504769,
 starmath_CheckBox_RID_FONTDIALOG_1,1401455617,
 starmath_CheckBox_RID_FONTDIALOG_2,1401455618,
diff --git a/source/text/shared/optionen/01010900.xhp 
b/source/text/shared/optionen/01010900.xhp
index c8fdd77..b18af50 100644
--- a/source/text/shared/optionen/01010900.xhp
+++ b/source/text/shared/optionen/01010900.xhp
@@ -36,6 +36,7 @@
 printing; warnings
 paper size warning
 
+
 Print Options
 Specifies the print setting 
options.
 
@@ -45,44 +46,44 @@
 
 Reduce print data
 You can reduce the amount of data to be sent to the printer. 
Reducing the print data increases the print speed because the print files are 
smaller. This makes it easier for printers with a smaller memory to print. 
Reducing print data can result in slightly lower print quality.
-
-Settings for
-Specifies 
whether the print settings apply to direct printing or to printing to a 
file.
-Reduce transparency
-If you mark 
this field the transparent objects will be printed like normal, non-transparent 
objects, depending on your selection in the following two option 
buttons.
+
+Settings for
+Specifies whether the print 
settings apply to direct printing or to printing to a file.
+Reduce transparency
+If you mark this field 
the transparent objects will be printed like normal, non-transparent objects, 
depend

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1c4d620234f5f2861cf591171e8eb9423034a06
Author: Caolán McNamara 
Date:   Wed Feb 13 12:20:40 2013 +

Updated core
Project: help  7a051b06eee9561a19aa1248ec5dfde655c624e7

diff --git a/helpcontent2 b/helpcontent2
index 4d7b724..7a051b0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4d7b72491649f33d115f687f5deee58bd9619ca4
+Subproject commit 7a051b06eee9561a19aa1248ec5dfde655c624e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

[Michael Meeks]

 sw/inc/IDocumentStatistics.hxx  |   17 ++-
 sw/inc/doc.hxx  |   16 ++
 sw/inc/ndtxt.hxx|4 
 sw/source/core/doc/doc.cxx  |  181 ++--
 sw/source/core/doc/docnew.cxx   |4 
 sw/source/core/txtnode/txtedt.cxx   |   18 +--
 sw/source/ui/dialog/wordcountdialog.cxx |2 
 sw/source/ui/inc/view.hxx   |6 -
 sw/source/ui/uiview/view.cxx|1 
 sw/source/ui/uiview/view2.cxx   |9 +
 10 files changed, 163 insertions(+), 95 deletions(-)

New commits:
commit c138a8aec8dccb97948a7d7993e6869da4079b32
Author: Michael Meeks 
Date:   Wed Feb 13 11:35:13 2013 +

asynchronous word-count.

diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 4ec926a..2c5a0501 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -35,13 +35,26 @@
 
 /** Document - Statistics
 */
+/// Returns a reference to the existing document statistics
 virtual const SwDocStat &GetDocStat() const = 0;
 
-virtual const SwDocStat &GetUpdatedDocStat() = 0;
+/**
+  * Updates the document statistics if the document has been
+  * modified and returns a reference to the result.
+  * \param bCompleteAsync if true will return a partial result,
+  * and potentially trigger a timeout to complete the work.
+  */
+virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync) = 0;
 
+/// Set the document statistics
 virtual void SetDocStat(const SwDocStat& rStat) = 0;
 
-virtual void UpdateDocStat() = 0;
+/**
+  * Updates the internal document's statistics
+  * \param bCompleteAsync if true it may do part of the
+  * work and trigger a timeout to complete it.
+  */
+virtual void UpdateDocStat(bool bCompleteAsync) = 0;
 
 protected:
 virtual ~IDocumentStatistics() {};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c67f79f..ccebf5c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -282,6 +282,7 @@ class SW_DLLPUBLIC SwDoc :
 */
 Timer   aIdleTimer; ///< Own IdleTimer
 Timer   aOLEModifiedTimer;  ///< Timer for update modified 
OLE-Objecs
+Timer   aStatsUpdateTimer;  ///< Timer for asynchronous stats 
calculation
 SwDBDataaDBData;///< database descriptor
 ::com::sun::star::uno::Sequence  aRedlinePasswd;
 String  sTOIAutoMarkURL;///< ::com::sun::star::util::URL of 
table of index AutoMark file
@@ -909,9 +910,9 @@ public:
 */
 virtual void DocInfoChgd();
 virtual const SwDocStat &GetDocStat() const;
-virtual const SwDocStat &GetUpdatedDocStat();
+virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false);
 virtual void SetDocStat(const SwDocStat& rStat);
-virtual void UpdateDocStat();
+virtual void UpdateDocStat(bool bCompleteAsync = false);
 
 /** IDocumentState
 */
@@ -2071,6 +2072,17 @@ private:
 void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, 
SwPageDesc *pDesc, bool bLeft);
 /// Copies master footer to left / first one, if necessary - used by 
ChgPageDesc().
 void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, 
SwPageDesc *pDesc, bool bLeft);
+
+/** continue computing a chunk of document statistics
+  * \param nTextNodes number of paragraphs to calculate before
+  * exiting
+  *
+  * returns false when there is no more to calculate
+  */
+bool IncrementalDocStatCalculate(long nTextNodes = 250);
+
+/// Our own 'StatsUpdateTimer' calls the following method
+DECL_LINK( DoIdleStatsUpdate, Timer * );
 };
 
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 18c2b02..5a47fb2 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -745,8 +745,8 @@ public:
 xub_StrLen nStart, xub_StrLen nEnd,
 SwUndoTransliterate* pUndo = 0 );
 
-/// count words in given range
-void CountWords( SwDocStat& rStat, xub_StrLen nStart, xub_StrLen nEnd ) 
const;
+/// count words in given range - returns true if we refreshed out count
+bool CountWords( SwDocStat& rStat, xub_StrLen nStart, xub_StrLen nEnd ) 
const;
 
 /** Checks some global conditions like loading or destruction of document
to economize notifications */
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index cd71cf5..0470ef3 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -112,6 +113,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include// SwWebDocShell
 #include// SwPrintOptions
@@ -1146,10 +1148,6 @@ bool SwDoc::UpdateParRsid( SwTxtNode *pTxtNode, 
sal_uInt32 n