date:20130407

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3225

To pull it, you can do:

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

rename UI to UIConfig

I plan to use it to deliver all */uiconfig files, not just .ui, as a
preliminary step to get rid of postprocess/packconfig.

Change-Id: Ie7b4434b2f247165e3ab69a4d0c193418720a149
---
M Makefile.in
M basctl/Module_basctl.mk
R basctl/UIConfig_basicide.mk
M chart2/Module_chart2.mk
R chart2/UIConfig_chart2.mk
M cui/Module_cui.mk
R cui/UIConfig_cui.mk
M dbaccess/Module_dbaccess.mk
R dbaccess/UIConfig_dbaccess.mk
M desktop/Module_desktop.mk
R desktop/UIConfig_deployment.mk
M filter/Module_filter.mk
R filter/UIConfig_xsltdlg.mk
M padmin/Module_padmin.mk
R padmin/UIConfig_spa.mk
M sc/Module_sc.mk
R sc/UIConfig_scalc.mk
M sd/Module_sd.mk
R sd/UIConfig_sdraw.mk
R sd/UIConfig_simpress.mk
M sfx2/Module_sfx2.mk
R sfx2/UIConfig_sfx.mk
M solenv/gbuild/Postprocess.mk
M solenv/gbuild/TargetLocations.mk
D solenv/gbuild/UI.mk
A solenv/gbuild/UIConfig.mk
M solenv/gbuild/gbuild.mk
M starmath/Module_starmath.mk
R starmath/UIConfig_smath.mk
M starmath/uiconfig/smath/menubar/menubar.xml
M svtools/Module_svtools.mk
R svtools/UIConfig_svt.mk
M svx/Module_svx.mk
R svx/UIConfig_svx.mk
M sw/Module_sw.mk
R sw/UIConfig_swriter.mk
M tubes/Module_tubes.mk
R tubes/UIConfig_tubes.mk
M uui/Module_uui.mk
R uui/UIConfig_uui.mk
M vcl/Module_vcl.mk
R vcl/UIConfig_vcl.mk
M xmlsecurity/Module_xmlsecurity.mk
R xmlsecurity/UIConfig_xmlsec.mk
44 files changed, 264 insertions(+), 261 deletions(-)



diff --git a/Makefile.in b/Makefile.in
index fd4cba6..56b3632 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,7 +120,7 @@
Pyuno \
Rdb \
StaticLibrary \
-   UI \
+   UIConfig \
UnoApi \
UnoApiMerge \
UnpackedTarball \
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 3542e2b..ddb86ab 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -39,7 +39,7 @@
 
 $(eval $(call gb_Module_add_targets,basctl,\
Package_uiconfig \
-   UI_basicide \
+   UIConfig_basicide \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/basctl/UI_basicide.mk b/basctl/UIConfig_basicide.mk
similarity index 78%
rename from basctl/UI_basicide.mk
rename to basctl/UIConfig_basicide.mk
index a808d921..66dfb83 100644
--- a/basctl/UI_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/BasicIDE))
+$(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
 
-$(eval $(call gb_UI_add_uifiles,modules/BasicIDE,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
 ))
 
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 03fa54b..e8b8567 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -33,7 +33,7 @@
 Library_chartcontroller \
 Library_chartcore \
 Package_uiconfig \
-   UI_chart2 \
+   UIConfig_chart2 \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
diff --git a/chart2/UI_chart2.mk b/chart2/UIConfig_chart2.mk
similarity index 78%
rename from chart2/UI_chart2.mk
rename to chart2/UIConfig_chart2.mk
index e75f209..4c19d79 100644
--- a/chart2/UI_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/schart))
+$(eval $(call gb_UIConfig_UIConfig,modules/schart))
 
-$(eval $(call gb_UI_add_uifiles,modules/schart,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
 ))
 
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 895013e..12b3bee 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -30,7 +30,7 @@
 $(eval $(call gb_Module_add_targets,cui,\
AllLangResTarget_cui \
Library_cui \
-   UI_cui \
+   UIConfig_cui \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cui/UI_cui.mk b/cui/UIConfig_cui.mk
similarity index 96%
rename from cui/UI_cui.mk
rename to cui/UIConfig_cui.mk
index c5cf568..3fbdb23 100644
--- a/cui/UI_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,cui))
+$(eval $(call gb_UIConfig_UIConfig,cui))
 
-$(eval $(call gb_UI_add_uifiles,cui,\
+$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/asiantypography \
cui/uiconfig/ui/backgroundpage \
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 0e5fe13..598ec42 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -43,7 +43,7 @@
 Library_sdbt \
 Package_inc \
 Package_uiconfig \
-UI_dbaccess \
+UIConfig_dbaccess \
 ))
 
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git

[PATCH] use extra package for every lang

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3226

To pull it, you can do:

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

use extra package for every lang

Change-Id: Iccd5225b65887734ff599ca247109c2c1ce4ec25
---
M solenv/gbuild/UIConfig.mk
1 file changed, 30 insertions(+), 10 deletions(-)



diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 1bd01be..3cc33ba 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -107,24 +107,32 @@
rm -f $(call gb_UIConfig_get_target,$*) \
)
 
+gb_UIConfig_get_packagename = UIConfig/$(1)
+gb_UIConfig_get_packagename_for_lang = UIConfig/$(1)_$(2)
+
 # Processes and delivers a set of UI configuration files.
 #
 # gb_UIConfig_UIConfig modulename
 define gb_UIConfig_UIConfig
-$(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR))
+$(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename,$(1)),$(SRCDIR))
 $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call 
gb_UIConfig_get_target,$(1))).dir
-$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui)
+$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)))
 $(call gb_Postprocess_get_target,AllUIConfigs) : $(call 
gb_UIConfig_get_target,$(1))
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(1)_ui)
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)))
 
 ifneq ($(gb_UIConfig_LANGS),)
-$(call 
gb_Package_Package_internal,$(1)_ui_localized,$(gb_UILocalizeTarget_WORKDIR))
-$(call gb_UIConfig_get_target,$(1)) :| $(call 
gb_Package_get_target,$(1)_ui_localized)
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(1)_ui_localized)
+$(foreach lang,$(gb_UIConfig_LANGS),$(call 
gb_UIConfig__UIConfig_for_lang,$(1),$(lang)))
 endif
 
 $$(eval $$(call gb_Module_register_target,$(call 
gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1
 $(call gb_Helper_make_userfriendly_targets,$(1),UIConfig)
+
+endef
+
+define gb_UIConfig__UIConfig_for_lang
+$(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR))
+$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
 
 endef
 
@@ -136,14 +144,27 @@
 
 # gb_UIConfig__add_uifile target file
 define gb_UIConfig__add_uifile
-$(call gb_UIConfig__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui)
+$(call gb_UIConfig__package_uifile,$(1),$(call 
gb_UIConfig_get_packagename,$(1)),$(notdir $(2)).ui,$(2).ui)
 
 endef
 
+# Add a l10n for an .ui file to respective lang package.
+#
 # gb_UIConfig__add_uifile_for_lang target file lang
 define gb_UIConfig__add_uifile_for_lang
-$(call gb_UIConfig__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir 
$(2)),$(2)/$(3).ui)
+$(call gb_UIConfig__package_uifile,$(1),$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(3)),res/$(3)/$(notdir 
$(2)),$(2)/$(3).ui)
 
+endef
+
+# Add a l10n for an .ui file to respective lang package.
+#
+# This is only for real languages, i.e., everything except qtz.
+#
+# gb_UIConfig__add_uifile_for_real_lang target file lang
+define gb_UIConfig__add_uifile_for_real_lang
+$(if $(filter qtz,$(3)),$(call 
gb_Output_error,gb_UIConfig__add_uifile_for_real_lang called with qtz))
+$(call gb_Package_get_preparation_target,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(lang))) : $(call 
gb_UILocalizeTarget_get_target,$(2))
+$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang))
 endef
 
 # gb_UIConfig__add_translations_impl target uifile langs
@@ -151,8 +172,7 @@
 $(call gb_UILocalizeTarget_UILocalizeTarget,$(2))
 $(call gb_UIConfig_get_target,$(1)) : $(call 
gb_UILocalizeTarget_get_target,$(2))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_UILocalizeTarget_get_clean_target,$(2))
-$(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call 
gb_UILocalizeTarget_get_target,$(2))
-$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang)))
+$(foreach lang,$(3),$(call 
gb_UIConfig__add_uifile_for_real_lang,$(1),$(2),$(lang)))
 
 endef
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccd5225b65887734ff599ca247109c2c1ce4ec25
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com

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

[PATCH] use normal deps for depending on Package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3227

To pull it, you can do:

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

use normal deps for depending on Package

Change-Id: Idaf0f5c938deff5b774e675991d0c6aa328ffd4f
---
M solenv/gbuild/UIConfig.mk
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 3cc33ba..6aaab28 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -116,7 +116,7 @@
 define gb_UIConfig_UIConfig
 $(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename,$(1)),$(SRCDIR))
 $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call 
gb_UIConfig_get_target,$(1))).dir
-$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)))
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)))
 $(call gb_Postprocess_get_target,AllUIConfigs) : $(call 
gb_UIConfig_get_target,$(1))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)))
 
@@ -131,7 +131,7 @@
 
 define gb_UIConfig__UIConfig_for_lang
 $(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR))
-$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call 
gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
 
 endef

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaf0f5c938deff5b774e675991d0c6aa328ffd4f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com

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

[PATCH] allow to add other types of UI config files

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3228

To pull it, you can do:

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

allow to add other types of UI config files

Change-Id: I878b41783e043efe19097829495a8f13b0f995c0
---
M solenv/gbuild/UIConfig.mk
1 file changed, 89 insertions(+), 1 deletion(-)



diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 6aaab28..a38b838 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -115,6 +115,7 @@
 # gb_UIConfig_UIConfig modulename
 define gb_UIConfig_UIConfig
 $(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename,$(1)),$(SRCDIR))
+$(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR))
 $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call 
gb_UIConfig_get_target,$(1))).dir
 $(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)))
 $(call gb_Postprocess_get_target,AllUIConfigs) : $(call 
gb_UIConfig_get_target,$(1))
@@ -136,9 +137,15 @@
 
 endef
 
+# gb_UIConfig__package_file target package type destfile srcfile
+define gb_UIConfig__package_file
+$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/$(3)/$(4),$(5))
+
+endef
+
 # gb_UIConfig__package_uifile target package destfile srcfile
 define gb_UIConfig__package_uifile
-$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4))
+$(call gb_UIConfig__package_file,$(1),$(2),ui,$(3),$(4))
 
 endef
 
@@ -218,4 +225,85 @@
 
 endef
 
+# gb_UIConfig__add_xmlfile target package-target type xmlfile
+define gb_UIConfig__add_xmlfile
+$(call gb_UIConfig__package_file,$(1),$(call 
gb_UIConfig_get_packagename,$(2)),$(3),$(notdir $(4)).xml,$(4).xml)
+
+endef
+
+# Add menubar config file to the package.
+#
+# The file is relative to $(SRCDIR) and without extension.
+#
+# gb_UIConfig_add_menubarfile target file
+define gb_UIConfig_add_menubarfile
+$(call gb_UIConfig__add_xmlfile,$(1),$(1),menubar,$(2))
+
+endef
+
+# Adds multiple menubar config files to the package.
+#
+# gb_UIConfig_add_menubarfiles target file(s)
+define gb_UIConfig_add_menubarfiles
+$(foreach menubarfile,$(2),$(call 
gb_UIConfig_add_menubarfile,$(1),$(menubarfile)))
+
+endef
+
+# Add a generated menubar config file to the package.
+#
+# The file is relative to $(WORKDIR) and without extension.
+#
+# gb_UIConfig_add_generated_menubarfile target file
+define gb_UIConfig_add_generated_menubarfile
+$(call gb_UIConfig__add_xmlfile,$(1),$(1)_generated,menubar,$(2))
+
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)_generated))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)_generated))
+
+endef
+
+# Adds multiple menubar config files to the package.
+#
+# gb_UIConfig_add_generated_menubarfiles target file(s)
+define gb_UIConfig_add_generated_menubarfiles
+$(foreach menubarfile,$(2),$(call 
gb_UIConfig_add_generated_menubarfile,$(1),$(menubarfile)))
+
+endef
+
+# Add statusbar config file to the package.
+#
+# The file is relative to $(SRCDIR) and without extension.
+#
+# gb_UIConfig_add_statusbarfile target file
+define gb_UIConfig_add_statusbarfile
+$(call gb_UIConfig__add_xmlfile,$(1),$(1),statusbar,$(2))
+
+endef
+
+# Adds multiple statusbar config files to the package.
+#
+# gb_UIConfig_add_statusbarfiles target file(s)
+define gb_UIConfig_add_statusbarfiles
+$(foreach statusbarfile,$(2),$(call 
gb_UIConfig_add_statusbarfile,$(1),$(statusbarfile)))
+
+endef
+
+# Add toolbar config file to the package.
+#
+# The file is relative to $(SRCDIR) and without extension.
+#
+# gb_UIConfig_add_toolbarfile target file
+define gb_UIConfig_add_toolbarfile
+$(call gb_UIConfig__add_xmlfile,$(1),$(1),toolbar,$(2))
+
+endef
+
+# Adds multiple toolbar config files to the package.
+#
+# gb_UIConfig_add_toolbarfiles target file(s)
+define gb_UIConfig_add_toolbarfiles
+$(foreach toolbarfile,$(2),$(call 
gb_UIConfig_add_toolbarfile,$(1),$(toolbarfile)))
+
+endef
+
 # vim: set noet sw=4 ts=4:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I878b41783e043efe19097829495a8f13b0f995c0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com

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

[PATCH] add gbuild class PackageSet

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3230

To pull it, you can do:

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

add gbuild class PackageSet

This is intended for bundling filelists of multiple Packages together,
to simplify the scp2 configuration.

Change-Id: I6f700f691b37375a09a5400166aac80a8bb2a2b4
---
M Makefile.in
M instsetoo_native/util/openoffice.lst.in
M solenv/bin/modules/installer/environment.pm
A solenv/gbuild/PackageSet.mk
M solenv/gbuild/TargetLocations.mk
M solenv/gbuild/gbuild.mk
6 files changed, 84 insertions(+), 5 deletions(-)



diff --git a/Makefile.in b/Makefile.in
index 56b3632..183f4ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,6 +116,7 @@
Library \
Module \
Package \
+   PackageSet \
Pagein \
Pyuno \
Rdb \
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 8e831e7..9bf1472 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -83,7 +83,7 @@
 downloadnameLibreOffice_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}
+include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package
 }
 }
 
@@ -140,7 +140,7 @@
 downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
 langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
 helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}
+include 
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external,{filelistpath}/PackageSet,{filelistpath}/Package
 }
 }
 
@@ -179,7 +179,7 @@
 active 1
 compression 5
 script sdkoo
-include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}
+include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package
 }
 }
 
@@ -224,7 +224,7 @@
 active 1
 compression 5
 script sdkoo
-include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}
+include 
{solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/filelists.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS,{filelistpath}/PackageSet,{filelistpath}/Package
 }
 }
 
diff --git a/solenv/bin/modules/installer/environment.pm 
b/solenv/bin/modules/installer/environment.pm
index cfc8fdf..613c86b 100644
--- a/solenv/bin/modules/installer/environment.pm
+++

[PATCH] prepare UIConfig for producing filelists

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3231

To pull it, you can do:

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

prepare UIConfig for producing filelists

Change-Id: I0285f6371e68aaccfc7b3347c87b4e24c4a3fda2
---
M solenv/gbuild/UIConfig.mk
1 file changed, 14 insertions(+), 5 deletions(-)



diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index a38b838..3aa008f 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -84,6 +84,12 @@
 #
 # This mostly means UI description files (suffix .ui) for the new layouting
 # mechanism.
+#
+# This class provides the following filelists:
+# * UIConfig/name containing all nontranslatable files
+# * UIConfig/name_lang for each active lang, containing translations
+#   of .ui files. This filelist only exists if the UIConfig contains any
+#   .ui files.
 
 # en-US is the default, so there is no translation for it
 gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
@@ -109,17 +115,22 @@
 
 gb_UIConfig_get_packagename = UIConfig/$(1)
 gb_UIConfig_get_packagename_for_lang = UIConfig/$(1)_$(2)
+gb_UIConfig_get_packagesetname = UIConfig/$(1)
 
 # Processes and delivers a set of UI configuration files.
 #
 # gb_UIConfig_UIConfig modulename
 define gb_UIConfig_UIConfig
+$(call gb_PackageSet_PackageSet_internal,$(call 
gb_UIConfig_get_packagesetname,$(1)))
 $(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename,$(1)),$(SRCDIR))
 $(call gb_Package_Package_internal,$(call 
gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR))
+
+$(call gb_PackageSet_add_package,$(call 
gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)))
+
 $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call 
gb_UIConfig_get_target,$(1))).dir
-$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)))
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call 
gb_UIConfig_get_packagesetname,$(1)))
 $(call gb_Postprocess_get_target,AllUIConfigs) : $(call 
gb_UIConfig_get_target,$(1))
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_PackageSet_get_clean_target,$(call gb_UIConfig_get_packagesetname,$(1)))
 
 ifneq ($(gb_UIConfig_LANGS),)
 $(foreach lang,$(gb_UIConfig_LANGS),$(call 
gb_UIConfig__UIConfig_for_lang,$(1),$(lang)))
@@ -256,9 +267,7 @@
 # gb_UIConfig_add_generated_menubarfile target file
 define gb_UIConfig_add_generated_menubarfile
 $(call gb_UIConfig__add_xmlfile,$(1),$(1)_generated,menubar,$(2))
-
-$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)_generated))
-$(call gb_UIConfig_get_clean_target,$(1)) : $(call 
gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename,$(1)_generated))
+$(call gb_PackageSet_add_package,$(call 
gb_UIConfig_get_packagesetname,$(1)),$(call 
gb_UIConfig_get_packagename,$(1)_generated))
 
 endef
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0285f6371e68aaccfc7b3347c87b4e24c4a3fda2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com

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

[PATCH] impl. platform-specific processing for menubar configs

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3232

To pull it, you can do:

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

impl. platform-specific processing for menubar configs

This is the last step needed to obsolete
postprocess/packconfig/packconfig.pl.

Change-Id: Iad6de126a467aadc829244951f98fc8b202fbd95
---
M solenv/gbuild/TargetLocations.mk
M solenv/gbuild/UIConfig.mk
M solenv/gbuild/platform/IOS_ARM_GCC.mk
M solenv/gbuild/platform/WNT_INTEL_GCC.mk
M solenv/gbuild/platform/com_MSC_class.mk
M solenv/gbuild/platform/macosx.mk
M solenv/gbuild/platform/solaris.mk
M solenv/gbuild/platform/unxgcc.mk
8 files changed, 112 insertions(+), 3 deletions(-)



diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 49ed141..484b42c 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -194,6 +194,7 @@
 gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1)
 gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
 gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
+gb_UIMenubarTarget_get_target = $(WORKDIR)/UIMenubarTarget/$(1).xml
 gb_UnoApiTarget_get_external_headers_target = 
$(WORKDIR)/UnoApiTarget/$(1).external
 gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers
 gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
@@ -308,6 +309,7 @@
ExternalProject \
UIConfig \
UILocalizeTarget \
+   UIMenubarTarget \
UnoApiHeadersTarget \
UnoApiTarget \
UnpackedTarball \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 3aa008f..cf56de6 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -78,6 +78,39 @@
 
 endef
 
+# class UIMenubarTarget
+
+# Handles platform-specific processing of menubar config files.
+
+# defined by platform:
+#  gb_UIMenubarTarget_UIMenubarTarget_platform
+#  gb_UIMenubarTarget__command
+
+$(dir $(call gb_UIMenubarTarget_get_target,%)).dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_UIMenubarTarget_get_target,%))%/.dir :
+   $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_UIMenubarTarget_get_target,%) :
+   $(call gb_UIMenubarTarget__command,$@,$*,$)
+
+.PHONY : $(call gb_UIMenubarTarget_get_clean_target,%)
+$(call gb_UIMenubarTarget_get_clean_target,%) :
+   $(call gb_Output_announce,$(2),$(false),UIM,1)
+   rm -f $(call gb_UIMenubarTarget_get_target,$*)
+
+# Process a menubar configuration file.
+#
+# gb_UIMenubarTarget_UIMenubarTarget target source
+define gb_UIMenubarTarget_UIMenubarTarget
+$(call gb_UIMenubarTarget_get_target,$(1)) : $(2)
+$(call gb_UIMenubarTarget_get_target,$(1)) :| $(dir $(call 
gb_UIMenubarTarget_get_target,$(1))).dir
+
+$(call gb_UIMenubarTarget_UIMenubarTarget_platform,$(1),$(2))
+
+endef
+
 # class UIConfig
 
 # Handles UI configuration files.
@@ -242,13 +275,23 @@
 
 endef
 
+define gb_UIConfig__add_menubarfile
+$(call gb_UIMenubarTarget_UIMenubarTarget,$(2),$(3))
+$(call gb_Package_add_file,$(call 
gb_UIConfig_get_packagename,$(1)_generated),xml/uiconfig/$(1)/menubar/$(notdir 
$(2)).xml,$(subst $(WORKDIR)/,,$(call gb_UIMenubarTarget_get_target,$(2
+$(call gb_PackageSet_add_package,$(call 
gb_UIConfig_get_packagesetname,$(1)),$(call 
gb_UIConfig_get_packagename,$(1)_generated))
+
+$(call gb_Package_get_target,$(call 
gb_UIConfig_get_packagename,$(1)_generated)) : $(call 
gb_UIMenubarTarget_get_target,$(2))
+$(call gb_Package_get_clean_target,$(call 
gb_UIConfig_get_packagename,$(1)_generated)) : $(call 
gb_UIMenubarTarget_get_clean_target,$(2))
+
+endef
+
 # Add menubar config file to the package.
 #
 # The file is relative to $(SRCDIR) and without extension.
 #
 # gb_UIConfig_add_menubarfile target file
 define gb_UIConfig_add_menubarfile
-$(call gb_UIConfig__add_xmlfile,$(1),$(1),menubar,$(2))
+$(call gb_UIConfig__add_menubarfile,$(1),$(2),$(SRCDIR)/$(2).xml)
 
 endef
 
@@ -266,8 +309,7 @@
 #
 # gb_UIConfig_add_generated_menubarfile target file
 define gb_UIConfig_add_generated_menubarfile
-$(call gb_UIConfig__add_xmlfile,$(1),$(1)_generated,menubar,$(2))
-$(call gb_PackageSet_add_package,$(call 
gb_UIConfig_get_packagesetname,$(1)),$(call 
gb_UIConfig_get_packagename,$(1)_generated))
+$(call gb_UIConfig__add_menubarfile,$(1),$(2),$(WORKDIR)/$(2).xml)
 
 endef
 
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index e0d8b06..466a821 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -286,6 +286,16 @@
 # Package class
 gb_Package_SDKDIRNAME := sdk
 
+# UIMenubarTarget class
+
+define gb_UIMenubarTarget__command
+$(call gb_Output_announce,$(2),$(true),UIM,1)
+cp $(3) $(1)
+
+endef
+
+gb_UIMenubarTarget_UIMenubarTarget_platform :=
+
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
diff --git

[PATCH] install UI config. files using filelists

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3233

To pull it, you can do:

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

install UI config. files using filelists

Change-Id: I422c8912bc2557c2c03bb885e5c193deb93d1d5e
---
D postprocess/CustomTarget_config.mk
M postprocess/CustomTarget_images.mk
M postprocess/Module_postprocess.mk
D postprocess/Package_config.mk
M postprocess/packimages/image-sort.lst
M scp2/inc/macros.inc
M scp2/source/ooo/file_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
M scp2/source/ooo/module_lang_template.scp
M solenv/gbuild/UIConfig.mk
10 files changed, 417 insertions(+), 354 deletions(-)



diff --git a/postprocess/CustomTarget_config.mk 
b/postprocess/CustomTarget_config.mk
deleted file mode 100644
index 80a4158..000
--- a/postprocess/CustomTarget_config.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,postprocess/config))
-
-$(eval $(call gb_CustomTarget_register_targets,postprocess/config,\
-   uiconfig.zip \
-))
-
-.PHONY: $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
-
-# We need this dependency for delivering in package postprocess_config:
-$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \
-   $(call 
gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
-   @true
-
-$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : \
-   $(SRCDIR)/postprocess/packconfig/packconfig.pl \
-   $(call gb_Postprocess_get_target,AllPackages) \
-   $(call gb_Postprocess_get_target,AllUIs)
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
-   cd $(SRCDIR)/postprocess/packconfig \
-$(PERL) packconfig.pl -i $(OUTDIR)/xml/uiconfig -o $(dir $@)
-
-# vim: set noet sw=4 ts=4:
diff --git a/postprocess/CustomTarget_images.mk 
b/postprocess/CustomTarget_images.mk
index 1555b1a..31591b2 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -87,9 +87,9 @@
 
 $(packimages_DIR)/sorted.lst : \
$(SRCDIR)/postprocess/packimages/image-sort.lst \
-   $(call gb_Postprocess_get_target,AllPackages)
+   $(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
-   $(PERL) $(SOLARENV)/bin/image-sort.pl $ $(OUTDIR)/xml $@)
+   $(PERL) $(SOLARENV)/bin/image-sort.pl $ 
$(INSTDIR)/$(gb_UIConfig_INSTDIR) $@)
 
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/Module_postprocess.mk 
b/postprocess/Module_postprocess.mk
index 808d7f3..9ed1a75 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -13,10 +13,8 @@
 # is reused in Package_registry!
 
 $(eval $(call gb_Module_add_targets,postprocess,\
-   CustomTarget_config \
CustomTarget_images \
CustomTarget_registry \
-   Package_config \
Package_images \
Package_registry \
Rdb_services \
diff --git a/postprocess/Package_config.mk b/postprocess/Package_config.mk
deleted file mode 100644
index 03350d4..000
--- a/postprocess/Package_config.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,postprocess_config,$(call 
gb_CustomTarget_get_workdir,postprocess/config)))
-
-$(eval $(call 
gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip))
-
-$(eval $(call gb_Package_add_files,postprocess_config,bin,\
-   $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),uiconfig_$(lang).zip) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packimages/image-sort.lst 
b/postprocess/packimages/image-sort.lst
index 6a84af7..223668c 100644
--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst
@@ -19,26 +19,26 @@
 -- literal
 
 # 'standard' toolbars
-uiconfig/modules/swriter/toolbar/standardbar.xml
-uiconfig/modules/scalc/toolbar/standardbar.xml
-uiconfig/modules/simpress/toolbar/standardbar.xml
-uiconfig/modules/sdraw/toolbar/standardbar.xml
+modules/swriter/toolbar/standardbar.xml
+modules/scalc/toolbar/standardbar.xml
+modules/simpress/toolbar/standardbar.xml
+modules/sdraw/toolbar/standardbar.xml
 -- group
 
 # default /

[PATCH] remove obsoleted postprocess/packconfig

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3234

To pull it, you can do:

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

remove obsoleted postprocess/packconfig

Change-Id: I93313dc03e8ed7d4d1a653df92145a153e20e5b1
---
D postprocess/packconfig/packconfig.pl
R solenv/bin/macosx_menubar_modification.xsl
M solenv/gbuild/platform/macosx.mk
3 files changed, 2 insertions(+), 332 deletions(-)



diff --git a/postprocess/packconfig/packconfig.pl 
b/postprocess/packconfig/packconfig.pl
deleted file mode 100644
index 0ce653d..000
--- a/postprocess/packconfig/packconfig.pl
+++ /dev/null
@@ -1,330 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+$@}'
-if 0;
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-#
-# packconfig.pl - pack xml configuration into archives
-#
-
-use strict;
-use Getopt::Long;
-use File::Find;
-use File::Basename;
-use File::Spec;
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-
- globals 
-
-my $out_path;# path to output archives in
-my $files_path;  # path to look for desired files
-my $verbose; # be verbose
-my $extra_verbose;   # be extra verbose
-my $current_lang;# big fat global because File::Find is a pig
-
- script id #
-
-( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-
- main #
-
-parse_options();
-
-#pack the .ui translations
-my @langs = split(/\s+/, $ENV{WITH_LANG_LIST});
-foreach (@langs) {
-next if ($_ eq en-US);
-my %files_hash;
-my $file_ref = get_lang_files(\%files_hash, $_);
-my $out_file=$out_path.uiconfig_.$_..zip;
-packzip(\%files_hash, $out_file);
-}
-
-#pack the core files
-my %files_hash;
-my $file_ref = get_core_files(\%files_hash);
-my $out_file=$out_path.uiconfig.zip;
-packzip(\%files_hash, $out_file);
-
-exit(0);
-
- subroutines 
-
-sub packzip
-{
-my $file_hash_ref = shift;
-my $output_file = shift;
-
-# Check if output_file can be written.
-my $out_dir = dirname($output_file);
-print_error(no such directory: '$out_dir', 2) if ! -d $out_dir;
-print_error(can't search directory: '$out_dir', 2) if ! -x $out_dir;
-print_error(directory is not writable: '$out_dir', 2) if ! -w $out_dir;
-
-# is rebuilding zipfile required?
-my $do_rebuild = is_file_newer($file_hash_ref, $output_file);
-
-if ( $do_rebuild == 1 ) {
-#temporary intermediate output file
-my $tmp_out_file=$output_file.$$.$ENV{INPATH};
-create_zip_archive($file_hash_ref, $tmp_out_file);
-replace_file($tmp_out_file, $output_file);
-print_message(packing  $output_file finished.);
-} else {
-print_message($output_file up to date. nothing to do.);
-}
-}
-
-sub parse_options
-{
-my $opt_help;
-my $p = Getopt::Long::Parser-new();
-my $success =$p-getoptions(
- '-h' = \$opt_help,
- '-o=s' = \$out_path,
- '-i=s' = \$files_path,
- '-v'   = \$verbose,
- '-vv'  = \$extra_verbose
-);
-
-if ( $opt_help || !$success || !$out_path || !$files_path )
-{
-usage();
-exit(1);
-}
-
-# Check paths.
-foreach ($files_path) {
-print_error(no such directory: '$_', 2) if ! -d $_;
-print_error(can't search directory: '$_', 2) if ! -x $_;
-}
-}
-
-sub get_core_files
-{
-local @main::file_list;
-
-my $files_hash_ref = shift;
-find_core_files($files_hash_ref);
-
-if ( !keys %$files_hash_ref ) {
-print_error(can't find any core config files in '$files_path', 3);
-}
-
-return wantarray ? @main::file_list : \@main::file_list;
-}
-
-sub find_core_files
-{
-my $files_hash_ref = shift;
-find({ wanted = \wanted_core, no_chdir = 0 }, $files_path);
-foreach ( @main::file_list ) {
-/^\Q$files_path\E\/(.*)$/o;
-$files_hash_ref-{$1}++;
-}
-}
-
-sub get_lang_files
-{
-local @main::file_list;
-
-my $files_hash_ref = shift;
-my $lang = shift;
-find_lang_files($files_hash_ref, $lang);
-
-if ( !keys %$files_hash_ref

[PATCH] drop unused directory records

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3235

To pull it, you can do:

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

drop unused directory records

Change-Id: I9d1a812e1d1771d8d3fc022869984dcb623f2055
---
M scp2/source/ooo/directory_ooo.scp
1 file changed, 0 insertions(+), 105 deletions(-)



diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 65acecc..6012032 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -403,69 +403,9 @@
 DosName = BasicIDE;
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Basicide_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Basicide;
-DosName = menubar;
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Dbquery
 ParentID = gid_Dir_Share_Config_Sofficecfg;
 DosName = dbquery;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbquery_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Dbquery;
-DosName = menubar;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbbrowser
-ParentID = gid_Dir_Share_Config_Sofficecfg;
-DosName = dbbrowser;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbbrowser_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Dbbrowser;
-DosName = menubar;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbapp
-ParentID = gid_Dir_Share_Config_Sofficecfg;
-DosName = dbapp;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbapp_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Dbapp;
-DosName = menubar;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbrelation
-ParentID = gid_Dir_Share_Config_Sofficecfg;
-DosName = dbrelation;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbrelation_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Dbrelation;
-DosName = menubar;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbtable
-ParentID = gid_Dir_Share_Config_Sofficecfg;
-DosName = dbtable;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Dbtable_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Dbtable;
-DosName = menubar;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sbibliography
-ParentID = gid_Dir_Share_Config_Sofficecfg;
-DosName = sbibliography;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sbibliography_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Sbibliography;
-DosName = menubar;
 End
 
 Directory gid_Dir_Share_Config_Sofficecfg_Scalc
@@ -473,19 +413,9 @@
 DosName = scalc;
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Scalc_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Scalc;
-DosName = menubar;
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Schart
 ParentID = gid_Dir_Share_Config_Sofficecfg;
 DosName = schart;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Schart_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Schart;
-DosName = menubar;
 End
 
 Directory gid_Dir_Share_Config_Sofficecfg_Sdraw
@@ -493,19 +423,9 @@
 DosName = sdraw;
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Sdraw_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Sdraw;
-DosName = menubar;
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Sglobal
 ParentID = gid_Dir_Share_Config_Sofficecfg;
 DosName = sglobal;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Sglobal_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Sglobal;
-DosName = menubar;
 End
 
 Directory gid_Dir_Share_Config_Sofficecfg_Simpress
@@ -513,19 +433,9 @@
 DosName = simpress;
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Simpress_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Simpress;
-DosName = menubar;
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Smath
 ParentID = gid_Dir_Share_Config_Sofficecfg;
 DosName = smath;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Smath_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Smath;
-DosName = menubar;
 End
 
 Directory gid_Dir_Share_Config_Sofficecfg_Startmodule
@@ -533,29 +443,14 @@
 DosName = StartModule;
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Startmodule_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Startmodule;
-DosName = menubar;
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Sweb
 ParentID = gid_Dir_Share_Config_Sofficecfg;
 DosName = sweb;
 End
 
-Directory gid_Dir_Share_Config_Sofficecfg_Sweb_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Sweb;
-DosName = menubar;
-End
-
 Directory gid_Dir_Share_Config_Sofficecfg_Swriter
 ParentID = gid_Dir_Share_Config_Sofficecfg;
 DosName = swriter;
-End
-
-Directory gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar
-ParentID = gid_Dir_Share_Config_Sofficecfg_Swriter;
-DosName = menubar;
 End
 
 Directory gid_Dir_Share_Registry_Res

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

[PATCH] drop undefined file IDs

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3236

To pull it, you can do:

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

drop undefined file IDs

Change-Id: I5650327429118ad52e82050039dd237c2ff32286
---
M scp2/source/calc/module_calc.scp
M scp2/source/draw/module_draw.scp
M scp2/source/ooo/module_hidden_ooo.scp
M scp2/source/writer/module_writer.scp
4 files changed, 2 insertions(+), 14 deletions(-)



diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 0f0c20c..89b29dc 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -42,7 +42,7 @@
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = 
(gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+Files = 
(gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
 gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
 gid_File_Lib_Vbaobj,
 gid_File_Tmp_Userinstall_Calc_Inf);
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 63e982c..7132f9c 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -42,7 +42,7 @@
 Minimal = YES;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = 
(gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml,
+Files = 
(gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
 gid_File_Share_Registry_Draw_Xcd,
 gid_File_Tmp_Userinstall_Draw_Inf);
 End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 81e3786..3cae218 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -532,15 +532,6 @@
 gid_File_Share_Config_Sofficecfg_uiconfig_uui,
 gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
 gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
-   gid_File_Share_Config_Sofficecfg_Basicide_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Bibliography_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Dbuquery_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Dbubrowser_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Dbuapp_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Dburelation_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Dbutable_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Startmodule_Menubar_Xml,
-   gid_File_Share_Config_Sofficecfg_Chart_Menubar_Xml,
gid_File_Dtd_Accelerator,
gid_File_Dtd_Dialog,
gid_File_Dtd_Event,
diff --git a/scp2/source/writer/module_writer.scp 
b/scp2/source/writer/module_writer.scp
index 8a8f309..525f650 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -53,9 +53,6 @@
 gid_File_Lib_Vbaswobj,
 gid_File_Lib_writerfilter_auto_installed,
 gid_File_Lib_lwpft_auto_installed,
-gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
-gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
-gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml,
 gid_File_Jar_Email, 
 gid_File_Jar_Mail, 
 gid_File_Jar_Activation,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5650327429118ad52e82050039dd237c2ff32286
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com

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

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

2013-04-07 Thread Takeshi Abe

 svx/source/svdraw/svdoashp.cxx |   34 ++---
 svx/source/svdraw/svdoattr.cxx |2 -
 svx/source/svdraw/svdobj.cxx   |4 +--
 svx/source/svdraw/svdocirc.cxx |4 +--
 svx/source/svdraw/svdoedge.cxx |8 +++---
 svx/source/svdraw/svdograf.cxx |8 +++---
 svx/source/svdraw/svdoole2.cxx |   14 +--
 svx/source/svdraw/svdopath.cxx |   48 -
 8 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit 8d11a1e522b83bdf1c9d0f952a5415359dee6851
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sun Apr 7 23:53:53 2013 +0900

keep them local

Change-Id: I5c76e2a423199a892ad541edded7127659fe310c

diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 680239b..3f3288d 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1671,12 +1671,12 @@ SdrPathObj::~SdrPathObj()
 impDeleteDAC();
 }
 
-bool ImpIsLine(const basegfx::B2DPolyPolygon rPolyPolygon)
+static bool lcl_ImpIsLine(const basegfx::B2DPolyPolygon rPolyPolygon)
 {
 return (1L == rPolyPolygon.count()  2L == 
rPolyPolygon.getB2DPolygon(0L).count());
 }
 
-Rectangle ImpGetBoundRect(const basegfx::B2DPolyPolygon rPolyPolygon)
+static Rectangle lcl_ImpGetBoundRect(const basegfx::B2DPolyPolygon 
rPolyPolygon)
 {
 basegfx::B2DRange aRange(basegfx::tools::getRange(rPolyPolygon));
 
@@ -1687,7 +1687,7 @@ Rectangle ImpGetBoundRect(const basegfx::B2DPolyPolygon 
rPolyPolygon)
 
 void SdrPathObj::ImpForceLineWink()
 {
-if(OBJ_LINE == meKind  ImpIsLine(GetPathPoly()))
+if(OBJ_LINE == meKind  lcl_ImpIsLine(GetPathPoly()))
 {
 const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0L));
 const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0L));
@@ -1734,8 +1734,8 @@ void SdrPathObj::ImpForceKind()
 }
 }
 
-if (meKind==OBJ_LINE  !ImpIsLine(GetPathPoly())) meKind=OBJ_PLIN;
-if (meKind==OBJ_PLIN  ImpIsLine(GetPathPoly())) meKind=OBJ_LINE;
+if (meKind==OBJ_LINE  !lcl_ImpIsLine(GetPathPoly())) meKind=OBJ_PLIN;
+if (meKind==OBJ_PLIN  lcl_ImpIsLine(GetPathPoly())) meKind=OBJ_LINE;
 
 bClosedObj=IsClosed();
 
@@ -1768,7 +1768,7 @@ void SdrPathObj::ImpForceKind()
 // #i10659# for SdrTextObj, keep aRect up to date
 if(GetPathPoly().count())
 {
-aRect = ImpGetBoundRect(GetPathPoly());
+aRect = lcl_ImpGetBoundRect(GetPathPoly());
 }
 }
 
@@ -1868,7 +1868,7 @@ void SdrPathObj::TakeObjNameSingul(XubString rName) const
 {
 sal_uInt16 nId(STR_ObjNameSingulLINE);
 
-if(ImpIsLine(GetPathPoly()))
+if(lcl_ImpIsLine(GetPathPoly()))
 {
 const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0L));
 const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0L));
@@ -2416,7 +2416,7 @@ void SdrPathObj::RecalcSnapRect()
 {
 if(GetPathPoly().count())
 {
-maSnapRect = ImpGetBoundRect(GetPathPoly());
+maSnapRect = lcl_ImpGetBoundRect(GetPathPoly());
 }
 }
 
@@ -2510,7 +2510,7 @@ void SdrPathObj::NbcSetPoint(const Point rPnt, 
sal_uInt32 nHdlNum)
 if(GetPathPoly().count())
 {
 // #i10659# for SdrTextObj, keep aRect up to date
-aRect = ImpGetBoundRect(GetPathPoly());
+aRect = lcl_ImpGetBoundRect(GetPathPoly());
 }
 }
 
commit 93dc48ae47201cbcc9f30623bf1150f57d9353a6
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sun Apr 7 23:05:56 2013 +0900

sal_Bool to bool

Change-Id: Iac3b6fbe42ae0ffd9229935b46d1352987f99596

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0346823..424c799 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -183,9 +183,9 @@ static MSO_SPT ImpGetCustomShapeType( const 
SdrObjCustomShape rCustoShape )
 return eRetValue;
 };
 
-static sal_Bool ImpVerticalSwitch( const SdrObjCustomShape rCustoShape )
+static bool ImpVerticalSwitch( const SdrObjCustomShape rCustoShape )
 {
-sal_Bool bRet = sal_False;
+bool bRet = false;
 MSO_SPT eShapeType( ImpGetCustomShapeType( rCustoShape ) );
 switch( eShapeType )
 {
@@ -193,7 +193,7 @@ static sal_Bool ImpVerticalSwitch( const SdrObjCustomShape 
rCustoShape )
 case mso_sptBorderCallout1 :// 2 diag
 case mso_sptBorderCallout2 :// 3
 {
-bRet = sal_True;
+bRet = true;
 }
 break;
 default: break;
@@ -220,12 +220,12 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject 
rOriginal, const SfxItemS
 
 // look for used stuff
 SdrObjListIter aIterator(rOriginal);
-sal_Bool bLineUsed(sal_False);
-sal_Bool bAllFillUsed(sal_False);
-sal_Bool bSolidFillUsed(sal_False);
-sal_Bool bGradientFillUsed(sal_False);
-sal_Bool bHatchFillUsed(sal_False);
-

[Libreoffice-commits] core.git: sal/osl

2013-04-07 Thread Caolán McNamara

 sal/osl/unx/module.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit e1248e0f0dcf427b4e8b8615d08524e6f3c4cc77
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Apr 7 09:59:11 2013 -0500

fix up c code after move to c++

Change-Id: Id3de792f47c778c7a79cc9160ca3480affcaf3cf

diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index 43ff2a4e..ebeceb6 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -48,14 +48,16 @@ static sal_Bool getModulePathFromAddress(void * address, 
rtl_String ** path) {
 char *buf, *filename=NULL;
 struct ld_info *lp;
 
-if ((buf = malloc(size)) == NULL)
-return result;
+if ((buf = (char*)malloc(size)) == NULL)
+return false;
 
-while(loadquery(L_GETINFO, buf, size) == -1  errno == ENOMEM)
+//figure out how big a buffer we need
+while (loadquery(L_GETINFO, buf, size) == -1  errno == ENOMEM)
 {
 size += 4 * 1024;
-if ((buf = malloc(size)) == NULL)
-break;
+free(buf);
+if ((buf = (char*)malloc(size)) == NULL)
+return false;
 }
 
 lp = (struct ld_info*) buf;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

2013-04-07 Thread Peter Foley

 config_host.mk.in |1 +
 configure.ac  |5 +
 solenv/gbuild/JavaClassSet.mk |3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b97cade9183d14ad21ae71892348a9a81689488b
Author: Peter Foley pefol...@verizon.net
Date:   Sun Apr 7 12:14:36 2013 -0400

Supress warnings about unset classpath

I get the below warning for every single jar file without this patch.
warning: [options] bootstrap class path not set in conjunction with
-source 1.5
1 warning

Change-Id: I71c01aeea993640f1ec86fe1d8a977656861358d

diff --git a/config_host.mk.in b/config_host.mk.in
index 66a5c68..772e5d4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -257,6 +257,7 @@ export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
 export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JAVA_HOME=@JAVA_HOME@
diff --git a/configure.ac b/configure.ac
index 912c111..cdda016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6068,6 +6068,10 @@ you must use the --with-jdk-home configure option 
explicitly])
 if test $_jdk_ver -lt 10500; then
 AC_MSG_ERROR([JDK is too old, you need at least 1.5])
 fi
+if test $_jdk_ver -gt 10600; then
+JAVA_CLASSPATH_NOT_SET=1
+fi
+
 AC_MSG_RESULT([checked (JDK $_jdk)])
 JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n s,//*bin//*java,,p`
 if test $_os = WINNT; then
@@ -6613,6 +6617,7 @@ AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVADOC)
 AC_SUBST(JAVAINTERPRETER)
 AC_SUBST(JAVAIFLAGS)
+AC_SUBST(JAVA_CLASSPATH_NOT_SET)
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA_SOURCE_VER)
 AC_SUBST(JAVA_TARGET_VER)
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 7dd586a..a3e6477 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -27,7 +27,8 @@
 #*
 
 gb_JavaClassSet_JAVACCOMMAND := $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVAFLAGS) \
--source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER)
+-source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) \
+$(if $(JAVA_CLASSPATH_NOT_SET),-Xlint:-options)
 gb_JavaClassSet_JAVACDEBUG :=
 
 # Enforces correct dependency order for possibly generated stuff:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#39468 Translate German comments - source/edit/texteng.cx...

2013-04-07 Thread Christian M. Heller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3237

To pull it, you can do:

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

fdo#39468 Translate German comments - source/edit/texteng.cxx

Change-Id: Ifc02535cecc24d9362d2534784c659ee8705f751
---
M vcl/source/edit/texteng.cxx
1 file changed, 126 insertions(+), 164 deletions(-)



diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index b03924c..2342b2f 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -61,9 +61,6 @@
 using namespace ::rtl;
 
 
-// -
-// (-) class TextEngine
-// -
 TextEngine::TextEngine()
 {
 mpDoc = 0;
@@ -118,7 +115,7 @@
 delete mpIdleFormatter;
 delete mpDoc;
 delete mpTEParaPortions;
-delete mpViews; // nur die Liste, nicht die Vies
+delete mpViews; // only the list, not the Views
 delete mpRefDev;
 delete mpUndoManager;
 delete mpIMEInfos;
@@ -188,8 +185,8 @@
 else
 maTextColor = rFont.GetColor();
 
-// Wegen Selektion keinen Transparenten Font zulassen...
-// (Sonst spaeter in ImplPaint den Hintergrund anders loeschen...)
+// because selection, don't allow transparent fonts
+// (otherwise delete the background in ImplPaint later differently)
 maFont.SetTransparent( sal_False );
 // Tell VCL not to use the font color, use text color from OutputDevice
 maFont.SetColor( COL_TRANSPARENT );
@@ -336,7 +333,7 @@
 case KEYFUNC_CUT:
 case KEYFUNC_PASTE: bDoesChange = sal_True;
 break;
-default:// wird dann evtl. unten bearbeitet.
+default:// might get handled below
 eFunc = KEYFUNC_DONTKNOW;
 }
 }
@@ -421,7 +418,7 @@
 sal_uInt16 nEndPos = pNode-GetText().Len();
 if ( nNode == nStartPara )
 nStartPos = aSel.GetStart().GetIndex();
-if ( nNode == nEndPara ) // kann auch == nStart sein!
+if ( nNode == nEndPara ) // may also be == nStart!
 nEndPos = aSel.GetEnd().GetIndex();
 
 aText += pNode-GetText().Copy( nStartPos, nEndPos-nStartPos );
@@ -450,7 +447,7 @@
 ImpRemoveText();
 
 sal_Bool bUndoCurrentlyEnabled = IsUndoEnabled();
-// Der von Hand reingesteckte Text kann nicht vom Anwender rueckgaengig 
gemacht werden.
+// the manually inserted text cannot be reversed by the user
 EnableUndo( sal_False );
 
 TextPaM aStartPaM( 0, 0 );
@@ -465,13 +462,12 @@
 TextView* pView = (*mpViews)[ nView ];
 pView-ImpSetSelection( aEmptySel );
 
-// Wenn kein Text, dann auch Kein FormatUpdate
-// = Der Text bleibt stehen.
+// if no text, then no FormatUpdate = the text remains
 if ( rText.isEmpty()  GetUpdateMode() )
 pView-Invalidate();
 }
 
-if( rText.isEmpty() )  // sonst muss spaeter noch invalidiert werden, 
!bFormatted reicht.
+if( rText.isEmpty() )  // otherwise needs invalidation later; !bFormatted 
is sufficient
 mnCurTextHeight = 0;
 
 FormatAndUpdate();
@@ -483,7 +479,7 @@
 
 void TextEngine::CursorMoved( sal_uLong nNode )
 {
-// Leere Attribute loeschen, aber nur, wenn Absatz nicht leer!
+// delete empty attribute; but only if paragraph is not empty!
 TextNode* pNode = mpDoc-GetNodes().GetObject( nNode );
 if ( pNode  pNode-GetCharAttribs().HasEmptyAttribs()  
pNode-GetText().Len() )
 pNode-GetCharAttribs().DeleteEmptyAttribs();
@@ -494,11 +490,11 @@
 DBG_ASSERT( nChars, ImpRemoveChars: 0 Chars?! );
 if ( IsUndoEnabled()  !IsInUndo() )
 {
-// Attribute muessen hier vorm RemoveChars fuer UNDO gesichert werden!
+// attributes have to be saved for UNDO before RemoveChars!
 TextNode* pNode = mpDoc-GetNodes().GetObject( rPaM.GetPara() );
 XubString aStr( pNode-GetText().Copy( rPaM.GetIndex(), nChars ) );
 
-// Pruefen, ob Attribute geloescht oder geaendert werden:
+// check if attributes are being deleted or changed
 sal_uInt16 nStart = rPaM.GetIndex();
 sal_uInt16 nEnd = nStart + nChars;
 for ( sal_uInt16 nAttr = pNode-GetCharAttribs().Count(); nAttr; )
@@ -526,7 +522,7 @@
 if ( IsUndoEnabled()  !IsInUndo() )
 InsertUndo( new TextUndoConnectParas( this, nLeft, 
pLeft-GetText().Len() ) );
 
-// Erstmal Portions suchen, da pRight nach ConnectParagraphs weg.
+// first lookup Portions, as pRight is gone after ConnectParagraphs
 TEParaPortion* pLeftPortion = mpTEParaPortions-GetObject( nLeft );
 TEParaPortion* pRightPortion = mpTEParaPortions-GetObject( nRight );
 DBG_ASSERT( pLeft  pLeftPortion, ImpConnectParagraphs(1): Hidden 
Portion );
@@ -539,7 +535,7 @@
 
 mpTEParaPortions-Remove(

Help regarding presentation objects

2013-04-07 Thread Janit Anjaria

Hey!
I was just wishing to have a look at all the places where the presentation
objects are present.

I figured out that changing/adding a few presentation object at :
http://opengrok.libreoffice.org/xref/core/sd/inc/pres.hxx#28

can bring about the changes in presentation objects used everywhere.

It would be great if someone can let me know if adding a new object here
would lead to troubles in the other files where the header is used or other
objects are used.

Hope to receive a positive response from your end.

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

Re: QA Wiki Cleanup - Any Pages not Under ../QA/..?

2013-04-07 Thread Robinson Tryon

On Sat, Apr 6, 2013 at 11:58 PM, Marc Paré m...@marcpare.com wrote:
 Le 05/04/13 05:31 PM, Joel Madero a écrit :

 Hi All,

 Qubit has done a tremendous amount of work in the past couple days
 moving QA related wiki pages to their appropriate location (../QA/..) vs
 under root of wiki or elsewhere. Is anyone aware of pages that should be
 under QA header but currently are not? If so please let us know so that
 we can get them moved.

 Also note that we are starting to formalize some of our processes, we've
 moved to a much cleaner agenda/minutes setup:

 https://wiki.documentfoundation.org/QA/Meetings


 Thanks Qubit again for the great work!
 ...
 I am just curious, who is Qubit?

*waves*

I'm 'qubit' on most sites, but 'colonelqubit' on Freenode
:-)

-- Robinson 'qubit' Tryon
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-04-07 Thread Miklos Vajna

 svtools/inc/svtools/rtfkeywd.hxx |2 +
 sw/qa/extras/rtfexport/data/i120928.rtf  |   48 +++
 sw/qa/extras/rtfexport/rtfexport.cxx |   23 
 sw/source/filter/ww8/attributeoutputbase.hxx |3 +
 sw/source/filter/ww8/docxattributeoutput.hxx |3 -
 sw/source/filter/ww8/docxexport.cxx  |   16 -
 sw/source/filter/ww8/docxexport.hxx  |3 -
 sw/source/filter/ww8/rtfattributeoutput.cxx  |   35 +++
 sw/source/filter/ww8/rtfattributeoutput.hxx  |2 +
 sw/source/filter/ww8/rtfexport.cxx   |   11 +-
 sw/source/filter/ww8/wrtww8.cxx  |   17 +
 sw/source/filter/ww8/wrtww8.hxx  |2 +
 12 files changed, 142 insertions(+), 23 deletions(-)

New commits:
commit 41ac8040ab9d16615f7c0a02e8cbd4faf6cba2e0
Author: Miklos Vajna vmik...@suse.cz
Date:   Sun Apr 7 20:24:11 2013 +0200

move BulletDefinitions() to MSWordExportBase to avoid copypaste

Change-Id: I56b077e978a41668ea274f1e12440d44af80b66f

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 62b80c7..baad6ac 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -597,6 +597,9 @@ public:
 ( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner,
   sal_uInt32 rPageSize, bool rRelBoxSize );
 
+/// Exports the definition (image, size) of a single numbering picture 
bullet.
+virtual void BulletDefinition(int /*nId*/, const Graphic /*rGraphic*/, 
Size /*aSize*/) {}
+
 };
 
 #endif // _ATTRIBUTEOUTPUTBASE_HXX_
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 050980e..c044ad8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -685,8 +685,7 @@ public:
 virtual void WriteOutliner(const OutlinerParaObject rParaObj);
 virtual oox::drawingml::DrawingML GetDrawingML();
 
-/// Exports the definition (image, size) of a single numbering picture 
bullet.
-void BulletDefinition(int nId, const Graphic rGraphic, Size aSize);
+void BulletDefinition(int nId, const Graphic rGraphic, Size aSize) 
SAL_OVERRIDE;
 };
 
 #endif // _DOCXATTRIBUTEOUTPUT_HXX_
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index b25b1eb..e04f12d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -61,7 +61,6 @@
 #include comphelper/string.hxx
 #include rtl/ustrbuf.hxx
 #include vcl/font.hxx
-#include vcl/svapp.hxx
 
 using namespace sax_fastparser;
 using namespace ::comphelper;
@@ -528,21 +527,6 @@ void DocxExport::WritePostitFields()
 }
 }
 
-void DocxExport::BulletDefinitions()
-{
-for (size_t i = 0; i  m_vecBulletPic.size(); ++i)
-{
-const MapMode aMapMode(MAP_TWIP);
-const Graphic rGraphic = *m_vecBulletPic[i];
-Size aSize(rGraphic.GetPrefSize());
-if (MAP_PIXEL == rGraphic.GetPrefMapMode().GetMapUnit())
-aSize = Application::GetDefaultDevice()-PixelToLogic(aSize, 
aMapMode);
-else
-aSize = 
OutputDevice::LogicToLogic(aSize,rGraphic.GetPrefMapMode(), aMapMode);
-m_pAttrOutput-BulletDefinition(i, rGraphic, aSize);
-}
-}
-
 void DocxExport::WriteNumbering()
 {
 if ( !pUsedNumTbl )
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index d8790f8..16bf73e 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -202,9 +202,6 @@ private:
 /// Write word/settings.xml
 void WriteSettings();
 
-/// Write the numbering picture bullets part of word/numbering.xml
-void BulletDefinitions();
-
 /// All xml namespaces to be used at the top of any text .xml file (main 
doc, headers, footers,...)
 sax_fastparser::XFastAttributeListRef MainXmlNamespaces( 
sax_fastparser::FSHelperPtr serializer );
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index c4c6e84..bfcb1ea 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -587,8 +587,7 @@ public:
 /// Writes binary data as a hex dump.
 static OString WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, 
SvStream* pStream = 0, sal_uInt32 nLimit = 64);
 
-/// Exports the definition (image, size) of a single numbering picture 
bullet.
-void BulletDefinition(int nId, const Graphic rGraphic, Size aSize);
+void BulletDefinition(int nId, const Graphic rGraphic, Size aSize) 
SAL_OVERRIDE;
 };
 
 #endif // _RTFATTRIBUTEOUTPUT_HXX_
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index aaf8a5c..c98b780 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -225,21 +225,6 @@ void

[PATCH libreoffice-4-0] Separate template region ids from thumbnail ids.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3238

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3238/1

Separate template region ids from thumbnail ids.

- Update all actions to use the new system.

Change-Id: I8aa09a3317eff4cb083c8fc151ea2f93a5a971fe
---
M sfx2/inc/sfx2/templatecontaineritem.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/thumbnailview.cxx
M sfx2/source/doc/templatedlg.cxx
7 files changed, 90 insertions(+), 55 deletions(-)



diff --git a/sfx2/inc/sfx2/templatecontaineritem.hxx 
b/sfx2/inc/sfx2/templatecontaineritem.hxx
index 4768604..527571c 100644
--- a/sfx2/inc/sfx2/templatecontaineritem.hxx
+++ b/sfx2/inc/sfx2/templatecontaineritem.hxx
@@ -17,6 +17,7 @@
 {
 public:
 
+sal_uInt16 mnRegionId;
 BitmapEx maPreview2;
 BitmapEx maPreview3;
 BitmapEx maPreview4;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index 68b7dc7..6d6beb1 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -42,6 +42,8 @@
 
 virtual void showRegion (ThumbnailViewItem *pItem);
 
+sal_uInt16 getCurRegionItemId () const;
+
 sal_uInt16 getRegionId (size_t pos) const;
 
 std::vectorOUString getFolderNames ();
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 5a56645..2310060 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -192,6 +192,8 @@
 
 sal_uInt16 GetItemId( const Point rPos ) const;
 
+sal_uInt16 getNextItemId () const;
+
 long GetItemWidth() const { return mnItemWidth; }
 
 long GetItemHeight() const { return mnItemHeight; }
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index 8af4bcc..49aea81 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -382,7 +382,7 @@
 {
 // Fill templates
 
-mnCurRegionId = pContainerItem-mnId-1;
+mnCurRegionId = pContainerItem-mnRegionId+1;
 maCurRegionName = pContainerItem-maTitle;
 maFTName.SetText(maCurRegionName);
 showRegion(pItem);
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 429b4dc..d435f3d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -61,6 +61,7 @@
 
 TemplateContainerItem* pItem = new TemplateContainerItem( *this );
 pItem-mnId = i+1;
+pItem-mnRegionId = i;
 pItem-maTitle = aRegionName;
 pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
@@ -100,11 +101,11 @@
 // Check if we are currently browsing a region or root folder
 if (mnCurRegionId)
 {
-sal_uInt16 nItemId = mnCurRegionId + 1;
+sal_uInt16 nRegionId = mnCurRegionId - 1;   //Is offset by 1
 
 for (size_t i = 0; i  maRegions.size(); ++i)
 {
-if (maRegions[i]-mnId == nItemId)
+if (maRegions[i]-mnRegionId == nRegionId)
 {
 showRegion(maRegions[i]);
 break;
@@ -128,6 +129,7 @@
 TemplateContainerItem *pCur = maRegions[i];
 TemplateContainerItem *pItem = new TemplateContainerItem(*this);
 pItem-mnId = pCur-mnId;
+pItem-mnRegionId = pCur-mnRegionId;
 pItem-maTitle = pCur-maTitle;
 pItem-maTemplates = pCur-maTemplates;
 pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
@@ -147,7 +149,7 @@
 {
 mnHeaderHeight = maAllButton.GetSizePixel().getHeight() + 
maAllButton.GetPosPixel().Y() * 2;
 
-mnCurRegionId = pItem-mnId-1;
+mnCurRegionId = static_castTemplateContainerItem*(pItem)-mnRegionId+1;
 maCurRegionName = pItem-maTitle;
 maAllButton.Show(true);
 maFTName.Show(true);
@@ -155,6 +157,17 @@
 insertItems(reinterpret_castTemplateContainerItem*(pItem)-maTemplates);
 
 maOpenRegionHdl.Call(NULL);
+}
+
+sal_uInt16 TemplateLocalView::getCurRegionItemId() const
+{
+for (size_t i = 0; i  maRegions.size(); ++i)
+{
+if (maRegions[i]-mnRegionId == mnCurRegionId-1)
+return maRegions[i]-mnId;
+}
+
+return 0;
 }
 
 sal_uInt16 TemplateLocalView::getRegionId(size_t pos) const
@@ -197,6 +210,7 @@
 sal_uInt16 TemplateLocalView::createRegion(const OUString rName)
 {
 sal_uInt16 nRegionId = mpDocTemplates-GetRegionCount();// Next 
regionId
+sal_uInt16 nItemId = getNextItemId();
 
 if (!mpDocTemplates-InsertDir(rName,nRegionId))
 return false;
@@ -205,14 +219,16 @@
 
 // Insert to the region cache list and to the thumbnail item list
 TemplateContainerItem* pItem = new TemplateContainerItem( *this );
-

[PATCH libreoffice-4-0] Fix deleting templates through Template Manager.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3239

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3239/1

Fix deleting templates through Template Manager.

Change-Id: I79c16eb264d957b510a8bf8ee2009e1f55190a0b
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 3 insertions(+), 14 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6951df3..75449d0 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1079,29 +1079,18 @@
 else
 {
 sal_uInt16 nRegionItemId = maView-getCurRegionItemId();
+std::setconst ThumbnailViewItem*,selection_cmp_fn aSelTemplates = 
maSelTemplates;  //Avoid invalid iterators
 
 std::setconst ThumbnailViewItem*,selection_cmp_fn::const_iterator 
pIter;
-for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
+for (pIter = aSelTemplates.begin(); pIter != aSelTemplates.end(); 
++pIter)
 {
-if (maView-removeTemplate((*pIter)-mnId,nRegionItemId))
-maSelTemplates.erase(pIter++);
-else
+if (!maView-removeTemplate((*pIter)-mnId,nRegionItemId))
 {
 if (aTemplateList.isEmpty())
 aTemplateList = (*pIter)-maTitle;
 else
 aTemplateList = aTemplateList + \n + (*pIter)-maTitle;
-
-++pIter;
 }
-}
-
-if (maSelTemplates.empty())
-{
-mpTemplateBar-SetItemDown(TBI_TEMPLATE_DELETE,false);
-mpTemplateBar-Show(false);
-mpViewBar-Show();
-mpActionBar-Show();
 }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c16eb264d957b510a8bf8ee2009e1f55190a0b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Delete the correct template from the selected search results...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3240

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3240/1

Delete the correct template from the selected search results.

Change-Id: I4a594e3c35d4c68da51421c92247b6687d163fe5
---
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templatesearchview.cxx
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/inc/templatesearchview.hxx
M sfx2/source/inc/templatesearchviewitem.hxx
6 files changed, 62 insertions(+), 64 deletions(-)



diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index 6d6beb1..9dccf51 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -46,6 +46,8 @@
 
 sal_uInt16 getRegionId (size_t pos) const;
 
+OUString getRegionName(const sal_uInt16 nRegionId) const;
+
 std::vectorOUString getFolderNames ();
 
 std::vectorTemplateItemProperties
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index d435f3d..e7eaa98 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -177,6 +177,11 @@
 return maRegions[pos]-mnId;
 }
 
+OUString TemplateLocalView::getRegionName(const sal_uInt16 nRegionId) const
+{
+return mpDocTemplates-GetRegionName(nRegionId);
+}
+
 std::vectorOUString TemplateLocalView::getFolderNames()
 {
 size_t n = maRegions.size();
@@ -193,9 +198,9 @@
 {
 std::vectorTemplateItemProperties aItems;
 
-for (size_t i = 0; i  maRegions.size(); ++i)
+if (mnCurRegionId)
 {
-TemplateContainerItem *pFolderItem = 
static_castTemplateContainerItem*(maRegions[i]);
+TemplateContainerItem *pFolderItem = maRegions[mnCurRegionId-1];
 
 for (size_t j = 0; j  pFolderItem-maTemplates.size(); ++j)
 {
@@ -203,6 +208,19 @@
 aItems.push_back(pFolderItem-maTemplates[j]);
 }
 }
+else
+{
+for (size_t i = 0; i  maRegions.size(); ++i)
+{
+TemplateContainerItem *pFolderItem = maRegions[i];
+
+for (size_t j = 0; j  pFolderItem-maTemplates.size(); ++j)
+{
+if (rFunc(pFolderItem-maTemplates[j]))
+aItems.push_back(pFolderItem-maTemplates[j]);
+}
+}
+}
 
 return aItems;
 }
diff --git a/sfx2/source/control/templatesearchview.cxx 
b/sfx2/source/control/templatesearchview.cxx
index 775abbc..eaec8dc 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -20,14 +20,15 @@
 {
 }
 
-void TemplateSearchView::AppendItem(sal_uInt16 nItemId, sal_uInt16 nRegionId, 
sal_uInt16 nIdx,
+void TemplateSearchView::AppendItem(sal_uInt16 nAssocItemId, sal_uInt16 
nRegionId, sal_uInt16 nIdx,
 const OUString rTitle, const OUString 
rSubtitle,
 const OUString rPath,
 const BitmapEx rImage)
 {
 TemplateSearchViewItem *pItem = new TemplateSearchViewItem(*this);
-pItem-mnId = nItemId;
-pItem-mnIdx = nIdx;
+pItem-mnId = getNextItemId();
+pItem-mnAssocId = nAssocItemId;
+pItem-mnDocId = nIdx;
 pItem-mnRegionId = nRegionId;
 pItem-maPreview1 = rImage;
 pItem-maTitle = rTitle;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 75449d0..f5d5bd6 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -649,56 +649,47 @@
 
 IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
 {
-// if the search view is hidden, hide the folder view and display search 
one
-if (!mpCurView-isNonRootRegionVisible()  !mpSearchView-IsVisible())
-{
-mpSearchView-Clear();
-mpSearchView-Show();
-mpCurView-Hide();
-}
-
 OUString aKeyword = mpSearchEdit-GetText();
 
 if (!aKeyword.isEmpty())
 {
-if (mpCurView-isNonRootRegionVisible())
+mpSearchView-Clear();
+
+// if the search view is hidden, hide the folder view and display 
search one
+if (!mpSearchView-IsVisible())
 {
-mpCurView-filterItems(ViewFilter_Keyword(aKeyword));
+mpSearchView-Show();
+mpCurView-Hide();
 }
-else
+
+bool bDisplayFolder = !mpCurView-isNonRootRegionVisible();
+
+std::vectorTemplateItemProperties aItems =
+maView-getFilteredItems(SearchView_Keyword(aKeyword));
+
+for (size_t i = 0; i  aItems.size(); ++i)
 {
-mpSearchView-Clear();
+TemplateItemProperties *pItem = aItems[i];
 
-std::vectorTemplateItemProperties aItems =
-maView-getFilteredItems(SearchView_Keyword(aKeyword));
+OUString aFolderName;
 
-size_t nCounter =

[PATCH libreoffice-4-0] Fix exporting selected search results in Template Manager.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3241

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3241/1

Fix exporting selected search results in Template Manager.

Change-Id: I60e517807fec797a99d2f182e41731d515d30dcc
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f5d5bd6..f757623 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -896,7 +896,7 @@
 
 OUString aPath = aPathObj.GetMainURL( INetURLObject::NO_DECODE 
);
 
-if 
(!maView-exportTo(pItem-mnDocId,pItem-mnRegionId+1,aPath))
+if 
(!maView-exportTo(pItem-mnAssocId,pItem-mnRegionId,aPath))
 {
 if (aTemplateList.isEmpty())
 aTemplateList = pItem-maTitle;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60e517807fec797a99d2f182e41731d515d30dcc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Get the correct region id view when saving a template.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3243

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3243/1

Get the correct region id view when saving a template.

Change-Id: If3a75fa2d64dd1c912bfa9a7f3ea96e5fd80e594
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6077c8a..825147a 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1162,7 +1162,7 @@
 
 if (maView-isNonRootRegionVisible())
 {
-sal_uInt16 nRegionItemId = maView-getCurRegionId()+1;
+sal_uInt16 nRegionItemId = 
maView-getRegionId(maView-getCurRegionId()-1);
 
 if (!maView-isTemplateNameUnique(nRegionItemId,aName))
 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3a75fa2d64dd1c912bfa9a7f3ea96e5fd80e594
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Update search results when changing template type in Templat...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3245

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/3245/1

Update search results when changing template type in Template Manager.

Change-Id: I52f79b5963e331332f02974dc739d631b9c359eb
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f4465dd..99d083d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -332,6 +332,10 @@
 break;
 }
 mpCurView-filterItems(ViewFilter_Application(eFilter));
+
+if (mpSearchView-IsVisible())
+SearchUpdateHdl(NULL);
+
 return 0;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f79b5963e331332f02974dc739d631b9c359eb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Fix moving selected search results in Template Manager.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3242

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3242/1

Fix moving selected search results in Template Manager.

Change-Id: I577f7cc9f56f5309cd6ebccdc73b4072a4ee91a3
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f757623..6077c8a 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1418,7 +1418,7 @@
 const TemplateSearchViewItem *pItem =
 static_castconst TemplateSearchViewItem*(*aIter);
 
-if(!maView-moveTemplate(pItem,pItem-mnRegionId+1,nItemId))
+if(!maView-moveTemplate(pItem,pItem-mnRegionId,nItemId))
 {
 if (aTemplateList.isEmpty())
 aTemplateList = (*aIter)-maTitle;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I577f7cc9f56f5309cd6ebccdc73b4072a4ee91a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Display create template folder only when its allowed.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3246

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3246/1

Display create template folder only when its allowed.

Change-Id: I892cfd88907ac4588e882e3a89c4feb200ce6744
---
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/templateremoteview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateremoteview.cxx
5 files changed, 17 insertions(+), 0 deletions(-)



diff --git a/sfx2/inc/sfx2/templateabstractview.hxx 
b/sfx2/inc/sfx2/templateabstractview.hxx
index 4eeafa0..1df856d 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -94,6 +94,9 @@
 
 virtual void showRegion (ThumbnailViewItem *pItem) = 0;
 
+// Return if we can have regions inside the current region
+virtual bool isNestedRegionAllowed () const = 0;
+
 sal_uInt16 getCurRegionId () const;
 
 const OUString getCurRegionName () const;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index 9dccf51..762dbf5 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -55,6 +55,8 @@
 
 sal_uInt16 createRegion (const OUString rName);
 
+virtual bool isNestedRegionAllowed () const;
+
 bool removeRegion (const sal_uInt16 nItemId);
 
 bool removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 
nSrcItemId);
diff --git a/sfx2/inc/sfx2/templateremoteview.hxx 
b/sfx2/inc/sfx2/templateremoteview.hxx
index 3319022..0a89803 100644
--- a/sfx2/inc/sfx2/templateremoteview.hxx
+++ b/sfx2/inc/sfx2/templateremoteview.hxx
@@ -31,6 +31,8 @@
 
 bool loadRepository (TemplateRepository* pRepository, bool bRefresh);
 
+virtual bool isNestedRegionAllowed () const;
+
 private:
 
 com::sun::star::uno::Reference com::sun::star::ucb::XCommandEnvironment  
m_xCmdEnv;
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index e7eaa98..dd472f2 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -258,6 +258,11 @@
 return pItem-mnId;
 }
 
+bool TemplateLocalView::isNestedRegionAllowed() const
+{
+return !mnCurRegionId;
+}
+
 bool TemplateLocalView::removeRegion(const sal_uInt16 nItemId)
 {
 sal_uInt16 nRegionId = USHRT_MAX;
diff --git a/sfx2/source/control/templateremoteview.cxx 
b/sfx2/source/control/templateremoteview.cxx
index a8d88f5..8fd2e87 100644
--- a/sfx2/source/control/templateremoteview.cxx
+++ b/sfx2/source/control/templateremoteview.cxx
@@ -190,4 +190,9 @@
 return true;
 }
 
+bool TemplateRemoteView::isNestedRegionAllowed() const
+{
+return true;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I892cfd88907ac4588e882e3a89c4feb200ce6744
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] fdo#60581 Display import templates only when its allowed.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3247

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/3247/1

fdo#60581 Display import templates only when its allowed.

Change-Id: Iefe4fdd1484389d0bbbccecdca49e4c0061ec81e
---
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/inc/sfx2/templateremoteview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templateremoteview.cxx
M sfx2/source/doc/templatedlg.cxx
6 files changed, 19 insertions(+), 0 deletions(-)



diff --git a/sfx2/inc/sfx2/templateabstractview.hxx 
b/sfx2/inc/sfx2/templateabstractview.hxx
index 1df856d..e181a00 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -97,6 +97,9 @@
 // Return if we can have regions inside the current region
 virtual bool isNestedRegionAllowed () const = 0;
 
+// Return if we can import templates to the current region
+virtual bool isImportAllowed () const = 0;
+
 sal_uInt16 getCurRegionId () const;
 
 const OUString getCurRegionName () const;
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index 762dbf5..59d0588 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -57,6 +57,8 @@
 
 virtual bool isNestedRegionAllowed () const;
 
+virtual bool isImportAllowed () const;
+
 bool removeRegion (const sal_uInt16 nItemId);
 
 bool removeTemplate (const sal_uInt16 nItemId, const sal_uInt16 
nSrcItemId);
diff --git a/sfx2/inc/sfx2/templateremoteview.hxx 
b/sfx2/inc/sfx2/templateremoteview.hxx
index 0a89803..01a582f 100644
--- a/sfx2/inc/sfx2/templateremoteview.hxx
+++ b/sfx2/inc/sfx2/templateremoteview.hxx
@@ -33,6 +33,8 @@
 
 virtual bool isNestedRegionAllowed () const;
 
+virtual bool isImportAllowed () const;
+
 private:
 
 com::sun::star::uno::Reference com::sun::star::ucb::XCommandEnvironment  
m_xCmdEnv;
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index dd472f2..571cbec 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -263,6 +263,11 @@
 return !mnCurRegionId;
 }
 
+bool TemplateLocalView::isImportAllowed() const
+{
+return mnCurRegionId;
+}
+
 bool TemplateLocalView::removeRegion(const sal_uInt16 nItemId)
 {
 sal_uInt16 nRegionId = USHRT_MAX;
diff --git a/sfx2/source/control/templateremoteview.cxx 
b/sfx2/source/control/templateremoteview.cxx
index 8fd2e87..3fc85a7 100644
--- a/sfx2/source/control/templateremoteview.cxx
+++ b/sfx2/source/control/templateremoteview.cxx
@@ -195,4 +195,9 @@
 return true;
 }
 
+bool TemplateRemoteView::isImportAllowed() const
+{
+return true;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 99d083d..7c13f95 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -639,6 +639,8 @@
 maSelFolders.clear();
 maSelTemplates.clear();
 
+mpViewBar-ShowItem(TBI_TEMPLATE_IMPORT,mpCurView-isImportAllowed());
+
 mpTemplateBar-Hide();
 mpViewBar-Show();
 mpActionBar-Show();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefe4fdd1484389d0bbbccecdca49e4c0061ec81e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] fdo#60581 Import templates into current directory.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3248

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3248/1

fdo#60581 Import templates into current directory.

Change-Id: I3dfec069c606e61fc49b44e36602804054ca1bca
---
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/templatedlg.cxx
5 files changed, 99 insertions(+), 6 deletions(-)



diff --git a/sfx2/inc/sfx2/templateabstractview.hxx 
b/sfx2/inc/sfx2/templateabstractview.hxx
index e181a00..a60fdb3 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -82,6 +82,8 @@
 
 virtual ~TemplateAbstractView ();
 
+void insertItem (const TemplateItemProperties rTemplate);
+
 // Fill view with new item list
 void insertItems (const std::vectorTemplateItemProperties rTemplates);
 
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index 59d0588..f17f0f8 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -70,6 +70,9 @@
 
 bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx rThumbnail, 
const OUString rPath);
 
+// Import a template to the current region
+bool copyFrom (const OUString rPath);
+
 bool copyFrom(TemplateContainerItem *pItem, const OUString rPath);
 
 bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, 
const OUString rName);
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index 49aea81..8fac81e 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -143,6 +143,32 @@
 {
 }
 
+void TemplateAbstractView::insertItem(const TemplateItemProperties rTemplate)
+{
+const TemplateItemProperties *pCur = rTemplate;
+
+TemplateViewItem *pChild = new TemplateViewItem(*this);
+pChild-mnId = pCur-nId;
+pChild-mnDocId = pCur-nDocId;
+pChild-mnRegionId = pCur-nRegionId;
+pChild-maTitle = pCur-aName;
+pChild-setPath(pCur-aPath);
+pChild-maPreview1 = pCur-aThumbnail;
+
+if ( pCur-aThumbnail.IsEmpty() )
+{
+// Use the default thumbnail if we have nothing else
+pChild-maPreview1 = 
TemplateAbstractView::getDefaultThumbnail(pCur-aPath);
+}
+
+pChild-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
+
+mItemList.push_back(pChild);
+
+CalculateItemPositions();
+Invalidate();
+}
+
 void TemplateAbstractView::insertItems(const 
std::vectorTemplateItemProperties rTemplates)
 {
 std::vectorThumbnailViewItem* aItems(rTemplates.size());
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 571cbec..c6d32af 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -590,6 +590,42 @@
 return false;
 }
 
+bool TemplateLocalView::copyFrom(const OUString rPath)
+{
+assert(mnCurRegionId);
+
+TemplateContainerItem *pRegItem = maRegions[mnCurRegionId-1];
+
+sal_uInt16 nId = getNextItemId();
+sal_uInt16 nDocId = 0;
+sal_uInt16 nRegionId = pRegItem-mnRegionId;
+
+String aPath(rPath);
+
+if (!pRegItem-maTemplates.empty())
+nDocId = (pRegItem-maTemplates.back()).nDocId+1;
+
+if (!mpDocTemplates-CopyFrom(nRegionId,nDocId,aPath))
+return false;
+
+TemplateItemProperties aTemplate;
+aTemplate.aIsFolder = false;
+aTemplate.nId = nId;
+aTemplate.nDocId = nDocId;
+aTemplate.nRegionId = nRegionId;
+aTemplate.aName = aPath;
+aTemplate.aThumbnail = TemplateAbstractView::fetchThumbnail(rPath,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT);
+aTemplate.aPath = rPath;
+
+pRegItem-maTemplates.push_back(aTemplate);
+
+insertItem(aTemplate);
+
+return true;
+}
+
 bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString 
rPath)
 {
 sal_uInt16 nId = 1;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7c13f95..6ca1fb4 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -879,15 +879,41 @@
 
 if (aFiles.hasElements())
 {
-std::setconst 
ThumbnailViewItem*,selection_cmp_fn::const_iterator pIter;
-for (pIter = maSelFolders.begin(); pIter != maSelFolders.end(); 
++pIter)
+if (!maSelFolders.empty())
 {
-OUString aTemplateList;
-TemplateContainerItem *pFolder = 
(TemplateContainerItem*)(*pIter);
+//Import to the selected regions
+std::setconst

[PATCH libreoffice-4-0] Show search and extra buttons when a template is selected.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3249

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3249/1

Show search and extra buttons when a template is selected.

Change-Id: Ia3e97f3f540ab07725ae3871251aefe4ba3d5e2d
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 3 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6ca1fb4..46270ff 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -356,7 +356,7 @@
 
 long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(), 
aActionSize.getHeight()), aTemplateSize.getHeight());
 
-aActionSize.setWidth(3*aActionSize.getWidth());
+aActionSize.setWidth(2.5*aActionSize.getWidth());
 
aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar-GetPosPixel().X());
 aTemplateSize.setWidth(aWinSize.getWidth());
 
@@ -776,7 +776,6 @@
 if (maSelTemplates.empty())
 {
 mpViewBar-Show(false);
-mpActionBar-Show(false);
 mpTemplateBar-Show();
 }
 else if (maSelTemplates.size() != 1 || !bInSelection)
@@ -802,7 +801,6 @@
 {
 mpTemplateBar-Show(false);
 mpViewBar-Show();
-mpActionBar-Show();
 }
 else if (maSelTemplates.size() == 1)
 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3e97f3f540ab07725ae3871251aefe4ba3d5e2d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Deselect templates when closing the search view.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3250

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3250/1

Deselect templates when closing the search view.

Change-Id: If187b154a023a9364b6775270ce4c24377a98524
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 46270ff..0fdb87f 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1046,6 +1046,7 @@
 // Hide search view
 if (bVisible)
 {
+mpSearchView-deselectItems();
 mpSearchView-Hide();
 mpCurView-Show();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If187b154a023a9364b6775270ce4c24377a98524
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Deselect items when searching for templates to reset toolbar...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3251

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/3251/1

Deselect items when searching for templates to reset toolbars.

Change-Id: I762762f5684287d06a046aca6d7160bce10e3653
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0fdb87f..05dd022 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -687,6 +687,7 @@
 // if the search view is hidden, hide the folder view and display 
search one
 if (!mpSearchView-IsVisible())
 {
+mpCurView-deselectItems();
 mpSearchView-Show();
 mpCurView-Hide();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I762762f5684287d06a046aca6d7160bce10e3653
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Calculate template thumbnail subtitle position to fit drawin...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3252

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3252/1

Calculate template thumbnail subtitle position to fit drawing area.

Change-Id: Ieaf067f5182c9dc690d028cdc6ba5bc28ac8436f
---
M sfx2/source/control/templateviewitem.cxx
1 file changed, 0 insertions(+), 3 deletions(-)



diff --git a/sfx2/source/control/templateviewitem.cxx 
b/sfx2/source/control/templateviewitem.cxx
index 94ce4d3..d68268b 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -55,9 +55,6 @@
 
 long nSpace = (nDisplayHeight + nPadding - 2*aTextDev.getTextHeight()) 
/ 3;
 
-// Set title position
-maTextPos.setY(maDrawArea.getY() + nThumbnailHeight + nPadding + 
nSpace + aTextDev.getTextHeight());
-
 // Set subtitle position
 maSubTitlePos.setY(maTextPos.getY() + nSpace + 
aTextDev.getTextHeight());
 maSubTitlePos.setX(maDrawArea.Left() +

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaf067f5182c9dc690d028cdc6ba5bc28ac8436f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Make template thumbnail sizes appropiate to the content in t...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3253

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3253/1

Make template thumbnail sizes appropiate to the content in them.

Change-Id: I785a351a5a936a42b56081a868c01d97e0a6105f
---
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/source/doc/templatedlg.cxx
2 files changed, 5 insertions(+), 2 deletions(-)



diff --git a/sfx2/inc/sfx2/templateabstractview.hxx 
b/sfx2/inc/sfx2/templateabstractview.hxx
index a60fdb3..f14efad 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -17,11 +17,14 @@
 
 //template thumbnail item defines
 #define TEMPLATE_ITEM_MAX_WIDTH 160
-#define TEMPLATE_ITEM_MAX_HEIGHT 160
+#define TEMPLATE_ITEM_MAX_HEIGHT 140
 #define TEMPLATE_ITEM_PADDING 5
 #define TEMPLATE_ITEM_MAX_TEXT_LENGTH 20
 #define TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT 88
 
+//template thumbnail height with a subtitle
+#define TEMPLATE_ITEM_MAX_HEIGHT_SUB 160
+
 //template thumbnail image defines
 #define TEMPLATE_THUMBNAIL_MAX_HEIGHT TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT - 
2*TEMPLATE_ITEM_PADDING
 #define TEMPLATE_THUMBNAIL_MAX_WIDTH TEMPLATE_ITEM_MAX_WIDTH - 
2*TEMPLATE_ITEM_PADDING
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 05dd022..94bbea6 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -225,7 +225,7 @@
 mpSearchView-setItemMaxTextLength(TEMPLATE_ITEM_MAX_TEXT_LENGTH);
 
 
mpSearchView-setItemDimensions(TEMPLATE_ITEM_MAX_WIDTH,TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
-
TEMPLATE_ITEM_MAX_HEIGHT-TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
+
TEMPLATE_ITEM_MAX_HEIGHT_SUB-TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT,
 TEMPLATE_ITEM_PADDING);
 
 
mpSearchView-setItemStateHdl(LINK(this,SfxTemplateManagerDlg,TVItemStateHdl));

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I785a351a5a936a42b56081a868c01d97e0a6105f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Display empty folders in Template Manager.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3254

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/3254/1

Display empty folders in Template Manager.

Change-Id: I1cab8c78dc6dc3f1969cd2e4e8bcda0b684a4caa
---
M sfx2/source/control/templateabstractview.cxx
1 file changed, 0 insertions(+), 2 deletions(-)



diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index 8fac81e..5c0b563 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -102,8 +102,6 @@
 }
 }
 }
-
-return mApp != FILTER_APP_NONE ? nVisCount : true ;
 }
 return true;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cab8c78dc6dc3f1969cd2e4e8bcda0b684a4caa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Dont reload template information after saving.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3255

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/3255/1

Dont reload template information after saving.

Change-Id: Ib75bd4561581254f690e6dd4a2b83343c99d65af
---
M sfx2/inc/sfx2/doctempl.hxx
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/doctempl.cxx
M sfx2/source/doc/templatedlg.cxx
5 files changed, 74 insertions(+), 8 deletions(-)



diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index b9ca56d..add39df 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -96,6 +96,8 @@
 sal_BoolInsertDir(const String rText, sal_uInt16 nRegion);
 sal_BoolSetName(const String rName, sal_uInt16 nRegion, 
sal_uInt16 nIdx);
 
+sal_Bool InsertTemplate (sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const 
OUString rName, const OUString rPath);
+
 /** Change the name of an entry or a directory
 
 \param rName
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx 
b/sfx2/inc/sfx2/templatelocalview.hxx
index f17f0f8..8490e37 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -81,7 +81,7 @@
  
com::sun::star::uno::Referencecom::sun::star::frame::XModel rModel,
  const OUString rName);
 
-bool saveTemplateAs (const TemplateContainerItem *pDstItem,
+bool saveTemplateAs (TemplateContainerItem *pDstItem,
  
com::sun::star::uno::Referencecom::sun::star::frame::XModel rModel,
  const OUString rName);
 
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index c6d32af..012fdba 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -695,21 +695,50 @@
 
com::sun::star::uno::Referencecom::sun::star::frame::XModel rModel,
 const OUString rName)
 {
-bool bRet = false;
 
 for (size_t i = 0, n = maRegions.size(); i  n; ++i)
 {
 if (maRegions[i]-mnId == nItemId)
 {
-bRet = saveTemplateAs((const 
TemplateContainerItem*)maRegions[i],rModel,rName);
-break;
+uno::Reference frame::XStorable  xStorable(rModel, 
uno::UNO_QUERY_THROW );
+
+uno::Reference frame::XDocumentTemplates  xTemplates(
+
frame::DocumentTemplates::create(comphelper::getProcessComponentContext()) );
+
+if 
(!xTemplates-storeTemplate(mpDocTemplates-GetRegionName(maRegions[i]-mnRegionId),rName,
 xStorable ))
+return false;
+
+sal_uInt16 nDocId = maRegions[i]-maTemplates.size();
+
+OUString aURL = 
mpDocTemplates-GetTemplateTargetURLFromComponent(mpDocTemplates-GetRegionName(maRegions[i]-mnRegionId),rName);
+
+
if(!mpDocTemplates-InsertTemplate(maRegions[i]-mnRegionId,nDocId,rName,aURL))
+return false;
+
+
+TemplateItemProperties aTemplate;
+aTemplate.aIsFolder = false;
+aTemplate.nId = getNextItemId();
+aTemplate.nDocId = nDocId;
+aTemplate.nRegionId = maRegions[i]-mnRegionId;
+aTemplate.aName = rName;
+aTemplate.aThumbnail = TemplateAbstractView::fetchThumbnail(aURL,
+
TEMPLATE_THUMBNAIL_MAX_WIDTH,
+
TEMPLATE_THUMBNAIL_MAX_HEIGHT);
+aTemplate.aPath = aURL;
+
+maRegions[i]-maTemplates.push_back(aTemplate);
+
+insertItem(aTemplate);
+
+return true;
 }
 }
 
-return bRet;
+return false;
 }
 
-bool TemplateLocalView::saveTemplateAs(const TemplateContainerItem *pDstItem,
+bool TemplateLocalView::saveTemplateAs(TemplateContainerItem *pDstItem,

com::sun::star::uno::Referencecom::sun::star::frame::XModel rModel,
const OUString rName)
 {
@@ -721,6 +750,25 @@
 if 
(!xTemplates-storeTemplate(mpDocTemplates-GetRegionName(pDstItem-mnRegionId),rName,
 xStorable ))
 return false;
 
+sal_uInt16 nDocId = pDstItem-maTemplates.size();
+OUString aURL = 
mpDocTemplates-GetTemplateTargetURLFromComponent(mpDocTemplates-GetRegionName(pDstItem-mnRegionId),rName);
+
+if(!mpDocTemplates-InsertTemplate(pDstItem-mnRegionId,nDocId,rName,aURL))
+return false;
+
+TemplateItemProperties aTemplate;
+aTemplate.aIsFolder = false;
+aTemplate.nId = pDstItem-maTemplates.empty() ? 1 : 
pDstItem-maTemplates.back().nId+1;
+aTemplate.nDocId = nDocId;
+aTemplate.nRegionId = pDstItem-mnRegionId;
+aTemplate.aName = rName;
+

[PATCH libreoffice-4-0] Position view below toolbox and search bar when resizing Tem...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3256

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/3256/1

Position view below toolbox and search bar when resizing Template dialog.

Change-Id: I94806487f4cebde965652997a595c7263d710338
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 10 insertions(+), 16 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9cf663c..9c81d6d 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -341,13 +341,9 @@
 
 void SfxTemplateManagerDlg::Resize()
 {
-Size aWinSize = GetSizePixel();
-
 // Fit the tab page control and the toolbars
-Size aTabSize = maTabControl.GetSizePixel();
-aTabSize.setWidth(aWinSize.getWidth());
-maTabControl.SetSizePixel(aTabSize);
-maTabControl.SetTabPageSizePixel(aWinSize);
+maTabControl.SetSizePixel(GetSizePixel());
+const Size aWinSize = maTabControl.GetTabPageSizePixel();
 
 // Calculate toolboxes size and positions
 Size aViewSize = mpViewBar-CalcMinimumWindowSizePixel();
@@ -367,15 +363,9 @@
 mpActionBar-SetPosSizePixel(aActionPos,aActionSize);
 mpTemplateBar-SetSizePixel(aTemplateSize);
 
-// Set view position below toolbox
 Point aViewPos = maView-GetPosPixel();
 aViewPos.setY(nToolbarsHeight);
 aViewPos.setX(0);
-Size aThumbSize(aWinSize.getWidth(), 
maTabControl.GetTabPageSizePixel().getHeight() - aViewPos.getY());
-maView-SetPosSizePixel(aViewPos, aThumbSize);
-
-if (aWinSize.getHeight()  aViewPos.getY() + aThumbSize.getHeight() + 
PADDING_DLG_BORDER)
-aWinSize.setHeight(aViewPos.getY() + aThumbSize.getHeight() + 
PADDING_DLG_BORDER);
 
 // Set search box position and size
 Size aSearchSize = mpSearchEdit-CalcMinimumSize();
@@ -384,11 +374,15 @@
 mpSearchEdit-SetSizePixel(aSearchSize);
 mpSearchEdit-SetPosPixel(Point(PADDING_DLG_BORDER,aViewPos.Y()));
 
-maView-SetSizePixel(aThumbSize);
-mpOnlineView-SetPosSizePixel(aViewPos,aThumbSize);
-mpSearchView-SetSizePixel(aThumbSize);
+if (mpSearchEdit-IsVisible())
+aViewPos.setY(aViewPos.getY() + 
mpSearchEdit-GetSizePixel().getHeight() );
 
-mpCurView-Resize();
+// Set view position below toolbox and search box
+Size aThumbSize(aWinSize.getWidth(), aWinSize.getHeight() - 
aViewPos.getY());
+
+maView-SetPosSizePixel(aViewPos,aThumbSize);
+mpOnlineView-SetPosSizePixel(aViewPos,aThumbSize);
+mpSearchView-SetPosSizePixel(aViewPos,aThumbSize);
 
 ModelessDialog::Resize();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94806487f4cebde965652997a595c7263d710338
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Dont show import action while in save mode.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3258

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3258/1

Dont show import action while in save mode.

Change-Id: Iafe814382ed1b52c9119893851c98bd15812fa60
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b091956..948de70 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -716,7 +716,8 @@
 maSelFolders.clear();
 maSelTemplates.clear();
 
-mpViewBar-ShowItem(TBI_TEMPLATE_IMPORT,mpCurView-isImportAllowed());
+if (!mbIsSaveMode)
+mpViewBar-ShowItem(TBI_TEMPLATE_IMPORT,mpCurView-isImportAllowed());
 
 mpTemplateBar-Hide();
 mpViewBar-Show();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafe814382ed1b52c9119893851c98bd15812fa60
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Rafael Dominguez venccsra...@gmail.com

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

[PATCH libreoffice-4-0] Avoid generating filter list several times.

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3259

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/3259/1

Avoid generating filter list several times.

- Only generate the list after applying a new filter function.
- Append item directly to the filtered list if its allowed when appending
a new item to the thumbnailview.

Change-Id: I408785507ef94908d31e4373b407e9d443f72895
---
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/templateabstractview.cxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/control/templatesearchview.cxx
M sfx2/source/control/thumbnailview.cxx
5 files changed, 65 insertions(+), 52 deletions(-)



diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 2310060..6d9f30e 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -179,6 +179,8 @@
 
 virtual ~ThumbnailView ();
 
+void AppendItem (ThumbnailViewItem *pItem);
+
 void RemoveItem( sal_uInt16 nItemId );
 
 void Clear();
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index 5c0b563..e28d2e8 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -161,7 +161,7 @@
 
 pChild-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
-mItemList.push_back(pChild);
+AppendItem(pChild);
 
 CalculateItemPositions();
 Invalidate();
diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 7ac7b69..6dd82df 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -262,7 +262,7 @@
 pItem-maTitle = aRegionName;
 pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
-mItemList.push_back(pItem);
+AppendItem(pItem);
 
 CalculateItemPositions();
 Invalidate();
diff --git a/sfx2/source/control/templatesearchview.cxx 
b/sfx2/source/control/templatesearchview.cxx
index eaec8dc..c24c567 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -36,7 +36,7 @@
 pItem-setPath(rPath);
 pItem-setSelectClickHdl(LINK(this,ThumbnailView,OnItemSelected));
 
-mItemList.push_back(pItem);
+ThumbnailView::AppendItem(pItem);
 
 CalculateItemPositions();
 }
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 6c64662..725520c 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -81,6 +81,14 @@
 ImplDeleteItems();
 }
 
+void ThumbnailView::AppendItem(ThumbnailViewItem *pItem)
+{
+if (maFilterFunc(pItem))
+mFilteredItemList.push_back(pItem);
+
+mItemList.push_back(pItem);
+}
+
 void ThumbnailView::ImplInit()
 {
 mpScrBar= NULL;
@@ -221,11 +229,9 @@
 return;
 
 SizeaWinSize = GetOutputSizePixel();
-size_t  nItemCount = mItemList.size();
+size_t  nItemCount = mFilteredItemList.size();
 WinBits nStyle = GetStyle();
 ScrollBar*  pDelScrBar = NULL;
-
-mFilteredItemList.clear();
 
 // consider the scrolling
 if ( nStyle  WB_VSCROLL )
@@ -304,59 +310,35 @@
 size_t nCurCount = 0;
 for ( size_t i = 0; i  nItemCount; i++ )
 {
-ThumbnailViewItem *const pItem = mItemList[i];
+ThumbnailViewItem *const pItem = mFilteredItemList[i];
 
-if (maFilterFunc(pItem))
+if ((nCurCount = nFirstItem)  (nCurCount  nLastItem))
 {
-mFilteredItemList.push_back(pItem);
-if ((nCurCount = nFirstItem)  (nCurCount  nLastItem))
+if( !pItem-isVisible())
 {
-if( !pItem-isVisible())
+if ( ImplHasAccessibleListeners() )
 {
-if ( ImplHasAccessibleListeners() )
-{
-::com::sun::star::uno::Any aOldAny, aNewAny;
+::com::sun::star::uno::Any aOldAny, aNewAny;
 
-aNewAny = pItem-GetAccessible( 
mbIsTransientChildrenDisabled );
-ImplFireAccessibleEvent( 
::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
-}
-
-pItem-show(true);
-
-maItemStateHdl.Call(pItem);
+aNewAny = pItem-GetAccessible( 
mbIsTransientChildrenDisabled );
+ImplFireAccessibleEvent( 
::com::sun::star::accessibility::AccessibleEventId::CHILD, aOldAny, aNewAny );
 }
 
-pItem-setDrawArea(Rectangle( Point(x,y), Size(mnItemWidth, 
mnItemHeight) ));
-
pItem-calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs-nMaxTextLenght,mpItemAttrs);
+pItem-show(true);
 
-if

[PATCH libreoffice-4-0] fdo#61390 - Thumbnail navigation by shift-click and shift-ke...

2013-04-07 Thread Rafael Dominguez (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3260

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3260/1

fdo#61390 - Thumbnail navigation by shift-click and shift-keyboard.

Change-Id: I0b107d0918e1914709de31fd52cd11480e7fd419
---
M sfx2/inc/sfx2/thumbnailview.hxx
M sfx2/source/control/thumbnailview.cxx
2 files changed, 189 insertions(+), 10 deletions(-)



diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 6d9f30e..1286385 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -305,6 +305,7 @@
 
 ValueItemList mItemList;
 ValueItemList mFilteredItemList; /// Cache to store the filtered items
+ValueItemList::iterator mpStartSelRange;
 ScrollBar* mpScrBar;
 Rectangle maItemListRect;
 long mnHeaderHeight;
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 725520c..8d03d5a 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -10,6 +10,8 @@
 #include sfx2/thumbnailview.hxx
 #include sfx2/thumbnailviewitem.hxx
 
+#include utility
+
 #include thumbnailviewacc.hxx
 
 #include basegfx/color/bcolortools.hxx
@@ -84,7 +86,20 @@
 void ThumbnailView::AppendItem(ThumbnailViewItem *pItem)
 {
 if (maFilterFunc(pItem))
+{
+// Save current start,end range, iterator might get invalidated
+size_t nSelStartPos = 0;
+ThumbnailViewItem *pSelStartItem = NULL;
+
+if (mpStartSelRange != mFilteredItemList.end())
+{
+pSelStartItem = *mpStartSelRange;
+nSelStartPos = mpStartSelRange - mFilteredItemList.begin();
+}
+
 mFilteredItemList.push_back(pItem);
+mpStartSelRange = pSelStartItem != NULL ? mFilteredItemList.begin() + 
nSelStartPos : mFilteredItemList.end();
+}
 
 mItemList.push_back(pItem);
 }
@@ -107,6 +122,7 @@
 mbHasVisibleItems   = false;
 maFilterFunc = ViewFilterAll();
 maColor = GetSettings().GetStyleSettings().GetFieldColor();
+mpStartSelRange = mFilteredItemList.end();
 
 // Create the processor and process the primitives
 const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
@@ -145,6 +161,8 @@
 
 mItemList.clear();
 mFilteredItemList.clear();
+
+mpStartSelRange = mFilteredItemList.end();
 }
 
 void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool 
bBackground )
@@ -398,9 +416,9 @@
 
 if ( maItemListRect.IsInside( rPos ) )
 {
-for (size_t i = 0; i  mItemList.size(); ++i)
+for (size_t i = 0; i  mFilteredItemList.size(); ++i)
 {
-if (mItemList[i]-isVisible()  
mItemList[i]-getDrawArea().IsInside(rPos))
+if (mFilteredItemList[i]-isVisible()  
mFilteredItemList[i]-getDrawArea().IsInside(rPos))
 return i;
 }
 
@@ -417,7 +435,7 @@
 
 ThumbnailViewItem* ThumbnailView::ImplGetItem( size_t nPos )
 {
-return ( nPos  mItemList.size() ) ? mItemList[nPos] : NULL;
+return ( nPos  mFilteredItemList.size() ) ? mFilteredItemList[nPos] : 
NULL;
 }
 
 sal_uInt16 ThumbnailView::ImplGetVisibleItemCount() const
@@ -505,39 +523,68 @@
 }
 }
 
+bool bValidRange = false;
+bool bHasSelRange = mpStartSelRange != mFilteredItemList.end();
+size_t nNextPos = nLastPos;
 KeyCode aKeyCode = rKEvt.GetKeyCode();
 ThumbnailViewItem* pNext = NULL;
+
+if (aKeyCode.IsShift()  bHasSelRange)
+{
+//If the last elemented selected is the start range position
+//search for the first selected item
+size_t nSelPos = mpStartSelRange - mFilteredItemList.begin();
+
+if (nLastPos == nSelPos)
+{
+while (nLastPos  mFilteredItemList[nLastPos-1]-isSelected())
+--nLastPos;
+}
+}
+
 switch ( aKeyCode.GetCode() )
 {
 case KEY_RIGHT:
 {
-size_t nNextPos = nLastPos;
 if ( bFoundLast  nLastPos  mFilteredItemList.size( ) - 1 )
+{
+bValidRange = true;
 nNextPos = nLastPos + 1;
+}
+
 pNext = mFilteredItemList[nNextPos];
 }
 break;
 case KEY_LEFT:
 {
-size_t nNextPos = nLastPos;
 if ( nLastPos  0 )
+{
+bValidRange = true;
 nNextPos = nLastPos - 1;
+}
+
 pNext = mFilteredItemList[nNextPos];
 }
 break;
 case KEY_DOWN:
 {
-size_t nNextPos = nLastPos;
 if ( bFoundLast  nLastPos  mFilteredItemList.size( ) - 
mnCols )
+{
+bValidRange = true;
 nNextPos = nLastPos + mnCols;
+}
+
 pNext =

GSOC 2013 help

2013-04-07 Thread Gergő Mocsi

Dear Developers,
I'd like to participate in GSOC 2013 in LO. I've alredy worked on issue
https://bugs.freedesktop.org/show_bug.cgi?id=35546 . I've seen some GSOC
ideas, but I'm completely lost. Can anybody recommend one for me? Also,
I've got an idea: in MS Word 2003, there was a wizard (or a macro) which
could create calendar, for month/year with style, etc. Would that be an
idea?
Thank you,
Gergő
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 lotuswordpro/source/filter/xfilter/xfstylecont.cxx |3 +--
 svtools/source/contnr/fileview.cxx |5 +
 sw/source/core/txtnode/txtedt.cxx  |3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit f53cbe59fb60b144ef59da7123141422ebe674f7
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 7 21:30:31 2013 +0200

Some cppcheck cleaning

Change-Id: I07ef58fd99bc9fc4fd601570b59f9a3581824aa9

diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx 
b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 7c9a19e..51def4b 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -71,9 +71,8 @@ XFStyleContainer::XFStyleContainer(const OUString 
strStyleNamePrefix)
 }
 
 XFStyleContainer::XFStyleContainer(const XFStyleContainer 
other):IXFObject(other),
-m_strStyleNamePrefix(other.m_strStyleNamePrefix)
+m_aStyles(other.m_aStyles), 
m_strStyleNamePrefix(other.m_strStyleNamePrefix)
 {
-this-m_aStyles = other.m_aStyles;
 }
 
 XFStyleContainer XFStyleContainer::operator=(const XFStyleContainer other)
diff --git a/svtools/source/contnr/fileview.cxx 
b/svtools/source/contnr/fileview.cxx
index 827e986..7a99e67 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1036,11 +1036,10 @@ void ViewTabListBox_Impl::DoQuickSearch( const 
sal_Unicode rChar )
 
 OUStringaLastText = maQuickSearchText;
 sal_uInt32  aLastPos = mnSearchIndex;
-sal_BoolbFound = sal_False;
 
 maQuickSearchText += OUString(rChar).toAsciiLowerCase();
 
-bFound = mpParent-SearchNextEntry( mnSearchIndex, maQuickSearchText, 
sal_False );
+sal_Bool bFound = mpParent-SearchNextEntry( mnSearchIndex, 
maQuickSearchText, sal_False );
 
 if ( !bFound  ( aLastText.getLength() == 1 ) 
  ( aLastText == OUString(rChar) ) )
@@ -1060,8 +1059,6 @@ void ViewTabListBox_Impl::DoQuickSearch( const 
sal_Unicode rChar )
 SetCurEntry( pEntry );
 MakeVisible( pEntry );
 }
-else
-bFound = sal_False;
 }
 
 maResetQuickSearch.Start();
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index 38b52f5..fac69fe 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1281,8 +1281,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, 
const SwViewOption rV
 // within the word
 LanguageType eActLang = aScanner.GetCurrentLanguage();
 
-sal_Bool bSpell = sal_True;
-bSpell = xSpell.is() ? xSpell-hasLanguage( eActLang ) : sal_False;
+sal_Bool bSpell = xSpell.is() ? xSpell-hasLanguage( eActLang ) : 
sal_False;
 if( bSpell  rWord.Len()  0 )
 {
 // check for: bAlter = xHyphWord.is()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: src/lib

 src/lib/CDRCollector.cpp|   14 +++---
 src/lib/CDRContentCollector.cpp |   20 ++--
 src/lib/CDRInternalStream.cpp   |4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit b11e5a536fa1c9194f5b4d03ce28ba85b5963ce4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Apr 7 21:29:42 2013 +0200

Removing some warnings

diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index be4eaec..d6958d5 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -62,7 +62,7 @@ void libcdr::CDRParserState::setColorTransform(const 
std::vectorunsigned char
 {
   if (profile.empty())
 return;
-  cmsHPROFILE tmpProfile = cmsOpenProfileFromMem(profile[0], profile.size());
+  cmsHPROFILE tmpProfile = cmsOpenProfileFromMem(profile[0], 
cmsUInt32Number(profile.size()));
   cmsHPROFILE tmpRGBProfile = cmsCreate_sRGBProfile();
   cmsColorSpaceSignature signature = cmsGetColorSpace(tmpProfile);
   switch (signature)
@@ -322,7 +322,7 @@ unsigned libcdr::CDRParserState::_getRGBColor(const 
CDRColor color)
   0x00, 0x46, 0x73, 0x91, 0xa2, 0xad, 0x2a, 0x3d, 0x69, 0x7d, 0x85, 0x8f, 
0xa3,
 };
 
-unsigned short pantoneIndex = ((unsigned short)col1  8) | (unsigned 
short)col0;
+unsigned short pantoneIndex = (unsigned short)(((int)col1  8) | 
(int)col0);
 double pantoneSaturation = (double)(((unsigned short)col3  8) | 
(unsigned short)col2) / 100.0;
 typedef struct
 {
@@ -339,9 +339,9 @@ unsigned libcdr::CDRParserState::_getRGBColor(const 
CDRColor color)
   pureColor.g = WaldoColorType0_G[pantoneIndex];
   pureColor.b = WaldoColorType0_B[pantoneIndex];
 }
-unsigned tmpRed = cdr_round(255.0*(1-pantoneSaturation) + 
(double)pureColor.r*pantoneSaturation);
-unsigned tmpGreen = cdr_round(255.0*(1-pantoneSaturation) + 
(double)pureColor.g*pantoneSaturation);
-unsigned tmpBlue = cdr_round(255.0*(1-pantoneSaturation) + 
(double)pureColor.b*pantoneSaturation);
+unsigned tmpRed = (unsigned)cdr_round(255.0*(1-pantoneSaturation) + 
(double)pureColor.r*pantoneSaturation);
+unsigned tmpGreen = (unsigned)cdr_round(255.0*(1-pantoneSaturation) + 
(double)pureColor.g*pantoneSaturation);
+unsigned tmpBlue = (unsigned)cdr_round(255.0*(1-pantoneSaturation) + 
(double)pureColor.b*pantoneSaturation);
 red = (tmpRed  255 ? (unsigned char)tmpRed : 255);
 green = (tmpGreen  255 ? (unsigned char)tmpGreen : 255);
 blue = (tmpBlue  255 ? (unsigned char)tmpBlue : 255);
@@ -407,7 +407,7 @@ unsigned libcdr::CDRParserState::_getRGBColor(const 
CDRColor color)
   // HSB
   case 0x06:
   {
-unsigned short hue = (col18) | col0;
+unsigned short hue = (unsigned short)(((int)col18) | col0);
 double saturation = (double)col2/255.0;
 double brightness = (double)col3/255.0;
 
@@ -442,7 +442,7 @@ unsigned libcdr::CDRParserState::_getRGBColor(const 
CDRColor color)
   // HLS
   case 0x07:
   {
-unsigned short hue = (col18) | col0;
+unsigned short hue = (unsigned short)(((int)col18) | col0);
 double lightness = (double)col2/255.0;
 double saturation = (double)col3/255.0;
 
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index a2a3808..502cf65 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -396,7 +396,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
 double y1 = m_currentTextBox.m_y;
 double x2 = m_currentTextBox.m_x + m_currentTextBox.m_w;
 double y2 = m_currentTextBox.m_y - m_currentTextBox.m_h;
-if (m_currentTextBox.m_h != 0.0  m_currentTextBox.m_w != 0)
+if (!CDR_ALMOST_ZERO(m_currentTextBox.m_h)  
!CDR_ALMOST_ZERO(m_currentTextBox.m_w))
 {
   m_currentTransforms.applyToPoint(x1, y1);
   m_currentTransforms.applyToPoint(x2, y2);
@@ -406,7 +406,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
 m_groupTransforms.top().applyToPoint(x2, y2);
   }
 }
-else if (m_currentBBox.getWidth() != 0.0  m_currentBBox.getHeight() != 
0.0)
+else if (!CDR_ALMOST_ZERO(m_currentBBox.getWidth())  
!CDR_ALMOST_ZERO(m_currentBBox.getHeight()))
 {
   y1 = m_currentBBox.getMinY();
   y2 = m_currentBBox.getMinY() + m_currentBBox.getHeight();
@@ -1015,7 +1015,7 @@ void 
libcdr::CDRContentCollector::_lineProperties(WPXPropertyList propList)
   gap = iter-second.dashArray[1];
 }
 
-unsigned count = iter-second.dashArray.size() / 2;
+unsigned long count = iter-second.dashArray.size() / 2;
 unsigned i = 0;
 for (; i  count;)
 {
@@ -1081,21 +1081,21 @@ void 
libcdr::CDRContentCollector::_generateBitmapFromPattern(WPXBinaryData bitm
 
   // Create DIB file header
   writeU16(bitmap, 0x4D42);  // Type
-  writeU32(bitmap, tmpDIBFileSize); // Size
+  writeU32(bitmap, (int)tmpDIBFileSize); // Size
   writeU16(bitmap, 0); // Reserved1
   writeU16(bitmap, 0); // Reserved2
-  writeU32(bitmap,

[Libreoffice-commits] libcdr.git: configure.ac

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f69bf77ebaf68cd4ab907a2f25793b5c423b752a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Apr 7 21:37:01 2013 +0200

Bump version

diff --git a/configure.ac b/configure.ac
index 715ed61..f839f57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # 
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[11])
+m4_define([libcdr_version_micro],[12])
 
m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#62475 - remove pointless comments and ASCII art in sw/so...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3262

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/3262/1

fdo#62475 - remove pointless comments and ASCII art in sw/source/core/doc

Change-Id: I15f0af451a2259ddfeaa5e7964317e6c0537e4db
---
M sw/source/core/doc/docdesc.cxx
M sw/source/core/doc/docdraw.cxx
M sw/source/core/doc/docedt.cxx
M sw/source/core/doc/docfld.cxx
M sw/source/core/doc/doclay.cxx
M sw/source/core/doc/docnew.cxx
M sw/source/core/doc/docsort.cxx
M sw/source/core/doc/docstat.cxx
M sw/source/core/doc/doctxm.cxx
M sw/source/core/doc/fmtcol.cxx
M sw/source/core/doc/list.cxx
M sw/source/core/doc/notxtfrm.cxx
M sw/source/core/doc/sortopt.cxx
M sw/source/core/doc/tblafmt.cxx
14 files changed, 9 insertions(+), 179 deletions(-)



diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 9f3fa78..fc6809c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -114,12 +114,6 @@
 rFmt3.SetFmtAttr( aUL );
 }
 
-/*
-|*
-|*  SwDoc::ChgPageDesc()
-|*
-|*/
-
 static void lcl_DescSetAttr( const SwFrmFmt rSource, SwFrmFmt rDest,
  const bool bPage = true )
 {
@@ -514,14 +508,6 @@
 SetModified();
 }
 
-
-
-/*
-|*
-|*  SwDoc::MakePageDesc()
-|*
-|*/
-
 sal_uInt16 SwDoc::MakePageDesc( const String rName, const SwPageDesc *pCpy,
 bool bRegardLanguage, bool bBroadcast)
 {
@@ -581,11 +567,6 @@
 }
 return pRet;
 }
-
-/**
- *  Method  :   void SwDoc::PrtDataChanged()
- *  Description :
- 
**/
 
 void SwDoc::PrtDataChanged()
 {
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index c172e1f..80cedc9 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -381,12 +381,6 @@
 delete [] pFmtsAndObjs;
 }
 
-/*
-|*
-|*  SwDoc::DeleteSelection()
-|*
-|*/
-
 bool SwDoc::DeleteSelection( SwDrawView rDrawView )
 {
 bool bCallBase = false;
@@ -482,12 +476,6 @@
 return bCallBase;
 }
 
-/*
-|*
-|*  SwDoc::DeleteSelection()
-|*
-|*/
-
 _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
   sal_uInt32 nArrOrdNum )
 : pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
@@ -524,7 +512,6 @@
 }
 }
 
-/*/
 // Is also called by the Sw3 Reader, if there was an error when reading the
 // drawing layer. If it is called by the Sw3 Reader the layer is rebuilt
 // from scratch.
@@ -762,9 +749,6 @@
 return nInvisibleLayerId;
 }
 
-/*/
-
-
 void SwDoc::ReleaseDrawModel()
 {
 if ( mpDrawModel )
@@ -785,9 +769,6 @@
 SfxItemPool::Free(pEEgPool);
 }
 }
-
-/*/
-
 
 SdrModel* SwDoc::_MakeDrawModel()
 {
@@ -812,8 +793,6 @@
 return mpDrawModel;
 }
 
-/*/
-
 void SwDoc::DrawNotifyUndoHdl()
 {
 mpDrawModel-SetNotifyUndoActionHdl( Link() );
@@ -835,19 +814,14 @@
 
 if (pField  pField-ISA(SvxDateField))
 {
-/**
-* Date field
-**/
+// Date field
 pInfo-SetRepresentation(
 ((const SvxDateField*) pField)-GetFormatted(
 *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) );
 }
 else if (pField  pField-ISA(SvxURLField))
 {
-/**
-* URL field
-**/
-
+// URL field
 switch ( ((const SvxURLField*) pField)-GetFormat() )
 {
 case SVXURLFORMAT_APPDEFAULT: //!!! Can be set in App???
@@ -883,16 +857,12 @@
 }
 else if (pField  pField-ISA(SdrMeasureField))
 {
-

[PATCH] more work on comments in sw/source/core/doc

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3263

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/3263/1

more work on comments in sw/source/core/doc

Change-Id: I4fbf683da081ad04dfd1b9ea830aa94c38f33d43
---
M sw/source/core/doc/doc.cxx
M sw/source/core/doc/docbm.cxx
M sw/source/core/doc/docdraw.cxx
M sw/source/core/doc/docedt.cxx
M sw/source/core/doc/docfld.cxx
M sw/source/core/doc/docfmt.cxx
M sw/source/core/doc/docnew.cxx
M sw/source/core/doc/docnum.cxx
M sw/source/core/doc/docruby.cxx
M sw/source/core/doc/fmtcol.cxx
M sw/source/core/doc/number.cxx
11 files changed, 21 insertions(+), 43 deletions(-)



diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index a337f57..084289f 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1356,13 +1356,10 @@
 pStPage = (SwPageFrm*)pStPage-GetNext();
 }
 
-
-//
 // now that we have identified the valid pages for printing according
 // to the print settings we need to get the PageRange to use and
 // use both results to get the actual pages to be printed
 // (post-it settings need to be taken into account later on!)
-//
 
 // get PageRange value to use
 OUString aPageRange;
@@ -1802,7 +1799,6 @@
 }
 }
 
-// Document - info
 void SwDoc::DocInfoChgd( )
 {
 GetSysFldType( RES_DOCINFOFLD )-UpdateFlds();
@@ -2215,9 +2211,7 @@
 }
 }
 
-//
 // Remove any hidden paragraph (hidden text attribute)
-//
 for( sal_uLong n = GetNodes().Count(); n; )
 {
 SwTxtNode* pTxtNd = GetNodes()[ --n ]-GetTxtNode();
@@ -2355,9 +2349,7 @@
 if( aIter.First( TYPE( SwFmtFld ) ) )
 bRet = true;
 
-//
 // Search for any hidden paragraph (hidden text attribute)
-//
 if( ! bRet )
 {
 for( sal_uLong n = GetNodes().Count(); !bRet  (n  0); )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 7d6f59c..4454659 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1037,7 +1037,7 @@
 const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const
 { return static_cast IDocumentMarkAccess* (mpMarkManager.get()); }
 
-// SaveBookmark
+// SaveBookmark methods
 
 SaveBookmark::SaveBookmark(
 bool bSavePos,
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 80cedc9..a147595 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -512,12 +512,11 @@
 }
 }
 
+#include svx/sxenditm.hxx
+
 // Is also called by the Sw3 Reader, if there was an error when reading the
 // drawing layer. If it is called by the Sw3 Reader the layer is rebuilt
 // from scratch.
-
-#include svx/sxenditm.hxx
-
 void SwDoc::InitDrawModel()
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLog, SW, JP93722,  SwDoc::InitDrawModel 
);
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 39d895d..e397077 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1473,6 +1473,7 @@
 return bRet;
 }
 
+///@todo fix implementation
 bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM  rPam, const bool )
 {
 OSL_ENSURE( IsRedlineOn(), DeleteAndJoinWithRedline: redline off );
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index c27319c..48bec3c4 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -298,9 +298,7 @@
 return pRet;
 }
 
-/*
- *All have to be re-evaluated.
- */
+// All have to be re-evaluated.
 void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
 {
 // Call Modify() for every field type,
@@ -2209,18 +2207,18 @@
 delete pFldSortLst;
 pFldSortLst = new _SetGetExpFlds;
 
-/// consider and unhide sections
-/// with hide condition, only in mode GETFLD_ALL (eGetMode == 
GETFLD_ALL)
-/// notes by OD:
-/// eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
-/// eGetMode == GETFLD_EXPAND in call from method 
SwDoc::FldsToExpand
-/// eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFlds
-/// I figured out that hidden section only have to be shown,
-/// if fields have updated (call by SwDoc::UpdateExpFlds) and thus
-/// the hide conditions of section have to be updated.
-/// For correct updating the hide condition of a section, its 
position
-/// have to be known in order to insert the hide condition as a new
-/// expression field into the sorted field list (pFldSortLst).
+// consider and unhide sections
+// with hide condition, only in mode GETFLD_ALL (eGetMode == 
GETFLD_ALL)
+// notes by OD:
+// eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
+// eGetMode == GETFLD_EXPAND in call from method 
SwDoc::FldsToExpand
+// eGetMode ==

[PATCH] remove code that was commented out many years ago

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3264

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/3264/1

remove code that was commented out many years ago

Change-Id: I45292b157b5ea278ec9e0d9a18bf185276ba78c1
---
M sw/source/core/doc/doc.cxx
M sw/source/core/doc/doccomp.cxx
M sw/source/core/doc/docfld.cxx
3 files changed, 0 insertions(+), 12 deletions(-)



diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 084289f..1ec553d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2023,15 +2023,11 @@
 static bool lcl_CheckSmartTagsAgain( const SwNodePtr rpNd, void*  )
 {
 SwTxtNode *pTxtNode = (SwTxtNode*)rpNd-GetTxtNode();
-//  sal_Bool bOnlyWrong = *(sal_Bool*)pArgs;
 if( pTxtNode )
 {
 pTxtNode-SetSmartTagDirty( true );
 if( pTxtNode-GetSmartTags() )
 {
-//if ( bOnlyWrong ) // only some smart tag types have been enabled 
or disabled
-//  pTxtNode-GetSmartTags()-SetInvalid( 0, STRING_LEN );
-//else // smart tags all have been enabled or disabled
 pTxtNode-SetSmartTags( NULL );
 }
 }
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index c1f753a..676a937 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1154,7 +1154,6 @@
  pSrcTOX-GetType() == pDstTOX-GetType()
  pSrcTOX-GetTitle() == pDstTOX-GetTitle()
  pSrcTOX-GetTypeName() == pDstTOX-GetTypeName()
-//   pSrcTOX-GetTOXName() == pDstTOX-GetTOXName()
 ;
 }
 break;
@@ -1222,7 +1221,6 @@
 if( pTOX )
 sRet.Append( pTOX-GetTitle() )
 .Append( pTOX-GetTypeName() )
-//  .Append( pTOX-GetTOXName() )
 .Append( OUString::number( pTOX-GetType() ));
 }
 break;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 48bec3c4..65222e7 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1362,12 +1362,6 @@
 
 const String rName = pFld-GetTyp()-GetName();
 
-// Set value for Calculator
-//JP 10.02.96: GetValue doesn't make sense here
-//  ((SwDBField*)pFld)-GetValue();
-
-//!OK   aCalc.VarChange(aName, ((SwDBField*)pFld)-GetValue(aCalc));
-
 // Add entry to hash table
 // Entry present?
 sal_uInt16 nPos;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45292b157b5ea278ec9e0d9a18bf185276ba78c1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer ruderphil...@gmail.com

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

[PATCH] delete commented code

2013-04-07 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3267

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/3267/1

delete commented code

Change-Id: Ia144e7b6e567d39816a4baa68187c157f7d8776e
---
M sw/source/core/text/pormulti.cxx
1 file changed, 0 insertions(+), 16 deletions(-)



diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 18951c5..a375f34f 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -888,22 +888,6 @@
 if ( CH_TXTATR_BREAKWORD == GetChar( rPos ) )
 {
 bFldBidi = true;
-/*
-// examining the script of the field text should be sufficient
-// for 99% of all cases
-XubString aTxt = GetTxtFrm()-GetTxtNode()-GetExpandTxt( rPos, 1 );
-
-if ( pBreakIt-GetBreakIter().is()  aTxt.Len() )
-{
-bool bFldDir = ( i18n::ScriptType::COMPLEX ==
- pBreakIt-GetRealScriptOfText( aTxt, 0 ) );
-bool bCurrDir = ( 0 != ( nCurrLevel % 2 ) );
-if ( bFldDir != bCurrDir )
-{
-nNextLevel = nCurrLevel + 1;
-bFldBidi = true;
-}
-}*/
 }
 else
 nNextLevel = rSI.DirType( rPos );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia144e7b6e567d39816a4baa68187c157f7d8776e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de

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

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

 writerfilter/source/dmapper/GraphicImport.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 717553f9cd5ee6a0e4385f963b0fd9ba5c566ec8
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 7 21:49:31 2013 +0200

Fix variables not initialized

Change-Id: Ib741c7144bfa48f8071c2b86478c111dbf09b14e

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index d5a509f..895e814 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -290,6 +290,11 @@ public:
 ,nRightMargin(319)
 ,nTopMargin(0)
 ,nBottomMargin(0)
+,bShadow(false)
+,nShadowXDistance(0)
+,nShadowYDistance(0)
+,nShadowColor(0)
+,nShadowTransparence(0)
 ,nContrast(0)
 ,nBrightness(0)
 ,fGamma( -1.0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/source sc/source sw/source xmloff/source

 chart2/source/controller/dialogs/ObjectNameProvider.cxx |9 +++--
 chart2/source/tools/ObjectIdentifier.cxx|7 ++-
 sc/source/filter/qpro/qpro.cxx  |3 +--
 sw/source/ui/shells/textsh1.cxx |3 +--
 xmloff/source/core/xmluconv.cxx |3 +--
 5 files changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 3f3980ff242203e45e10c8fb13f871f968377383
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 7 22:18:57 2013 +0200

Some cppcheck cleaning

Change-Id: I425ed98a721ded162c2ae08d145aaa9dbf548632

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 6ef7bd9..29a3f38 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -509,9 +509,8 @@ OUString ObjectNameProvider::getHelpText( const OUString 
rObjectCID, const Refe
 sal_Int32 nPointIndex( 
ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
 
 //replace data point index
-sal_Int32 nIndex = -1;
 OUString aWildcard(  %POINTNUMBER );
-nIndex = aRet.indexOf( aWildcard );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 if( nIndex != -1 )
 {
 aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), 
OUString::valueOf(nPointIndex+1) );
@@ -569,9 +568,8 @@ OUString ObjectNameProvider::getHelpText( const OUString 
rObjectCID, const Refe
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
 // replace formula
-sal_Int32 nIndex = -1;
 OUString aWildcard( %FORMULA );
-nIndex = aRet.indexOf( aWildcard );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 if( nIndex != -1 )
 aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), xCalculator-getRepresentation());
 
@@ -620,9 +618,8 @@ OUString ObjectNameProvider::getHelpText( const OUString 
rObjectCID, const Refe
 
 sal_Unicode aDecimalSep( '.' );
 
-sal_Int32 nIndex = -1;
 OUString aWildcard( %AVERAGE_VALUE );
-nIndex = aRet.indexOf( aWildcard );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 // as the curve is constant, the value at any x-value 
is ok
 if( nIndex != -1 )
 {
diff --git a/chart2/source/tools/ObjectIdentifier.cxx 
b/chart2/source/tools/ObjectIdentifier.cxx
index 1097984..8d4b3ba 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -764,8 +764,7 @@ bool ObjectIdentifier::isMultiClickObject( const OUString 
rClassifiedIdentifier
 //was selected before;
 
 //! by definition the name of a MultiClickObject starts with 
CID/MultiClick:
-bool bRet = false;
-bRet = rClassifiedIdentifier.match( m_aMultiClick, m_aProtocol.getLength() 
);
+bool bRet = rClassifiedIdentifier.match( m_aMultiClick, 
m_aProtocol.getLength() );
 return bRet;
 }
 
@@ -1027,11 +1026,9 @@ OUString ObjectIdentifier::createChildParticleWithIndex( 
ObjectType eObjectType,
 
 sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString 
rParticleOrCID )
 {
-sal_Int32 nRet = -1;
-
 OUString aIndexString = lcl_getIndexStringAfterString( rParticleOrCID, = 
);
 sal_Int32 nCharacterIndex=0;
-nRet = lcl_StringToIndex( aIndexString.getToken( 0, ',', nCharacterIndex ) 
);
+sal_Int32 nRet = lcl_StringToIndex( aIndexString.getToken( 0, ',', 
nCharacterIndex ) );
 
 return nRet;
 }
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 1247ecc..f665884 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -126,9 +126,8 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* 
pDoc, ScQProStyle *pSt
 
 FltError ScFormatFilterPluginImpl::ScImportQuattroPro( SfxMedium rMedium, 
ScDocument *pDoc )
 {
-FltError   eRet = eERR_OK;
 ScQProReader aReader( rMedium );
-eRet = aReader.import( pDoc );
+FltError eRet = aReader.import( pDoc );
 return eRet;
 }
 
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 056a5c8..23b8500 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -431,11 +431,10 @@ sal_Bool SvXMLUnitConverter::convertDateTime( double 
fDateTime,
 
 if (bSuccess)
 {
-double fTempDateTime = 0.0;
 const Date aTmpNullDate(aTempNullDate.Day, aTempNullDate.Month, 
aTempNullDate.Year);
 const Date aTempDate((sal_uInt16)aDateTime.Day,

[Libreoffice-commits] Changes to 'refs/tags/libcdr-0.0.12'

Tag 'libcdr-0.0.12' created by Fridrich Å trba fridrich.st...@bluewin.ch at 
2013-04-07 21:21 -0700

Tagging 0.0.12 release

Changes since libcdr-0.0.11-26:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen

2013-04-07 Thread Issa Alkurtass

 icon-themes/crystal/cmd/lc_dbqueryproperties.png|binary
 icon-themes/crystal/cmd/sc_dbqueryproperties.png|binary
 icon-themes/galaxy/cmd/lc_dbqueryproperties.png |binary
 icon-themes/galaxy/cmd/sc_dbqueryproperties.png |binary
 icon-themes/hicontrast/cmd/lc_dbqueryproperties.png |binary
 icon-themes/hicontrast/cmd/sc_dbqueryproperties.png |binary
 icon-themes/human/cmd/lc_dbqueryproperties.png  |binary
 icon-themes/human/cmd/sc_dbqueryproperties.png  |binary
 icon-themes/industrial/cmd/lc_dbqueryproperties.png |binary
 icon-themes/industrial/cmd/sc_dbqueryproperties.png |binary
 icon-themes/oxygen/cmd/lc_dbqueryproperties.png |binary
 icon-themes/oxygen/cmd/sc_dbqueryproperties.png |binary
 12 files changed

New commits:
commit 86f8fba8e7b13f9ba6c4c9f3cdc19ba39044e552
Author: Issa Alkurtass ialkurt...@kacst.edu.sa
Date:   Sat Apr 6 11:09:04 2013 +0300

Added query properties icon for Base

Created a new icon for query properties as discussed here
http://bit.ly/16Ae2ce
Made for all themes containing icons for queries.

Change-Id: Ib65e10479298b7a530b973658d202505fb33ccf3
Reviewed-on: https://gerrit.libreoffice.org/3216
Reviewed-by: Stefan Knorr heinzless...@gmail.com
Reviewed-by: Zolnai TamÃ¡s zolnaitamas2...@gmail.com
Tested-by: Zolnai TamÃ¡s zolnaitamas2...@gmail.com

diff --git a/icon-themes/crystal/cmd/lc_dbqueryproperties.png 
b/icon-themes/crystal/cmd/lc_dbqueryproperties.png
new file mode 100644
index 000..39bdfbf
Binary files /dev/null and b/icon-themes/crystal/cmd/lc_dbqueryproperties.png 
differ
diff --git a/icon-themes/crystal/cmd/sc_dbqueryproperties.png 
b/icon-themes/crystal/cmd/sc_dbqueryproperties.png
new file mode 100644
index 000..ec19079
Binary files /dev/null and b/icon-themes/crystal/cmd/sc_dbqueryproperties.png 
differ
diff --git a/icon-themes/galaxy/cmd/lc_dbqueryproperties.png 
b/icon-themes/galaxy/cmd/lc_dbqueryproperties.png
new file mode 100644
index 000..1cc82e9
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_dbqueryproperties.png 
differ
diff --git a/icon-themes/galaxy/cmd/sc_dbqueryproperties.png 
b/icon-themes/galaxy/cmd/sc_dbqueryproperties.png
new file mode 100644
index 000..815d137
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_dbqueryproperties.png 
differ
diff --git a/icon-themes/hicontrast/cmd/lc_dbqueryproperties.png 
b/icon-themes/hicontrast/cmd/lc_dbqueryproperties.png
new file mode 100644
index 000..e9cab25
Binary files /dev/null and 
b/icon-themes/hicontrast/cmd/lc_dbqueryproperties.png differ
diff --git a/icon-themes/hicontrast/cmd/sc_dbqueryproperties.png 
b/icon-themes/hicontrast/cmd/sc_dbqueryproperties.png
new file mode 100644
index 000..9e2d377
Binary files /dev/null and 
b/icon-themes/hicontrast/cmd/sc_dbqueryproperties.png differ
diff --git a/icon-themes/human/cmd/lc_dbqueryproperties.png 
b/icon-themes/human/cmd/lc_dbqueryproperties.png
new file mode 100644
index 000..ebe9dd5
Binary files /dev/null and b/icon-themes/human/cmd/lc_dbqueryproperties.png 
differ
diff --git a/icon-themes/human/cmd/sc_dbqueryproperties.png 
b/icon-themes/human/cmd/sc_dbqueryproperties.png
new file mode 100644
index 000..d0b7673
Binary files /dev/null and b/icon-themes/human/cmd/sc_dbqueryproperties.png 
differ
diff --git a/icon-themes/industrial/cmd/lc_dbqueryproperties.png 
b/icon-themes/industrial/cmd/lc_dbqueryproperties.png
new file mode 100644
index 000..bd693b4
Binary files /dev/null and 
b/icon-themes/industrial/cmd/lc_dbqueryproperties.png differ
diff --git a/icon-themes/industrial/cmd/sc_dbqueryproperties.png 
b/icon-themes/industrial/cmd/sc_dbqueryproperties.png
new file mode 100644
index 000..d0b7673
Binary files /dev/null and 
b/icon-themes/industrial/cmd/sc_dbqueryproperties.png differ
diff --git a/icon-themes/oxygen/cmd/lc_dbqueryproperties.png 
b/icon-themes/oxygen/cmd/lc_dbqueryproperties.png
new file mode 100644
index 000..39bdfbf
Binary files /dev/null and b/icon-themes/oxygen/cmd/lc_dbqueryproperties.png 
differ
diff --git a/icon-themes/oxygen/cmd/sc_dbqueryproperties.png 
b/icon-themes/oxygen/cmd/sc_dbqueryproperties.png
new file mode 100644
index 000..ec19079
Binary files /dev/null and b/icon-themes/oxygen/cmd/sc_dbqueryproperties.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Added query properties icon for Base

2013-04-07 Thread 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/3216

Approvals:
  Stefan Knorr: Looks good to me, but someone else must approve
  Zolnai Tamás: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib65e10479298b7a530b973658d202505fb33ccf3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Issa Alkurtass ialkurt...@kacst.edu.sa
Gerrit-Reviewer: Issa Alkurtass ialkurt...@kacst.edu.sa
Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Stefan Knorr heinzless...@gmail.com
Gerrit-Reviewer: Zolnai Tamás zolnaitamas2...@gmail.com

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

[Libreoffice-commits] core.git: download.lst libcdr/libcdr-0.0.11-encoding.patch libcdr/UnpackedTarball_cdr.mk

 download.lst|4 ++--
 libcdr/UnpackedTarball_cdr.mk   |6 --
 libcdr/libcdr-0.0.11-encoding.patch |   36 
 3 files changed, 2 insertions(+), 44 deletions(-)

New commits:
commit 29339357cfba19e80c3687639fe33e847d3e6f93
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Apr 7 22:15:09 2013 +0200

Uploading libcdr-0.0.12: fixing fdo#62538 and fdo#53278

Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff

diff --git a/download.lst b/download.lst
index 2ff86dab..f0888a2 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
-export CDR_TARBALL := libcdr-0.0.11.tar.bz2
+CDR_MD5SUM := 6db2c96a4ae5977da8b84893c1441038
+export CDR_TARBALL := libcdr-0.0.12.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
 MWAW_MD5SUM := 7c08542921466eee797e0be23e9535b3
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 1c77ebd..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
-   libcdr/libcdr-0.0.11-encoding.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.11-encoding.patch 
b/libcdr/libcdr-0.0.11-encoding.patch
deleted file mode 100644
index 73fa58a..000
--- a/libcdr/libcdr-0.0.11-encoding.patch
+++ /dev/null
@@ -1,36 +0,0 @@
 a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, 
unsigned length)
- }
- unsigned numFonts = readU32(input);
- CDR_DEBUG_MSG((CDRParser::readStlt numFonts 0x%x\n, numFonts));
--std::mapunsigned,unsigned fontIds;
-+std::mapunsigned,unsigned short fontIds;
-+std::mapunsigned,unsigned short fontEncodings;
- std::mapunsigned,double fontSizes;
- for (i=0; inumFonts; ++i)
- {
-@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, 
unsigned length)
- input-seek(12, WPX_SEEK_CUR);
-   else
- input-seek(20, WPX_SEEK_CUR);
--  fontIds[fontStyleId] = readU32(input);
-+  fontIds[fontStyleId] = readU16(input);
-+  fontEncodings[fontStyleId] = readU16(input);
-   input-seek(8, WPX_SEEK_CUR);
-   fontSizes[fontStyleId] = readCoordinate(input);
-   if (m_version  1000)
-@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, 
unsigned length)
- }
- if (!fontRecordId)
-   continue;
--std::mapunsigned, unsigned::const_iterator iterFontId = 
fontIds.find(fontRecordId);
-+std::mapunsigned, unsigned short::const_iterator iterFontId = 
fontIds.find(fontRecordId);
- if (iterFontId != fontIds.end())
-   tmpCharStyle.m_fontId = iterFontId-second;
-+std::mapunsigned, unsigned short::const_iterator iterCharSet = 
fontEncodings.find(fontRecordId);
-+if (iterCharSet != fontEncodings.end())
-+  tmpCharStyle.m_charSet = iterCharSet-second;
- std::mapunsigned, double::const_iterator iterFontSize = 
fontSizes.find(fontRecordId);
- if (iterFontSize != fontSizes.end())
-   tmpCharStyle.m_fontSize = iterFontSize-second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svl/source/numbers/zforscan.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 53494630705692dec31587d746aa84d5d998c62f
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Apr 7 22:48:58 2013 +0200

Fix Array index i is used before limits check

Change-Id: Ie7a4b836db7391f4e625bfeaeab55c2ed4304604

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 24bfde3..43a4bbc 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1474,8 +1474,8 @@ bool ImpSvNumberformatScan::InsertSymbol( sal_uInt16  
nPos, svt::NfSymbolType e
 int ImpSvNumberformatScan::FinalScanGetCalendar( sal_Int32 nPos, sal_uInt16 
i,
  sal_uInt16 rAnzResStrings )
 {
-if ( sStrArray[i][0] == '[' 
- i  nAnzStrings-1 
+if ( i  nAnzStrings-1 
+ sStrArray[i][0] == '[' 
  nTypeArray[i+1] == NF_SYMBOLTYPE_STRING 
  sStrArray[i+1][0] == '~' )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fix typos

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3268

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/3268/1

fix typos

See https://gerrit.libreoffice.org/2444

Change-Id: Ia45a3e30a25692cc1f5de90363bd7fe2f427e0d7
---
M dbaccess/source/ui/querydesign/QueryTableView.cxx
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx 
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index cc79302..1971bcc 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -768,7 +768,7 @@
 DBG_CHKTHIS(OQueryTableView,NULL);
 OSL_ENSURE(pTabWin != NULL, OQueryTableView::RemoveTabWin : Window should 
not be NULL !);
 
-// I need my parent so it can be infomed about the deletion
+// I need my parent so it can be informed about the deletion
 OQueryDesignView* pParent = 
static_castOQueryDesignView*(getDesignView());
 
 SfxUndoManager rUndoMgr = m_pView-getController().GetUndoManager();
@@ -961,7 +961,7 @@
 }
 else
 {
-// Initiaisation failed
+// Initialisation failed
 // (for example when the Connection to the database is not 
available at the moment)
 pTabWin-clearListBox();
 delete pTabWin;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia45a3e30a25692cc1f5de90363bd7fe2f427e0d7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer ruderphil...@gmail.com

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

[PATCH libreoffice-4-0] Uploading libcdr-0.0.12: fixing fdo#62538 and fdo#53278

2013-04-07 Thread Fridrich Strba (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3269

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/3269/1

Uploading libcdr-0.0.12: fixing fdo#62538 and fdo#53278

Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff
(cherry picked from commit 29339357cfba19e80c3687639fe33e847d3e6f93)
---
M download.lst
M libcdr/UnpackedTarball_cdr.mk
D libcdr/libcdr-0.0.11-encoding.patch
3 files changed, 2 insertions(+), 44 deletions(-)



diff --git a/download.lst b/download.lst
index 0420af9..e0026dd 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := 107a3d18f637b342684b3c21eb0fcd7d
-export CDR_TARBALL := libcdr-0.0.11.tar.bz2
+CDR_MD5SUM := 6db2c96a4ae5977da8b84893c1441038
+export CDR_TARBALL := libcdr-0.0.12.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
 VISIO_MD5SUM := 92bde158f249b9b27f76f48cc65a0242
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 1c77ebd..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
-   libcdr/libcdr-0.0.11-encoding.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.11-encoding.patch 
b/libcdr/libcdr-0.0.11-encoding.patch
deleted file mode 100644
index 73fa58a..000
--- a/libcdr/libcdr-0.0.11-encoding.patch
+++ /dev/null
@@ -1,36 +0,0 @@
 a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -2415,7 +2415,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, 
unsigned length)
- }
- unsigned numFonts = readU32(input);
- CDR_DEBUG_MSG((CDRParser::readStlt numFonts 0x%x\n, numFonts));
--std::mapunsigned,unsigned fontIds;
-+std::mapunsigned,unsigned short fontIds;
-+std::mapunsigned,unsigned short fontEncodings;
- std::mapunsigned,double fontSizes;
- for (i=0; inumFonts; ++i)
- {
-@@ -2424,7 +2425,8 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, 
unsigned length)
- input-seek(12, WPX_SEEK_CUR);
-   else
- input-seek(20, WPX_SEEK_CUR);
--  fontIds[fontStyleId] = readU32(input);
-+  fontIds[fontStyleId] = readU16(input);
-+  fontEncodings[fontStyleId] = readU16(input);
-   input-seek(8, WPX_SEEK_CUR);
-   fontSizes[fontStyleId] = readCoordinate(input);
-   if (m_version  1000)
-@@ -2578,9 +2580,12 @@ void libcdr::CDRParser::readStlt(WPXInputStream *input, 
unsigned length)
- }
- if (!fontRecordId)
-   continue;
--std::mapunsigned, unsigned::const_iterator iterFontId = 
fontIds.find(fontRecordId);
-+std::mapunsigned, unsigned short::const_iterator iterFontId = 
fontIds.find(fontRecordId);
- if (iterFontId != fontIds.end())
-   tmpCharStyle.m_fontId = iterFontId-second;
-+std::mapunsigned, unsigned short::const_iterator iterCharSet = 
fontEncodings.find(fontRecordId);
-+if (iterCharSet != fontEncodings.end())
-+  tmpCharStyle.m_charSet = iterCharSet-second;
- std::mapunsigned, double::const_iterator iterFontSize = 
fontSizes.find(fontRecordId);
- if (iterFontSize != fontSizes.end())
-   tmpCharStyle.m_fontSize = iterFontSize-second;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org

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

Re: [Libreoffice-qa] Wiki pages cruft cleanup

2013-04-07 Thread Samuel Mehrbrodt


Hi,

the new page looks nice and clean, thanks for that.

An idea: Freedomsponsor has quite a few sponsored Issues: 
http://www.freedomsponsors.org/core/issue/?s=project_id=149project_name=LibreOffice


Do you think we should put a link to that list on the 
https://wiki.documentfoundation.org/Development page?

That might encourage volunteers to start one of those issues.

Samuel

Am 02.04.2013 11:45, schrieb Bjoern Michaelsen:

Hi,

I cleaned up:

  https://wiki.documentfoundation.org/Main_Page
  https://wiki.documentfoundation.org/Development
  https://wiki.documentfoundation.org/QA

and removed a lot of cruft on these pages. The intention was:
- To separate the 'get involved' section from the the 'tips and tricks'-stuff a
   la: 'If you run Lattice C on AmigaOS, might get a faster build by applying a
   few drops of rose water to your keyboard'
- the 'get involved' pages are now short an sweet and not some overwhelming,
   messy and confusing page containing a lot of auxilary infos that are mostly
   irrelevant for a new starter:
   - https://wiki.documentfoundation.org/QA/GetInvolved
   - https://wiki.documentfoundation.org/Development/GetInvolved
   Please ensure to keep them that way.
- contact data is much more visible: IRC, mailing list, calls.

Please help keeping the wiki somewhat clean and do not overload the
introductionary pages with information only revelant in a subset of scenarios.

Best,

Bjoern
___
List Name: Libreoffice-qa mailing list
Mail address: libreoffice...@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


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

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

2013-04-07 Thread Philipp Riemer

 dbaccess/source/ui/querydesign/QueryTableView.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 87f185d192668d233f6a8606b1c3d77469e17e04
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Sun Apr 7 22:50:28 2013 +0200

fix typos

See https://gerrit.libreoffice.org/2444

Change-Id: Ia45a3e30a25692cc1f5de90363bd7fe2f427e0d7
Reviewed-on: https://gerrit.libreoffice.org/3268
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx 
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index cc79302..1971bcc 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -768,7 +768,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
 DBG_CHKTHIS(OQueryTableView,NULL);
 OSL_ENSURE(pTabWin != NULL, OQueryTableView::RemoveTabWin : Window should 
not be NULL !);
 
-// I need my parent so it can be infomed about the deletion
+// I need my parent so it can be informed about the deletion
 OQueryDesignView* pParent = 
static_castOQueryDesignView*(getDesignView());
 
 SfxUndoManager rUndoMgr = m_pView-getController().GetUndoManager();
@@ -961,7 +961,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* 
pTabWin, OQueryTabWinUn
 }
 else
 {
-// Initiaisation failed
+// Initialisation failed
 // (for example when the Connection to the database is not 
available at the moment)
 pTabWin-clearListBox();
 delete pTabWin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fix typos

2013-04-07 Thread Fridrich Strba (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/3268

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia45a3e30a25692cc1f5de90363bd7fe2f427e0d7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer ruderphil...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED] Fixed 4 spelling errors in the comments.

2013-04-07 Thread Fridrich Strba (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/3164

Approvals:
  Andras Timar: Verified; Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic48f52d7ea4f6a4964f627e3051c96c46ffc2f76
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Golnaz Irannejad golnaziranne...@gmail.com
Gerrit-Reviewer: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Golnaz Irannejad golnaziranne...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[Libreoffice-commits] core.git: 11 commits - editeng/source filter/inc filter/source sd/source sw/source

2013-04-07 Thread Armin Le Grand

 editeng/source/uno/unonrule.cxx   |6 +
 filter/inc/filter/msfilter/svdfppt.hxx|9 +
 filter/source/msfilter/escherex.cxx   |  104 --
 filter/source/msfilter/svdfppt.cxx|   58 +++-
 sd/source/filter/eppt/epptso.cxx  |   31 +-
 sd/source/ui/animations/CustomAnimationDialog.cxx |   19 ++--
 sw/source/core/text/itrpaint.cxx  |   10 +-
 sw/source/filter/ww8/wrtww8.cxx   |   30 +-
 sw/source/filter/ww8/wrtww8gr.cxx |   17 +++
 sw/source/filter/ww8/ww8atr.cxx   |2 
 10 files changed, 237 insertions(+), 49 deletions(-)

New commits:
commit a72e3ed81a0d619b81074cb80d7ef9d3d11feda6
Author: Armin Le Grand a...@apache.org
Date:   Thu Sep 27 14:24:57 2012 +

Fix #121074# Added support for bitmap attributes

transparency, red, green, blue and gamma for ppt export
(cherry picked from commit df0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540)

Conflicts:
filter/source/msfilter/escherex.cxx

Change-Id: If413df9bac6d0144f6650f5d9ae99834f6a33642

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index e68b87e..330f7c0 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1008,11 +1008,6 @@ void 
EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
 ::com::sun::star::drawing::ColorMode eColorMode( 
::com::sun::star::drawing::ColorMode_STANDARD );
 sal_Int16 nLuminance = 0;
 sal_Int32 nContrast = 0;
-sal_Int16 nRed = 0;
-sal_Int16 nGreen = 0;
-sal_Int16 nBlue = 0;
-double fGamma = 1.0;
-sal_Int16 nTransparency = 0;
 
 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( GraphicColorMode ) ) )
 aAny = eColorMode;
@@ -1024,16 +1019,6 @@ void 
EscherPropertyContainer::ImplCreateGraphicAttributes( const ::com::sun::sta
 aAny = nC;
 nContrast = nC;
 }
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( AdjustRed ) ) )
-aAny = nRed;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( AdjustGreen ) ) )
-aAny = nGreen;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( AdjustBlue ) ) )
-aAny = nBlue;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( Gamma ) ) )
-aAny = fGamma;
-if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( Transparency ) ) )
-aAny = nTransparency;
 
 if ( eColorMode == ::com::sun::star::drawing::ColorMode_WATERMARK )
 {
@@ -1286,6 +1271,12 @@ sal_Bool 
EscherPropertyContainer::CreateGraphicProperties(
 OUStringaGraphicUrl;
 OString aUniqueId;
 boolbIsGraphicMtf(false);
+// #121074#
+sal_Int16 nTransparency(0);
+sal_Int16 nRed(0);
+sal_Int16 nGreen(0);
+sal_Int16 nBlue(0);
+double fGamma(1.0);
 
 ::com::sun::star::drawing::BitmapMode   eBitmapMode( 
::com::sun::star::drawing::BitmapMode_NO_REPEAT );
 ::com::sun::star::uno::Any aAny;
@@ -1365,6 +1356,33 @@ sal_Bool 
EscherPropertyContainer::CreateGraphicProperties(
 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( IsMirrored ), sal_True ) )
 aAny = bMirrored;
 
+// #121074# transparency of graphic is not supported in MS formats, 
get and apply it
+// in the GetTransformedGraphic call in GetBlibID
+if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, 
String(RTL_CONSTASCII_USTRINGPARAM(Transparency
+{
+aAny = nTransparency;
+}
+
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
String( RTL_CONSTASCII_USTRINGPARAM( AdjustRed ) ) ) )
+{
+aAny = nRed;
+}
+
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
String( RTL_CONSTASCII_USTRINGPARAM( AdjustGreen ) ) ) )
+{
+aAny = nGreen;
+}
+
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
String( RTL_CONSTASCII_USTRINGPARAM( AdjustBlue ) ) ) )
+{
+aAny = nBlue;
+}
+
+if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
String( RTL_CONSTASCII_USTRINGPARAM( Gamma ) ) ) )
+{
+aAny = fGamma;
+}
+
 if ( bCreateFillBitmap  bFillBitmapModeAllowed )
 {
 if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, 
OUString( FillBitmapMode ), sal_True ) )
@@ -1401,7 +1419,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 const sal_uInt16 nFormat = aDescriptor.GetFileFormat();
 
 // can MSO handle it?
-if ( bMirrored || nAngle ||
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e5/720990bd3691222363bb2d674b7d39a0d8829f

 e5/720990bd3691222363bb2d674b7d39a0d8829f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ca44b393cc3846a0c593bed7be484e15ebb5d44b
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:41:19 2013 +0200

Notes added by 'git notes add'

diff --git a/e5/720990bd3691222363bb2d674b7d39a0d8829f 
b/e5/720990bd3691222363bb2d674b7d39a0d8829f
new file mode 100644
index 000..9f28af4
--- /dev/null
+++ b/e5/720990bd3691222363bb2d674b7d39a0d8829f
@@ -0,0 +1 @@
+merged as: 7a90044df279e1ec2336e7c398fa938a6fa3ad56
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/1449731638d6432fb9adfef3a8a303ad9bf76b

 bf/1449731638d6432fb9adfef3a8a303ad9bf76b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9d70294bba1aa7f9b5609430abae48e03bc043a0
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:43:35 2013 +0200

Notes added by 'git notes add'

diff --git a/bf/1449731638d6432fb9adfef3a8a303ad9bf76b 
b/bf/1449731638d6432fb9adfef3a8a303ad9bf76b
new file mode 100644
index 000..5add976
--- /dev/null
+++ b/bf/1449731638d6432fb9adfef3a8a303ad9bf76b
@@ -0,0 +1 @@
+merged as: 461c262eb93412b46cc73a28932afdcbaeb34748
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 98/0ee15bad53f765a0df1a4507befc9184fc0c63

 98/0ee15bad53f765a0df1a4507befc9184fc0c63 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c2c8dc708956ec9a49b58830e9478654ce2d12e1
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:47:53 2013 +0200

Notes added by 'git notes add'

diff --git a/98/0ee15bad53f765a0df1a4507befc9184fc0c63 
b/98/0ee15bad53f765a0df1a4507befc9184fc0c63
new file mode 100644
index 000..785bb33
--- /dev/null
+++ b/98/0ee15bad53f765a0df1a4507befc9184fc0c63
@@ -0,0 +1 @@
+merged as: 8b5cd38aae487dc2a84a1ee0f56e25daca851b02
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/25f6c6441b49093504874925f37ca0e61f34f9

 70/25f6c6441b49093504874925f37ca0e61f34f9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dd33929cff532ace1979f8061490796bd74dd1fa
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:49:20 2013 +0200

Notes added by 'git notes add'

diff --git a/70/25f6c6441b49093504874925f37ca0e61f34f9 
b/70/25f6c6441b49093504874925f37ca0e61f34f9
new file mode 100644
index 000..857bda1
--- /dev/null
+++ b/70/25f6c6441b49093504874925f37ca0e61f34f9
@@ -0,0 +1 @@
+merged as: ad2651af85181235a0c3a44bf93d7ecb08dd9353
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f8/48fc9e9708916dd24fe64646486db0d90996c7

 f8/48fc9e9708916dd24fe64646486db0d90996c7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 92beb86e0816c6073001858e61d023f2b8d5c1e1
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:50:25 2013 +0200

Notes added by 'git notes add'

diff --git a/f8/48fc9e9708916dd24fe64646486db0d90996c7 
b/f8/48fc9e9708916dd24fe64646486db0d90996c7
new file mode 100644
index 000..98a94d2
--- /dev/null
+++ b/f8/48fc9e9708916dd24fe64646486db0d90996c7
@@ -0,0 +1 @@
+merged as: 7ec7a9a68b4a9c5600840a34434fc800cda3d815
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9b/4e6064f9598c834a9c36c39932f3e326419d44

 9b/4e6064f9598c834a9c36c39932f3e326419d44 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 93d7daff88a5b9d7f71947e73f5813f65ca3d327
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:51:30 2013 +0200

Notes added by 'git notes add'

diff --git a/9b/4e6064f9598c834a9c36c39932f3e326419d44 
b/9b/4e6064f9598c834a9c36c39932f3e326419d44
new file mode 100644
index 000..3499ad6
--- /dev/null
+++ b/9b/4e6064f9598c834a9c36c39932f3e326419d44
@@ -0,0 +1 @@
+merged as: b86cf0421b432ebbf964960f0fcd2e6a5360f979
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/969d29b354467c659abe79541a4f5e7b92b0ef

 00/969d29b354467c659abe79541a4f5e7b92b0ef |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 87394af36200274aaf94226e2ec71db6bcfb245c
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:52:32 2013 +0200

Notes added by 'git notes add'

diff --git a/00/969d29b354467c659abe79541a4f5e7b92b0ef 
b/00/969d29b354467c659abe79541a4f5e7b92b0ef
new file mode 100644
index 000..2a8f545
--- /dev/null
+++ b/00/969d29b354467c659abe79541a4f5e7b92b0ef
@@ -0,0 +1 @@
+merged as: ed6d89dd55cff5ca91ecbfc8716a4e6c584be165
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540

 df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 47fde97af3fe04d9a3e87b1af1847ffa127c
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun Apr 7 23:53:34 2013 +0200

Notes added by 'git notes add'

diff --git a/df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540 
b/df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540
new file mode 100644
index 000..f461b8f
--- /dev/null
+++ b/df/0f83c87148769ca7cbcfc3d1cb9ccf9d5c0540
@@ -0,0 +1 @@
+merged as: a72e3ed81a0d619b81074cb80d7ef9d3d11feda6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - vcl/coretext vcl/inc vcl/quartz

2013-04-07 Thread Tor Lillqvist

 vcl/coretext/salcoretextfontutils.cxx |   16 +
 vcl/coretext/salcoretextlayout.cxx|  287 +++---
 vcl/coretext/salcoretextstyle.cxx |   22 +-
 vcl/inc/coretext/common.h |9 -
 vcl/inc/coretext/salcoretextstyle.hxx |7 
 vcl/inc/quartz/utils.h|3 
 vcl/quartz/utils.cxx  |   38 
 7 files changed, 247 insertions(+), 135 deletions(-)

New commits:
commit 764e8a05ca5fb2f1335c5b5e96142f651de8c640
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Apr 8 02:12:41 2013 +0300

Refactoring, no change in end result

Change-Id: I18cb4e00b86e25f299b897a1a71c1d7d68d8309d

diff --git a/vcl/coretext/salcoretextlayout.cxx 
b/vcl/coretext/salcoretextlayout.cxx
index 1de073f..4765076 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -53,8 +53,16 @@ public:
 virtual void Simplify( bool bIsBase );
 
 private:
+void GetMeasurements();
 void InvalidateMeasurements();
-bool InitGIA( ImplLayoutArgs rArgs ) const;
+void ApplyDXArray( ImplLayoutArgs );
+void Justify( long );
+
+#ifndef NDEBUG
+int mnSavedMinCharPos;
+int mnSavedEndCharPos;
+sal_Unicode *mpSavedStr;
+#endif
 
 QuartzSalGraphics* mpGraphics;
 CoreTextStyleInfo* mpStyle;
@@ -88,6 +96,9 @@ private:
 };
 
 CoreTextLayout::CoreTextLayout(QuartzSalGraphics* graphics, CoreTextStyleInfo* 
style) :
+#ifndef NDEBUG
+mpSavedStr(NULL),
+#endif
 mpGraphics(graphics),
 mpStyle(style),
 mnCharCount(-1),
@@ -112,6 +123,11 @@ CoreTextLayout::CoreTextLayout(QuartzSalGraphics* 
graphics, CoreTextStyleInfo* s
 CoreTextLayout::~CoreTextLayout()
 {
 InvalidateMeasurements();
+SafeCFRelease(mpTypesetter);
+SafeCFRelease(mpLine);
+#ifndef NDEBUG
+delete[] mpSavedStr;
+#endif
 SAL_INFO( vcl.coretext.layout, ~CoreTextLayout(  this  ) );
 }
 
@@ -119,16 +135,45 @@ void CoreTextLayout::AdjustLayout( ImplLayoutArgs rArgs )
 {
 SAL_INFO( vcl.coretext.layout, AdjustLayout(  this  ,rArgs=  
rArgs  ) );
 
-InvalidateMeasurements();
+#ifndef NDEBUG
+assert( mnSavedMinCharPos == rArgs.mnMinCharPos );
+assert( mnSavedEndCharPos == rArgs.mnEndCharPos );
+assert( memcmp( mpSavedStr[mnSavedMinCharPos],
+rArgs.mpStr[mnSavedMinCharPos],
+(mnSavedEndCharPos - mnSavedMinCharPos) * sizeof( 
sal_Unicode ) ) == 0 );
+#endif
+
 SalLayout::AdjustLayout( rArgs );
-mnCharCount = mnEndCharPos - mnMinCharPos;
-InitGIA( rArgs );
+
+// adjust positions if requested
+if( rArgs.mpDXArray )
+ApplyDXArray( rArgs );
+else if( rArgs.mnLayoutWidth )
+Justify( rArgs.mnLayoutWidth );
+else
+return;
 }
 
-void CoreTextLayout::InvalidateMeasurements()
+void CoreTextLayout::ApplyDXArray( ImplLayoutArgs rArgs )
+{
+Justify( rArgs.mpDXArray[mnCharCount-1] );
+}
+
+void CoreTextLayout::Justify( long nNewWidth )
 {
-SAL_INFO( vcl.coretext.layout, InvalidateMeasurements(  this  ) 
);
+CTLineRef justifiedLine = CTLineCreateJustifiedLine( mpLine, 1.0, 
nNewWidth );
+if ( !justifiedLine ) {
+SAL_INFO( vcl.coretext.layout, ApplyDXArray(): 
CTLineCreateJustifiedLine() failed );
+} else {
+CFRelease( mpLine );
+mpLine = justifiedLine;
+}
+
+GetMeasurements();
+}
 
+void CoreTextLayout::InvalidateMeasurements()
+{
 if( mpGlyphs ) {
 delete[] mpGlyphs;
 mpGlyphs = NULL;
@@ -149,8 +194,6 @@ void CoreTextLayout::InvalidateMeasurements()
 delete[] mpGlyphPositions;
 mpGlyphPositions = NULL;
 }
-SafeCFRelease(mpTypesetter);
-SafeCFRelease(mpLine);
 mbHasBoundRectangle = false;
 }
 
@@ -227,25 +270,22 @@ void CoreTextLayout::DropGlyph( int /*nStart*/ )
 
 long CoreTextLayout::FillDXArray( sal_Int32* pDXArray ) const
 {
-SAL_INFO( vcl.coretext.layout, FillDXArray(  this  ) );
-
-// short circuit requests which don't need full details
+// Short circuit requests which don't need full details
 if( !pDXArray ) {
-SAL_INFO( vcl.coretext.layout, FillDXArray() returning 
GetTextWidth() );
 return GetTextWidth();
 }
 
-// distribute the widths among the string elements
+// Distribute the widths among the string elements
 long width = 0;
 float scale = mpStyle-GetFontStretchFactor();
-CGFloat accumulated_width = 0;
+CGFloat accumulatedWidth = 0;
 
 std::ostringstream DXArrayInfo;
 for( int i = 0; i  mnCharCount; ++i ) {
-// convert and adjust for accumulated rounding errors
-accumulated_width += mpCharWidths[ i ];
+// Convert and adjust for accumulated rounding errors
+accumulatedWidth += mpCharWidths[ i ];
 const long old_width = width;
-width = round_to_long( accumulated_width * scale );
+width = round_to_long( accumulatedWidth * scale );
 pDXArray[i] = width - old_width;
 #ifdef SAL_LOG_INFO

Re: [Libreoffice-qa] How to change QA processes: was: What should we do with bugs filed against Extensions/Templates?

2013-04-07 Thread Rainer Bielefeld


Petr Mladek schrieb:


Ah, this sounds pretty bossy.


Hi,

yes, may be. My tone reflects my exception. I see too much unqualified 
discussion. Before thinking about changes everybody should have have 
understood the current system, why it is how it is? With such a base 
improvement seems more promising I know, that sounds rather obdurate, as 
I would want to defend my creation against any change. That's wrong. 
But I am such kind of Swiss wrist watch maker. 50 years ago that was an 
admired art, today it's considered spinning mills.


Quality Assurance has to do something with quality, and we have to 
observe and grant the quality of your own work. And here I have serious 
concerns.


Let's take Bug 63210 - EDITING: Superscript Defaults incorrect. Joel, 
please excuse me for taking that example, it was the first but I saw 
this morning in my New bug reports folder, and it's a typical one for 
observations I see with rising number in the last months. The goal seems 
to be to get the reports out of the QA process as quick as possible 
(because we have so many untouched reports), but I do not like that way, 
that only increases the amount of unfixed confirmed bugs. If we cans 
save 5 developer minutes at each bugs with careful research, that's a 
potential of 55 hours for the 679 bugs what changed to NEW in March 
2013. That's 1 work of week for a busy developer!


It has status NEW, what means ready for bugfixing,
https://wiki.documentfoundation.org/QA/BugTriage#Step_5._Set_Status 
item 1, but I believe it's not:


a) We have a report without info concerning Version and OS, and a 
confirmation for 1 Linux distribution. So current knowledge (for the 
moment) seems to indicate a LINUX problem? Should the report leave QA 
process (NEW) without having this corrected or at least mentioned? 
Well, I confirm that for WIN, and so finally the found OS selection is 
correct, but without reasoning that's simply wrong. Reporter should be 
asked for related info.


b) In between we have 3.6.6.2, what might be the next release. Shouldn't 
be checked whether the problem has been solved in between?


c) This problem is text language related (of course), in German text 
language this auto correct does not exist. That might lead to the roots 
of the problem, I would have liked to find out where that problem started.


d) It should be stated that the problem is limited to Enter after the 
date, works fine if you simply type a space or even after 
Shift+Enter or Control+Enter.	


e) Not only Writer is affected, same in Calc with Control+Enter and 
Draw (and so probably Impress), might also appear in Base.


f) The summary line still has that meaningless incorrect. After QA it 
should be AUTOCORRECT: Superscript of English ordinal number suffixes 
continued behind 'Enter' directly after suffix. Or similar!
Queries for DUPs really are painful if you have lots of bugs only 
distinguishable by the words improperly and incorrect in Summary.


g) Back to versions: This worked fine in 3.3.3, so it seems interesting 
to know where this problem appeared? And it's a regression.


h) The example in the report seems a little misleading to me because of 
the parenthesis around the date. The screenshot shows what reporter 
typed, but I would have mentioned what I typed exactly (well, this is 
splitting hairs)


i) May be I even would have tested whether the bug persists with new 
User Profile? But I doubt that it's related and so I think I would have 
written I doubt that it's profile related


k) And after having added all this information I would think about 
adding András to CC. I agree with minor rating and we should not 
bother developers with too many odds and ends, but on the other hand a 
known bug can be integrated into the work flow for a fix some later.


l) And I would have thought about an enhancement request for localized 
list numbering with correct localized ordinary numbers, but that already 
is quite a different thing.


And so back to the beginning. I like to co work with Swiss wrist watch 
makers, these guys who know for every of their actions at work why they 
do it exactly how they do it, and who always check whether there is a 
possibility how they could do better.


The question is whether there is a place for these people in the LibO 
community. From my point of view, at some places I see too much 
actionism instead of careful work and enhancement (beneath a lot of good 
work, of course), and that's a pain for me. We Swiss wristwatch makers 
need a wristwatch maker workshop with wristwatch makers tools, and I 
doubt that this workplace will be kept in the LibO project. I will not 
change the principles of my way of working, when my workplace will have 
vanished I will not whine, but simply move to a new place where I can 
work with congenial colleagues.


Of course I should have mentioned that I like the efforts to interest 
more people for bug wrangling, the cleanup in the QA wiki, the thoughts 
ofa more

Re: [Libreoffice-qa] Windows 8 Tester for FDO#63215 (crasher)

2013-04-07 Thread Pedro

Answered on the Bugzilla report





--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Windows-8-Tester-for-FDO-63215-crasher-tp4048318p4048344.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Windows 8 Tester for FDO#63215 (crasher)

2013-04-07 Thread Jay Lozier


On 04/07/2013 07:03 AM, Pedro wrote:

Answered on the Bugzilla report





--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Windows-8-Tester-for-FDO-63215-crasher-tp4048318p4048344.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Answered on Bugzilla report - using Linux Mint and 4.0.2.1 and unable to 
replicate reported problems.


--
Jay Lozier
jsloz...@gmail.com

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] [Moztrap] Can someone explain test case #122 to me?

2013-04-07 Thread Thomas Hackert

Hello Yifan, *,
during my translation I stumble upon test case #122
(http://vm12.documentfoundation.org/manage/case/122/) and downloaded the
attached file
(http://manual-test.libreoffice.org/media/attachments/2012/09/12/LibreO_qaTest_ConditionalFormatting_3-5-5-3_en.ods).

But either my English is too bad or maybe I found a bug, but when I
follow the instructions in the test case, I can only see one change in
the file: In LO Version 4.0.2.2 (Build ID:
4c82dcdd6efcd48b1d8bba66bfe1989deee49c3) under Debian Testing AMD64 I
see only cell H6 (column #4) changing its background colour ... :(

Now I am not sure, if there is something wrong on my system, the file
and/or the description in the test case ... :(

For any clearance and help I would be really thankful :)
Have a nice evening
Thomas.

-- 
NP: Volbeat – Devil Or The Blue Cat’s Song
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [Moztrap] Can someone explain test case #122 to me?

2013-04-07 Thread mariosv

Hi Thomas, I did the test, and certain that the bad English is mine.

Basically changing the values:
- in column #6 must change the background color in column #4 from green to
blank.
- in column #10 must change the background color in column #13 from salmon
to green.
- in column #15 must change the background color in column #13 from salmon
to blank.

Seems to work fine, except a crash the first time doing the test.
Win7x64Ult, Version 4.0.2.2 (Build ID:
4c82dcdd6efcd48b1d8bba66bfe1989deee49c3)

Miguel Ángel



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Moztrap-Can-someone-explain-test-case-122-to-me-tp4048378p4048383.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] LibreOffice help update?

2013-04-07 Thread mariosv

Hi all,

sometimes, trying to help other users, I like to give them the reference
where to find in the help about what are they looking for, etc.?. And always
I can, I recommended to have a quick read of the help to know what is there,
specially with new user.

But with more enhancements introduced, I begun to find that this is no
possible, because the help is not updated.

Why is I have done an analysis about what enhancements, detailed in 4.0 New
Features page
(https://www.libreoffice.org/download/4-0-new-features-and-fixes), have been
updated in the help. And unfortunately, the results are what I was afraid.
nabble_a

The analysis is tabulate in the joined spreadsheet.
lt;nabble_a
href=quot;QA_Analysis_New_4-0_Features_in_LibreOffice_Help.odsquot;QA_Analysis_New_4-0_Features_in_LibreOffice_Help.ods

IMVHO, the enhancements, should not be in final release without the help
properly updated.
Because if the help is not the reference, where is the reference?.
How can no one to know what is there?.
Is it right? we all trying to know how the new announced enhancements works.
How can we know when there is a bug or is the expected result?
How can we do an QA test without know in detail the enhancement?.
Why not mandatory to introduce the enhancements, update the help?
So again IMVHO what is not in help is like it does not exist in program.

I think I have read time ago in the net, about how difficult is maintain the
help system. But if this is not done then I think we are going to nowhere.

I hope some progress can be done here.

Regards.
Miguel Ángel.

--
View this message in context:
http://nabble.documentfoundation.org/LibreOffice-help-update-tp4048388.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] QA Wiki Cleanup - Any Pages not Under ../QA/..?

2013-04-07 Thread Robinson Tryon

On Sat, Apr 6, 2013 at 11:58 PM, Marc Paré m...@marcpare.com wrote:
 Le 05/04/13 05:31 PM, Joel Madero a écrit :

 Hi All,

 Qubit has done a tremendous amount of work in the past couple days
 moving QA related wiki pages to their appropriate location (../QA/..) vs
 under root of wiki or elsewhere. Is anyone aware of pages that should be
 under QA header but currently are not? If so please let us know so that
 we can get them moved.

 Also note that we are starting to formalize some of our processes, we've
 moved to a much cleaner agenda/minutes setup:

 https://wiki.documentfoundation.org/QA/Meetings


 Thanks Qubit again for the great work!
 ...
 I am just curious, who is Qubit?

*waves*

I'm 'qubit' on most sites, but 'colonelqubit' on Freenode
:-)

-- Robinson 'qubit' Tryon
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Bugzilla administration - Possible Duplicates search logic

2013-04-07 Thread V Stuart Foote

OK, nevermid...

Was checking on this getting ready to submit a bug.  

Discovered that the search logic for the Bugzilla Possible Duplicates
suggestions is already NOT case sensitive.  
Also that entering either File Association or file association provided
the same result including return of the earlier  fdo#44462 issue.

Not sure why @Pedro did not get the possible duplicate suggestion from
Bugzilla,  but the way to work with it does seem to be to complete the
summary field with a few key words--i.e. less is better for the matching
routines, and if none match  to then expand the summary fully and proceed
with bug submission.

Lesson learned on my part.  HTH

Stuart



--
View this message in context: 
http://nabble.documentfoundation.org/Bugzilla-administration-Possible-Duplicates-search-logic-tp4047904p4048417.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] QA Wiki Cleanup - Any Pages not Under ../QA/..?

2013-04-07 Thread Marc Paré


Le 07/04/13 07:24 PM, Italo Vignoli a écrit :

Il 07/04/2013 20:00, Robinson Tryon ha scritto:


I'm 'qubit' on most sites, but 'colonelqubit' on Freenode


I have met Robinson at LibrePlanet in Boston, and he is really a great 
guy.


Thanks for the note Italo, all these people who need to meet face to 
face. I know that we should all meet at the LibOCon once a year. I am 
organizing in the hopes of going to the meet in Italy, but not sure if 
my body will let me go yet. Sorry I missed you in Boston for the same 
reasons.


Maybe I will have the chance to meet Robinson sometime at another 
N.American conference in the near future.


Cheers,

Marc

--
Marc Paré
m...@marcpare.com
http://www.parEntreprise.com
parEntreprise.com Supports OpenDocument Formats (ODF)
parEntreprise.com Supports http://www.LibreOffice.org

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] QA Wiki Cleanup - Any Pages not Under ../QA/..?

2013-04-07 Thread Robinson Tryon

On Sun, Apr 7, 2013 at 8:56 PM, Marc Paré m...@marcpare.com wrote:
 Le 07/04/13 07:24 PM, Italo Vignoli a écrit :

 Il 07/04/2013 20:00, Robinson Tryon ha scritto:

 I'm 'qubit' on most sites, but 'colonelqubit' on Freenode


 I have met Robinson at LibrePlanet in Boston, and he is really a great
 guy.

It was nice to have a chance to chat with Italo at LibrePlanet. Audio
and video conferencing are a neat trick, but nothing really beats
sitting down in person!

 Thanks for the note Italo, all these people who need to meet face to face. I
 know that we should all meet at the LibOCon once a year. I am organizing in
 the hopes of going to the meet in Italy, but not sure if my body will let me
 go yet. Sorry I missed you in Boston for the same reasons.

I'm not sure about getting to the LibOCon this year as the flights are
a bit expensive, but perhaps in the future if I have an employer who
is willing to sponsor such trips :-)

 Maybe I will have the chance to meet Robinson sometime at another N.American
 conference in the near future.

Yes, that would be grand! Are we planning on having a LibreOffice
presence at any other N.A. conferences this year?

--R
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [Moztrap] Can someone explain test case #122 to me?

2013-04-07 Thread Yifan Jiang

Hi Thomas,

The translation style looks beautiful, it is fancy to see how the
progress is being made :) Thanks a lot for your effort!

For the conditional formatting case particularly, let's take a look at
left hand side of the sheet (ONE condition by cell).

The idea is cells background color in Column H is conditionally
formatted, according to numeric comparison between cells in Column F
and J in the same row. Meanwhile the numeric comparison is defined by
Column I.

For example, for a random row 11, the test case indicates background
color of the cell H11 should be green when F11 (value 2)  J11 (
adjustable value 3). Otherwise when F11 (value 2) = J11 (adjustable
value 0), the background color of H11 should be none.

Actually all steps are following the ideas above, we simply do similar
kind of check for each rows in both left-hand side area (left to
column N) and right-hand side area (right to column O).

However the test case was described in a generic way to save the
wording length. May be this brings some confusing?

In addition, I tested the case myself with a master build and did not
find problems:

Version 4.1.0.0.alpha0+ (Build ID: 0552b4334c2fb6b130ec05934b952b60418aadc)

Hope these information helps better understanding :)

Best wishes,
Yifan

On Sun, Apr 07, 2013 at 05:57:05PM +0200, Thomas Hackert wrote:
 Hello Yifan, *,
 during my translation I stumble upon test case #122
 (http://vm12.documentfoundation.org/manage/case/122/) and downloaded the
 attached file
 (http://manual-test.libreoffice.org/media/attachments/2012/09/12/LibreO_qaTest_ConditionalFormatting_3-5-5-3_en.ods).
 
 But either my English is too bad or maybe I found a bug, but when I
 follow the instructions in the test case, I can only see one change in
 the file: In LO Version 4.0.2.2 (Build ID:
 4c82dcdd6efcd48b1d8bba66bfe1989deee49c3) under Debian Testing AMD64 I
 see only cell H6 (column #4) changing its background colour ... :(
 
 Now I am not sure, if there is something wrong on my system, the file
 and/or the description in the test case ... :(
 
 For any clearance and help I would be really thankful :)
 Have a nice evening
 Thomas.
 
-- 
  Yifan Jiang
  Libreoffice / SUSE
  Contact: yifan - irc.freenode.net/libreoffice
  =  
  http://www.libreoffice.org/
  http://www.documentfoundation.org/

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 63213] problemas al imprimir

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |INVALID
 CC||jmadero@gmail.com

--- Comment #1 from Joel Madero jmadero@gmail.com ---
Marking as INVALID. FDO policy is that all bugs shall be reported in English.
If you need help with translating please go to your locales mailing list and
ask someone to do so. Thank you for your understanding.

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

[Libreoffice-bugs] [Bug 62442] OSX 10.8.3 refuses to open LibreOffice

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

--- Comment #14 from papayes jy...@free.fr ---
hello,
I have the same problem whith LibO 4.0.2.2 and MacOS X 10.8.3
After the installation of LibreOffice_40.2_MacOS_x86_langpack_fr.dmg,
the same message of fider 
LibreOffice est endommagé et ne peut pas être ouvert. Vous devriez placer cet
élément dans la Corbeille.

No problem with MacPPC or Windows 7 or 8

But without installing langpack_fr, only whith LibreOffice_40.2_MacOS_x86.dmg
159 MB, no message. I can open LibO in US.
I see in Extension Manager :
English spelling dictionaries, hyphenation rules, thesa... 2011.12.05.1
Error: The status of this extension is unknown !

If I want to add the extension lo-oo-ressources-linguistiques-fr-v4-10.oxt
i have this message :
(com.sun.star.lang.Disposed Exception){{{Message= Binary URP bridge disposed
during call, Content = (com.sun.star.uno.XInterface) @1c2a6020}}}

Note : Hash is OK, (6 download for tests)
install without or not 3.6.5 installed 
with or not profile, plists or script.savedState.

Repair of the authorization and 3 scripts makes 5 times...
before and after desinstallaion of LibO 4.2.0 

I reinstalled 3.6.5 : all is OK !

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

[Libreoffice-bugs] [Bug 62442] OSX 10.8.3 refuses to open LibreOffice

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

--- Comment #15 from papayes jy...@free.fr ---
Created attachment 77546
  -- https://bugs.freedesktop.org/attachment.cgi?id=77546action=edit
4.0.2.2 US on MacOsX 10.8.3 English dictionaries unknown

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

[Libreoffice-bugs] [Bug 62442] OSX 10.8.3 refuses to open LibreOffice

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

--- Comment #16 from papayes jy...@free.fr ---
Created attachment 77547
  -- https://bugs.freedesktop.org/attachment.cgi?id=77547action=edit
ERROR Extension Manager Add French Dictionnary V-0.4.10

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

[Libreoffice-bugs] [Bug 63210] EDITING: Superscript Defaults incorrect

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
   Severity|normal  |minor
   Priority|medium  |low
 CC||jmadero@gmail.com
 Ever confirmed|0   |1

--- Comment #1 from Joel Madero jmadero@gmail.com ---
Thank you for reporting this issue! I have been able to confirm the issue on:
Version 3.6.5.2 
Platform: Bodhi Linux 2.2 x64
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 
As I've been able to confirm this problem on an earlier release I am changing
the version number as version is the earliest version that we can confirm the
bug, we use comments to say that the bug exists in newer versions as well.

Marking as:

New (confirmed)
Minor - doesn't prevent high quality work but slows it down
Low - default for minor bugs, seems appropriate


+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 
LibreOffice is powered by a team of volunteers, every bug is confirmed
(triaged) by human beings who mostly give their time for free. We invite you to
join our triaging by checking out this link:
https://wiki.documentfoundation.org/QA/BugTriage

There are also other ways to get involved including with marketing, UX,
documentation, and of course developing - 
http://www.libreoffice.org/get-help/mailing-lists/. 

Lastly, good bug reports help tremendously in making the process go smoother,
please always provide reproducible steps (even if it seems easy) and attach any
and all relevant material

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

[Libreoffice-bugs] [Bug 63210] EDITING: Superscript Defaults incorrect

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

   Hardware|Other   |All
Version|unspecified |3.6.5.2 release

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

[Libreoffice-bugs] [Bug 56880] EDITING: Dingbats Don't Stick in .xlsx

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

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 Whiteboard|BSA |BSA target:4.1.0
 CC||cedric.bosdonnat.ooo@free.f
   ||r, mst...@redhat.com

--- Comment #7 from Julien Nabet serval2...@yahoo.fr ---
CAJ: for your information, according to this link
https://wiki.documentfoundation.org/ReleasePlan#4.1_release, the first 4.1, so
4.1.0, will be published in the end of July.

Cédric/Michael: any idea of the patch(es) which would be to cherry-pick in 4.0
branch?

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

[Libreoffice-bugs] [Bug 62442] OSX 10.8.3 refuses to open LibreOffice

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

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 CC||b...@eikota.de,
   ||ipla...@yahoo.co.uk

--- Comment #17 from Julien Nabet serval2...@yahoo.fr ---
papayes: thank you for your feedback. I put the tracker at New since it's
confirmed.

Roman/Alex: would you have some time to take a look to this MacOs bug? The goal
is to know if it's specific to 10.8 or not.

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

[Libreoffice-bugs] [Bug 63222] New: Embedded Movie File has Green Border