[Libreoffice-commits] .: desktop/source

2011-10-31 Thread Stephan Bergmann 
 desktop/source/deployment/registry/dp_backend.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 0c13fbb5bd4cbb0dd8c26b6a168d22a695dd11d6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Oct 31 09:04:33 2011 +0100

Improved an OSL_FAIL.

diff --git a/desktop/source/deployment/registry/dp_backend.cxx 
b/desktop/source/deployment/registry/dp_backend.cxx
index cbb0bf5..672364d 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -677,8 +677,13 @@ void Package::processPackage_impl(
  xCmdEnv );
 }
 }
-catch (RuntimeException ) {
-OSL_FAIL( ### unexpected RuntimeException! );
+catch (RuntimeException e) {
+(void) e; // avoid warnings
+OSL_FAIL(
+OSL_FORMAT(
+unexpected RuntimeException \%s\,
+(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).
+ getStr(;
 throw;
 }
 catch (CommandFailedException ) {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - swext/mediawiki sysui/desktop

2011-10-31 Thread Andras Timar 
 swext/mediawiki/help/wikiaccount.xhp |2 +-
 sysui/desktop/man/unopkg.1   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cedad6e08b5b820e2cb295ddebd431f576fb6f18
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 12:16:39 2011 +0100

change wiki's address

diff --git a/swext/mediawiki/help/wikiaccount.xhp 
b/swext/mediawiki/help/wikiaccount.xhp
index 3254de7..b27ea09 100644
--- a/swext/mediawiki/help/wikiaccount.xhp
+++ b/swext/mediawiki/help/wikiaccount.xhp
@@ -49,7 +49,7 @@
 paragraph role=paragraph id=par_id1113010 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenEnter your password on the 
MediaWiki server. Leave empty for anonymous 
access./ahelp/paragraphcommentSave password/comment
 bookmark xml-lang=en-US 
branch=hid/com.sun.star.wiki.MediaWiki.EditSetting.SaveBox id=bm_id4558247 
localize=false/
 paragraph role=paragraph id=par_id656758 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenEnable to store your password 
between sessions. The master password must be enabled, see item 
type=menuitemTools - Options - %PRODUCTNAME - 
Security/item./ahelp/paragraph
-paragraph role=paragraph id=par_id3112582 xml-lang=en-US 
l10n=NEWEnter the Internet address of a Wiki server in a format like 
http://wiki.services.openoffice.org/wiki or copy the URL from a web 
browser./paragraph
+paragraph role=paragraph id=par_id3112582 xml-lang=en-US 
l10n=NEWEnter the Internet address of a Wiki server in a format like 
http://wiki.documentfoundation.org or copy the URL from a web 
browser./paragraph
 paragraph role=paragraph id=par_id628070 xml-lang=en-US l10n=NEWIf 
the Wiki allows anonymous access, you can leave the account text boxes empty. 
Else enter your user name and password./paragraph
 paragraph role=paragraph id=par_id9046601 xml-lang=en-US l10n=NEWIf 
you have enabled the master password feature on the Security tab page of the 
Tools - Options - %PRODUCTNAME dialog, then the software can store your 
password and automatically insert the data where necessary. Enable the Save 
password checkbox to store your password./paragraph
 /body
commit ff290dac977017f6c5114077f28f668432b7180a
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 12:15:35 2011 +0100

change address of extensions' website

diff --git a/sysui/desktop/man/unopkg.1 b/sysui/desktop/man/unopkg.1
index b98a30d..dad74dd 100644
--- a/sysui/desktop/man/unopkg.1
+++ b/sysui/desktop/man/unopkg.1
@@ -25,7 +25,7 @@ LibreOffice is a fully featured office suite for the daily 
use with all
 features you would normally expect in an office suite.
 
 There exists many LibreOffice extensions all over the word. For example, see
-\fBhttp://extensions.services.openoffice.org/\fR
+\fBhttp://extensions.libreoffice.org/\fR
 
 This tool allows to manage the extensions from the command line.
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: reportbuilder/util

2011-10-31 Thread Stephan Bergmann 
 reportbuilder/util/makefile.mk |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit b67ae8dd02a1b9aeb35ef123017d8c02d1d8aaf5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Oct 31 12:39:38 2011 +0100

Make sure COMPONENT_EXTJARFILES are included in report-builder.oxt.

diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 8e838e7..c099efb 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -86,12 +86,13 @@ COMPONENT_HELP= \
 
 # .jar files from solver
 COMPONENT_EXTJARFILES = \
-$(EXTENSIONDIR)$/sun-report-builder.jar
\
+$(EXTENSIONDIR)$/sun-report-builder.jar
+COMPONENT_EXTJARFILES_COPY = \
 $(OUTDIR)$/bin$/reportbuilderwizard.jar
 
 .IF $(SYSTEM_JFREEREPORT) != YES
 .INCLUDE :  $(OUTDIR)/bin/jfreereport_version.mk
-COMPONENT_EXTJARFILES += \
+COMPONENT_EXTJARFILES_COPY += \
 $(OUTDIR)$/bin$/flute-$(FLUTE_VERSION).jar 
\
 $(OUTDIR)$/bin$/libserializer-$(LIBSERIALIZER_VERSION).jar 
\
 $(OUTDIR)$/bin$/libbase-$(LIBBASE_VERSION).jar \
@@ -105,7 +106,7 @@ COMPONENT_EXTJARFILES += \
 $(OUTDIR)$/bin$/sac.jar
 .ENDIF
 .IF $(SYSTEM_APACHE_COMMONS) != YES
-COMPONENT_EXTJARFILES += \
+COMPONENT_EXTJARFILES_COPY += \
 $(OUTDIR)$/bin$/commons-logging-1.1.1.jar
 .ENDIF
 
@@ -113,7 +114,7 @@ COMPONENT_MANIFEST_GENERIC:=TRUE
 COMPONENT_MANIFEST_SEARCHDIR:=registry
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) 
$(COMPONENT_OTR_FILES) $(COMPONENT_HELP) $(COMPONENT_IMAGES)
+EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied 
$(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) 
$(COMPONENT_IMAGES)
 .ENDIF
 # --- Targets --
 
@@ -144,6 +145,11 @@ $(COMPONENT_HELP) : $$(@:f)
 $(DESCRIPTION_SRC): description.xml
 +-$(RM) $@
 $(TYPE) description.xml | $(SED) s/#VERSION#/$(EXTENSION_VERSION)/  $@
+
+$(MISC)/$(TARGET).copied: $(COMPONENT_EXTJARFILES_COPY)
+@@-$(MKDIRHIER) $(EXTENSIONDIR)
+: $(foreach,i,$(COMPONENT_EXTJARFILES_COPY)  $(COPY) $i $(EXTENSIONDIR)/)
+$(TOUCH) $@
 .ENDIF
 .ELSE  # $(SOLAR_JAVA)!=
 .INCLUDE : target.mk
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2011-10-31 Thread Michael Meeks 
 vcl/unx/gtk/app/gtksys.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c8278a72b36adfd7f0a44dbedc558961dfd0dd24
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Oct 31 14:15:02 2011 +

gtk: tolerate NULL from gdk_screen_get_monitor_plug_name

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index b752cce..dbe1c47 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -118,7 +118,7 @@ static int _fallback_get_primary_monitor (GdkScreen 
*pScreen)
 for (int i = 0; i  max  ret  0; i++)
 {
 char *name = gdk_screen_get_monitor_plug_name (pScreen, i);
-if (!g_ascii_strncasecmp (name, LVDS, 4))
+if (name  !g_ascii_strncasecmp (name, LVDS, 4))
 ret = i;
 g_free (name);
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source

2011-10-31 Thread Andras Timar 
 sdext/source/minimizer/description-en-US.txt  |2 +
 sdext/source/minimizer/description.xml|2 -
 sdext/source/minimizer/help/component.txt |2 -
 sdext/source/minimizer/makefile.mk|   24 --
 sdext/source/pdfimport/config/component.txt   |1 
 sdext/source/pdfimport/config/description.xml |   33 --
 sdext/source/pdfimport/description-en-US.txt  |1 
 sdext/source/pdfimport/description.xml|   33 ++
 sdext/source/pdfimport/makefile.mk|   24 +-
 sdext/source/presenter/description-en-US.txt  |2 +
 sdext/source/presenter/description.xml|2 -
 sdext/source/presenter/help/component.txt |2 -
 sdext/source/presenter/makefile.mk|   20 ++-
 13 files changed, 91 insertions(+), 57 deletions(-)

New commits:
commit 3c3f1e3959ccfbd6427ae6610daa4c961559ba69
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 13:23:36 2011 +0100

enable localization of extension descriptions in sdext

diff --git a/sdext/source/minimizer/description-en-US.txt 
b/sdext/source/minimizer/description-en-US.txt
new file mode 100644
index 000..98f2687
--- /dev/null
+++ b/sdext/source/minimizer/description-en-US.txt
@@ -0,0 +1,2 @@
+The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
+The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/description.xml 
b/sdext/source/minimizer/description.xml
index f8762c7..eef22a7 100644
--- a/sdext/source/minimizer/description.xml
+++ b/sdext/source/minimizer/description.xml
@@ -28,7 +28,7 @@
 /icon
 
 extension-description
-  src xlink:href=help/component.txt lang=en-US /
+  src xlink:href=description-en-US.txt lang=en-US /
 /extension-description
 
 /description
diff --git a/sdext/source/minimizer/help/component.txt 
b/sdext/source/minimizer/help/component.txt
deleted file mode 100755
index 98f2687..000
--- a/sdext/source/minimizer/help/component.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presentation Minimizer is used to reduce the file size of the current 
presentation. Images will be compressed, and data that is no longer needed will 
be removed.
-The Presentation Minimizer can optimize the image quality size. Presentations 
designed for screen or projector do not require the same high quality as 
presentations designed for print.
diff --git a/sdext/source/minimizer/makefile.mk 
b/sdext/source/minimizer/makefile.mk
index fcca6aa..7932e59 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -103,11 +103,15 @@ COMPONENT_IMAGES=\
 # rather freestyle or common to all?
 COMPONENT_HELP= \
 $(EXTENSIONDIR)$/help$/help_de.odt \
-$(EXTENSIONDIR)$/help$/help_en-US.odt \
-$(EXTENSIONDIR)$/help$/component.txt
+$(EXTENSIONDIR)$/help$/help_en-US.odt
+
+DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
+
+COMPONENT_DESCRIPTION= \
+$(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP)
+EXTENSION_PACKDEPS=$(COMPONENT_BITMAPS) $(COMPONENT_IMAGES) $(COMPONENT_HELP) 
$(COMPONENT_DESCRIPTION)
 
 ZIP2TARGET= presentation_minimizer_develop
 .IF $(WITH_LANG)!=
@@ -143,4 +147,18 @@ $(COMPONENT_HELP) : help$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $ $@
 
+$(DESCRIPTION_SRC) : description.xml
+@@-$(MKDIRHIER) $(@:d)
+.IF $(WITH_LANG) != 
+$(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all
+.ELSE
+$(COPY) $ $@
+.ENDIF
+
+$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COPY) description-en-US.txt $(EXTENSIONDIR)
+.IF $(WITH_LANG) != 
+$(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
+.ENDIF
+
 .ENDIF # L10N_framework
diff --git a/sdext/source/pdfimport/config/component.txt 
b/sdext/source/pdfimport/config/component.txt
deleted file mode 100644
index 969581e..000
--- a/sdext/source/pdfimport/config/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-The PDF Import Extension allows you to import and modify PDF documents. Best 
results with 100% layout accuracy can be achieved with the PDF/ODF hybrid 
file format, which this extension also enables. A hybrid PDF/ODF file is a PDF 
file that contains an embedded ODF source file. Hybrid PDF/ODF files will be 
opened in OpenOffice.org as an ODF file without any layout changes.
diff --git a/sdext/source/pdfimport/config/description.xml 
b/sdext/source/pdfimport/config/description.xml
deleted file mode 100644
index ac0d502..000
--- a/sdext/source/pdfimport/config/description.xml
+++ /dev/null
@@ -1,33 +0,0 @@

[Libreoffice-commits] .: desktop/win32

2011-10-31 Thread Jan Holesovsky 
 desktop/win32/source/applauncher/sbase.cxx|2 +-
 desktop/win32/source/applauncher/scalc.cxx|2 +-
 desktop/win32/source/applauncher/sdraw.cxx|2 +-
 desktop/win32/source/applauncher/simpress.cxx |2 +-
 desktop/win32/source/applauncher/smath.cxx|2 +-
 desktop/win32/source/applauncher/sweb.cxx |2 +-
 desktop/win32/source/applauncher/swriter.cxx  |2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 79228bb177bc9ebe847509d761630663b9c488ef
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Oct 31 15:25:14 2011 +0100

The -something switches are obsolete, use --something instead.

diff --git a/desktop/win32/source/applauncher/sbase.cxx 
b/desktop/win32/source/applauncher/sbase.cxx
index 9a1f31d..5fbbd15 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -base );
+_TCHAR APPLICATION_SWITCH[] = _T( --base );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/scalc.cxx 
b/desktop/win32/source/applauncher/scalc.cxx
index ceca63e..1a56bd6 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -calc );
+_TCHAR APPLICATION_SWITCH[] = _T( --calc );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sdraw.cxx 
b/desktop/win32/source/applauncher/sdraw.cxx
index 034a7c4..e3f0a53 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -draw );
+_TCHAR APPLICATION_SWITCH[] = _T( --draw );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/simpress.cxx 
b/desktop/win32/source/applauncher/simpress.cxx
index cd01d01..9397e24 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -impress );
+_TCHAR APPLICATION_SWITCH[] = _T( --impress );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/smath.cxx 
b/desktop/win32/source/applauncher/smath.cxx
index 3e670cd..d1e50c5 100644
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -math );
+_TCHAR APPLICATION_SWITCH[] = _T( --math );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sweb.cxx 
b/desktop/win32/source/applauncher/sweb.cxx
index 1c2fd8e..bbe2c77 100644
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
@@ -32,6 +32,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -web );
+_TCHAR APPLICATION_SWITCH[] = _T( --web );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/swriter.cxx 
b/desktop/win32/source/applauncher/swriter.cxx
index 1909cb9..5e41003 100644
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
@@ -30,6 +30,6 @@
 
 #include launcher.hxx
 
-_TCHAR APPLICATION_SWITCH[] = _T( -writer );
+_TCHAR APPLICATION_SWITCH[] = _T( --writer );
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: reportbuilder/util

2011-10-31 Thread Andras Timar 
 reportbuilder/util/component.txt |1 -
 reportbuilder/util/description-en-US.txt |1 +
 reportbuilder/util/description.xml   |2 +-
 reportbuilder/util/makefile.mk   |   21 ++---
 4 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit d5486145c510de842a17f906fd8a7119d30d9993
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 15:51:35 2011 +0100

enable localization of extension description in reportbuilder

diff --git a/reportbuilder/util/component.txt b/reportbuilder/util/component.txt
deleted file mode 100755
index 21a1f1e..000
--- a/reportbuilder/util/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-Create with the Report Builder stylish, smart-looking database reports. The 
flexible report editor can define group and page headers as well as group and 
page footers and even calculation fields are available to accomplish complex 
database reports.
diff --git a/reportbuilder/util/description-en-US.txt 
b/reportbuilder/util/description-en-US.txt
new file mode 100644
index 000..21a1f1e
--- /dev/null
+++ b/reportbuilder/util/description-en-US.txt
@@ -0,0 +1 @@
+Create with the Report Builder stylish, smart-looking database reports. The 
flexible report editor can define group and page headers as well as group and 
page footers and even calculation fields are available to accomplish complex 
database reports.
diff --git a/reportbuilder/util/description.xml 
b/reportbuilder/util/description.xml
index 78ae108..f048b86 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -17,7 +17,7 @@
 default xlink:href=images/extension_32.png /
   /icon
   extension-description
-src xlink:href=component.txt lang=en-US /
+src xlink:href=description-en-US.txt lang=en-US /
   /extension-description
 /description
 
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index c099efb..99752c2 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -81,8 +81,8 @@ COMPONENT_HTMLFILES = 
$(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
 COMPONENT_JARFILES = \
 $(EXTENSIONDIR)$/sun-report-builder.jar
 
-COMPONENT_HELP= \
-$(EXTENSIONDIR)$/component.txt
+COMPONENT_DESCRIPTION= \
+$(foreach,lang,$(alllangiso) $(EXTENSIONDIR)$/description-$(lang).txt)
 
 # .jar files from solver
 COMPONENT_EXTJARFILES = \
@@ -114,7 +114,7 @@ COMPONENT_MANIFEST_GENERIC:=TRUE
 COMPONENT_MANIFEST_SEARCHDIR:=registry
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied 
$(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_HELP) 
$(COMPONENT_IMAGES)
+EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied 
$(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_DESCRIPTION) 
$(COMPONENT_IMAGES)
 .ENDIF
 # --- Targets --
 
@@ -138,13 +138,20 @@ $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html : 
$(PRJ)$/license$/THIRDPARTYREADM
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $ $@
 
-$(COMPONENT_HELP) : $$(@:f)
-@@-$(MKDIRHIER) $(@:d)
-$(COPY) $ $@
+$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+
 
 $(DESCRIPTION_SRC): description.xml
 +-$(RM) $@
-$(TYPE) description.xml | $(SED) s/#VERSION#/$(EXTENSION_VERSION)/  $@
+$(COPY) description-en-US.txt $(EXTENSIONDIR)/description-en-US.txt
+.IF $(WITH_LANG) != 
+$(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all
+$(SED) s/#VERSION#/$(EXTENSION_VERSION)/  $@  $@.new
+mv $@.new $@
+@$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR)
+.ELSE
+$(SED) s/#VERSION#/$(EXTENSION_VERSION)/  $  $@
+.ENDIF
 
 $(MISC)/$(TARGET).copied: $(COMPONENT_EXTJARFILES_COPY)
 @@-$(MKDIRHIER) $(EXTENSIONDIR)
diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: g

2011-10-31 Thread Michael Meeks 
 g |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2ed58be87924acc4aec81407ba93641afe776b35
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Oct 31 15:03:56 2011 +

make --last-working checkout the last working version

thanks to Bjoern and Christian for tips.

diff --git a/g b/g
index 66c1cb2..f09caf0 100755
--- a/g
+++ b/g
@@ -242,7 +242,13 @@ for REPO in $DIRS ; do
 elif [ -d $DIR -a z$LAST_WORKING != z ]; then
echo fetching notes for $REPO ...
(cd $DIR  git fetch origin 'refs/notes/*:refs/notes/*')
-   # FIXME: we need to grep the git log for a known good note name...
+   hash=`(cd $DIR  git log --pretty='%H %N' | grep 'win32 working build' 
| head -n1 | sed 's/ win32.*//')`
+   if test z$hash != z; then
+  echo update to $hash
+  (cd $DIR  git checkout $hash)
+   else
+  echo Warning: missing known working note on repo $REPO
+   fi
 elif [ -d $DIR -a z$SET_LAST_WORKING != z ]; then
echo fetching notes for $REPO ...
(cd $DIR  git fetch origin 'refs/notes/*:refs/notes/*')
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4-4' - drawinglayer/inc drawinglayer/source

2011-10-31 Thread Petr Mladek 
 drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx |6 
++
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx   |9 
++---
 drawinglayer/source/processor2d/vclprocessor2d.cxx  |9 
-
 3 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 551fd132dc68652942ebb0c339a6e36b3e299f19
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Wed Oct 26 11:36:47 2011 -0400

fdo#37129: Fix the drawing of dotted and dashed borders in Calc.

Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Cedric Bosdonnat cedric.bosdonnat@free.fr

diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 1428a10..84139b0 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -33,6 +33,7 @@
 #include basegfx/color/bcolor.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
 #include basegfx/polygon/b2dpolypolygon.hxx
+#include svtools/ctrlbox.hxx
 
 //
 
@@ -110,6 +111,11 @@ namespace drawinglayer
 return basegfx::fTools::equal(1.0, mfRightWidth);
 }
 
+bool isSolidLine() const
+{
+return (mnStyle==STYLE_SOLID);
+}
+
 bool isInsideUsed() const
 {
 return !basegfx::fTools::equalZero(mfLeftWidth);
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 33df59c..1a3b66c 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include precompiled_drawinglayer.hxx
 
+#include drawinglayer/geometry/viewinformation2d.hxx
 #include drawinglayer/primitive2d/borderlineprimitive2d.hxx
 #include drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
 #include basegfx/polygon/b2dpolygon.hxx
@@ -79,7 +80,7 @@ namespace drawinglayer
 return basegfx::B2DPolyPolygon( clipPolygon );
 }
 
-Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const 
geometry::ViewInformation2D /*rViewInformation*/) const
+Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const 
geometry::ViewInformation2D rViewInformation) const
 {
 Primitive2DSequence xRetval;
 
@@ -214,6 +215,7 @@ namespace drawinglayer
 
 // Get which is the line to show
 bool bIsHairline = leftIsHairline();
+bool bIsSolidline = isSolidLine();
 double nWidth = getCorrectedLeftWidth();
 basegfx::BColor aColor = getRGBColorLeft();
 if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) )
@@ -223,7 +225,7 @@ namespace drawinglayer
 aColor = getRGBColorRight();
 }
 
-if(bIsHairline)
+if(bIsHairline  bIsSolidline)
 {
 // create hairline primitive
 aPolygon.append( getStart() );
@@ -237,12 +239,13 @@ namespace drawinglayer
 {
 // create filled polygon primitive
 const basegfx::B2DVector aLineWidthOffset(((nWidth + 
1) * 0.5) * aPerpendicular);
+basegfx::B2DVector aScale( 
rViewInformation.getInverseObjectToViewTransformation() * aVector );
 
 aPolygon.append( aTmpStart );
 aPolygon.append( aTmpEnd );
 
 basegfx::B2DPolyPolygon aDashed = 
svtools::ApplyLineDashing(
-   aPolygon, getStyle(), MAP_100TH_MM );
+   aPolygon, getStyle(), MAP_PIXEL, 
aScale.getLength() );
 for (sal_uInt32 i = 0; i  aDashed.count(); i++ )
 {
 basegfx::B2DPolygon aDash = aDashed.getB2DPolygon( 
i );
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 19648d4..4806cde 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -766,9 +766,13 @@ namespace drawinglayer
 }
 else
 {
+// remember that we enter a PolygonStrokePrimitive2D 
decomposition,
+// used for AA thick line drawing
+mnPolygonStrokePrimitive2D++;
+

[Libreoffice-commits] Changes to 'feature/cell-notes'

2011-10-31 Thread Michael Meeks 
New branch 'feature/cell-notes' available with the following commits:
commit 9d8d0e99a78f903e9c7315808e5986f63aca27d9
Author: Kevin Hunter hunt...@earlham.edu
Date:   Mon Oct 31 13:23:06 2011 -0400

Move ScPostIt storage from ScBaseCell-ScDocument

ScPostIt is the behind-the-scenes name for Notes.  This move removes a
usually empty pointer for each ScBaseCell to list of pointers within
ScDocument.  The advantage is basically a reduction in size of 8 bytes
per cell.  The current sizeof(ScBaseCell) is 16.  Here are the
highlights:

* Remove mpNote from ScBaseCell, and add a std::map (data structure) to
  ScDocument to store notes and associate with addresses.

* Remove ScPostIt accessors and mutators from ScTable, ScColumn, and
  ScBaseCell

* Replace ScPostIt accessors and mutators in ScDocument with ones to
  handle move of data structure from ScBaseCell to ScDocument

* Rename ScPostIt.CloneWithoutNote to ScPostIt.Clone, while completely
  removing ScPostIt.CloneWithNote.  Any cloning of cell notes must now
  be handled outside external to the ScPostIt class, through
  ScDocument.*Note() functions.

* Rename ScNoteCell to a more ScEmptyCell.  I expect this can be
  completely removed at some point the future, if we can handle
  broadcasters external to the cell logic.

* Add ScDocument and ScTable to ScUsedAreaIterator data structure to
  accomodate for new placement of ScPostIt objects in ScDocument.

* Convert CELLTYPE_NOTE to CELLTYPE_EMPTY (and all ensuing uses).

* Wherever possible, respect 80-columns.

* New ScDocument based API (individually block-comment documented before
  their definitions):

SC_DLLPUBLIC ScPostIt* GetNote( ScAddress const  );
SC_DLLPUBLIC ScPostIt* GetOrCreateNote( const ScAddress rPos );
bool   SetNote( ScAddress const , ScPostIt* );
bool   MoveNote( ScAddress const  from, ScAddress const  
to );
bool   SwapNotes( ScAddress const , ScAddress const  );
ScPostIt*  ReleaseNote( ScAddress const  );
void   DeleteNote( ScAddress const  );

Of note, TakeNote has been replaced with SetNote, which returns true on
success, and false on failure.  TakeNote indicated failure by removing
the passed note.  The SetNote approach leaves room for the caller to
attempt to fix the issue, but also means the caller is now on the hook
to cleanup the memory.  For now, the Calc-internal API is lazy and does
not take advantage of this, but merely says You failed?  Oh well,
delete the note. ... which is exactly what TakeNote did.  This means, the
lazy-programmer's idiom for SetNote use is:

   if ( ! pDoc-SetNote( aAddress, pNotePointer ) )
  DELETEZ( pNotePointer );

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

[Libreoffice-commits] .: swext/Extension_wiki-publisher.mk swext/mediawiki swext/Zip_mediawiki_develop.mk

2011-10-31 Thread Andras Timar 
 swext/Extension_wiki-publisher.mk |2 +-
 swext/Zip_mediawiki_develop.mk|2 +-
 swext/mediawiki/src/component.txt |1 -
 swext/mediawiki/src/description-en-US.txt |1 +
 swext/mediawiki/src/description.xml   |2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 34191b3c0f2fe349293068a0b968c7c68724dea7
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 19:06:15 2011 +0100

towards enabling l10n of extension description in swext

diff --git a/swext/Extension_wiki-publisher.mk 
b/swext/Extension_wiki-publisher.mk
index bdf0855..d4c64d5 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -53,7 +53,7 @@ $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKIS
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
-$(eval $(call 
gb_Extension_add_file,wiki-publisher,component.txt,$(WIKISRC)/src/component.txt))
+$(eval $(call 
gb_Extension_add_file,wiki-publisher,description-en-US.txt,$(WIKISRC)/src/description-en-US.txt))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
 $(eval $(call 
gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk
index cb99ce8..f682b07 100644
--- a/swext/Zip_mediawiki_develop.mk
+++ b/swext/Zip_mediawiki_develop.mk
@@ -49,7 +49,7 @@ $(eval $(call 
gb_Zip_add_file,mediawiki_develop,WikiEditor/script.xlb,$(WIKISRC)
 $(eval $(call 
gb_Zip_add_file,mediawiki_develop,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
 $(eval $(call 
gb_Zip_add_file,mediawiki_develop,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
 $(eval $(call 
gb_Zip_add_file,mediawiki_develop,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
-$(eval $(call 
gb_Zip_add_file,mediawiki_develop,component.txt,$(WIKISRC)/src/component.txt))
+$(eval $(call 
gb_Zip_add_file,mediawiki_develop,description-en-US.txt,$(WIKISRC)/src/description-en-US.txt))
 $(eval $(call 
gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
 $(eval $(call 
gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
 $(eval $(call 
gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
diff --git a/swext/mediawiki/src/component.txt 
b/swext/mediawiki/src/component.txt
deleted file mode 100755
index d993ce1..000
--- a/swext/mediawiki/src/component.txt
+++ /dev/null
@@ -1 +0,0 @@
-The Wiki Publisher enables you to create Wiki articles on MediaWiki servers 
without having to know the syntax of the MediaWiki markup language. Publish 
your new and existing documents transparently with the Writer to a wiki page.
diff --git a/swext/mediawiki/src/description-en-US.txt 
b/swext/mediawiki/src/description-en-US.txt
new file mode 100644
index 000..d993ce1
--- /dev/null
+++ b/swext/mediawiki/src/description-en-US.txt
@@ -0,0 +1 @@
+The Wiki Publisher enables you to create Wiki articles on MediaWiki servers 
without having to know the syntax of the MediaWiki markup language. Publish 
your new and existing documents transparently with the Writer to a wiki page.
diff --git a/swext/mediawiki/src/description.xml 
b/swext/mediawiki/src/description.xml
index 31dcfe3..11d10b5 100644
--- a/swext/mediawiki/src/description.xml
+++ b/swext/mediawiki/src/description.xml
@@ -12,6 +12,6 @@
 name xlink:href=http://www.documentfoundation.org; lang=en-USThe 
Document Foundation/name
 /publisher
 extension-description
-src xlink:href=component.txt lang=en-US/
+src xlink:href=description-en-US.txt lang=en-US/
 /extension-description
 /description
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - nlpsolver/locale

2011-10-31 Thread Andras Timar 
 nlpsolver/locale/NLPSolverCommon_gd.properties   |   22 ++
 nlpsolver/locale/NLPSolverStatusDialog_gd.properties |   28 +++
 2 files changed, 50 insertions(+)

New commits:
commit 39e717ad229c2584c8024da08f0d1b2f6a45dee1
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 20:36:19 2011 +0100

Scottish Gaelic (gd) translation

diff --git a/nlpsolver/locale/NLPSolverCommon_gd.properties 
b/nlpsolver/locale/NLPSolverCommon_gd.properties
new file mode 100644
index 000..83fa728
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_gd.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Cuir mar fhiacham caochladairean 
neo-\u00E0icheil
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=Meud an sgaotha
+NLPSolverCommon.Properties.LibrarySize=Meud na leabhar-lainn
+NLPSolverCommon.Properties.LearningCycles=Cuairtean ionnsachaidh
+NLPSolverCommon.Properties.GuessVariableRange=Tomhas air cr\u00ECochan nan 
caochladairean
+NLPSolverCommon.Properties.VariableRangeThreshold=Stairsneach cr\u00ECochan 
nan caochladairean (nuair a nithear tomhas)
+NLPSolverCommon.Properties.UseACRComparator=Cleachd coimeasaiche ACR (an 
\u00E0ite BCH)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Cleachd puing 
t\u00F2iseachaidh air thuaiream
+NLPSolverCommon.Properties.StagnationLimit=Cr\u00ECoch na neo-ghluasadachd
+NLPSolverCommon.Properties.Tolerance=Fulangas na neo-ghluasadachd
+NLPSolverCommon.Properties.EnhancedSolverStatus=Seall staid mheudaichte an 
fhuasglair
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Reat suidseadh \u00E0idseint 
(Coltachd DE)
+NLPSolverCommon.Properties.DEFactor=DE: Factar sg\u00E8ilidh (0-1.2)
+NLPSolverCommon.Properties.DECR=DE: Coltachd Crossover (0-1)
+NLPSolverCommon.Properties.PSC1=PS: Cunbhalachan cognatach
+NLPSolverCommon.Properties.PSC2=PS: Cunbhalachan s\u00F2isealta
+NLPSolverCommon.Properties.PSWeight=PS: Co-\u00E8ifeachd cuingealachaidh
+NLPSolverCommon.Properties.PSCL=PS: Coltachd m\u00F9thaidh (0-0.005)
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_gd.properties 
b/nlpsolver/locale/NLPSolverStatusDialog_gd.properties
new file mode 100644
index 000..4bbe57a
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_gd.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=Staid an fhuasglair
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Am fuasgladh l\u00E0ithreach:
+NLPSolverStatusDialog.Controls.lblIteration=Ath-nochdaidhean:
+NLPSolverStatusDialog.Controls.lblStagnation=Neo-ghluasadachd:
+NLPSolverStatusDialog.Controls.lblRuntime=\u00D9ine ruith:
+NLPSolverStatusDialog.Controls.btnStop=Cuir stad air
+NLPSolverStatusDialog.Controls.btnOK=Ceart ma-th\u00E0
+NLPSolverStatusDialog.Controls.btnContinue=Lean air adhart
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=R\u00E0inig thu na tha ceadaichte 
de ath-nochdaidhean.
+NLPSolverStatusDialog.Message.StopStagnation=Stad am pr\u00F2iseas air 
sg\u00E0th neo-ghluasadachd.
+NLPSolverStatusDialog.Message.StopUser=Stad an cleachdaiche am pr\u00F2iseas.
+NLPSolverStatusDialog.Message.CurrentIteration=Stad am pr\u00F2iseas aig 
ath-nochdadh %d \u00E0 %d.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=Nano-dhiogan
+NLPSolverStatusDialog.Time.Microseconds=Micreo-dhiogan
+NLPSolverStatusDialog.Time.Milliseconds=Mille-dhiogan
+NLPSolverStatusDialog.Time.Second=Diog
+NLPSolverStatusDialog.Time.Seconds=Diogan
+NLPSolverStatusDialog.Time.Minute=Mionaid
+NLPSolverStatusDialog.Time.Minutes=Mionaidean
+NLPSolverStatusDialog.Time.Hour=Uair a th\u00ECde
+NLPSolverStatusDialog.Time.Hours=Uairean a th\u00ECde
+NLPSolverStatusDialog.Time.Day=Latha
+NLPSolverStatusDialog.Time.Days=L\u00E0ithean
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4-4' - nlpsolver/locale

2011-10-31 Thread Andras Timar 
 nlpsolver/locale/NLPSolverCommon_gd.properties   |   22 ++
 nlpsolver/locale/NLPSolverStatusDialog_gd.properties |   28 +++
 2 files changed, 50 insertions(+)

New commits:
commit 9d9add77f6a08c9511df902e9d34690c6846161f
Author: Andras Timar ati...@suse.com
Date:   Mon Oct 31 20:36:19 2011 +0100

Scottish Gaelic (gd) translation

diff --git a/nlpsolver/locale/NLPSolverCommon_gd.properties 
b/nlpsolver/locale/NLPSolverCommon_gd.properties
new file mode 100644
index 000..83fa728
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_gd.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Cuir mar fhiacham caochladairean 
neo-\u00E0icheil
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=Meud an sgaotha
+NLPSolverCommon.Properties.LibrarySize=Meud na leabhar-lainn
+NLPSolverCommon.Properties.LearningCycles=Cuairtean ionnsachaidh
+NLPSolverCommon.Properties.GuessVariableRange=Tomhas air cr\u00ECochan nan 
caochladairean
+NLPSolverCommon.Properties.VariableRangeThreshold=Stairsneach cr\u00ECochan 
nan caochladairean (nuair a nithear tomhas)
+NLPSolverCommon.Properties.UseACRComparator=Cleachd coimeasaiche ACR (an 
\u00E0ite BCH)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Cleachd puing 
t\u00F2iseachaidh air thuaiream
+NLPSolverCommon.Properties.StagnationLimit=Cr\u00ECoch na neo-ghluasadachd
+NLPSolverCommon.Properties.Tolerance=Fulangas na neo-ghluasadachd
+NLPSolverCommon.Properties.EnhancedSolverStatus=Seall staid mheudaichte an 
fhuasglair
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Reat suidseadh \u00E0idseint 
(Coltachd DE)
+NLPSolverCommon.Properties.DEFactor=DE: Factar sg\u00E8ilidh (0-1.2)
+NLPSolverCommon.Properties.DECR=DE: Coltachd Crossover (0-1)
+NLPSolverCommon.Properties.PSC1=PS: Cunbhalachan cognatach
+NLPSolverCommon.Properties.PSC2=PS: Cunbhalachan s\u00F2isealta
+NLPSolverCommon.Properties.PSWeight=PS: Co-\u00E8ifeachd cuingealachaidh
+NLPSolverCommon.Properties.PSCL=PS: Coltachd m\u00F9thaidh (0-0.005)
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_gd.properties 
b/nlpsolver/locale/NLPSolverStatusDialog_gd.properties
new file mode 100644
index 000..4bbe57a
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_gd.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=Staid an fhuasglair
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Am fuasgladh l\u00E0ithreach:
+NLPSolverStatusDialog.Controls.lblIteration=Ath-nochdaidhean:
+NLPSolverStatusDialog.Controls.lblStagnation=Neo-ghluasadachd:
+NLPSolverStatusDialog.Controls.lblRuntime=\u00D9ine ruith:
+NLPSolverStatusDialog.Controls.btnStop=Cuir stad air
+NLPSolverStatusDialog.Controls.btnOK=Ceart ma-th\u00E0
+NLPSolverStatusDialog.Controls.btnContinue=Lean air adhart
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=R\u00E0inig thu na tha ceadaichte 
de ath-nochdaidhean.
+NLPSolverStatusDialog.Message.StopStagnation=Stad am pr\u00F2iseas air 
sg\u00E0th neo-ghluasadachd.
+NLPSolverStatusDialog.Message.StopUser=Stad an cleachdaiche am pr\u00F2iseas.
+NLPSolverStatusDialog.Message.CurrentIteration=Stad am pr\u00F2iseas aig 
ath-nochdadh %d \u00E0 %d.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=Nano-dhiogan
+NLPSolverStatusDialog.Time.Microseconds=Micreo-dhiogan
+NLPSolverStatusDialog.Time.Milliseconds=Mille-dhiogan
+NLPSolverStatusDialog.Time.Second=Diog
+NLPSolverStatusDialog.Time.Seconds=Diogan
+NLPSolverStatusDialog.Time.Minute=Mionaid
+NLPSolverStatusDialog.Time.Minutes=Mionaidean
+NLPSolverStatusDialog.Time.Hour=Uair a th\u00ECde
+NLPSolverStatusDialog.Time.Hours=Uairean a th\u00ECde
+NLPSolverStatusDialog.Time.Day=Latha
+NLPSolverStatusDialog.Time.Days=L\u00E0ithean
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2011-10-31 Thread Markus Mohrhard 
 sc/source/ui/view/tabview3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88f91adf266f19659014df22e09ce6c6761fb6f1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Oct 31 21:38:44 2011 +0100

update first ScMarkData before setting cursor (fdo#42432)

our ScMarkData instance might be used to set the cursor which will
result in a crash if the selected sheet has been deleted already

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index de2d683..fdb0b92 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -1511,7 +1511,6 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool 
bExtendSelection, bool bSa
 //  Fenster findet (wird aus SetCursor gerufen)
 UpdateShow();
 aViewData.ResetOldCursor();
-SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), true );
 
 SfxBindings rBindings = aViewData.GetBindings();
 ScMarkData rMark = aViewData.GetMarkData();
@@ -1548,6 +1547,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool 
bExtendSelection, bool bSa
 rBindings.Invalidate( FID_TAB_DESELECTALL );
 }
 
+SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), true );
 bool bUnoRefDialog = pScMod-IsRefDialogOpen()  
pScMod-GetCurRefDlgId() == WID_SIMPLE_REF;
 
 // recalc zoom-dependent values (before TabChanged, before 
UpdateEditViewPos)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-10-31 Thread Stephan Bergmann 
 scp2/source/ooo/common_brand.scp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1635f66a3dd35c5bf34143956940ec44fda751c2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Oct 31 23:47:02 2011 +0100

Moved CONFIGURATION_LAYERS from soffice to fundamental ini.

...so that unopkg uses it, too.

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index d9baffa..9b75f36 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -927,18 +927,6 @@ ProfileItem gid_Brand_Profileitem_Soffice_Startlang
 End
 #endif
 
-ProfileItem gid_Brand_Profileitem_Soffice_ConfigurationLayers
-ProfileID = gid_Brand_Profile_Soffice_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = Bootstrap;
-Key = CONFIGURATION_LAYERS;
-Value = xcsxcu:${BRAND_BASE_DIR}/share/registry 
module:${BRAND_BASE_DIR}/share/registry/modules 
res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/ 
PROFILENAME(uno) 
:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno) 
:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 xcsxcu:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno) 
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
 userext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno) 
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap) 
:UserInstallation}/user/registrymodifications.xcu;
-// xcsxcu:${${BRAND_BASE_DIR}/program/PROFILENAME(uno)
-// :UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.
-// configuration.PackageRegistryBackend/registry can be dropped once
-// old UserInstallation format can no longer exist (probably OOo 4)
-End
-
 ProfileItem gid_Brand_Profileitem_Version_Buildid
 ProfileID = gid_Brand_Profile_Version_Ini;
 ModuleID = gid_Module_Root_Brand;
@@ -1256,6 +1244,18 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
 #endif
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
+ProfileID = gid_Brand_Profile_Fundamental_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = Bootstrap;
+Key = CONFIGURATION_LAYERS;
+Value = xcsxcu:${BRAND_BASE_DIR}/share/registry 
module:${BRAND_BASE_DIR}/share/registry/modules 
res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/ 
PROFILENAME(uno) 
:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno) 
:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 xcsxcu:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno) 
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
 userext:${${BRAND_BASE_DIR}/program/ PROFILENAME(uno) 
:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:${$BRAND_BASE_DIR/program/ PROFILENAME(bootstrap) 
:UserInstallation}/user/registrymodifications.xcu;
+// xcsxcu:${${BRAND_BASE_DIR}/program/PROFILENAME(uno)
+// :UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.
+// configuration.PackageRegistryBackend/registry can be dropped once
+// old UserInstallation format can no longer exist (probably OOo 4)
+End
+
 #if !defined MACOSX
 ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
 ModuleID = gid_Module_Root_Brand;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/source

2011-10-31 Thread Markus Mohrhard 
 tools/source/stream/stream.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 125aa32e71eb9a8de6214a7f7bc3e3be13b14a7a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Nov 1 00:51:46 2011 +0100

we need to assign this value also for non unix platforms (fdo#40801)

diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 34dc93d..2b9295b 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1308,10 +1308,8 @@ SvStream SvStream::operator(double r)
 #if defined UNX
 if (bSwap)
   SwapDouble(n);
-r = n;
-#else
-(void) r;
 #endif
+r = n;
 }
 return *this;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/inc autodoc/source

2011-10-31 Thread Joseph Powers 
 autodoc/inc/ary/actions.hxx   |  105 --
 autodoc/inc/ary/doc/d_parametrized.hxx|  124 --
 autodoc/inc/ary/doc/ht/dht_interpreter.hxx|   79 --
 autodoc/inc/ary/udmhost.hxx   |   65 ---
 autodoc/inc/autodoc/dsp_txt_flist.hxx |   67 ---
 autodoc/source/ary/inc/cross_refs.hxx |  101 -
 autodoc/source/ary/inc/sorted_idset.hxx   |   99 -
 autodoc/source/ary/inc/traits_impl.hxx|  122 -
 autodoc/source/inc/manip.hxx  |   63 ---
 autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx |   65 ---
 autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx |   84 --
 11 files changed, 974 deletions(-)

New commits:
commit 0ba264cc9f8ab33c7081223a3612cfe6604b150f
Author: Joseph Powers jpower...@cox.net
Date:   Mon Oct 31 21:29:39 2011 -0700

Delete some unused .hxx files from autodoc

diff --git a/autodoc/inc/ary/actions.hxx b/autodoc/inc/ary/actions.hxx
deleted file mode 100644
index 5e2536c..000
--- a/autodoc/inc/ary/actions.hxx
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef ARY_ACTIONS_HXX
-#define ARY_ACTIONS_HXX
-//  KORR_DEPRECATED_3.0
-
-
-// USED SERVICES
-// BASE CLASSES
-// COMPONENTS
-// PARAMETERS
-
-
-namespace ary
-{
-class RepositoryCenter;
-
-
-/*
-enum E_Action
-{
-action_Parse,
-action_SecondaryProductions,
-action_Save,
-action_Load,
-action_ReadyForRead
-};
-*/
-
-
-/** @resp
-Performs such commands on the repository, which refer to
-large parts of it.
-
-@collab ::ary::Repository
-and its components and derivates.
-@descr
-This class works in kind of double dispatch way:
-
-// Client code:
-Command_Xy  aMyCommand;
-ary::Repository::The_().PerformCommand( aMyCommand );
-
-// Repository_Implementation::PerformCommand() code:
-aMyCommand.Run(*this);
-
-// Command_Xy::Run(Repository_Implementation  rRepository) code:
-rRepository.Run_Command_Xy(*this);
-*/
-class Command
-{
-  public:
-virtual ~Command() {}
-
-voidRun(
-n22::RepositoryCenter 
-io_rReposy );
-  private:
-virtual voiddo_Run(
-n22::RepositoryCenter 
-io_rReposy ) = 0;
-};
-
-
-// IMPLEMENTATION
-
-inline void
-Command::Run(n22::RepositoryCenter  io_rReposy)
-{ do_Run(io_rReposy); }
-
-
-} // namespace ary
-
-
-#endif
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_parametrized.hxx 
b/autodoc/inc/ary/doc/d_parametrized.hxx
deleted file mode 100644
index 78659e7..000
--- a/autodoc/inc/ary/doc/d_parametrized.hxx
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A