date:20130421

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3517

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/3517/1

Add HarfBuzz support to the build system

To be used in the next commit. No support for non-system build, yet.

Change-Id: I6ee286d0c050a5ca650e7fb3692b0facccb5f0c0
---
M RepositoryExternal.mk
M config_host.mk.in
A config_host/config_harfbuzz.h.in
M configure.ac
M vcl/Library_vcl.mk
5 files changed, 64 insertions(+), 0 deletions(-)



diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index df44d2d..2707a23 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1186,6 +1186,39 @@
 
 endif # SYSTEM_ICU
 
+ifeq ($(SYSTEM_HARFBUZZ),YES)
+
+define gb_LinkTarget__use_harfbuzz
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(HARFBUZZ_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
+
+endef
+
+else ifeq ($(SYSTEM_HARFBUZZ),NO)
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   harfbuzz \
+))
+define gb_LinkTarget__use_harfbuzz
+$(call gb_LinkTarget_use_unpacked,$(1),harfbuzz)
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,harfbuzz/include) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+harfbuzz \
+)
+
+endef
+
+else # DISABLED HARFBUZZ
+
+gb_LinkTarget__use_harfbuzz :=
+
+endif # SYSTEM_HARFBUZZ
 
 ifeq ($(DISABLE_OPENSSL),YES)
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 4256fa7..ad33e7d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -122,6 +122,7 @@
 export ENABLE_GIO=@ENABLE_GIO@
 export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
+export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
 export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
 export ENABLE_GTK3=@ENABLE_GTK3@
@@ -196,6 +197,8 @@
 export GPERF=@GPERF@
 export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@
 export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@
+export HARFBUZZ_CFLAGS=$(gb_SPACE)@HARFBUZZ_CFLAGS@
+export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@
 @x_Cygwin@ export GREP=@WIN_GREP@
 export GSSAPI_LIBS=@GSSAPI_LIBS@
 export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
@@ -478,6 +481,7 @@
 export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
 export SYSTEM_GENCMN=@SYSTEM_GENCMN@
 export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
+export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@
 export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@
 export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@
 export SYSTEM_HYPH=@SYSTEM_HYPH@
diff --git a/config_host/config_harfbuzz.h.in b/config_host/config_harfbuzz.h.in
new file mode 100644
index 000..b408f52
--- /dev/null
+++ b/config_host/config_harfbuzz.h.in
@@ -0,0 +1,6 @@
+#ifndef CONFIG_HARFBUZZ_H
+#define CONFIG_HARFBUZZ_H
+
+#define ENABLE_HARFBUZZ 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index 2152487..6b844d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -720,6 +720,11 @@
 [Enables the compilation of Graphite smart font rendering.])
 )
 
+AC_ARG_ENABLE(harfbuzz,
+AS_HELP_STRING([--enable-harfbuzz],
+[Determines whether to use HarfBuzz text layout engine.])
+)
+
 AC_ARG_ENABLE(fetch-external,
 AS_HELP_STRING([--disable-fetch-external],
 [Disables fetching external tarballs from web sources.])
@@ -8378,6 +8383,20 @@
 AC_SUBST(ENABLE_GRAPHITE)
 
 dnl ===
+dnl HarfBuzz
+dnl ===
+AC_MSG_CHECKING([whether to enable HarfBuzz support])
+if test $_os != WINNT -a $_os != Darwin  test $enable_harfbuzz = 
 -o $enable_harfbuzz != no; then
+AC_MSG_RESULT([yes])
+ENABLE_HARFBUZZ=TRUE
+AC_DEFINE(ENABLE_HARFBUZZ)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz = 0.9.10])
+else
+AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_HARFBUZZ)
+
+dnl ===
 dnl Check for NPAPI interface to plug browser plugins into LibreOffice 
documents
 dnl ===
 AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
@@ -11880,6 +11899,7 @@
 AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
+AC_CONFIG_HEADERS([config_host/config_harfbuzz.h])
 AC_CONFIG_HEADERS([config_host/config_kde4.h])
 AC_CONFIG_HEADERS([config_host/config_mingw.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 17d1ef6..870dbd7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -340,6 +340,7 @@
 endif
 
 $(eval $(call gb_Library_use_external,vcl,graphite))
+$(eval $(call gb_Library_use_externals,vcl,harfbuzz))
 
 endif
 

-- 
To view, visit https://gerrit.libreoffice.org/3517
To

[PATCH] Add support for using HarfBuzz instead of ICU LE

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3518

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/3518/1

Add support for using HarfBuzz instead of ICU LE

Change-Id: I07e698f7486379bae68329771695cd94d6e561b5
---
M vcl/generic/glyphs/gcach_layout.cxx
1 file changed, 178 insertions(+), 15 deletions(-)



diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index ddf6d7c..02392c2 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include config_harfbuzz.h
 #include gcach_ftyp.hxx
 #include sallayout.hxx
 #include salgdi.hxx
@@ -30,10 +31,15 @@
 #include sal/alloca.h
 #include rtl/instance.hxx
 
+#if ENABLE_HARFBUZZ
+#include hb-ft.h
+#include hb-icu.h
+#else
 #include layout/LayoutEngine.h
 #include layout/LEFontInstance.h
 #include layout/LELanguages.h
 #include layout/LEScripts.h
+#endif // ENABLE_HARFBUZZ
 
 #include unicode/uscript.h
 #include unicode/ubidi.h
@@ -86,6 +92,172 @@
 }
 }
 
+// ===
+
+static bool lcl_CharIsJoiner(sal_Unicode cChar)
+{
+return ((cChar == 0x200C) || (cChar == 0x200D));
+}
+
+static bool needPreviousCode(sal_Unicode cChar)
+{
+return lcl_CharIsJoiner(cChar) || U16_IS_LEAD(cChar);
+}
+
+static bool needNextCode(sal_Unicode cChar)
+{
+return lcl_CharIsJoiner(cChar) || U16_IS_TRAIL(cChar);
+}
+
+#if ENABLE_HARFBUZZ
+class HbLayoutEngine : public ServerFontLayoutEngine
+{
+private:
+UScriptCode meScriptCode;
+
+public:
+HbLayoutEngine(ServerFont);
+virtual ~HbLayoutEngine(){};
+
+virtual boollayout(ServerFontLayout, ImplLayoutArgs);
+};
+
+HbLayoutEngine::HbLayoutEngine(ServerFont /*rServerFont*/)
+:   meScriptCode(USCRIPT_INVALID_CODE)
+{}
+
+bool HbLayoutEngine::layout(ServerFontLayout rLayout, ImplLayoutArgs rArgs)
+{
+ServerFont rFont = rLayout.GetServerFont();
+FT_Face aFace = rFont.GetFtFace();
+
+// allocate temporary arrays, note: round to even
+int nGlyphCapacity = (3 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos) | 15) 
+ 1;
+
+rLayout.Reserve(nGlyphCapacity);
+
+Point aNewPos(0, 0);
+while (true)
+{
+int nMinRunPos, nEndRunPos;
+bool bRightToLeft;
+if (!rArgs.GetNextRun(nMinRunPos, nEndRunPos, bRightToLeft))
+break;
+
+int nRunLen = nEndRunPos - nMinRunPos;
+
+// find matching script
+// TODO: use ICU's UScriptRun API
+UScriptCode eScriptCode = USCRIPT_INVALID_CODE;
+for (int i = nMinRunPos; i  nEndRunPos; ++i)
+{
+UErrorCode rcI18n = U_ZERO_ERROR;
+UScriptCode eNextScriptCode = uscript_getScript(rArgs.mpStr[i], 
rcI18n);
+if ((eNextScriptCode  USCRIPT_INHERITED))
+{
+eScriptCode = eNextScriptCode;
+if (eNextScriptCode != USCRIPT_LATIN)
+break;
+}
+}
+if (eScriptCode  0)   // TODO: handle errors better
+eScriptCode = USCRIPT_LATIN;
+
+meScriptCode = eScriptCode;
+
+hb_font_t *aHbFont = hb_ft_font_create(aFace, NULL);
+
+LanguageTag aLangTag(rArgs.meLanguage);
+OString sLanguage = OUStringToOString(aLangTag.getLanguage(), 
RTL_TEXTENCODING_UTF8);
+
+hb_buffer_t *aHbBuffer = hb_buffer_create();
+hb_buffer_set_direction(aHbBuffer, bRightToLeft ? HB_DIRECTION_RTL: 
HB_DIRECTION_LTR);
+hb_buffer_set_script(aHbBuffer, hb_icu_script_to_script(eScriptCode));
+hb_buffer_set_language(aHbBuffer, 
hb_language_from_string(sLanguage.getStr(), -1));
+hb_buffer_add_utf16(aHbBuffer, rArgs.mpStr, nRunLen, nMinRunPos, 
nRunLen);
+hb_shape(aHbFont, aHbBuffer, NULL, 0);
+
+int nRunGlyphCount = hb_buffer_get_length(aHbBuffer);
+hb_glyph_info_t *aHbGlyphInfos = hb_buffer_get_glyph_infos(aHbBuffer, 
NULL);
+hb_glyph_position_t *aHbPositions = 
hb_buffer_get_glyph_positions(aHbBuffer, NULL);
+
+int32_t nLastCluster = -1;
+for (int i = 0; i  nRunGlyphCount; ++i) {
+int32_t nGlyphIndex = aHbGlyphInfos[i].codepoint;
+int32_t nCluster = aHbGlyphInfos[i].cluster;
+int32_t nCharPos = nCluster;
+
+// if needed request glyph fallback by updating LayoutArgs
+if (!nGlyphIndex)
+{
+if (nCharPos = 0)
+{
+rArgs.NeedFallback(nCharPos, bRightToLeft);
+// XXX: do we need this in harfbuzz?
+if  ((nCharPos  0)  
needPreviousCode(rArgs.mpStr[nCharPos-1]))
+rArgs.NeedFallback(nCharPos-1, bRightToLeft);
+else if  ((nCharPos + 1  nEndRunPos)

[PATCH] Determine if glyph is diacritic from GDEF table

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3519

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/3519/1

Determine if glyph is diacritic from GDEF table

GDEF table should have the definitive answer about glyph class,
including if it is a mark (diacritic[sic]) or not. Though I don't know
what GlyphItem::IS_DIACRITIC flag is used for, if at all.

Change-Id: Ib935dd571e2191eb5f8ae72650394293dd248140
---
M vcl/generic/glyphs/gcach_layout.cxx
1 file changed, 3 insertions(+), 2 deletions(-)



diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 02392c2..8fbe9d7 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -34,6 +34,7 @@
 #if ENABLE_HARFBUZZ
 #include hb-ft.h
 #include hb-icu.h
+#include hb-ot.h
 #else
 #include layout/LayoutEngine.h
 #include layout/LEFontInstance.h
@@ -166,6 +167,7 @@
 meScriptCode = eScriptCode;
 
 hb_font_t *aHbFont = hb_ft_font_create(aFace, NULL);
+hb_face_t *aHbFace = hb_font_get_face(aHbFont);
 
 LanguageTag aLangTag(rArgs.meLanguage);
 OString sLanguage = OUStringToOString(aLangTag.getLanguage(), 
RTL_TEXTENCODING_UTF8);
@@ -220,8 +222,7 @@
 if (bInCluster)
 nGlyphFlags |= GlyphItem::IS_IN_CLUSTER;
 
-// XXX: query GDEF glyph class? Do we even need this?
-if (aHbPositions[i].x_advance == 0)
+if (hb_ot_layout_get_glyph_class(aHbFace, nGlyphIndex) == 
HB_OT_LAYOUT_GLYPH_CLASS_MARK)
 nGlyphFlags |= GlyphItem::IS_DIACRITIC;
 
 aHbPositions[i].x_offset /= 64;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib935dd571e2191eb5f8ae72650394293dd248140
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Khaled Hosny khaledho...@eglug.org

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

[PATCH] Add some comments

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3520

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/3520/1

Add some comments

Change-Id: I2a0dbf5f69efa0f35170c77a1efc9936cf9ecb94
---
M vcl/generic/glyphs/gcach_layout.cxx
1 file changed, 10 insertions(+), 2 deletions(-)



diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 8fbe9d7..1848ab0 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -148,7 +148,9 @@
 int nRunLen = nEndRunPos - nMinRunPos;
 
 // find matching script
-// TODO: use ICU's UScriptRun API
+// TODO: use ICU's UScriptRun API to properly resolves common and
+// inherited script codes, probably use it in GetNextRun() and return
+// the script there
 UScriptCode eScriptCode = USCRIPT_INVALID_CODE;
 for (int i = nMinRunPos; i  nEndRunPos; ++i)
 {
@@ -195,7 +197,8 @@
 if (nCharPos = 0)
 {
 rArgs.NeedFallback(nCharPos, bRightToLeft);
-// XXX: do we need this in harfbuzz?
+// XXX: do we need this? HarfBuzz can take context into
+// account when shaping
 if  ((nCharPos  0)  
needPreviousCode(rArgs.mpStr[nCharPos-1]))
 rArgs.NeedFallback(nCharPos-1, bRightToLeft);
 else if  ((nCharPos + 1  nEndRunPos)  
needNextCode(rArgs.mpStr[nCharPos+1]))
@@ -234,6 +237,10 @@
 
 GlyphItem aGI(nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, 
nGlyphWidth);
 
+// This is a hack to compensate for assumptions made elsewhere in
+// the codebase, the right way is to use aHbPositions[i].x_advance
+// instead of nGlyphWidth above, and leave mnNewWidth alone
+// (whatever it is meant for)
 if (i + 1  nRunGlyphCount)
 aGI.mnNewWidth = nGlyphWidth + (aHbPositions[i + 1].x_offset / 
64);
 
@@ -249,6 +256,7 @@
 
 // sort glyphs in visual order
 // and then in logical order (e.g. diacritics after cluster start)
+// XXX: why?
 rLayout.SortGlyphItems();
 
 // determine need for kashida justification

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a0dbf5f69efa0f35170c77a1efc9936cf9ecb94
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Khaled Hosny khaledho...@eglug.org

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

[PATCH] Allow switching between HarfBuzz and LE at runtime

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3521

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3521/1

Allow switching between HarfBuzz and LE at runtime

Using the env variable SAL_USE_HARFBUZZ.

Change-Id: If83d4e0e6b9e9a06481840661d51fff6af35b3ae
---
M vcl/generic/glyphs/gcach_layout.cxx
1 file changed, 10 insertions(+), 9 deletions(-)



diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 1848ab0..032a396 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -35,12 +35,11 @@
 #include hb-ft.h
 #include hb-icu.h
 #include hb-ot.h
-#else
+#endif // ENABLE_HARFBUZZ
 #include layout/LayoutEngine.h
 #include layout/LEFontInstance.h
 #include layout/LELanguages.h
 #include layout/LEScripts.h
-#endif // ENABLE_HARFBUZZ
 
 #include unicode/uscript.h
 #include unicode/ubidi.h
@@ -110,7 +109,6 @@
 return lcl_CharIsJoiner(cChar) || U16_IS_TRAIL(cChar);
 }
 
-#if ENABLE_HARFBUZZ
 class HbLayoutEngine : public ServerFontLayoutEngine
 {
 private:
@@ -132,6 +130,7 @@
 ServerFont rFont = rLayout.GetServerFont();
 FT_Face aFace = rFont.GetFtFace();
 
+#if ENABLE_HARFBUZZ
 // allocate temporary arrays, note: round to even
 int nGlyphCapacity = (3 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos) | 15) 
+ 1;
 
@@ -263,10 +262,10 @@
 if((rArgs.mpDXArray || rArgs.mnLayoutWidth)
  ((meScriptCode == USCRIPT_ARABIC) || (meScriptCode == USCRIPT_SYRIAC)))
 rArgs.mnFlags |= SAL_LAYOUT_KASHIDA_JUSTIFICATON;
+#endif // ENABLE_HARFBUZZ
 
 return true;
 }
-#else
 // ===
 // bridge to ICU LayoutEngine
 // ===
@@ -929,19 +928,21 @@
 
 return true;
 }
-#endif // ENABLE_HARFBUZZ
 
 // ===
 
 ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
 {
+const char* pUseHarfBuzz = getenv( SAL_USE_HARFBUZZ );
 // find best layout engine for font, platform, script and language
-if (!mpLayoutEngine)
+if (!mpLayoutEngine) {
 #if ENABLE_HARFBUZZ
-mpLayoutEngine = new HbLayoutEngine(*this);
-#else
-mpLayoutEngine = new IcuLayoutEngine(*this);
+if (pUseHarfBuzz)
+mpLayoutEngine = new HbLayoutEngine(*this);
+else
 #endif // ENABLE_HARFBUZZ
+mpLayoutEngine = new IcuLayoutEngine(*this);
+}
 return mpLayoutEngine;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If83d4e0e6b9e9a06481840661d51fff6af35b3ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Khaled Hosny khaledho...@eglug.org

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

Re: [PATCH] Add HarfBuzz support to the build system

2013-04-21 Thread Khaled Hosny

Hi,

I didn't know that it will submit each commit separately (git review),
should I abandon this and the next commits and squash them into one?

Also, there are some unresolved issues that I can't handle, may be
submitting to gerrit wasn't the best idea after all.

Regards,
Khaled

On Sun, Apr 21, 2013 at 08:19:15AM +, Khaled Hosny (via Code Review) wrote:
 Hi,
 
 I have submitted a patch for review:
 
 https://gerrit.libreoffice.org/3517
 
 To pull it, you can do:
 
 git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/3517/1
 
 Add HarfBuzz support to the build system
 
 To be used in the next commit. No support for non-system build, yet.
 
 Change-Id: I6ee286d0c050a5ca650e7fb3692b0facccb5f0c0
 ---
 M RepositoryExternal.mk
 M config_host.mk.in
 A config_host/config_harfbuzz.h.in
 M configure.ac
 M vcl/Library_vcl.mk
 5 files changed, 64 insertions(+), 0 deletions(-)
 
 
 
 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
 index df44d2d..2707a23 100644
 --- a/RepositoryExternal.mk
 +++ b/RepositoryExternal.mk
 @@ -1186,6 +1186,39 @@
  
  endif # SYSTEM_ICU
  
 +ifeq ($(SYSTEM_HARFBUZZ),YES)
 +
 +define gb_LinkTarget__use_harfbuzz
 +$(call gb_LinkTarget_set_include,$(1),\
 + $$(INCLUDE) \
 + $(HARFBUZZ_CFLAGS) \
 +)
 +$(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
 +
 +endef
 +
 +else ifeq ($(SYSTEM_HARFBUZZ),NO)
 +
 +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 + harfbuzz \
 +))
 +define gb_LinkTarget__use_harfbuzz
 +$(call gb_LinkTarget_use_unpacked,$(1),harfbuzz)
 +$(call gb_LinkTarget_set_include,$(1),\
 + -I$(call gb_UnpackedTarball_get_dir,harfbuzz/include) \
 + $$(INCLUDE) \
 +)
 +$(call gb_LinkTarget_use_static_libraries,$(1),\
 +harfbuzz \
 +)
 +
 +endef
 +
 +else # DISABLED HARFBUZZ
 +
 +gb_LinkTarget__use_harfbuzz :=
 +
 +endif # SYSTEM_HARFBUZZ
  
  ifeq ($(DISABLE_OPENSSL),YES)
  
 diff --git a/config_host.mk.in b/config_host.mk.in
 index 4256fa7..ad33e7d 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
 @@ -122,6 +122,7 @@
  export ENABLE_GIO=@ENABLE_GIO@
  export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
  export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 +export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
  export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
  export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
  export ENABLE_GTK3=@ENABLE_GTK3@
 @@ -196,6 +197,8 @@
  export GPERF=@GPERF@
  export GRAPHITE_CFLAGS=$(gb_SPACE)@GRAPHITE_CFLAGS@
  export GRAPHITE_LIBS=$(gb_SPACE)@GRAPHITE_LIBS@
 +export HARFBUZZ_CFLAGS=$(gb_SPACE)@HARFBUZZ_CFLAGS@
 +export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@
  @x_Cygwin@ export GREP=@WIN_GREP@
  export GSSAPI_LIBS=@GSSAPI_LIBS@
  export GSTREAMER_0_10_CFLAGS=$(gb_SPACE)@GSTREAMER_0_10_CFLAGS@
 @@ -478,6 +481,7 @@
  export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
  export SYSTEM_GENCMN=@SYSTEM_GENCMN@
  export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
 +export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@
  export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@
  export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@
  export SYSTEM_HYPH=@SYSTEM_HYPH@
 diff --git a/config_host/config_harfbuzz.h.in 
 b/config_host/config_harfbuzz.h.in
 new file mode 100644
 index 000..b408f52
 --- /dev/null
 +++ b/config_host/config_harfbuzz.h.in
 @@ -0,0 +1,6 @@
 +#ifndef CONFIG_HARFBUZZ_H
 +#define CONFIG_HARFBUZZ_H
 +
 +#define ENABLE_HARFBUZZ 0
 +
 +#endif
 diff --git a/configure.ac b/configure.ac
 index 2152487..6b844d6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -720,6 +720,11 @@
  [Enables the compilation of Graphite smart font rendering.])
  )
  
 +AC_ARG_ENABLE(harfbuzz,
 +AS_HELP_STRING([--enable-harfbuzz],
 +[Determines whether to use HarfBuzz text layout engine.])
 +)
 +
  AC_ARG_ENABLE(fetch-external,
  AS_HELP_STRING([--disable-fetch-external],
  [Disables fetching external tarballs from web sources.])
 @@ -8378,6 +8383,20 @@
  AC_SUBST(ENABLE_GRAPHITE)
  
  dnl ===
 +dnl HarfBuzz
 +dnl ===
 +AC_MSG_CHECKING([whether to enable HarfBuzz support])
 +if test $_os != WINNT -a $_os != Darwin  test $enable_harfbuzz = 
  -o $enable_harfbuzz != no; then
 +AC_MSG_RESULT([yes])
 +ENABLE_HARFBUZZ=TRUE
 +AC_DEFINE(ENABLE_HARFBUZZ)
 +libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz = 0.9.10])
 +else
 +AC_MSG_RESULT([no])
 +fi
 +AC_SUBST(ENABLE_HARFBUZZ)
 +
 +dnl ===
  dnl Check for NPAPI interface to plug browser plugins into LibreOffice 
 documents
  dnl ===
  AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
 @@ -11880,6 +11899,7 @@
  AC_CONFIG_HEADERS([config_host/config_features.h])
  AC_CONFIG_HEADERS([config_host/config_global.h])
  AC_CONFIG_HEADERS([config_host/config_graphite.h])

Calc statistical accuracy

2013-04-21 Thread Chris Sherlock

Hi all,

This is a question more from curiosity than anything.

Today I was reading that the Journal of Computational Statistics and Data
Analysis was not at all happy with Microsoft Excel 2003, stating that:

Given Microsoft’s track record, we recommend that no statistical procedure
be used unless Microsoft demonstrates that the procedure in question has
been correctly programmed, e.g., by the use of test datasets from
textbooks, or by comparison with another software package. [1]

What interests me the most is that they gave some specific advise on how to
test statistical software. In particular they stated that NIST has a
Statistical Reference Dataset that can be used to test statistical
software. [2]

I found the datasets on the NIST website [3]. They have a number of tests
for ANOVA, Linear Regressions, Markov Chain Monte Carlo, Nonlinear
Regression and Univariate Summary Statistics.

I was wondering if we've done any work on testing Calc against these
datasets?

Chris

1. http://www.pages.drexel.edu/~bdm25/excel2007.pdf
2. http://www.itl.nist.gov/div898/strd/
3. http://www.itl.nist.gov/div898/strd/general/dataarchive.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Different Gerrit workflows -- was Master branch now requires liborcus 0.5.0 or higher.

2013-04-21 Thread David Ostrovsky

On Tue Apr 16 09:32:13 PDT 2013, Kohei Yoshida wrote: 

On Sat, Apr 13, 2013 at 5:55 AM, Bjoern Michaelsen 
bjoern.michaelsen at canonical.com wrote:


 BTW, this seems like a prime example benefitting from upload to
gerrit,
 let
 someone schudule a test build on all platforms -- any reason you
skipped
 that?

Skipped?  I don't use gerrit for things that need to be done right
away. So it wasn't even an option.  I needed that to be done right away
so that I could move on to doing other things which depended on it.
Putting that up on gerrit and wait for a few days or more was never an
option for this.
Plus, the whole feature branch needed to be merged, which isn't a
typical
use case for gerrit review system anyway.

I feel like there is a lot of misunderstanding here.

LO's Gerrit site installation doesn't enforce code review and patch
verification, permitting all commiters to push directly to master,
bypassing Gerrit review  verification facility completely.
But you can still benefit from Gerrit buildbot verification facility
only.

What can tb/tinbuild2 - Gerrit-buildbot tool chain do for you today?
* it builds your single Gerrit patch/Gerrit branch/serie of Gerrit
patches on three different platforms: Linux 64bit, Mac OS X 32bit,
Windows 32bit, MSVS 2008.

What can it do for you in (near) future?
* we are going to put more hardware on it
* add (optionally) further platforms (mingw, iOS, Android, ...),
architectures (Linux 32 bit, Mac OS X 64 bit), compilers (clang, MSVS
2010, 2012, ...), configurations (--with-foo, --without-bar), ...

Different Gerrit wokflows
=

a. upload a single patch to Gerrit and let it test build on buildbot
(discouraged, see b.). Submit it to master if it was successful or amend
and repeat.

Note: If you think you are wasting ca. 2 hours (time currently needed
for Windows build, that we hopefully can improve), then you are just
wrong. You saved a lot of frustration of other devs by not breaking
master.

b. upload the content of local branch to Gerrit's review, so called
series of patches: p_1 ... p_n and let it test build on buildbot. Again,
submit it to master if it was successful or amend and repeat. 

In fact Gerrit is currently missing native support for series of patches
(they call it Gerrit topic review feature [1]) as the first class
objects. With such support it should be possible to submit, abandon or
let verify all changes that belong to the topic as single entity. The
guys from kitware patched their Gerrit and enabled it [2], check the two
top level entities in their Gerrit UI: topic  changes). One reason they
did it is not having enough hardware on all different platforms to check
every patch isolated, it resembles me that we suffer from the same
problem ;-) Gerrit core developers are going to discuss about the ways
to upstream that feature to Gerrit on upcoming spring Hackathon [3].

So back to your use case: the content of your feature branch can be put
on Gerrit for *only* verification (not wasting days or weeks but only 2
hours) with *one* command:
git push logerrit your_branch:refs/for/master
(or even put your whole branch on gerrit for review/verification, like
libreoffice-4) and let test build it and push if it was OK, or amend and
repeat.

Sure, you must not do it (not yet ;-), but then consider to make all
those cross platform checks for current and future platforms,
architectures, compilers and configurations that buildbot offer to you
for granted on your own site to make sure you don't break master.

[1] https://groups.google.com/forum/#!
msg/repo-discuss/gXjbuhfW0tg/21ORzuycLoIJ
[2] http://review.source.kitware.com/#/q/entity:topic%20status:open,n,z
[3] http://gerritforge.com/gerrit-london-hackathon.html 

David

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

Re: Value of a ListBox, FMC paradigm for Form elements (controls)

2013-04-21 Thread Alex Thurgood

Le 20/04/2013 23:34, Lionel Elie Mamane a écrit :

Hi Lionel,

 One last question: where can I edit the help to document a new feature
 I'm introducing (namely, the option that the storage value is the
 index in the list)? I grepped for a string that appears in the right
 help page, but no result. In particular, I did not find it in the
 helpcontent2 directory. Also, do we have our fork of the
 OpenOffice.org Developer's Guide?

AFAIK, there is nothing about the MVC paradigm and its application in
database controls in the helpcontent, unless perhaps there is a mention
in the Basic programming section (but I doubt it). The database help in
helpcontent2 is spartan at best, and I don't ever recall seeing anything
that explained the quite sophisticated (at least to the neophyte
user/programmer/form designer) concepts you outline above. That is
precisely why the OOo developers produced the documentation you mention.

I suppose the new information could go here :
https://help.libreoffice.org/Common/General_5

which I believe is this file :

/helpcontent2/text/shared/02/01170201.xhp

Alex


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

Re: Calc statistical accuracy

2013-04-21 Thread Markus Mohrhard

 This is a question more from curiosity than anything.

 Today I was reading that the Journal of Computational Statistics and Data
 Analysis was not at all happy with Microsoft Excel 2003, stating that:

 Given Microsoft’s track record, we recommend that no statistical
 procedure be used unless Microsoft demonstrates that the procedure in
 question has been correctly programmed, e.g., by the use of test datasets
 from textbooks, or by comparison with another software package. [1]


I would agree with that for all spreadsheet programs. There is statistical
software out there that has been tested and is known to produce good
results for that like R.



 What interests me the most is that they gave some specific advise on how
 to test statistical software. In particular they stated that NIST has a
 Statistical Reference Dataset that can be used to test statistical
 software. [2]

 I found the datasets on the NIST website [3]. They have a number of tests
 for ANOVA, Linear Regressions, Markov Chain Monte Carlo, Nonlinear
 Regression and Univariate Summary Statistics.

 I was wondering if we've done any work on testing Calc against these
 datasets?


No and as long as you don't plan to work on them I doubt anyone is going to
do it soon.

Additionally as long as this mainly serves as theoretical discussion I
think it is off-topic here and should be moved to the discuss list. However
if you want to work on improving Calc's statistical capabilities I think
the best start is to think about a interface to connect it to R. I think we
even have somewhere at some old wiki page this idea as a crazy idea for the
future.

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

Re: Master branch now requires liborcus 0.5.0 or higher.

Hi,

(sorry for the late reply, I missed this mail)
On Tue, Apr 16, 2013 at 12:32:13PM -0400, Kohei Yoshida wrote:
I'd say gbuild itself, compounded by some regular build breakage related to
ccache (particular if you use a combination of gcc-wrapper with ccache
directly specified in CC and CXX environment variables), and the very weird
handling of DLL's by MSVC. The slow build process on Windows didn't make
the whole experience any better.

Well, thats using ccache on MSVC? Thats indeed a tricky scenario and one I
intentionally avoided during the initial concept of gbuild. The added
complexity was just not worth the gains. Esp. if it introduces a single-point of
failure build system expert that can handle that case.

Having said that, if I were to point out one major concern with the current
build system is that we are creating so many layers of abstractions,
indirections just to make the system more elegant that, it's becoming
increasing hard for non-build system experts to do anything non-trivial.
So, for a non-build system expert such as myself, the choices are either 1)
don't do anything non-trivial, such as integrating an external library into
the build, or 2) become a build expert yourself.

I think there are two thing to discuss here: One is the common assumption that
building LibreOffice on multiple platforms is trivial, and the complexity is
there only for some misguided elegance. Its not. Its an inherently complex
problem. And I dont think having some layers of abstraction is a problem per
se. A lot of the mindnumbling complexity of gbuild is because:

- it had to stay compatible with the dmake/solver concept
(we can rid ourselves of that now it is completely gone, modulo scp2 madness)
- three-layer-office (now effectly two-layer office)
a lot could be simplified by ridding ourselves of that madness
- platform-specific optimizations that are not completely transparent
(this esp. is an issue for windows)

We killed the first. I hope we can kill the second someday. The third is the
reason for my reluctance for having support in the build system for bazillion
build scenarios in gbuild (like LLVM, mingw, Android, ccache on Windows, PCH on
Windows) -- all of which add complexity to the build system and many having
only a very small group supporting that functionality introducing fragility and
frustration. Thats warranted when the platform is of strategic importance, but
e.g. even with the build time improvements PCH give, I am still unsure if its
worth the complexity and fragility it introduces.

Also note the old build system was a good example what happens if you
encourage local ad-hoc trickstering instead of some global concept for a
problem -- a huge unmaintainable mess of fragile stuff, that only works by
accident. See:

http://web.archive.org/web/20100504161204/http://blogs.sun.com/GullFOSS/entry/why_some_compilers_suck_more

or the fact that it had at least four stacked different methods to declare a
symbol as exported (that all had fucky interactions with each other, sometimes
resulting in different exports on different platforms).

Finally, let me encourage you to become/stay a 'build expert' yourself at least
to the point that you can judge if adding yet another feature/scenario to the
build system will introduce new complexity(*). Like every system gbuild will
bitrot and in 5-10 years someone will come along and rewrite the whole mess in
a fresh attempt that then hold on for another 10 years. Your best bet to
prevent such a 'we need to rewrite it again'-event from happening too soon, is
to help preventing bitrot, contribute to maintainance of gbuild and have a good
insight in the tradeoff of adding yet-another-feature to gbuild (esp. localized
micro-optimizations).

Skipped? I don't use gerrit for things that need to be done right away.

Why not?

Putting that up on gerrit and wait for a few days or more was never an option
for this.

Why wait a few days? If you ping any of us on IRC, you get a build started on
all
platforms ~instantly(*). And most certainly in the two days you wrote you
worked on this.

Best,

Bjoern

(*) And the core to understand is the 1KLOC solenv/gbuild/LinkTarget.mk
(**) And once we have the Windows builders in place you wont need that anymore.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Converted Tools - Protect Document- Document widget.

2013-04-21 Thread Abdulelah Alarifi (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3522

To pull it, you can do:

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

Converted Tools - Protect Document- Document widget.

Change-Id: Ia947ee7430fba8151a682299e7221339dd61dcd1
---
A sc/uiconfig/scalc/ui/protectdocumentdlg.ui
1 file changed, 208 insertions(+), 0 deletions(-)



diff --git a/sc/uiconfig/scalc/ui/protectdocumentdlg.ui 
b/sc/uiconfig/scalc/ui/protectdocumentdlg.ui
new file mode 100644
index 000..146ccb4
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/protectdocumentdlg.ui
@@ -0,0 +1,208 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=protectdocument
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesProtect Document/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=layout_stylecenter/property
+child
+  object class=GtkButton id=button1
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=button2
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=button3
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing6/property
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkGrid id=grid1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing10/property
+child
+  object class=GtkLabel id=label3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label 
translatable=yes_Password/property
+property name=use_underlineTrue/property
+

Re: Calc statistical accuracy

2013-04-21 Thread Regina Henschel


Hi Chris,

Chris Sherlock schrieb:

Hi all,

This is a question more from curiosity than anything.

Today I was reading that the Journal of Computational Statistics and
Data Analysis was not at all happy with Microsoft Excel 2003, stating that:

Given Microsoft’s track record, we recommend that no statistical
procedure be used unless Microsoft demonstrates that the procedure in
question has been correctly programmed, e.g., by the use of test
datasets from textbooks, or by comparison with another software
package. [1]

What interests me the most is that they gave some specific advise on how
to test statistical software. In particular they stated that NIST has a
Statistical Reference Dataset that can be used to test statistical
software. [2]

I found the datasets on the NIST website [3]. They have a number of
tests for ANOVA, Linear Regressions, Markov Chain Monte Carlo, Nonlinear
Regression and Univariate Summary Statistics.

I was wondering if we've done any work on testing Calc against these
datasets?


Yes, I have used those tests when reworking LINEST.

Kind regards
Regina



Chris

1. http://www.pages.drexel.edu/~bdm25/excel2007.pdf
2. http://www.itl.nist.gov/div898/strd/
3. http://www.itl.nist.gov/div898/strd/general/dataarchive.html


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



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

Re: Patch for postgresql driver

2013-04-21 Thread Wols Lists

On 20/04/13 22:42, Lionel Elie Mamane wrote:
 Both of these methods allow to use git natively to apply the patch,
  and (assuming your git is setup properly) to automatically get your
  suggested commit message and the information of authorship recorded
  into git. For example, now I don't know whether the git authorship
  email should be wolslists at youngmanorg.uk (like the wiki Developers
  page says), antlists at youngman.org.uk (the address that sent this
  mail) or the more personal address you used to correspond with me by
  email in the past. Please advise. I'm also not sure whether you'd like
  the authorship name to be Anthony W. Youngman or Anthony Youngman.

I missed this bit in my earlier reply(s). Email address doesn't really
matter, although anthony is probably best. The antlists address is
really for mailing lists. Authorship - I'm happier with the long form -
Anthony W. Youngman - the wol and the W are related (although they
don't quite stand for each other :-)

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

Setting up one's git identity [was: Patch for postgresql driver]

2013-04-21 Thread Lionel Elie Mamane

On Sun, Apr 21, 2013 at 12:26:52PM +0100, Wols Lists wrote:
 On 20/04/13 22:42, Lionel Elie Mamane wrote:

 Both of these methods allow to use git natively to apply the patch,

 and (assuming your git is setup properly) to automatically get your
 suggested commit message and the information of authorship recorded
 into git. For example, now I don't know whether the git authorship
 email should be wolslists at youngmanorg.uk (like the wiki
 Developers page says), antlists at youngman.org.uk (the address
 that sent this mail) or the more personal address you used to
 correspond with me by email in the past. Please advise. I'm also
 not sure whether you'd like the authorship name to be Anthony
 W. Youngman or Anthony Youngman.

 I missed this bit in my earlier reply(s). Email address doesn't really
 matter, although anthony is probably best. The antlists address is
 really for mailing lists. Authorship - I'm happier with the long form -
 Anthony W. Youngman - the wol and the W are related (although they
 don't quite stand for each other :-)

OK, then do:

 git config --global user.name Anthony W. Youngman
 git config --global user.email anth...@youngman.org.uk

In this way your own git will put that information in your own
commits, which will be transferred with the git push (in the gerrit
case) or with the git format-patch (in the send patch to mailing
list case). (And neither you, nor anybody else will have to think
about these questions ever again, :) at least until you change
computers or something like that.)

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

Fwd: Calc statistical accuracy

2013-04-21 Thread Chris Sherlock

On Sunday, 21 April 2013, Markus Mohrhard wrote:


 No and as long as you don't plan to work on them I doubt anyone is going
 to do it soon.


There's a friendly response... Where did you get that idea?


 Additionally as long as this mainly serves as theoretical discussion


Why do you consider this to be a theoretical discussion? Don't you feel
there is any merit in the data sets?


 I think it is off-topic here and should be moved to the discuss list.


Why is that? It's a fairly innocent enquiry.


 However if you want to work on improving Calc's statistical capabilities I
 think the best start is to think about a interface to connect it to R. I
 think we even have somewhere at some old wiki page this idea as a crazy
 idea for the future.

 Regards,
 Markus


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

Re: Calc statistical accuracy

2013-04-21 Thread Noel Grandin

On Sun, Apr 21, 2013 at 1:56 PM, Chris Sherlock
chris.sherloc...@gmail.com wrote:
 I think it is off-topic here and should be moved to the discuss list.


 Why is that? It's a fairly innocent enquiry.


This is a list for people actually working on modifying the code of LO.

Discussions about what modifications are desirable belong on the
discuss mailing list.

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

Re: Calc statistical accuracy

2013-04-21 Thread Markus Mohrhard

2013/4/21 Chris Sherlock chris.sherloc...@gmail.com

 On Sunday, 21 April 2013, Markus Mohrhard wrote:


 No and as long as you don't plan to work on them I doubt anyone is going
 to do it soon.


 There's a friendly response... Where did you get that idea?


Please understand that posting at the developer mailing list will often
result in a response asking you to show some work in this area. This is
part of the rule of the mailing list and if you feel uncomfortable with
this you should move the discussion to the discuss list which is exactly
for that case.




 Additionally as long as this mainly serves as theoretical discussion


 Why do you consider this to be a theoretical discussion? Don't you feel
 there is any merit in the data sets?


I never said there is no merit in these data sets but as long as nobody is
doing the work this is a purely theoretical discussion.




 I think it is off-topic here and should be moved to the discuss list.


 Why is that? It's a fairly innocent enquiry.


Because this is the developer mailing list where we discuss code and code
related questions. General discussions that are not backed up by code
should be moved to the discuss mailing list or the user mailing list.
Please also see the general rules for the developer mailing list at
https://wiki.documentfoundation.org/Development/Use_of_MailList

I'm sorry if that sounds rude but I think that discussing this without
planning on working on it is just wasted time. If you want to work on this
issues we are happy to provide you with some code pointers. As I already
mentioned in my other mail IMHO the right solution is to provide an
interface to R.

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

Python scripts other than Logo missing in master build

2013-04-21 Thread Alex Thurgood

Hi all,

In my 32bit master build :

Version: 4.1.0.0.alpha0+
Build ID: ec2b98f4bcbe3b8a47b3b2b7127ac608d83ac6e

the Python scripts are not available either via the Macro management UI,
or via the command line, only the LibreLogo scripts show up.

The Enable Experimental Features options box is ticked.


Looking in
/instdir/unxlngi6.pro/share/Scripts/python/

shows that the scripts have not been copied over during build.

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

Re: Calc statistical accuracy

2013-04-21 Thread Chris Sherlock

On Sunday, 21 April 2013, Markus Mohrhard wrote:



 2013/4/21 Chris Sherlock chris.sherloc...@gmail.com javascript:_e({},
 'cvml', 'chris.sherloc...@gmail.com');

 On Sunday, 21 April 2013, Markus Mohrhard wrote:


 No and as long as you don't plan to work on them I doubt anyone is going
 to do it soon.


 There's a friendly response... Where did you get that idea?


 Please understand that posting at the developer mailing list will often
 result in a response asking you to show some work in this area. This is
 part of the rule of the mailing list and if you feel uncomfortable with
 this you should move the discussion to the discuss list which is exactly
 for that case.


Understood, I only raised it because I'm interested in statistics and was
wondering if it might be worthwhile putting some effort into it. I should
have made that more clear.






 Additionally as long as this mainly serves as theoretical discussion


 Why do you consider this to be a theoretical discussion? Don't you feel
 there is any merit in the data sets?


 I never said there is no merit in these data sets but as long as nobody is
 doing the work this is a purely theoretical discussion.




 I think it is off-topic here and should be moved to the discuss list.


 Why is that? It's a fairly innocent enquiry.


 Because this is the developer mailing list where we discuss code and code
 related questions. General discussions that are not backed up by code
 should be moved to the discuss mailing list or the user mailing list.
 Please also see the general rules for the developer mailing list at
 https://wiki.documentfoundation.org/Development/Use_of_MailList


Apologies, didn't mean to break mailing list etiquette.

I'm sorry if that sounds rude but I think that discussing this without
 planning on working on it is just wasted time. If you want to work on this
 issues we are happy to provide you with some code pointers. As I already
 mentioned in my other mail IMHO the right solution is to provide an
 interface to R.


Fair enough.

Regards,
 Markus


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

[PATCH] Changed a few compareTo's to '=='

2013-04-21 Thread Sameer Deshmukh (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3523

To pull it, you can do:

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

Changed a few compareTo's to '=='

Change-Id: I0a0ba87ec517e5dd776ab45b232dd7f227451466
---
M ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
M xmlhelp/source/cxxhelp/provider/databases.hxx
2 files changed, 3 insertions(+), 3 deletions(-)



diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx 
b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index 0f10513..0ec097c 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -135,7 +135,7 @@
 if ( !aValue.isEmpty() )
 {
 aValue = stripDavNamespace( aValue ).toAsciiLowerCase();
-if ( aValue.compareTo( collection ) == 0 )
+if ( aValue == collection )
 {
 thePropertyValue.Value
 = OUString(collection);
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx 
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 905c86c..8585700 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -156,7 +156,7 @@
 {
 bool operator()( const OUString rKey1, const OUString rKey2 ) 
const
 {
-return rKey1.compareTo( rKey2 ) == 0;
+return (rKey1 == rKey2);
 }
 };
 
@@ -351,7 +351,7 @@
 {
 bool operator()( const OString rKey1, const OString rKey2 ) const
 {
-return rKey1.compareTo( rKey2 ) == 0;
+return (rKey1 == rKey2);
 }
 };
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a0ba87ec517e5dd776ab45b232dd7f227451466
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com

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

[Libreoffice-commits] core.git: solenv/gbuild

2013-04-21 Thread Michael Stahl

 solenv/gbuild/platform/unxgcc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a12d25ac87fa01aa05b8cd4fe8606e066a4c1d03
Author: Michael Stahl mst...@redhat.com
Date:   Sun Apr 21 14:24:13 2013 +0200

accidentally renamed variable

Change-Id: I940a807a6bd92393fa4bf01790c1478234228e5e

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e2784d1..4a593be 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -433,7 +433,7 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
 gb_Pyuno_PROGRAMDIRNAME := program
 
 # Python
-gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) 
PYTHONHOME=$(OUTDIR)/lib/python 
PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
+gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) 
PYTHONHOME=$(OUTDIR)/lib/python 
PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(DEVINSTALLDIR)/opt/program/python
 # this is passed to gdb as executable when running tests
 gb_Python_INSTALLED_EXECUTABLE_GDB := $(DEVINSTALLDIR)/opt/program/python.bin
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Resolved bug fdo#63766

2013-04-21 Thread gokul s (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3524

To pull it, you can do:

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

Resolved bug fdo#63766

This check is not required as the option merge will be disabled
for merged cells, this code was returning true if any one the cells
selected for merging is merged hence throwing error, Which is not the
desired behviour.

Change-Id: Id1765b7c73beb8f3aa35394851413026d637088f
---
M sc/source/ui/docshell/docfunc.cxx
M sc/source/ui/view/viewfun2.cxx
2 files changed, 0 insertions(+), 18 deletions(-)



diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index fbdfdc0..0595379 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4652,15 +4652,6 @@
 rDocShell.ErrorMessage(aTester.GetMessageId());
 return false;
 }
-
-if ( pDoc-HasAttrib( nStartCol, nStartRow, *itr, nEndCol, nEndRow, 
*itr,
-HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-{
-// Zusammenfassen nicht verschachteln !
-if (!bApi)
-rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
-return false;
-}
 }
 
 ScDocument* pUndoDoc = NULL;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 22a25ec..be7f165 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1085,21 +1085,12 @@
 rMark.GetMarkArea( aMarkRange );
 SCCOL nStartCol = aMarkRange.aStart.Col();
 SCROW nStartRow = aMarkRange.aStart.Row();
-SCTAB nStartTab = aMarkRange.aStart.Tab();
 SCCOL nEndCol = aMarkRange.aEnd.Col();
 SCROW nEndRow = aMarkRange.aEnd.Row();
-SCTAB nEndTab = aMarkRange.aEnd.Tab();
 if ( nStartCol == nEndCol  nStartRow == nEndRow )
 {
 // nothing to do
 return true;
-}
-
-if ( pDoc-HasAttrib( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, 
nEndTab,
-HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-{   // Don't nest merging  !
-ErrorMessage(STR_MSSG_MERGECELLS_0);
-return false;
 }
 
 // Check for the contents of all selected tables.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1765b7c73beb8f3aa35394851413026d637088f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa

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

[PATCH] replace python-core zip built in pyuno with direct use of Pa...

2013-04-21 Thread Michael Stahl (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3525

To pull it, you can do:

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

replace python-core zip built in pyuno with direct use of Package

- python3: deliver files to INSTDIR, with same layout as instset
- pyuno: remove obsolete python.bin targets
- pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX
  platforms (sadly it is apparently still needed for system python on
  MinGW)
- scp2: use the python3 filelist
  There is still a problem here because the installer does not currently
  allow to preserve the executable bit on files in a filelist
- RepositoryExternal: run python executable from INSTDIR

Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832
---
M RepositoryExternal.mk
M python3/ExternalPackage_python3.mk
M pyuno/CustomTarget_zipcore.mk
M pyuno/Module_pyuno.mk
M scp2/source/python/file_python.scp
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
9 files changed, 70 insertions(+), 113 deletions(-)



diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index df44d2d..5015f90 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2888,8 +2888,8 @@
 
 else
 
-$(call gb_ExternalExecutable_set_internal,python)
-$(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND))
+$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/program/python$(if 
$(filter WNT,$(OS)),.exe,.bin))
+$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND))
 $(call gb_ExternalExecutable_add_dependencies,python,$(call 
gb_Package_get_target_for_build,python3))
 
 endif
diff --git a/python3/ExternalPackage_python3.mk 
b/python3/ExternalPackage_python3.mk
index 4f9c833..1d11487 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -9,20 +9,22 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3))
 
+$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTDIR)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
 ifeq ($(CPUNAME),X86_64)
 python_arch_subdir=amd64/
 endif
-$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python.exe,LO_lib/$(python_arch_subdir)python$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).exe))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 
$(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).dll))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 
$(MSVC_USE_DEBUG_RUNTIME),_d).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,program/python-core-$(PYTHON_VERSION)/bin/python.exe,LO_lib/$(python_arch_subdir)python$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).exe))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 
$(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).dll))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 
$(MSVC_USE_DEBUG_RUNTIME),_d).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
 $(MSVC_USE_DEBUG_RUNTIME),_d).lib))
 ifeq ($(MSVC_USE_DEBUG_RUNTIME),)
-$(eval $(call 
gb_ExternalPackage_add_file,python3,bin/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
-$(eval $(call 
gb_ExternalPackage_add_file,python3,lib/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).lib))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
+$(eval $(call 
gb_ExternalPackage_add_file,python3,program/python$(PYTHON_VERSION_MAJOR).lib,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).lib))
 endif
-$(eval $(call gb_ExternalPackage_add_files,python3,lib/python,\
+$(eval $(call 
gb_ExternalPackage_add_files,python3,program/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\
LO_lib/$(python_arch_subdir)_ctypes$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
LO_lib/$(python_arch_subdir)_ctypes_test$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
LO_lib/$(python_arch_subdir)_decimal$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
@@ -40,13 +42,13 @@
 ))
 else ifeq ($(OS),WNT) # MinGW
 # TODO how are C modules called on this platform?
-$(eval $(call gb_ExternalPackage_add_file,python3,bin/python.exe,python.exe))
-$(eval $(call

[Libreoffice-commits] core.git: 2 commits - pyuno/source RepositoryFixes.mk scp2/source

2013-04-21 Thread Michael Stahl

 RepositoryFixes.mk   |2 +-
 pyuno/source/module/pyuno_module.cxx |   10 +++---
 scp2/source/python/file_python.scp   |4 
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 288c8b9d59024897e88b55b9001f9922998d1302
Author: Michael Stahl mst...@redhat.com
Date:   Sat Apr 20 00:52:48 2013 +0200

adapt path for test.dll for WNT

Change-Id: I4d7cb081805213f55ae69c4ade8638bbfc06f0c4

diff --git a/pyuno/source/module/pyuno_module.cxx 
b/pyuno/source/module/pyuno_module.cxx
index 9662958..06632c8 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -342,9 +342,13 @@ static PyObject* initPoniesMode(
 if (!xMSF.is()) { abort(); }
 char *const outdir = getenv(OUTDIR);
 if (!outdir) { abort(); }
-OStringBuffer libname(outdir);
-libname.append(/lib/);
-libname.append(SAL_MODULENAME(test));
+OString const libname = (OString(OString(outdir, strlen(outdir)) +
+#ifdef _WIN32
+/bin/)).replaceAll(OString('/'), OString('\\'))
+#else
+/lib/))
+#endif
++ SAL_MODULENAME(test);
 oslModule const mod( osl_loadModuleAscii(libname.getStr(),
 SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL) );
 if (!mod) { abort(); }
commit 849f87db1da8659bcc79b472c9411d7ceae26ede
Author: Michael Stahl mst...@redhat.com
Date:   Sat Apr 20 00:51:21 2013 +0200

pyuno.pyd must be called pyuno_d.pyd with MSVC debug runtimes

Change-Id: I8ed937739d94bfc6316d9cb158870362a0b8b996

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 1ee9955..175f9cb 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -66,7 +66,7 @@ gb_Library_DLLFILENAMES := $(patsubst 
z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILENAMES))
 
 # libpyuno_wrapper.dll = pyuno.pyd
-gb_Library_DLLFILENAMES := $(patsubst 
pyuno:pyuno.dll,pyuno:pyuno.pyd,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst pyuno:pyuno.dll,pyuno:pyuno$(if 
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd,$(gb_Library_DLLFILENAMES))
 
 gb_StaticLibrary_FILENAMES := $(patsubst 
png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES))
 gb_StaticLibrary_FILENAMES := $(patsubst 
salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index c502986..5dba2c7 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -48,7 +48,11 @@ File gid_File_Lib_Pyuno
   #ifdef UNX
 Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
   #else
+  #ifdef MSVC_PKG_DEBUG_RUNTIME
+Name = pyuno_d.pyd;
+  #else
 Name = pyuno.pyd;
+  #endif // MSVC_PKG_DEBUG_RUNTIME
   #endif
 Dir = gid_Brand_Dir_Program;
 Styles = (PACKED);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-21 Thread Fridrich Štrba

 src/lib/VDXParser.cpp   |   31 +++
 src/lib/VDXParser.h |1 +
 src/lib/VSDCollector.h  |1 +
 src/lib/VSDContentCollector.cpp |   15 ---
 src/lib/VSDContentCollector.h   |2 ++
 src/lib/VSDParser.cpp   |   15 +++
 src/lib/VSDParser.h |2 ++
 src/lib/VSDStencils.cpp |8 ++--
 src/lib/VSDStencils.h   |1 +
 src/lib/VSDStylesCollector.cpp  |5 +
 src/lib/VSDStylesCollector.h|1 +
 src/lib/VSDTypes.h  |7 +++
 12 files changed, 84 insertions(+), 5 deletions(-)

New commits:
commit 5213878fe1e0f99a1ad1f82341e832bbbd35f5f0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Apr 21 15:41:31 2013 +0200

HideText for VSD

diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index d0b8c8a..e85f9a9 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -250,6 +250,10 @@ void libvisio::VDXParser::processXmlNode(xmlTextReaderPtr 
reader)
 if (XML_READER_TYPE_ELEMENT == tokenType)
   readXFormData(reader);
 break;
+  case XML_MISC:
+if (XML_READER_TYPE_ELEMENT == tokenType)
+  readMisc(reader);
+break;
   case XML_GEOM:
 if (XML_READER_TYPE_ELEMENT == tokenType)
   readGeometry(reader);
@@ -462,6 +466,33 @@ void 
libvisio::VDXParser::readFillAndShadow(xmlTextReaderPtr reader)
   }
 }
 
+void libvisio::VDXParser::readMisc(xmlTextReaderPtr reader)
+{
+  int ret = 1;
+  int tokenId = XML_TOKEN_INVALID;
+  int tokenType = -1;
+  do
+  {
+ret = xmlTextReaderRead(reader);
+tokenId = getElementToken(reader);
+if (XML_TOKEN_INVALID == tokenId)
+{
+  VSD_DEBUG_MSG((VDXParser::readMisc: unknown token %s\n, 
xmlTextReaderConstName(reader)));
+}
+tokenType = xmlTextReaderNodeType(reader);
+switch (tokenId)
+{
+case XML_HIDETEXT:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+ret = readBoolData(m_shape.m_misc.m_hideText, reader);
+  break;
+default:
+  break;
+}
+  }
+  while ((XML_MISC != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType)  
1 == ret);
+}
+
 void libvisio::VDXParser::readXFormData(xmlTextReaderPtr reader)
 {
   int ret = 1;
diff --git a/src/lib/VDXParser.h b/src/lib/VDXParser.h
index 909835c..32038a6 100644
--- a/src/lib/VDXParser.h
+++ b/src/lib/VDXParser.h
@@ -74,6 +74,7 @@ private:
   void readLine(xmlTextReaderPtr reader);
   void readFillAndShadow(xmlTextReaderPtr reader);
   void readXFormData(xmlTextReaderPtr reader);
+  void readMisc(xmlTextReaderPtr reader);
   void readTxtXForm(xmlTextReaderPtr reader);
   void readPageProps(xmlTextReaderPtr reader);
   void readFonts(xmlTextReaderPtr reader);
diff --git a/src/lib/VSDCollector.h b/src/lib/VSDCollector.h
index f53545b..2313e83 100644
--- a/src/lib/VSDCollector.h
+++ b/src/lib/VSDCollector.h
@@ -120,6 +120,7 @@ public:
   virtual void collectNameList(unsigned id, unsigned level) = 0;
   virtual void collectName(unsigned id, unsigned level,  const ::WPXBinaryData 
name, TextFormat format) = 0;
   virtual void collectPageSheet(unsigned id, unsigned level) = 0;
+  virtual void collectMisc(unsigned level, const VSDMisc misc) = 0;
 
   // Style collectors
   virtual void collectStyleSheet(unsigned id, unsigned level,unsigned 
parentLineStyle, unsigned parentFillStyle, unsigned parentTextStyle) = 0;
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index e668666..0f80948 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -84,8 +84,8 @@ libvisio::VSDContentCollector::VSDContentCollector(
 ) :
   m_painter(painter), m_isPageStarted(false), m_pageWidth(0.0), 
m_pageHeight(0.0),
   m_shadowOffsetX(0.0), m_shadowOffsetY(0.0),
-  m_scale(1.0), m_x(0.0), m_y(0.0), m_originalX(0.0), m_originalY(0.0), 
m_xform(),
-  m_txtxform(0), m_currentFillGeometry(), m_currentLineGeometry(), 
m_groupXForms(groupXFormsSequence.empty() ? 0 : groupXFormsSequence[0]),
+  m_scale(1.0), m_x(0.0), m_y(0.0), m_originalX(0.0), m_originalY(0.0), 
m_xform(), m_txtxform(0), m_misc(),
+  m_currentFillGeometry(), m_currentLineGeometry(), 
m_groupXForms(groupXFormsSequence.empty() ? 0 : groupXFormsSequence[0]),
   m_currentForeignData(), m_currentOLEData(), m_currentForeignProps(), 
m_currentShapeId(0), m_foreignType((unsigned)-1),
   m_foreignFormat(0), m_foreignOffsetX(0.0), m_foreignOffsetY(0.0), 
m_foreignWidth(0.0), m_foreignHeight(0.0),
   m_noLine(false), m_noFill(false), m_noShow(false), m_fonts(),
@@ -400,7 +400,8 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
 
 void libvisio::VSDContentCollector::_flushText()
 {
-  if (!m_textStream.size()) return;
+  if (!m_textStream.size() || m_misc.m_hideText)
+return;
 
   double xmiddle = m_txtxform ? m_txtxform-width / 2.0 : m_xform.width / 2.0;
   double ymiddle = m_txtxform ? m_txtxform-height / 2.0 : m_xform.height / 
2.0;
@@ -1739,6 +1740,8 @@ void

[ABANDONED] Changed a few compareTo's to '=='

2013-04-21 Thread Sameer Deshmukh (via Code Review)

Sameer Deshmukh has abandoned this change.

Change subject: Changed a few compareTo's to '=='
..


Patch Set 1: Abandoned

wrong commit

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I0a0ba87ec517e5dd776ab45b232dd7f227451466
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Depends on||42939

--- Comment #139 from Rainer Bielefeld libreoff...@bielefeldundbuss.de ---
I add Bug 42939 - SVG Export ignores line width, what makes SVG export
totally unusable.

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

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

2013-04-21 Thread Fridrich Štrba

 src/lib/VSDXMLParserBase.cpp |3 +++
 src/lib/VSDXParser.cpp   |4 
 2 files changed, 7 insertions(+)

New commits:
commit 721c81593b2fb698b00d556e5509f570f692c765
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Sun Apr 21 17:33:50 2013 +0200

HideText for xml parsers too

diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index 287df0a..da7a22e 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -1010,6 +1010,7 @@ void 
libvisio::VSDXMLParserBase::readShape(xmlTextReaderPtr reader)
   m_shape.m_charList = tmpShape-m_charList;
   m_shape.m_paraList = tmpShape-m_paraList;
   m_shape.m_text = tmpShape-m_text;
+  m_shape.m_misc = tmpShape-m_misc;
 }
   }
 
@@ -1715,6 +1716,8 @@ void libvisio::VSDXMLParserBase::_flushShape()
 
   m_collector-collectXFormData(m_currentShapeLevel+2, m_shape.m_xform);
 
+  m_collector-collectMisc(m_currentShapeLevel+2, m_shape.m_misc);
+
   if (m_shape.m_txtxform)
 m_collector-collectTxtXForm(m_currentShapeLevel+2, *(m_shape.m_txtxform));
 
diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index a6aa3ad..d067d21 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -1180,6 +1180,10 @@ void 
libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader)
   if (XML_READER_TYPE_ELEMENT == tokenType)
 readText(reader);
   break;
+case XML_HIDETEXT:
+  if (XML_READER_TYPE_ELEMENT == tokenType)
+ret = readBoolData(m_shape.m_misc.m_hideText, reader);
+  break;
 case XML_RESIZEMODE:
   break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - smoketest/com smoketest/Extension_TestExtension.mk smoketest/Module_smoketest.mk smoketest/Package_smoketestdoc.mk smoketest/Zip_smoketestdoc.mk smoketest/Z

 smoketest/Extension_TestExtension.mk|   14 +++
 smoketest/Module_smoketest.mk   |3 
 smoketest/Package_smoketestdoc.mk   |   14 +++
 smoketest/Zip_TestExtension.mk  |   48 --
 smoketest/Zip_smoketestdoc.mk   |   10 --
 smoketest/com/sun/star/comp/smoketest/META-INF/manifest.xml |4 
 smoketest/com/sun/star/comp/smoketest/description.xml   |   26 +
 smoketest/com/sun/star/comp/smoketest/manifest.xml  |4 
 ure/Module_ure.mk   |2 
 ure/Package_uretest.mk  |   32 ---
 ure/Zip_uretest.mk  |   53 
 11 files changed, 60 insertions(+), 150 deletions(-)

New commits:
commit f33b292d541a54c7d9033b04dc1de191c1513a3c
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 21 12:22:12 2013 +0200

gbuild: use Package for delivering smoketestdoc.sxw

Change-Id: I056a9457aee725e1c8f992ee2553e79f536920ee

diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 25ca96c..61e93ae 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -32,6 +32,7 @@ ifeq ($(CROSS_COMPILING),)
 $(eval $(call gb_Module_add_targets,smoketest,\
Library_smoketest \
Package_losmoketest \
+   Package_smoketestdoc \
Zip_smoketestdoc \
 ))
 
diff --git a/smoketest/Package_smoketestdoc.mk 
b/smoketest/Package_smoketestdoc.mk
new file mode 100644
index 000..cac1d65
--- /dev/null
+++ b/smoketest/Package_smoketestdoc.mk
@@ -0,0 +1,14 @@
+# -*- 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,smoketestdoc,$(WORKDIR)/Zip))
+
+$(eval $(call 
gb_Package_add_file,smoketestdoc,bin/smoketestdoc.sxw,smoketestdoc.zip))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
index d39e9f1..6823e52 100644
--- a/smoketest/Zip_smoketestdoc.mk
+++ b/smoketest/Zip_smoketestdoc.mk
@@ -52,14 +52,4 @@ $(eval $(call 
gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml))
 $(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml))
 $(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml))
 
-$(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
-$(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
-
-$(OUTDIR)/bin/smoketestdoc.sxw : $(call gb_Zip_get_target,smoketestdoc) | 
$(OUTDIR)/bin/.dir
-   $(call gb_Deliver_deliver,$,$@)
-
-.PHONY : Clean_smoketestdoc_sxw
-Clean_smoketestdoc_sxw :
-   rm -f $(OUTDIR)/bin/smoketestdoc.sxw
-
 # vim: set noet sw=4 ts=4:
commit 940bc35696c9020c8afb134759eb6b7802df7246
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 21 12:05:47 2013 +0200

gbuild: use Extension

Change-Id: Ibbcf0ea1744090e0108faf2a617a96177e934aec

diff --git a/smoketest/Extension_TestExtension.mk 
b/smoketest/Extension_TestExtension.mk
new file mode 100644
index 000..454aede
--- /dev/null
+++ b/smoketest/Extension_TestExtension.mk
@@ -0,0 +1,14 @@
+# -*- 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_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest))
+
+$(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call 
gb_Jar_get_outdir_target,TestExtension)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 31efcce..25ca96c 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_Module_add_targets,smoketest,\
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,smoketest,\
+   Extension_TestExtension \
Jar_TestExtension \
-   Zip_TestExtension \
 ))
 endif
 
diff --git a/smoketest/Zip_TestExtension.mk b/smoketest/Zip_TestExtension.mk
deleted file mode 100644
index b332f43..000
--- a/smoketest/Zip_TestExtension.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the License); you may not use this file except in compliance with
-# the License or as specified alternatively below. You

[PATCH] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

2013-04-21 Thread Ioan Radu (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3526

To pull it, you can do:

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

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

 - replaced osl_trace with sal_info
 - replaced dbg_* with sal_*

Change-Id: I4db4a2db0f4f2e9913826f428ba129099b1ac8a8
---
M xmloff/source/chart/SchXMLImport.cxx
M xmloff/source/chart/SchXMLLegendContext.cxx
M xmloff/source/chart/SchXMLPlotAreaContext.cxx
M xmloff/source/chart/SchXMLSeries2Context.cxx
M xmloff/source/chart/SchXMLSeriesHelper.cxx
M xmloff/source/chart/SchXMLTableContext.cxx
M xmloff/source/chart/SchXMLTools.cxx
M xmloff/source/chart/contexts.cxx
8 files changed, 60 insertions(+), 121 deletions(-)



diff --git a/xmloff/source/chart/SchXMLImport.cxx 
b/xmloff/source/chart/SchXMLImport.cxx
index 6f758c8..91ba282 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -165,7 +165,7 @@
 }
 else
 {
-OSL_FAIL( No valid XChartDocument given as XModel );
+SAL_WARN(xmloff.chart, No valid XChartDocument given as XModel );
 pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
 }
 
@@ -436,12 +436,7 @@
 }
 catch( const uno::Exception  ex )
 {
-(void)ex; // avoid warning for pro build
-OSL_FAIL( OUStringToOString(
-OUString(  Exception caught. Type:  ) +
-OUString::createFromAscii( typeid( ex ).name()) +
-OUString(  , Message:  ) +
-ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+   SAL_WARN(xmloff.chart,  Exception caught. Type:   
OUString::createFromAscii( typeid( ex ).name())  , Message:   ex.Message);
 }
 }
 
@@ -520,12 +515,7 @@
 }
 catch( const uno::Exception  ex )
 {
-(void)ex; // avoid warning for pro build
-OSL_FAIL( OUStringToOString(
-OUString(  Exception caught. Type:  ) +
-OUString::createFromAscii( typeid( ex ).name()) +
-OUString(  , Message:  ) +
-ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+SAL_WARN(xmloff.chart, Exception caught. Type:   
OUString::createFromAscii( typeid( ex ).name())  , Message:   ex.Message);
 }
 return xResult;
 }
@@ -678,12 +668,8 @@
 }
 catch( const uno::Exception  rEx )
 {
-#ifdef DBG_UTIL
 OString aBStr(OUStringToOString(rEx.Message, 
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE(SchXMLChartContext::StartElement(): Exception caught: %s, 
aBStr.getStr());
-#else
-(void)rEx; // avoid warning for pro build
-#endif
+SAL_INFO(xmloff.chart, SchXMLChartContext::StartElement(): 
Exception caught:   aBStr);
 }
 }
 
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx 
b/xmloff/source/chart/SchXMLLegendContext.cxx
index ba44bf3..73b651fb 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -105,7 +105,7 @@
 }
 catch(const beans::UnknownPropertyException)
 {
-OSL_TRACE( Property HasLegend not found );
+SAL_INFO(xmloff.chart, Property HasLegend not found );
 }
 }
 
@@ -113,7 +113,7 @@
 uno::Reference beans::XPropertySet  xLegendProps( xLegendShape, 
uno::UNO_QUERY );
 if( !xLegendShape.is() || !xLegendProps.is() )
 {
-OSL_TRACE( legend could not be created );
+SAL_INFO(xmloff.chart, legend could not be created );
 return;
 }
 
@@ -151,7 +151,7 @@
 }
 catch(const beans::UnknownPropertyException)
 {
-OSL_TRACE( Property Alignment (legend) not found );
+SAL_INFO(xmloff.chart, Property Alignment (legend) 
not found );
 }
 }
 break;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 8fef27b..a8663f5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -121,12 +121,8 @@
 }
 catch( const uno::Exception  rEx )
 {
-#ifdef DBG_UTIL
 OString aBStr(OUStringToOString(rEx.Message, 
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE( Exception caught for property NumberOfLines: %s, 
aBStr.getStr());
-#else
-(void)rEx; // avoid warning for pro build
-#endif
+SAL_INFO(xmloff.chart, Exception caught for property NumberOfLines: 
  aBStr);
 }
 }
 
@@ -184,7 +180,7 @@
 
 maSceneImportHelper.getCameraDefaultFromDiagram( mxDiagram );
 }
-DBG_ASSERT( mxDiagram.is(), Couldn't get XDiagram );
+SAL_WARN_IF( !mxDiagram.is(),xmloff.chart, Couldn't get XDiagram );
 
 // turn off all axes initially
 uno::Any aFalseBool;
@@ -231,7 +227,7 @@
 }

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

2013-04-21 Thread Matthias Freund

 sw/source/ui/shells/annotsh.cxx |   18 +--
 sw/source/ui/shells/basesh.cxx  |  193 +---
 2 files changed, 94 insertions(+), 117 deletions(-)

New commits:
commit 5741492149f39c4afa0c9cf575294f83ee4b3316
Author: Matthias Freund matti...@yahoo.de
Date:   Sun Apr 21 00:08:09 2013 +0200

fdo#39468 Comment translation GER-ENG in sw/source/ui/shells/ (Part 1)

basesh.cxx line 112 translated with a hint of David Tardon. (Thank you!)

Change-Id: I98af528c011a7d63b07b3aa71271d6816c11f7ab
Reviewed-on: https://gerrit.libreoffice.org/3512
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 3c7db4f..8e3e08d 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -311,7 +311,7 @@ void SwAnnotationShell::Exec( SfxRequest rReq )
 
 if (pFieldItem  pFieldItem-GetField()-ISA(SvxURLField))
 {
-// Feld selektieren, so dass es beim Insert geloescht wird
+// Select the field so that it will be deleted during 
insert
 ESelection aSel = pOLV-GetSelection();
 aSel.nEndPos++;
 pOLV-SetSelection(aSel);
@@ -425,7 +425,7 @@ void SwAnnotationShell::Exec( SfxRequest rReq )
 */
 SfxItemSet aDlgAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
 
-// util::Language gibts an der EditEngine nicht! Daher nicht 
im Set.
+// util::Language does not exist in the EditEngine! Therefore 
not included in the set.
 
 aDlgAttr.Put( aEditAttr );
 aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
@@ -1580,7 +1580,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest rReq)
 else
 aAllSet.Put( SfxStringItem( SID_FONT_NAME, 
aSetDlgFont.GetFamilyName() ) );
 
-// Wenn Zeichen selektiert ist kann es angezeigt werden
+// If character is selected then it can be shown.
 SfxAbstractDialog* pDlg = pFact-CreateSfxDialog( rView.GetWindow(), 
aAllSet,
 rView.GetViewFrame()-GetFrame().GetFrameInterface(), 
RID_SVXDLG_CHARMAP );
 
@@ -1610,7 +1610,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest rReq)
 
 if( sSym.Len() )
 {
-// nicht flackern
+// do not flicker
 pOLV-HideCursor();
 Outliner * pOutliner = pOLV-GetOutliner();
 pOutliner-SetUpdateMode(sal_False);
@@ -1623,10 +1623,10 @@ void SwAnnotationShell::InsertSymbol(SfxRequest rReq)
 0 );
 aFontSet.Set( aOldSet );
 
-// String einfuegen
+// Insert string
 pOLV-InsertText( sSym);
 
-// attributieren (Font setzen)
+// Attributing (set font)
 SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() );
 SvxFontItem aFontItem (aFont.GetFamily(),aFont.GetName(),
 aFont.GetStyleName(), aFont.GetPitch(),
@@ -1641,16 +1641,16 @@ void SwAnnotationShell::InsertSymbol(SfxRequest rReq)
 aSetFont.Put( aFontItem, EE_CHAR_FONTINFO_CTL );
 pOLV-SetAttribs(aSetFont);
 
-// Selektion loeschen
+// Erase selection
 ESelection aSel(pOLV-GetSelection());
 aSel.nStartPara = aSel.nEndPara;
 aSel.nStartPos = aSel.nEndPos;
 pOLV-SetSelection(aSel);
 
-// Alten Font restaurieren
+// Restore old font
 pOLV-SetAttribs( aFontSet );
 
-// ab jetzt wieder anzeigen
+// From now on show it again
 pOutliner-SetUpdateMode(sal_True);
 pOLV-ShowCursor();
 
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 773ac36..ff8aa17 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -109,8 +109,9 @@
 
 FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
 
-//Fuer die Erkennung der Id, die variable von Gallery mit SID_GALLERY_BG_BRUSH
-//ankommt.
+// These variables keep the state of Gallery (slot SID_GALLERY_BG_BRUSH)
+// detected by GetGalleryState() for the subsequent ExecuteGallery() call.
+
 static sal_uInt8 nParagraphPos;
 static sal_uInt8 nGraphicPos;
 static sal_uInt8 nOlePos;
@@ -148,9 +149,6 @@ SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0))
 
 TYPEINIT1(SwBaseShell,SfxShell)
 
-/*
-Beschreibung:   statics
- */
 static void lcl_UpdateIMapDlg( SwWrtShell rSh )
 {
 Graphic aGrf( rSh.GetIMapGraphic() );
@@ -189,9 +187,6 @@ static bool lcl_UpdateContourDlg( SwWrtShell rSh, int nSel 
)
 return bRet;
 }
 
-/*
-Beschreibung:   loeschen
-

[PATCH] allow odk/util/check.pl to use two base dirs

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3527

To pull it, you can do:

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

allow odk/util/check.pl to use two base dirs

This is in preparation for my plan to move stuff out of odkcommon.zip
and install it using filelists. The moved files will be in
$(INSTDIR)/sdk, not in the Zip's workdir, so we must look for them in
both places.

Change-Id: I7dd224c9067f2dbb522b87b7057ddc02a5fa0cad
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 51 insertions(+), 34 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index cdc83dc..ae23d3d 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -25,10 +25,14 @@
$(if $(filter MACOSX,$(OS)),macosx,\
$(if $(filter AIX,$(OS)),aix
 
-$(call gb_CustomTarget_get_workdir,odk/check)/checkbin: 
$(SRCDIR)/odk/util/check.pl $(call gb_CustomTarget_get_target,odk/odkcommon)
+$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
+   $(SRCDIR)/odk/util/check.pl \
+   $(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
touch $@
-   $(PERL) $ $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
+   $(PERL) $ \
+   $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
+   $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
$(odk_PLATFORM) $(gb_Exectable_EXT) $@
cat $@
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 5c57cbc..c1288a9 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -23,16 +23,29 @@
 
 $return = 0;
 
-$StartDir = $ARGV[0];
-$OperatingSystem = $ARGV[1];
-$ExePrefix = $ARGV[2];
+$PrimaryDir = $ARGV[0];
+$SecondaryDir = $ARGV[1];
+$OperatingSystem = $ARGV[2];
+$ExePrefix = $ARGV[3];
+
+sub check_file
+{
+my ($file) = @_;
+return -e $PrimaryDir/$file || -e $SecondaryDir/$file;
+}
+
+sub check_dir
+{
+my ($dir) = @_;
+return -d $PrimaryDir/$dir || -d $SecondaryDir/$dir;
+}
 
 print Check for $OperatingSystem\n;
 
-if (-d $StartDir) {
+if (-d $PrimaryDir || -d $SecondaryDir) {
 # check binaries
 print check binaries: ;
-if (-d $StartDir/bin) {
+if (check_dir(bin)) {
my @binarylist = ( idlc,cppumaker,javamaker,
regcompare,autodoc,
unoapploader, uno-skeletonmaker );
@@ -42,7 +55,7 @@
 
 foreach $i (@binarylist)
 {
-if (! -e $StartDir/bin/$i$ExePrefix) {
+if (!check_file(bin/$i$ExePrefix)) {
 $return++;
 print \nERROR: \$StartDir/bin/$i$ExePrefix\ is missing\n;
 } else {
@@ -51,7 +64,7 @@
 }
 
 if ($OperatingSystem eq windows || $OperatingSystem eq mingw) {
-if ($OperatingSystem eq windows  ! -e 
$StartDir/bin/climaker.exe) {
+if ($OperatingSystem eq windows  !check_file(bin/climaker.exe)) {
 $return++;
 print \nERROR: \$StartDir/bin/climaker.exe\ is missing\n;
 } else {
@@ -59,7 +72,7 @@
 }
 }
 if ($OperatingSystem eq macosx) {
-if (! -e $StartDir/bin/addsym-macosx.sh) {
+if (!check_file(bin/addsym-macosx.sh)) {
 $return++;
 print \nERROR: \$StartDir/bin/addsym-macosx.sh\ is missing\n;
 } else {
@@ -73,7 +86,7 @@
 
 # packaging files
 print check packaging files: ;
-if (-d $StartDir/docs) {
+if (check_dir(docs)) {
 my @filelist = ( install.html,
  notsupported.html,sdk_styles.css,tools.html,
  images/arrow-1.gif, images/arrow-3.gif,
@@ -90,7 +103,7 @@
 
 foreach $i (@filelist)
 {
-if (! -e $StartDir/docs/$i) {
+if (!check_file(docs/$i)) {
 $return++;
 print \nERROR: \$StartDir/docs/$i\ is missing\n;
 } else {
@@ -105,36 +118,36 @@
 #check configure files
 print check config files: ;
 if ($OperatingSystem eq windows || $OperatingSystem eq mingw) {
-if (! -e $StartDir/setsdkenv_windows.bat) {
+if (!check_file(setsdkenv_windows.bat)) {
 print \nERROR: \$StartDir/setsdkenv_windows.bat\ is missing\n;
 $return++;
 }
-if (! -e $StartDir/setsdkenv_windows.template) {
+if (!check_file(setsdkenv_windows.template)) {
 print \nERROR: \$StartDir/setsdkenv_windows.template\ is missing\n;
 $return++;
 }
-if (! -e $StartDir/cfgWin.js) {
+if (!check_file(cfgWin.js)) {
 print \nERROR: \$StartDir/cfgWin.js\ is missing\n;
 $return++;
 }
 } else {
-if (! -e $StartDir/configure.pl) {
+if (!check_file(configure.pl)) {
 print \nERROR: \$StartDir/configure.pl\ is missing\n;
 $return++;
 }
-if (! -e $StartDir/config.guess) {
+if (!check_file(config.guess)) {
 print \nERROR: \$StartDir/config.guess\ is missing\n;
 $return++;
 }
-if (! -e $StartDir/config.sub) {
+if

[PATCH] fix typo

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3528

To pull it, you can do:

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

fix typo

Change-Id: I58f0cd2248310fd7c5f1c82a6d10acc5a2446169
---
M odk/CustomTarget_check.mk
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index ae23d3d..b7454d6 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -33,7 +33,7 @@
$(PERL) $ \
$(INSTDIR)/$(gb_Package_SDKDIRNAME) \
$(call gb_CustomTarget_get_workdir,odk/odkcommon) \
-   $(odk_PLATFORM) $(gb_Exectable_EXT) $@
+   $(odk_PLATFORM) $(gb_Executable_EXT) $@
cat $@
 
 # vim: set noet sw=4 ts=4:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58f0cd2248310fd7c5f1c82a6d10acc5a2446169
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] replace CustomTarget_odk/odkcommon/bin by Package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3529

To pull it, you can do:

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

replace CustomTarget_odk/odkcommon/bin by Package

Change-Id: Ia57ed471294595f1a8ee0aa0af05f3b82d439393
---
D odk/CustomTarget_bin.mk
M odk/CustomTarget_check.mk
M odk/CustomTarget_odkcommon.mk
M odk/Module_odk.mk
A odk/Package_bin.mk
A odk/Package_macosx.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
8 files changed, 74 insertions(+), 46 deletions(-)



diff --git a/odk/CustomTarget_bin.mk b/odk/CustomTarget_bin.mk
deleted file mode 100644
index 0a548a2..000
--- a/odk/CustomTarget_bin.mk
+++ /dev/null
@@ -1,42 +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,odk/odkcommon/bin))
-
-odk_EXELIST := cppumaker \
-   regcompare \
-   idlc \
-   javamaker \
-   autodoc \
-   unoapploader \
-   uno-skeletonmaker \
-   $(if $(SYSTEM_UCPP),,ucpp) \
-   $(if $(filter WNT,$(OS)),climaker)
-
-define odk_exe
-odkcommon_ZIPLIST += bin/$(1)$(gb_Executable_EXT)
-$(call gb_CustomTarget_get_target,odk/odkcommon/bin): 
$(odk_WORKDIR)/bin/$(1)$(gb_Executable_EXT)
-$(odk_WORKDIR)/bin/$(1)$(gb_Executable_EXT): $(call 
gb_Executable_get_target,$(1))
-   mkdir -p $$(dir $$@)
-   $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-   cp $$ $$@
-endef
-
-$(foreach exe,$(odk_EXELIST),$(eval $(call odk_exe,$(exe
-
-ifeq ($(OS),MACOSX)
-odkcommon_ZIPLIST += bin/addsym-macosx.sh
-$(eval $(call 
gb_CustomTarget_register_target,odk/odkcommon/bin,addsym-macosx.sh))
-$(odk_WORKDIR)/bin/addsym-macosx.sh: 
$(SRCDIR)/odk/pack/copying/addsym-macosx.sh
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
-   cp $ $@
-   chmod 755 $@
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index b7454d6..326d5f0 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -27,6 +27,8 @@
 
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
+   $(call gb_Package_get_target,odk_bin) \
+   $(if $(filter MACOSX,$(OS)),macosx,$(call 
gb_Package_get_target,odk_macosx)) \
$(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
touch $@
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 9ba2d6e..b6cc3d2 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -19,7 +19,6 @@
$(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
$(call gb_CustomTarget_get_target,odk/odkcommon/settings) \
$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
-   $(call gb_CustomTarget_get_target,odk/odkcommon/bin) \
$(call gb_CustomTarget_get_target,odk/odkcommon/lib) \
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
$(call gb_CustomTarget_get_target,odk/odkcommon/include) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index c18223c..86778a4 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -14,14 +14,20 @@
$(if $(filter WNT,$(OS)),CustomTarget_cli) \
$(if $(DOXYGEN),CustomTarget_doxygen) \
CustomTarget_check \
-   CustomTarget_bin \
CustomTarget_lib \
CustomTarget_settings \
CustomTarget_autodoc \
Executable_unoapploader \
+   Package_bin \
Package_examples \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,odk,\
+   Package_macosx \
+))
+endif
+
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_unowinreg \
diff --git a/odk/Package_bin.mk b/odk/Package_bin.mk
new file mode 100644
index 000..8c1200f
--- /dev/null
+++ b/odk/Package_bin.mk
@@ -0,0 +1,28 @@
+# -*- 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,odk_bin,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,odk_bin,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_bin,$(gb_Package_SDKDIRNAME)/bin,\
+$(addsuffix $(gb_Executable_EXT),\
+   autodoc \
+   $(if $(filter WNT,$(OS)),climaker) \
+   cppumaker \
+   idlc \
+   javamaker \
+   regcompare \
+

[PATCH] replace CustomTarget_odk/odkcommon/cli by Package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3530

To pull it, you can do:

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

replace CustomTarget_odk/odkcommon/cli by Package

Change-Id: I1d747fec9b1bf2aeef2a1886981f7f07a338ea12
---
M odk/CustomTarget_check.mk
D odk/CustomTarget_cli.mk
M odk/CustomTarget_odkcommon.mk
M odk/Module_odk.mk
A odk/Package_cli.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
7 files changed, 35 insertions(+), 32 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 326d5f0..15a651a 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -28,6 +28,7 @@
 $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(call gb_Package_get_target,odk_bin) \
+   $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) 
\
$(if $(filter MACOSX,$(OS)),macosx,$(call 
gb_Package_get_target,odk_macosx)) \
$(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
diff --git a/odk/CustomTarget_cli.mk b/odk/CustomTarget_cli.mk
deleted file mode 100644
index 88f2625..000
--- a/odk/CustomTarget_cli.mk
+++ /dev/null
@@ -1,29 +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,odk/odkcommon/cli))
-
-odk_CLILIST := cli_basetypes.dll \
-   cli_uretypes.dll \
-   cli_oootypes.dll \
-   cli_ure.dll \
-   cli_cppuhelper.dll
-
-define odk_cli
-odkcommon_ZIPLIST += cli/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/cli): $(odk_WORKDIR)/cli/$(1)
-$(odk_WORKDIR)/cli/$(1): $(call gb_CliAssembly_get_target,$(1))
-   mkdir -p $$(dir $$@)
-   $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-   cp $$ $$@
-endef
-
-$(foreach cli,$(odk_CLILIST),$(eval $(call odk_cli,$(cli
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index b6cc3d2..4e903a1 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -21,8 +21,7 @@
$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
$(call gb_CustomTarget_get_target,odk/odkcommon/lib) \
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
-   $(call gb_CustomTarget_get_target,odk/odkcommon/include) \
-   $(if $(filter MSC,$(COM)),$(call 
gb_CustomTarget_get_target,odk/odkcommon/cli))
+   $(call gb_CustomTarget_get_target,odk/odkcommon/include)
 
 ifeq ($(OS),WNT)
 odk_CONFIGLIST := cfgWin.js \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 86778a4..a7ccf52 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Module_add_targets,odk,\
CustomTarget_odkcommon \
-   $(if $(filter WNT,$(OS)),CustomTarget_cli) \
+   $(if $(filter WNT,$(OS)),Package_cli) \
$(if $(DOXYGEN),CustomTarget_doxygen) \
CustomTarget_check \
CustomTarget_lib \
diff --git a/odk/Package_cli.mk b/odk/Package_cli.mk
new file mode 100644
index 000..bbb3c85
--- /dev/null
+++ b/odk/Package_cli.mk
@@ -0,0 +1,22 @@
+# -*- 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,odk_cli,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_cli,$(gb_Package_SDKDIRNAME)/cli,\
+   cli_basetypes.dll \
+   cli_cppuhelper.dll \
+   cli_oootypes.dll \
+   cli_ure.dll \
+   cli_uretypes.dll \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp 
b/scp2/source/sdkoo/module_sdkoo.scp
index 24b78c0..28ab105 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -35,6 +35,7 @@
 Default = NO;
 Files = (
 gid_File_Package_odk_bin,
+gid_File_Package_odk_cli,
 gid_File_Package_odk_macosx,
 gid_File_Zip_Odkexamples,
 gid_File_Zip_Odkcommon,
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index d4e0b54..1c7f68f 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -123,6 +123,15 @@
 Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
+#if defined(WNT)
+File

[PATCH] use Package for unowinreg

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3531

To pull it, you can do:

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

use Package for unowinreg

Change-Id: I7546e8938ba41e1462e704bd0405c5a887151d7b
---
M odk/CustomTarget_check.mk
M odk/CustomTarget_classes.mk
M odk/CustomTarget_unowinreg.mk
M odk/Module_odk.mk
A odk/Package_unowinreg.mk
M odk/Zip_uno_loader_classes.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
8 files changed, 42 insertions(+), 20 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 15a651a..29b2776 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -30,6 +30,7 @@
$(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) 
\
$(if $(filter MACOSX,$(OS)),macosx,$(call 
gb_Package_get_target,odk_macosx)) \
+   $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) 
\
$(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
touch $@
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index b009a58..ad59a4a 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -28,11 +28,4 @@
cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@)
touch $@
 
-odkcommon_ZIPLIST += classes/win/unowinreg.dll
-$(eval $(call 
gb_CustomTarget_register_target,odk/odkcommon/classes,win/unowinreg.dll))
-$(odk_WORKDIR)/classes/win/unowinreg.dll: $(call 
gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll
-   mkdir -p $(dir $@)
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
-   cp $ $@
-
 # vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk
index 76fe2f9..3a46ddf 100644
--- a/odk/CustomTarget_unowinreg.mk
+++ b/odk/CustomTarget_unowinreg.mk
@@ -11,11 +11,6 @@
 
 $(eval $(call gb_CustomTarget_register_target,odk/unowinreg,unowinreg.dll))
 
-ifeq ($(BUILD_UNOWINREG),YES)
-ifeq ($(COM),MSC)
-$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: $(call 
gb_Library_get_target,unowinreg)
-   cp $ $@
-else # COM=GCC
 $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \
$(SRCDIR)/odk/source/unowinreg/win/unowinreg.cxx
$(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ \
@@ -25,12 +20,7 @@
-I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\
$(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \
-shared -o $@ $ \
-   -Wl,--kill-at -lkernel32 -ladvapi32
+   -Wl,--kill-at -lkernel32 -ladvapi32  \
$(MINGWSTRIP) $@
-endif
-else # BUILD_UNOWINREG=NO
-$(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll: 
$(TARFILE_LOCATION)/$(UNOWINREG_DLL)
-   cp $ $@
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index a7ccf52..531fdbe 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -30,10 +30,11 @@
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
-   CustomTarget_unowinreg \
+   $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
CustomTarget_javadoc \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
+   Package_unowinreg \
Zip_uno_loader_classes \
 ))
 endif
diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk
new file mode 100644
index 000..0fd0928
--- /dev/null
+++ b/odk/Package_unowinreg.mk
@@ -0,0 +1,28 @@
+# -*- 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/.
+#
+
+ifeq ($(BUILD_UNOWINREG),YES)
+ifeq ($(COM),MSC)
+odk_unowinreg_DIR := $(OUTDIR)/bin
+else
+odk_unowinreg_DIR := $(call gb_CustomTarget_get_workdir,odk/unowinreg)
+endif
+odk_unowinreg_FILE := unowinreg.dll
+else # BUILD_UNOWINREG=NO
+odk_unowinreg_DIR := $(TARFILE_LOCATION)
+odk_unowinreg_FILE := $(UNOWINREG_DLL)
+endif
+
+$(eval $(call gb_Package_Package,odk_unowinreg,$(odk_unowinreg_DIR)))
+
+$(eval $(call gb_Package_set_outdir,odk_unowinreg,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_file,odk_unowinreg,$(gb_Package_SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Zip_uno_loader_classes.mk b/odk/Zip_uno_loader_classes.mk
index b22aa4d..6cf0bf1 100644
--- a/odk/Zip_uno_loader_classes.mk
+++ b/odk/Zip_uno_loader_classes.mk
@@ -13,7 +13,6 @@
 
 $(eval $(call gb_Zip_add_files,uno_loader_classes,\
com/sun/star/lib/loader \
-

[PATCH] replace CustomTarget_odk/odkcommon/lib by Package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3532

To pull it, you can do:

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

replace CustomTarget_odk/odkcommon/lib by Package

Change-Id: I929384077255b2fd944abf2da573c66572dec62b
---
M odk/CustomTarget_check.mk
D odk/CustomTarget_lib.mk
M odk/CustomTarget_odkcommon.mk
M odk/Module_odk.mk
A odk/Package_lib.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
7 files changed, 38 insertions(+), 42 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 29b2776..f820e47 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -29,6 +29,7 @@
$(SRCDIR)/odk/util/check.pl \
$(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) 
\
+   $(call gb_Package_get_target,odk_lib) \
$(if $(filter MACOSX,$(OS)),macosx,$(call 
gb_Package_get_target,odk_macosx)) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) 
\
$(call gb_CustomTarget_get_target,odk/odkcommon)
diff --git a/odk/CustomTarget_lib.mk b/odk/CustomTarget_lib.mk
deleted file mode 100644
index 910211e..000
--- a/odk/CustomTarget_lib.mk
+++ /dev/null
@@ -1,40 +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,odk/odkcommon/lib))
-
-define odk_lib
-odkcommon_ZIPLIST += lib/$(notdir $(1))
-$(call gb_CustomTarget_get_target,odk/odkcommon/lib) : \
-   $(odk_WORKDIR)/lib/$(notdir $(1))
-$(odk_WORKDIR)/lib/$(notdir $(1)) : $(1)
-   mkdir -p $$(dir $$@)
-   $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-   cp $$ $$@
-endef
-
-ifeq ($(COM),MSC)
-odk_LIBLIST := \
-   sal \
-   salhelper \
-   cppu \
-   cppuhelper \
-   purpenvhelper
-
-$(foreach lib,$(odk_LIBLIST),$(eval $(call odk_lib,$(call 
gb_Library_get_target,$(lib)
-else ifeq ($(OS),LINUX)
-odkcommon_ZIPLIST += lib/libsalcpprt.a
-$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/lib,libsalcpprt.a))
-$(odk_WORKDIR)/lib/libsalcpprt.a: $(call gb_StaticLibrary_get_target,salcpprt)
-   mkdir -p $(dir $@)
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
-   cp $ $@
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 4e903a1..99e42e6 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -19,7 +19,6 @@
$(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
$(call gb_CustomTarget_get_target,odk/odkcommon/settings) \
$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
-   $(call gb_CustomTarget_get_target,odk/odkcommon/lib) \
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
$(call gb_CustomTarget_get_target,odk/odkcommon/include)
 
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 531fdbe..58bdb4d 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -14,12 +14,12 @@
$(if $(filter WNT,$(OS)),Package_cli) \
$(if $(DOXYGEN),CustomTarget_doxygen) \
CustomTarget_check \
-   CustomTarget_lib \
CustomTarget_settings \
CustomTarget_autodoc \
Executable_unoapploader \
Package_bin \
Package_examples \
+   Package_lib \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk
new file mode 100644
index 000..7ea5d14
--- /dev/null
+++ b/odk/Package_lib.mk
@@ -0,0 +1,28 @@
+# -*- 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,odk_lib,$(gb_Helper_OUTDIRLIBDIR)))
+
+$(eval $(call gb_Package_set_outdir,odk_lib,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\
+   $(if $(filter MSC,$(COM)),\
+   $(foreach lib,\
+   cppu \
+   cppuhelper \
+   purpenvhelper \
+   sal \
+   salhelper \
+   ,$(notdir $(call gb_Library_get_target,$(lib))) \
+   ) \
+   ) \
+   $(if $(filter LINUX,$(OS)),$(notdir $(call 
gb_StaticLibrary_get_target,salcpprt))) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git

[PATCH] chip more files off the odkcommon.zip block

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3533

To pull it, you can do:

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

chip more files off the odkcommon.zip block

Change-Id: I3d5d841d094f397130e37799a2f26e4d85f7c136
---
M odk/CustomTarget_check.mk
A odk/CustomTarget_config_win.mk
A odk/CustomTarget_html.mk
M odk/CustomTarget_odkcommon.mk
M odk/Module_odk.mk
A odk/Package_config.mk
A odk/Package_config_notwin.mk
A odk/Package_config_win.mk
A odk/Package_docs.mk
A odk/Package_html.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
12 files changed, 231 insertions(+), 92 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f820e47..37504b5 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -29,6 +29,13 @@
$(SRCDIR)/odk/util/check.pl \
$(call gb_Package_get_target,odk_bin) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) 
\
+   $(call gb_Package_get_target,odk_config) \
+   $(if $(filter WNT,$(OS)),\
+   $(call gb_Package_get_target,odk_config_win),\
+   $(call gb_Package_get_target,odk_config_notwin) \
+   ) \
+   $(call gb_Package_get_target,odk_docs) \
+   $(call gb_Package_get_target,odk_html) \
$(call gb_Package_get_target,odk_lib) \
$(if $(filter MACOSX,$(OS)),macosx,$(call 
gb_Package_get_target,odk_macosx)) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) 
\
diff --git a/odk/CustomTarget_config_win.mk b/odk/CustomTarget_config_win.mk
new file mode 100644
index 000..2a9fc1f
--- /dev/null
+++ b/odk/CustomTarget_config_win.mk
@@ -0,0 +1,19 @@
+# -*- 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,odk/config))
+
+$(eval $(call gb_CustomTarget_register_targets,odk/config,\
+setsdkenv_windows.bat \
+))
+
+$(call gb_CustomTarget_get_workdir,odk/config)/setsdkenv_windows.bat : 
$(SRCDIR)/odk/config/setsdkenv_windows.bat
+   sed $ -e 's#__SDKNAME__#libreoffice$(PRODUCTVERSION)_sdk#'  $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk
new file mode 100644
index 000..9c96ac4
--- /dev/null
+++ b/odk/CustomTarget_html.mk
@@ -0,0 +1,25 @@
+# -*- 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,odk/html))
+
+$(eval $(call gb_CustomTarget_register_targets,odk/html,\
+   docs/install.html \
+   docs/notsupported.html \
+   docs/tools.html \
+   examples/DevelopersGuide/examples.html \
+   examples/examples.html \
+   index.html \
+))
+
+$(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html
+   $(call gb_Output_announce,$*.html,$(true),SED,1)
+   cat $ | tr -d \015 | sed -e 
's/%PRODUCT_RELEASE%/$(PRODUCTVERSION)/g'  $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 99e42e6..246247a 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -22,96 +22,4 @@
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
$(call gb_CustomTarget_get_target,odk/odkcommon/include)
 
-ifeq ($(OS),WNT)
-odk_CONFIGLIST := cfgWin.js \
-   setsdkenv_windows.template \
-   setsdkname.bat
-else
-odk_CONFIGLIST := configure.pl \
-   setsdkenv_unix \
-   setsdkenv_unix.sh.in \
-
-endif
-
-define odk_config
-odkcommon_ZIPLIST += $(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon): $(odk_WORKDIR)/$(1)
-$(odk_WORKDIR)/$(1): $(SRCDIR)/odk/config/$(1)
-   mkdir -p $$(dir $$@)
-   $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-   cp $$ $$@
-endef
-
-$(foreach config,$(odk_CONFIGLIST),$(eval $(call odk_config,$(config
-
-ifeq ($(OS),WNT)
-odkcommon_ZIPLIST += setsdkenv_windows.bat
-$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon,\
-   setsdkenv_windows.bat \
-))
-$(odk_WORKDIR)/setsdkenv_windows.bat: 
$(SRCDIR)/odk/config/setsdkenv_windows.bat
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
-   sed $ -e 's#__SDKNAME__#libreoffice$(PRODUCTVERSION)_sdk#'  $@
-else
-odkcommon_ZIPLIST += config.guess config.sub
-$(eval $(call

[PATCH] replace CustomTarget_odk/odkcommon/settings by Package

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3534

To pull it, you can do:

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

replace CustomTarget_odk/odkcommon/settings by Package

Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a
---
M odk/CustomTarget_check.mk
M odk/CustomTarget_odkcommon.mk
M odk/CustomTarget_settings.mk
M odk/Module_odk.mk
A odk/Package_settings.mk
A odk/Package_settings_generated.mk
M scp2/source/sdkoo/module_sdkoo.scp
M scp2/source/sdkoo/sdkoo.scp
8 files changed, 61 insertions(+), 19 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 37504b5..159bb3c 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -38,6 +38,8 @@
$(call gb_Package_get_target,odk_html) \
$(call gb_Package_get_target,odk_lib) \
$(if $(filter MACOSX,$(OS)),macosx,$(call 
gb_Package_get_target,odk_macosx)) \
+   $(call gb_Package_get_target,odk_settings) \
+   $(call gb_Package_get_target,odk_settings_generated) \
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) 
\
$(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 246247a..6b500e8 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -17,7 +17,6 @@
$(if $(DOXYGEN),$(call 
gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
$(if $(SOLAR_JAVA),$(call 
gb_CustomTarget_get_target,odk/odkcommon/docs/java/ref)) \
$(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
-   $(call gb_CustomTarget_get_target,odk/odkcommon/settings) \
$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
$(call gb_CustomTarget_get_target,odk/odkcommon/include)
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 358561b..581d522 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -9,25 +9,9 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings))
 
-odk_SETTINGSLIST := settings.mk \
-   std.mk \
-   stdtarget.mk \
-   $(if $(filter WNT,$(OS)),component.uno.def)
-
-define odk_settings
-odkcommon_ZIPLIST += settings/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/settings): 
$(odk_WORKDIR)/settings/$(1)
-$(odk_WORKDIR)/settings/$(1): $(SRCDIR)/odk/settings/$(1)
-   mkdir -p $$(dir $$@)
-   $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-   cp $$ $$@
-endef
-
-$(foreach setting,$(odk_SETTINGSLIST),$(eval $(call odk_settings,$(setting
-
-odkcommon_ZIPLIST += settings/dk.mk
 $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk))
-$(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk
+
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : 
$(SRCDIR)/odk/pack/copying/dk.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
tr -d \015  $ | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
-e 
's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/'
 \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 6a51a13..36eacef 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -24,6 +24,8 @@
Package_html \
Package_examples \
Package_lib \
+   Package_settings \
+   Package_settings_generated \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/odk/Package_settings.mk b/odk/Package_settings.mk
new file mode 100644
index 000..ff01fd2
--- /dev/null
+++ b/odk/Package_settings.mk
@@ -0,0 +1,21 @@
+# -*- 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,odk_settings,$(SRCDIR)/odk/settings))
+
+$(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,odk_settings,$(gb_Package_SDKDIRNAME)/settings,\
+   $(if $(filter WNT,$(OS)),component.uno.def) \
+   settings.mk \
+   std.mk \
+   stdtarget.mk \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_settings_generated.mk 
b/odk/Package_settings_generated.mk
new file mode 100644
index 000..3813d98
--- /dev/null
+++ b/odk/Package_settings_generated.mk
@@ -0,0 +1,18 @@
+# -*- 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,

[PATCH] silence odk check

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3536

To pull it, you can do:

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

silence odk check

Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 7 insertions(+), 7 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 159bb3c..af6eb1d 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -43,11 +43,12 @@
$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) 
\
$(call gb_CustomTarget_get_target,odk/odkcommon)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
-   touch $@
-   $(PERL) $ \
-   $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
-   $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
-   $(odk_PLATFORM) $(gb_Executable_EXT) $@
-   cat $@
+   $(call gb_Helper_print_on_error,\
+   $(PERL) $ \
+   $(INSTDIR)/$(gb_Package_SDKDIRNAME) \
+   $(call gb_CustomTarget_get_workdir,odk/odkcommon) \
+   $(odk_PLATFORM) $(gb_Executable_EXT) \
+   ,$@.log \
+   )
 
 # vim: set noet sw=4 ts=4:
diff --git a/odk/util/check.pl b/odk/util/check.pl
index c1288a9..de554e7 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -367,7 +367,6 @@
 if( $return != 0 )
 {
 print ERROR\n;
-unlink $ARGV[3];
 } else {
 print OK\n;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
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] make odk inst. check a check target

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3535

To pull it, you can do:

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

make odk inst. check a check target

Change-Id: I1bd8ee091a3c74ad05af69a4b7d5a2db21731b76
---
M odk/Module_odk.mk
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 36eacef..6e78471 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -13,7 +13,6 @@
CustomTarget_odkcommon \
$(if $(filter WNT,$(OS)),Package_cli) \
$(if $(DOXYGEN),CustomTarget_doxygen) \
-   CustomTarget_check \
CustomTarget_html \
CustomTarget_settings \
CustomTarget_autodoc \
@@ -62,5 +61,8 @@
Zip_odkcommon \
 ))
 
+$(eval $(call gb_Module_add_check_targets,odk,\
+   CustomTarget_check \
+))
 
 # vim: set noet sw=4 ts=4:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bd8ee091a3c74ad05af69a4b7d5a2db21731b76
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

[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/shells...

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3512

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98af528c011a7d63b07b3aa71271d6816c11f7ab
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

[PATCH] Slightly simplify loop

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3539

To pull it, you can do:

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

Slightly simplify loop

Change-Id: If44e86ceecd4a407d3b4e294a03a84ad010f95e1
---
M editeng/source/misc/hangulhanja.cxx
1 file changed, 3 insertions(+), 5 deletions(-)



diff --git a/editeng/source/misc/hangulhanja.cxx 
b/editeng/source/misc/hangulhanja.cxx
index 4f7189a..7d2c01e 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -534,9 +534,7 @@
 
 bool HangulHanjaConversion_Impl::ContinueConversion( bool 
_bRepeatCurrentUnit )
 {
-bool bNeedUserInteraction = false;  // when we leave here, do we need 
user interaction?
-
-while ( !bNeedUserInteraction  implNextConvertible( 
_bRepeatCurrentUnit ) )
+while ( implNextConvertible( _bRepeatCurrentUnit ) )
 {
 OUString sCurrentUnit( GetCurrentUnit() );
 
@@ -576,11 +574,11 @@
 
 // do not look for the next convertible: We have to wait for 
the user to interactivly
 // decide what happens with the current convertible
-bNeedUserInteraction = true;
+return false;
 }
 }
 
-return !bNeedUserInteraction;
+return true;
 }
 
 bool 
HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion( 
HHC::ConversionDirection rDirection )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If44e86ceecd4a407d3b4e294a03a84ad010f95e1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com

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

[PATCH] Prefer standard prefix for data members

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3540

To pull it, you can do:

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

Prefer standard prefix for data members

Change-Id: Ic0d0cdc88ee17bdeeb53855162085c30b25f9004
---
M editeng/source/editeng/textconv.cxx
M editeng/source/editeng/textconv.hxx
2 files changed, 88 insertions(+), 90 deletions(-)



diff --git a/editeng/source/editeng/textconv.cxx 
b/editeng/source/editeng/textconv.cxx
index 16e702a..e309441 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -52,22 +52,20 @@
 bool bIsStart,
 EditView* pView ) :
 HangulHanjaConversion( pWindow, rxContext, rSourceLocale, rTargetLocale, 
pTargetFont, nOptions, bIsInteractive )
+, m_nConvTextLang(LANGUAGE_NONE)
+, m_nUnitOffset(0)
+, m_nLastPos(0)
+, m_aConvSel(pView-GetSelection())
+, m_pEditView(pView)
+, m_pWin(pWindow)
+, m_bStartChk(false)
+, m_bStartDone(bIsStart)
+, m_bEndDone(false)
+, m_bAllowChange(false)
 {
 DBG_ASSERT( pWindow, TextConvWrapper: window missing );
 
-nConvTextLang = LANGUAGE_NONE;
-nUnitOffset = 0;
-
-bStartChk   = false;
-bStartDone  = bIsStart;
-bEndDone= false;
-pWin= pWindow;
-pEditView   = pView;
-
-aConvSel= pEditView-GetSelection();
-aConvSel.Adjust();  // make Start = End
-
-bAllowChange = false;
+m_aConvSel.Adjust();  // make Start = End
 }
 
 
@@ -80,17 +78,17 @@
 {
 // modified version of SvxSpellWrapper::SpellNext
 
-if( bStartChk )
-bStartDone = true;
+if( m_bStartChk )
+m_bStartDone = true;
 else
-bEndDone = true;
+m_bEndDone = true;
 
-if ( bStartDone  bEndDone )
+if ( m_bStartDone  m_bEndDone )
 {
 if ( ConvMore_impl() )  // examine another document?
 {
-bStartDone = true;
-bEndDone  = false;
+m_bStartDone = true;
+m_bEndDone  = false;
 ConvStart_impl( SVX_SPELL_BODY );
 return true;
 }
@@ -100,20 +98,20 @@
 
 bool bGoOn = false;
 
-if ( bStartDone  bEndDone )
+if ( m_bStartDone  m_bEndDone )
 {
 if ( ConvMore_impl() )  // examine another document?
 {
-bStartDone = true;
-bEndDone  = false;
+m_bStartDone = true;
+m_bEndDone  = false;
 ConvStart_impl( SVX_SPELL_BODY );
 return true;
 }
 }
-else if (!aConvSel.HasRange())
+else if (!m_aConvSel.HasRange())
 {
-bStartChk = !bStartDone;
-ConvStart_impl( bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END 
);
+m_bStartChk = !m_bStartDone;
+ConvStart_impl( m_bStartChk ? SVX_SPELL_BODY_START : 
SVX_SPELL_BODY_END );
 bGoOn = true;
 }
 return bGoOn;
@@ -126,7 +124,7 @@
 
 bool bFound = false;
 
-pWin-EnterWait();
+m_pWin-EnterWait();
 bool bConvert = true;
 
 while ( bConvert )
@@ -142,7 +140,7 @@
 bConvert = ConvNext_impl();
 }
 }
-pWin-LeaveWait();
+m_pWin-LeaveWait();
 return bFound;
 }
 
@@ -152,8 +150,8 @@
 // modified version of SvxSpellWrapper::SpellMore
 
 bool bMore = false;
-EditEngine* pEE = pEditView-GetEditEngine();
-ImpEditEngine* pImpEE = pEditView-GetImpEditEngine();
+EditEngine* pEE = m_pEditView-GetEditEngine();
+ImpEditEngine* pImpEE = m_pEditView-GetImpEditEngine();
 ConvInfo* pConvInfo = pImpEE-GetConvInfo();
 if ( pConvInfo-bMultipleDoc )
 {
@@ -161,7 +159,7 @@
 if ( bMore )
 {
 // The text has been entered in this engine ...
-pEditView-GetImpEditView()-SetEditSelection(
+m_pEditView-GetImpEditView()-SetEditSelection(
 pEE-GetEditDoc().GetStartPaM() );
 }
 }
@@ -173,19 +171,19 @@
 {
 // modified version of EditSpellWrapper::SpellStart
 
-EditEngine* pEE = pEditView-GetEditEngine();
-ImpEditEngine* pImpEE = pEditView-GetImpEditEngine();
+EditEngine* pEE = m_pEditView-GetEditEngine();
+ImpEditEngine* pImpEE = m_pEditView-GetImpEditEngine();
 ConvInfo* pConvInfo = pImpEE-GetConvInfo();
 
 if ( eArea == SVX_SPELL_BODY_START )
 {
 // Is called when Spell-forward has reached the end, and to start over
-if ( bEndDone )
+if ( m_bEndDone )
 {
 pConvInfo-bConvToEnd = false;
 pConvInfo-aConvTo = pConvInfo-aConvStart;
 pConvInfo-aConvContinue = EPaM( 0, 0 );
-pEditView-GetImpEditView()-SetEditSelection(
+m_pEditView-GetImpEditView()-SetEditSelection(
 pEE-GetEditDoc().GetStartPaM() );
 }
 else
@@ -199,11 +197,11 @@
 {
 // Is called when Spell-forward starts
 pConvInfo-bConvToEnd = true;
-if

[PATCH] Do not store return value for later, just exit

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3541

To pull it, you can do:

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

Do not store return value for later, just exit

Change-Id: If71398ee5a29652303ae492d23e3910526307d3c
---
M editeng/source/editeng/textconv.cxx
1 file changed, 3 insertions(+), 4 deletions(-)



diff --git a/editeng/source/editeng/textconv.cxx 
b/editeng/source/editeng/textconv.cxx
index e309441..b9324c5 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -96,8 +96,6 @@
 
 }
 
-bool bGoOn = false;
-
 if ( m_bStartDone  m_bEndDone )
 {
 if ( ConvMore_impl() )  // examine another document?
@@ -112,9 +110,10 @@
 {
 m_bStartChk = !m_bStartDone;
 ConvStart_impl( m_bStartChk ? SVX_SPELL_BODY_START : 
SVX_SPELL_BODY_END );
-bGoOn = true;
+return true;
 }
-return bGoOn;
+
+return false;
 }
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If71398ee5a29652303ae492d23e3910526307d3c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com

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

[PATCH] bDocumentDone is always false

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3538

To pull it, you can do:

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

bDocumentDone is always false

Change-Id: Ifde4d9235d3eacf0317b19885f5ea57e1c695cb3
---
M editeng/source/misc/hangulhanja.cxx
1 file changed, 2 insertions(+), 3 deletions(-)



diff --git a/editeng/source/misc/hangulhanja.cxx 
b/editeng/source/misc/hangulhanja.cxx
index a1493fe..4f7189a 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -535,9 +535,8 @@
 bool HangulHanjaConversion_Impl::ContinueConversion( bool 
_bRepeatCurrentUnit )
 {
 bool bNeedUserInteraction = false;  // when we leave here, do we need 
user interaction?
-bool bDocumentDone = false; // did we already check the whole 
document?
 
-while ( !bDocumentDone  !bNeedUserInteraction  
implNextConvertible( _bRepeatCurrentUnit ) )
+while ( !bNeedUserInteraction  implNextConvertible( 
_bRepeatCurrentUnit ) )
 {
 OUString sCurrentUnit( GetCurrentUnit() );
 
@@ -581,7 +580,7 @@
 }
 }
 
-return  bDocumentDone || !bNeedUserInteraction;
+return !bNeedUserInteraction;
 }
 
 bool 
HangulHanjaConversion_Impl::implGetConversionDirectionForCurrentPortion( 
HHC::ConversionDirection rDirection )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifde4d9235d3eacf0317b19885f5ea57e1c695cb3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com

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

[Libreoffice-commits] core.git: apple_remote/Library_AppleRemote.mk

 apple_remote/Library_AppleRemote.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8560c2df78072533007b84b31fc930b82191e9a3
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 21 18:53:41 2013 +0200

blind fix for MacOS X build problem

Change-Id: I56f0fd27fa246643d611f9fc6a9f1bcfed759c60

diff --git a/apple_remote/Library_AppleRemote.mk 
b/apple_remote/Library_AppleRemote.mk
index c5fdbef..a7cf3d8 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,AppleRemote))
 
-$(eval $(call gb_Library_use_package,AppleRemote,\
+$(eval $(call gb_Library_use_packages,AppleRemote,\
 apple_remote_inc \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] silence odk check

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3536

to look at the new patch set (#2).

Change subject: silence odk check
..

silence odk check

Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3536/2
-- 
To view, visit https://gerrit.libreoffice.org/3536
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

[Libreoffice-commits] core.git: android/sdremote l10ntools/inc l10ntools/source librelogo/CustomTarget_librelogo.mk solenv/gbuild

2013-04-21 Thread Zolnai Tamás

 android/sdremote/Makefile   |8 ++-
 l10ntools/inc/export.hxx|1 
 l10ntools/inc/helpmerge.hxx |6 +-
 l10ntools/inc/po.hxx|1 
 l10ntools/source/common.cxx |2 
 l10ntools/source/helpex.cxx |   22 ++--
 l10ntools/source/helpmerge.cxx  |   83 +
 l10ntools/source/merge.cxx  |   33 +
 l10ntools/source/po.cxx |   89 
 l10ntools/source/propmerge.cxx  |   46 --
 l10ntools/source/stringmerge.cxx|   56 +-
 l10ntools/source/treemerge.cxx  |   51 
 librelogo/CustomTarget_librelogo.mk |   27 +++---
 solenv/gbuild/Dictionary.mk |   26 ++
 solenv/gbuild/ExtensionTarget.mk|   88 ++-
 solenv/gbuild/HelpTarget.mk |   54 ++---
 16 files changed, 356 insertions(+), 237 deletions(-)

New commits:
commit 36b3bcefcf13996610239f95b1dce9f291bde95d
Author: Zolnai TamÃ¡s zolnaitamas2...@gmail.com
Date:   Sat Apr 20 09:20:31 2013 +0200

Some changes in qtz handling

Executalbes, which work one language, generat qtz by own.
(stringex,helpex,treex,propex)
So these executables can generate qtz without po file
when use them with qtz, call them with -m flag without parameter.

Change-Id: I56c34db7151dc3ef0ce1c85ed607719e4cbb5e92

diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index b8ea1e9..26acfd8 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -36,8 +36,10 @@ endef
 define android_translation_rules
 $(call android_get_po,$(1)):
mkdir -p res/values-$(1)
-   echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po 
 translations-$(1).db
-   $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
+   $(if $(filter-out qtz,$(1)), \
+   echo 
$(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po  
translations-$(1).db \
+   $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m translations-$(1).db -l $(1), \
+   $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o 
res/values-$(1)/strings.xml -m -l $(1))
 
 endef
 
@@ -46,7 +48,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
 endef
 
 define android_get_langlist
-$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo qtz nso 
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso 
kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
 endef
 
 $(eval $(call android_translations_rules,$(call android_get_langlist)))
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 2230569..a1a2e8c 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -281,6 +281,7 @@ public:
 bTitleFirst[ rId ] = true;
 }
 sal_Bool GetText( OString rReturn, sal_uInt16 nTyp, const OString 
nLangIndex, sal_Bool bDel = sal_False );
+static OString GetQTZText(const ResData rResData, const OString 
rOrigText);
 
 };
 
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 1f9c90a..42b2401 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -49,12 +49,12 @@ public:
 /// Method merges the String from the POfile into XMLfile. Both Strings must
 /// point to existing files.
 bool Merge( const OString rPOFile_in, const OString rDestinationFile_in ,
-const OString sLanguage , MergeDataFile aMergeDataFile );
+const OString sLanguage , MergeDataFile* pMergeDataFile );
 
 private:
-bool MergeSingleFile( XMLFile* file , MergeDataFile aMergeDataFile , 
const OString sLanguage , OString const  sPath );
+bool MergeSingleFile( XMLFile* file , MergeDataFile* pMergeDataFile , 
const OString sLanguage , OString const  sPath );
 
-void ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResData 
*pResData , MergeDataFile aMergeDataFile );
+void ProcessHelp( LangHashMap* aLangHM , const OString sCur , ResData 
*pResData , MergeDataFile* pMergeDataFile );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index 26bbedf..603727d 100755
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -63,6 +63,7 @@ public:
 OString getKeyId() const;
 
 static bool IsInSameComp(const PoEntry rPo1,const PoEntry rPo2);
+static OString  genKeyId(const OString rGenerator);
 
 };
 
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index 304f44c..b143a7c 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -37,6 +37,7 @@ bool handleArguments(
 else if ( OString( argv[ i ] ).toAsciiUpperCase() == -M )
 {

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

2013-04-21 Thread Matteo Casalin

 editeng/source/editeng/textconv.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 8e73c8ebcb4110e09d386927ffbe95a49ac5565c
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Apr 21 19:05:34 2013 +0200

Avoid multiple appends on OUString

Change-Id: I877c4520be335dc04bbfdfa9a15dab52dd7f446a

diff --git a/editeng/source/editeng/textconv.cxx 
b/editeng/source/editeng/textconv.cxx
index 0fc00a4..9733842 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -349,9 +349,6 @@ void TextConvWrapper::ReplaceUnit(
 if (!bOK)
 return;
 
-static OUString aBracketedStart( ( );
-static OUString aBracketedEnd( ) );
-
 // select current unit
 SelectNewUnit_impl( nUnitStart, nUnitEnd );
 
@@ -362,10 +359,10 @@ void TextConvWrapper::ReplaceUnit(
 case eExchange :
 break;
 case eReplacementBracketed :
-(((aNewTxt = aOrigTxt) += aBracketedStart) += rReplaceWith) += 
aBracketedEnd;
+aNewTxt = aOrigTxt + ( + rReplaceWith + );
 break;
 case eOriginalBracketed :
-(((aNewTxt = rReplaceWith) += aBracketedStart) += aOrigTxt) += 
aBracketedEnd;
+aNewTxt = rReplaceWith + ( + aOrigTxt + );
 break;
 case eReplacementAbove  :
 case eOriginalAbove :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-21 Thread Zolnai Tamás

 l10ntools/inc/export.hxx   |5 -
 l10ntools/source/merge.cxx |8 
 2 files changed, 13 deletions(-)

New commits:
commit 2d8e4f91feeba58dbe4dc38e484a3be0f578ae9f
Author: Zolnai TamÃ¡s zolnaitamas2...@gmail.com
Date:   Sun Apr 21 19:09:27 2013 +0200

Delete more unused member from export

Change-Id: Icebd32c7ac2144f99827ca48cca7bbcaf10814c4

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index a1a2e8c..7a6f911 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -128,16 +128,12 @@ public:
 OString sFilename;
 
 OStringHashMap sText;
-sal_uInt16 nTextRefId;
 
 OStringHashMap sHelpText;
-sal_uInt16 nHelpTextRefId;
 
 OStringHashMap sQuickHelpText;
-sal_uInt16 nQuickHelpTextRefId;
 
 OStringHashMap sTitle;
-sal_uInt16 nTitleRefId;
 
 OString sTextTyp;
 
@@ -322,7 +318,6 @@ public:
 class MergeDataFile
 {
 private:
-OString sErrorLog;
 MergeDataHashMap aMap;
 std::setOString aLanguageSet;
 
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 401cba5..498962f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -74,10 +74,6 @@ ResData::ResData( const OString rGId )
 bTitle( sal_False ),
 bList( sal_False ),
 sGId( rGId ),
-nTextRefId( REFID_NONE ),
-nHelpTextRefId( REFID_NONE ),
-nQuickHelpTextRefId( REFID_NONE ),
-nTitleRefId( REFID_NONE ),
 sTextTyp( Text ),
 pStringList( NULL ),
 pUIEntries( NULL ),
@@ -100,10 +96,6 @@ ResData::ResData( const OString rGId, const OString 
rFilename)
 bList( sal_False ),
 sGId( rGId ),
 sFilename( rFilename ),
-nTextRefId( REFID_NONE ),
-nHelpTextRefId( REFID_NONE ),
-nQuickHelpTextRefId( REFID_NONE ),
-nTitleRefId( REFID_NONE ),
 sTextTyp( Text ),
 pStringList( NULL ),
 pUIEntries( NULL ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] silence odk check

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3536

to look at the new patch set (#3).

Change subject: silence odk check
..

silence odk check

Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3536/3
-- 
To view, visit https://gerrit.libreoffice.org/3536
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

[PATCH] gbuild: fix generated deps for API headers

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3506

to look at the new patch set (#2).

Change subject: gbuild: fix generated deps for API headers
..

gbuild: fix generated deps for API headers

This should be reverted after some time, as it solves a one-time
problem.

Change-Id: Iaa4bc17267a24bd744573e56108b8d207936629c
---
M solenv/gbuild/UnoApi.mk
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/3506/2
-- 
To view, visit https://gerrit.libreoffice.org/3506
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Iaa4bc17267a24bd744573e56108b8d207936629c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

Re: Python scripts other than Logo missing in master build

2013-04-21 Thread julien2412

Hello Alex,

I've made some changes on this lately and noticed a typo in
scripting/Package_ScriptsPython.mk
The third line shows Scripting instead of scripting.
Badfully i don't have access to my laptop to change this.
Could Anyone do it?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Python-scripts-other-than-Logo-missing-in-master-build-tp4051350p4051397.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: scripting/Package_ScriptsPython.mk

 scripting/Package_ScriptsPython.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cde3a2b2c422d2d31e9cb5f36bfa8ca74dbce107
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 21 19:53:40 2013 +0200

fix typo

Change-Id: Iaf1875bd7223743aa4309c970601fca3417afe17

diff --git a/scripting/Package_ScriptsPython.mk 
b/scripting/Package_ScriptsPython.mk
index d844496..8ad8de4 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -30,7 +30,7 @@ $(eval $(call 
gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/exa
 
 $(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTDIR)))
 
-$(eval $(call 
gb_Package_add_files_with_dir,Scripting_ScriptsPython,share/Scripts,\
+$(eval $(call 
gb_Package_add_files_with_dir,scripting_ScriptsPython,share/Scripts,\
python/Capitalise.py \
python/HelloWorld.py \
python/pythonSamples/TableSample.py \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] silence odk check

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3536

to look at the new patch set (#4).

Change subject: silence odk check
..

silence odk check

Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3536/4
-- 
To view, visit https://gerrit.libreoffice.org/3536
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

[PATCH] add a check to catch typos in Package names

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3542

To pull it, you can do:

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

add a check to catch typos in Package names

Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236
---
M solenv/gbuild/Package.mk
1 file changed, 15 insertions(+), 0 deletions(-)



diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 493748d..a5ecf37 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -106,17 +106,27 @@
 
 endef
 
+# Ensure that the package is defined.
+#
+# gb_Package__check package
+define gb_Package__check
+$$(if $$(gb_Package_SOURCEDIR_$(1)),,$$(call 
gb_Output_error,gb_Package__check: Package $(1) has not been defined))
+
+endef
+
 # Set output dir for the package files.
 #
 # Default is $(OUTDIR).
 #
 # gb_Package_set_outdir package outdir
 define gb_Package_set_outdir
+$(call gb_Package__check,$(1))
 gb_Package_OUTDIR_$(1) := $(2)
 
 endef
 
 define gb_Package_add_file
+$(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 
arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
 $(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
@@ -134,6 +144,7 @@
 # $(eval $(call gb_Package_add_files,foo_inc,inc/foo,foo/bar/foo.hxx))
 # # - inc/foo/foo.hxx
 define gb_Package_add_files
+$(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call 
gb_Output_error,gb_Package_add_files: it looks like either pkg name or dest. 
dir is missing)))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(notdir 
$(file)),$(file)))
 
@@ -148,6 +159,7 @@
 # $(eval $(call gb_Package_add_files,foo_inc,inc,foo/bar/foo.hxx))
 # # - inc/foo/bar/foo.hxx
 define gb_Package_add_files_with_dir
+$(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call 
gb_Output_error,gb_Package_add_files: it looks like either pkg name or dest. 
dir is missing)))
 $(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file)))
 
@@ -155,18 +167,21 @@
 
 # Package files from custom target
 define gb_Package_use_custom_target
+$(call gb_Package__check,$(1))
 $(call gb_Package_get_preparation_target,$(1)) :| $(call 
gb_CustomTarget_get_target,$(2))
 
 endef
 
 # Package files from unpacked tarball of an external project
 define gb_Package_use_unpacked
+$(call gb_Package__check,$(1))
 $(call gb_Package_get_preparation_target,$(1)) :| $(call 
gb_UnpackedTarball_get_target,$(2))
 
 endef
 
 # Package files from build of an external project
 define gb_Package_use_external_project
+$(call gb_Package__check,$(1))
 $(call gb_Package_get_preparation_target,$(1)) :| $(call 
gb_ExternalProject_get_target,$(2))
 
 endef

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236
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

[RESTORED] Changed a few compareTo's to '=='

2013-04-21 Thread Sameer Deshmukh (via Code Review)

Sameer Deshmukh has restored this change.

Change subject: Changed a few compareTo's to '=='
..


Patch Set 1: Restored

restore

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

Gerrit-MessageType: restore
Gerrit-Change-Id: I0a0ba87ec517e5dd776ab45b232dd7f227451466
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com

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

[PATCH] fdo#62096 replaced some compareTo's with ==

2013-04-21 Thread Sameer Deshmukh (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3543

To pull it, you can do:

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

fdo#62096 replaced some compareTo's with ==

Change-Id: I2a8e835cdd7d00a31ec4acab433527ce8b6134ca
---
M sal/inc/rtl/ustring.hxx
M xmlhelp/source/cxxhelp/provider/db.hxx
2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 13756f8..e405ddf 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1113,7 +1113,7 @@
 friend sal_Bool operator == ( const OUString rStr1,const 
OUString rStr2 ) SAL_THROW(())
 { return rStr1.equals(rStr2); }
 friend sal_Bool operator == ( const OUString rStr1,const 
sal_Unicode * pStr2 ) SAL_THROW(())
-{ return rStr1.compareTo( pStr2 ) == 0; }
+{ return (rStr1 == pStr2); }
 friend sal_Bool operator == ( const sal_Unicode * pStr1,const 
OUString rStr2 ) SAL_THROW(())
 { return OUString( pStr1 ).compareTo( rStr2 ) == 0; }
 
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx 
b/xmlhelp/source/cxxhelp/provider/db.hxx
index d00fbab..2d60319 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -68,7 +68,7 @@
 struct eq
 {
 bool operator()( const OString rKey1, const OString rKey2 ) const
-{ return rKey1.compareTo( rKey2 ) == 0; }
+{ return (rKey == rKey2); }
 };
 
 struct ha

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a8e835cdd7d00a31ec4acab433527ce8b6134ca
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com

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

[PATCH] fdo#62096 - Replaced compareTo with ==

2013-04-21 Thread Sameer Deshmukh (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3544

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/3544/1

fdo#62096 - Replaced compareTo with ==

Change-Id: Ie5d3b3181038ddc2ffe2875aca1a5b8b18ab7a4f
---
M writerfilter/source/ooxml/OOXMLStreamImpl.cxx
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 96f37bd..fb37d34 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -169,8 +169,8 @@
 {
 beans::StringPair aPair = aSeq[i];
 
-if (aPair.First.compareTo(sType) == 0 
-aPair.Second.compareTo(sStreamType) == 0)
+if ((aPair.First == sType) 
+(aPair.Second == sStreamType))
 bFound = true;
 else if (aPair.First.compareTo(sId) == 0 
  aPair.Second.compareTo(rId) == 0)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5d3b3181038ddc2ffe2875aca1a5b8b18ab7a4f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com

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

[Libreoffice-commits] core.git: dictionaries

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

New commits:
commit 252b6b608f5fc35b154846c3487809fe5e147ab7
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 21 20:24:25 2013 +0200

Updated core
Project: dictionaries  36a0d3a959604b5c5af4adb17ca10a1d85542846

diff --git a/dictionaries b/dictionaries
index faf63ac..36a0d3a 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit faf63ac08a9f3f1463a7f119083964f76b71141c
+Subproject commit 36a0d3a959604b5c5af4adb17ca10a1d85542846
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Dictionary_pt-PT.mk

 Dictionary_pt-PT.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36a0d3a959604b5c5af4adb17ca10a1d85542846
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 21 20:24:25 2013 +0200

fix typo

Change-Id: If45a7a269ba94639b02209bc0e5191dd1815e682

diff --git a/Dictionary_pt-PT.mk b/Dictionary_pt-PT.mk
index 1dfe3a3..9e023be 100644
--- a/Dictionary_pt-PT.mk
+++ b/Dictionary_pt-PT.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Dictionary_add_root_files,dict-pt-PT,\
dictionaries/pt_PT/README_th_pt_PT_v2.txt \
 ))
 
-$(eval $(call gb_Dictionary_add_thesauri,dict-pt-pt,\
+$(eval $(call gb_Dictionary_add_thesauri,dict-pt-PT,\
dictionaries/pt_PT/th_pt_PT_v2.dat \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] add a check to catch typos in Package names

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3542

to look at the new patch set (#2).

Change subject: add a check to catch typos in Package names
..

add a check to catch typos in Package names

Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236
---
M solenv/gbuild/Package.mk
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3542/2
-- 
To view, visit https://gerrit.libreoffice.org/3542
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Icae1d4f9f96d8e79e4992f546aad0630f5ae9236
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

Stack trace in Windows

2013-04-21 Thread V Stuart Foote

So having a bit of a chore when grabbing a stack trace in Windows.

Application to use seems to be the Sysinternals (Microsoft TechNet)
Russinovich  Cogswell developed Process Monitor utility.  It will
completely capture to log ALL system activity on a Windows OS.

The problem then becomes filtering the log to identify the faulting
component.

Looking at the current TinberBox 6 crasher  fdo#63680
https://bugs.freedesktop.org/show_bug.cgi?id=63680   for Tinderbox builds
left me scratching my head looking for the exact point where Writer
aborts--and LibreOffice starts a recovery.

Can someone give me a hint about the process flow of session recovery and
which LibreOffice .dll would I look for to see the catch of the Writer crash
and launch a recovery? Trying to pin that down, so I can work backwards
through the dump.

  



--
View this message in context: 
http://nabble.documentfoundation.org/Stack-trace-in-Windows-tp4051411.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#62096 Corrected stupid error in previous patch

2013-04-21 Thread Sameer Deshmukh (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3545

To pull it, you can do:

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

fdo#62096 Corrected stupid error in previous patch

Change-Id: Ieb3ed1201918c5b4ba64e6f767353497e697
---
M xmlhelp/source/cxxhelp/provider/db.hxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx 
b/xmlhelp/source/cxxhelp/provider/db.hxx
index d00fbab..7945591 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -68,7 +68,7 @@
 struct eq
 {
 bool operator()( const OString rKey1, const OString rKey2 ) const
-{ return rKey1.compareTo( rKey2 ) == 0; }
+{ return (rKey1 == rKey2); }
 };
 
 struct ha

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb3ed1201918c5b4ba64e6f767353497e697
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sameer Deshmukh sameer.deshmuk...@gmail.com

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

adding a property to a published service [was: Value of a ListBox, FMC paradigm for Form elements (controls)]

2013-04-21 Thread Lionel Elie Mamane

On Sat, Apr 20, 2013 at 11:34:10PM +0200, Lionel Elie Mamane wrote:

 I'm tempted to (...) add a SelectedValues property for easy access
 to the selected storage values, (...)

And this property looks like it belongs in service
 com::sun::star::form::component::DatabaseListBox

That service is published. I can add new properties to it, right?
That's a backwards-compatible change.

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

[PATCH]fdo#62096 Replace O(U)String compareTo with ==

2013-04-21 Thread Janit Anjaria

Hey!

I am hereby attaching my patch for fdo#62096 where we replace .compareTo()
calls with '==' operator.

Any suggestions would be helpful and appreciated.Hope this finds you in
good health.


Regards,
Janit


0001-fdo-62096-Replace-O-U-String-compareTo-with-operator.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-04-21 Thread Tomaž Vajngerl

 vcl/source/filter/GraphicNativeTransform.cxx |6 +++---
 vcl/source/filter/jpeg/Exif.cxx  |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4cbe623af84f4a6761bf996fec82f2ea791a0769
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Sun Apr 21 22:52:30 2013 +0200

Fix enum Tag and Orientation usage.

Change-Id: I50014b227b07a4b7bff7b2569ec55409f371b38e

diff --git a/vcl/source/filter/GraphicNativeTransform.cxx 
b/vcl/source/filter/GraphicNativeTransform.cxx
index 793621b..7b3f640 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -128,7 +128,7 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 
aRotation)
 aSourceStream.Write(aLink.GetData(), aLink.GetDataSize());
 aSourceStream.Seek( STREAM_SEEK_TO_BEGIN );
 
-Orientation aOrientation = Orientation::TOP_LEFT;
+Orientation aOrientation = TOP_LEFT;
 
 Exif exif;
 if ( exif.read(aSourceStream) )
@@ -144,9 +144,9 @@ bool GraphicNativeTransform::rotateJPEG(sal_uInt16 
aRotation)
 aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
 
 // Reset orientation in exif if needed
-if ( exif.hasExif()  aOrientation != Orientation::TOP_LEFT)
+if ( exif.hasExif()  aOrientation != TOP_LEFT)
 {
-exif.setOrientation(Orientation::TOP_LEFT);
+exif.setOrientation(TOP_LEFT);
 exif.write(aTargetStream);
 }
 
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 318e2bd..d15cc4c 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -163,11 +163,11 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 
aLength, sal_uInt16 aOffs
 {
 ifd = (ExifIFD*) pExifData[aOffset];
 
-if (ifd-tag == Tag::ORIENTATION)
+if (ifd-tag == ORIENTATION)
 {
 if(bSetValue)
 {
-ifd-tag = Tag::ORIENTATION;
+ifd-tag = ORIENTATION;
 ifd-type = 3;
 ifd-count = 1;
 ifd-offset = maOrientation;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-21 Thread Tomaž Vajngerl

 vcl/source/filter/jpeg/Exif.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 2fa3cde17c90eb0eb7e9fda93909b02a2aebf1c9
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Sun Apr 21 22:55:41 2013 +0200

WaE: unused variable in Exif

Change-Id: I921ba50f1d251489bfb56703247890f9ff23200f

diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx
index def8ee3..490f144 100644
--- a/vcl/source/filter/jpeg/Exif.hxx
+++ b/vcl/source/filter/jpeg/Exif.hxx
@@ -49,7 +49,6 @@ class Exif
 {
 private:
 Orientation maOrientation;
-sal_Int32  mnStreamPosition;
 bool mbExifPresent;
 
 bool processJpeg(SvStream rStream, bool bSetValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PROPOSAL] enable gerrit buildbot trigger for all in group commiter

Hi,

so this is a proposal to enable the ability to trigger a build for all in the
group commiter and not some rather restricted and nonobvious set of people
(including me).

Securitywise, this presents no new risks as everyone in group committer already
has the ability to push stuff to master which is then executed by tinderboxes.

The restriction to just a few people being able to trigger the build was
originally done to prevent the bots to be overwhelmed resourcewise -- but I 
think
the explicit and manual triggering of builds is already enough to ensure that,
if everyone is acting responsible. In light of the cultural tradition in the
LibreOffice project to be optimistic and supporting about contributor skills
and judgements, I think the limitation to a restricted and arbitrary set of
people is overly cautious. Anybody, who has commit access to master should be
able to trigger a build, if e.g. asked about it on IRC.

This would work as follows:
- Random person asks hey can you trigger my change gerrit-URL
  (or someone with commit access want to test a change on all platforms before
  it hits master)
- Random commiter (that is a person with direct push-to-master permissions):
  - checks the change not to contain an evil exploit trying to harm a
tinderbox (no full review beyond that needed yet)
  - runs ssh logerrit buildbot show -p core to see if there is a huge backlog
on the builders already
  - runs ssh logerrit buildbot schedule -p core SHA1 the schedule the build

I dont think we should monopolize the access to these boxes, if it is used
responsible by everyone. If that is the case we will be quicker in response
time, without wasting these valueable ressource either by under- or overusing
it. If it is not used responsibly, we can still revert to the old subgroup
until we have the builderboxes.

Opinions?

Best,

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

Re: [PUSHED] Re: Bug 58505 - Tweak F5 for slide display, and add Shift-F5

2013-04-21 Thread kuba


On 04/16/2013 08:29 PM, Thorsten Behrens wrote:

I wrote:

Jan Holesovsky wrote:

Looks like great work to me - if you clarify the situation with the
accelerator, I think we can push that, unless Thorsten has more
ideas of course :-)


Nope. :)


So, since I don't see why this should not be merged to master, I did
just that - thanks a lot for your fix, Jakub!


Wow, I'm happy you decided to merge this.



Can you please subsequently give us a license statement for your
changes, see
https://wiki.documentfoundation.org/Development/Developers#Example_Statement ?


Is it ok to do that here? If so then:

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



And I'm curious what you would be up to next - I guess you might be
bored by EasyHacks, so
https://wiki.documentfoundation.org/Development/Impress#Draw.2FImpress_bugs
has a nice list of more involved bugs. :)


I'll try to have a look at this. Unfortunately I don't have as much free time as
I'd like to have.



Looking fwd to your next patch,

-- Thorsten


Kind regards,

kuba



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

[Libreoffice-commits] core.git: jpeg/ExternalPackage_jpeg.mk vcl/source

2013-04-21 Thread Tomaž Vajngerl

 jpeg/ExternalPackage_jpeg.mk|1 +
 vcl/source/filter/jpeg/Exif.cxx |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8ecf0d45d8301b95385eda64671df828c3003c62
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Sun Apr 21 23:31:03 2013 +0200

Add jpegint.h to jpeg module. Fix warning in Exif.

Change-Id: I098ad140d013f1bda057416b2e0622bc038d2a30

diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk
index c451ed5..66cfc91 100644
--- a/jpeg/ExternalPackage_jpeg.mk
+++ b/jpeg/ExternalPackage_jpeg.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,jpeg_inc,inc/external/jpeg,\
jconfig.h \
jerror.h \
jmorecfg.h \
+   jpegint.h \
jpeglib.h \
 ))
 
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index d15cc4c..167cf54 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -62,7 +62,7 @@ sal_Int32 Exif::getRotation()
 case LEFT_BOTTOM:
 return 900;
 default:
-return 0;
+break;
 }
 return 0;
 }
@@ -93,7 +93,6 @@ bool Exif::write(SvStream rStream)
 bool Exif::processJpeg(SvStream rStream, bool bSetValue)
 {
 sal_uInt16  aMagic16;
-sal_uInt8   aMarker;
 sal_uInt16  aLength;
 
 rStream.Seek(STREAM_SEEK_TO_END);
@@ -113,7 +112,9 @@ bool Exif::processJpeg(SvStream rStream, bool bSetValue)
 
 while(true)
 {
+sal_uInt8 aMarker = 0xD9;
 sal_Int32 aCount;
+
 for (aCount = 0; aCount  7; aCount++)
 {
 rStream  aMarker;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/gbuild

2013-04-21 Thread Michael Stahl

 solenv/gbuild/LinkTarget.mk |6 +-
 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d5e5de641cef7664a605f474bf7c18a70008806b
Author: Michael Stahl mst...@redhat.com
Date:   Sun Apr 21 18:07:43 2013 +0200

gbuild: work around problems with aux-targets and DLL renames (MSVC)

When renaming a DLL but not the import lib it can happen that
the touch rule creates the DLL file which is not helpful.
Since there is no easy way to fix this properly, and DLLs are not
renamed often, put in a lame hack to detect the situtation and delete
the import lib, which will get it re-linked on the next make invocation.

Change-Id: I3909cf7d377433d263e517719cca07005bade512

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
old mode 100644
new mode 100755
index 720a23d..da0018f
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1230,9 +1230,13 @@ endef
 # Add a file that is built by the LinkTarget command and define
 # a dummy touch rule for it so it can be tracked via dependencies.
 # gb_LinkTarget_add_auxtarget linktarget auxtarget
+# The assumption is that the file is created by linking; in case it does not
+# exist there is some problem.  This can be caused on WNT by re-naming DLL
+# files (which are aux-targets) but not the import .lib files (which
+# are the LinkTargets) and doing an incremental build.
 define gb_LinkTarget_add_auxtarget
 $(2) : $(call gb_LinkTarget_get_target,$(1))
-   touch $$@
+   $$(if $$(wildcard $$@),touch -r $$ $$@,rm -f $$; echo ERROR: 
aux-target missing, library deleted, please try again; false)
 
 $(call gb_LinkTarget_get_clean_target,$(1)) : AUXTARGETS += $(2)
 
commit 1ae59b52e302491ffcd97bde25a6dd68bf109123
Author: Michael Stahl mst...@redhat.com
Date:   Sun Apr 21 18:06:17 2013 +0200

gbuild: fix spurious delivering of import libs (MSVC)

The DLL aux-target is always newer than the work-dir import lib,
which causes spurious re-delivery of the solver import lib.
Touch the DLL file to the same timestamp as the import lib
to prevent this.

Change-Id: I8394201c7a672a50db3af51b9442f8992cdef1d1

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 36f973d..6457e9c 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -213,8 +213,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); 
RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1)  false; 
fi) \
-   $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
-   $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+   $(if $(filter Library,$(TARGETTYPE)), if [ -f $(DLLTARGET).manifest 
]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2  touch -r $(1) $(DLLTARGET).manifest 
$(DLLTARGET); fi) \
+   $(if $(filter Executable,$(TARGETTYPE)), if [ -f $(1).manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1 
 touch -r $(1) $(1).manifest; fi) \
; exit $$RC)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] replace python-core zip built in pyuno with direct use of Pa...

2013-04-21 Thread Michael Stahl (via Code Review)

Hello LibreOffice gerrit bot,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/3525

to look at the new patch set (#2).

Change subject: replace python-core zip built in pyuno with direct use of 
Package
..

replace python-core zip built in pyuno with direct use of Package

- python3: deliver files to INSTDIR, with same layout as instset
  and do not deliver .lib files
- pyuno: remove obsolete python.bin targets
- pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX
  platforms (sadly it is apparently still needed for system python on
  MinGW)
- scp2: use the python3 filelist
  There is still a problem here because the installer does not currently
  allow to preserve the executable bit on files in a filelist
- RepositoryExternal: run python executable from INSTDIR
  and link against libraries in UnpackedTarball dir

Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832
---
M RepositoryExternal.mk
M python3/ExternalPackage_python3.mk
M pyuno/CustomTarget_zipcore.mk
M pyuno/Module_pyuno.mk
M scp2/source/python/file_python.scp
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
9 files changed, 72 insertions(+), 116 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3525/2
-- 
To view, visit https://gerrit.libreoffice.org/3525
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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

Re: [ANN] LibreOffice 4.0.3 RC1 available

2013-04-21 Thread Thorsten Behrens

Dear Community,

due to a build issue on Mac, that resulted in non-working python
extensions, just pushed and published new Mac x86 install sets for
4.0.3 RC1. The source tarballs, lang packs and all other platforms
remain unmodified. Apologies for the mistake.

With kind regards,

-- Thorsten


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

Re: [PROPOSAL] enable gerrit buildbot trigger for all in group commiter

2013-04-21 Thread Norbert Thiebaud

On Sun, Apr 21, 2013 at 4:06 PM, Bjoern Michaelsen
bjoern.michael...@canonical.com wrote:

 Opinions?

as of now the only way to do that is to give buildbot admin ACL and to
use a command line to schedule build...

The intent was to find a way to trigger these semi-automatically using
the gerrit web gui... at which point yes everyone being in the
commiter group would have been able to schedule a build.

How to do that in the GUI is not settle... there are different
solutions considered but the most attractive one would require to be
able to upstream patches to gerrit itself. ( bear in mind that one of
the very basic rule is that our gerrit muct be able to function with a
vanilla gerrit and that we should be able to operate even if the
plugins(s) become unavailable. iow if for some reason gerrit plugin
does not work or fail to load, we should still be able to
review/commit patches... and not have the whole gerrit system
out-of-order)

a less sexy alternative is to trigger based on +1 review from a
committer. but of course that would be too much as we can't deal with
that many build yet.

a more hackish solution would be to teach buildbot to triggger on a
comment from a committer that contain some magic words...
iow a committer would do a revew +1 with, for example @schedule@ in a
the text of the comment.

either way we also need to present the current buidlbot build queue in
a page of gerrit's web... so that people can monitor how deep is the
queue.


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

Calc header/Footer mirroring in page. Is it working at all?

2013-04-21 Thread Olivier Hallot

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi

I am working to port the calc header and footer editing dialog to
widgets ui.

I am discovering a very complex setting that I guess is related to page
mirrorring. But I am actually unable to see it working.

* Had anyone seen if left and right header(footer) areas are or should
be swapped in mirrored pages?

* There seems to be a selectable setting for the left/center/right
content, as seen in these lines

source/ui/pagedlg/hfedtdlg.src:TabPage RID_HFBASE
source/ui/pagedlg/hfedtdlg.src: // die Eingabefenster jeweils mit
eigener ID, sonst aus RID_HFBASE kopiert
source/ui/pagedlg/hfedtdlg.src:TabPage RID_SCPAGE_HFED_HL  RID_HFBASE
source/ui/pagedlg/hfedtdlg.src:TabPage RID_SCPAGE_HFED_HR  RID_HFBASE
source/ui/pagedlg/hfedtdlg.src:TabPage RID_SCPAGE_HFED_FL  RID_HFBASE
source/ui/pagedlg/hfedtdlg.src:TabPage RID_SCPAGE_HFED_FR  RID_HFBASE

However RID_SCPAGE_HFED_XY  RID_HFBASE does not reflect changes except
strings, and the widgets are in the same position in the 4 cases.

Either this is an overkill or I missed totaly the purpose of all this
stuff?.

Thanks for any clue on that

- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJRdIJlAAoJEJp3R7nH3vLxriQH/jpMOAhWebBdgW9mwqSugCk9
FriwnQVRzP5cxmK2hu4/IOgwZ7UoGCKLV8xHn9JJV50FjUiWGDlFB2FKDEzbqe+p
VY0TdCZj/P+2SIuEEnXCXqV6H4tH+te3nn3uhI8zHkmlEJt7YeyJaIcdrPqmx0YT
3CNvmOYO+S3Mx3CfWUThwhq99WzJF8P5fpBTa/5G0GEvRhJWmcyX4zGtibVmMfyF
R08tpyWu8X6l0zPYuuZobqV0HvA5nCWZTBMTzjXLHWlt4hcY/goFj/lqeIPTmjKT
CJUSBym36ZCk0qHYIpWKmJCmS/z3L/SnBb+mfQWV7z3xQH58eo5z2P+PXx4FMnk=
=gwLv
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-04-21 Thread Takeshi Abe

 svx/source/xml/xmleohlp.cxx |   14 +++---
 svx/source/xml/xmlgrhlp.cxx |4 ++--
 svx/source/xml/xmlxtexp.cxx |2 +-
 svx/source/xml/xmlxtimp.cxx |8 
 svx/source/xoutdev/_xoutbmp.cxx |6 +++---
 svx/source/xoutdev/_xpoly.cxx   |2 +-
 svx/source/xoutdev/xattr.cxx|   38 +++---
 svx/source/xoutdev/xattrbmp.cxx |4 ++--
 8 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit 550546a2fc651913a5624f4bcc4bec6e6d382c26
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Apr 22 09:10:41 2013 +0900

sal_Bool to bool

Change-Id: Ibaa2a843e16c22b6e2fb7e53da335b9b35b70a96

diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index c8dbc57..02839ab 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -66,7 +66,7 @@ class OutputStorageWrapper_Impl : public 
::cppu::WeakImplHelper1XOutputStream
 ::osl::MutexmaMutex;
 Reference  XOutputStream  xOut;
 TempFile aTempFile;
-sal_Bool bStreamClosed : 1;
+bool bStreamClosed : 1;
 SvStream* pStream;
 
 public:
@@ -82,7 +82,7 @@ public:
 };
 
 OutputStorageWrapper_Impl::OutputStorageWrapper_Impl()
-: bStreamClosed( sal_False )
+: bStreamClosed( false )
 , pStream(0)
 {
 aTempFile.EnableKillingFile();
@@ -121,7 +121,7 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
 {
 MutexGuard  aGuard( maMutex );
 xOut-closeOutput();
-bStreamClosed = sal_True;
+bStreamClosed = true;
 }
 
 struct OUStringLess
@@ -283,7 +283,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
 if( -1 == nPos )
 return sal_False;
 sal_Bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE );
-sal_Bool bGrUrl = !bObjUrl 
+bool bGrUrl = !bObjUrl 
   aURLNoPar.startsWith( XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE );
 if( !(bObjUrl || bGrUrl) )
 return sal_False;
@@ -305,7 +305,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
 
 if( bGrUrl )
 {
-sal_Bool bOASIS = mxRootStorage.is() 
+bool bOASIS = mxRootStorage.is() 
 ( SotStorage::GetVersion( mxRootStorage )  
SOFFICE_FILEFORMAT_60 );
 rContainerStorageName = bOASIS
 ? maReplacementGraphicsContainerStorageName
@@ -515,7 +515,7 @@ uno::Reference io::XInputStream  
SvXMLEmbeddedObjectHelper::ImplGetReplacement
 {
 try
 {
-sal_Bool bSwitchBackToLoaded = sal_False;
+bool bSwitchBackToLoaded = false;
 sal_Int32 nCurState = xObj-getCurrentState();
 if ( nCurState == embed::EmbedStates::LOADED || nCurState == 
embed::EmbedStates::RUNNING )
 {
@@ -530,7 +530,7 @@ uno::Reference io::XInputStream  
SvXMLEmbeddedObjectHelper::ImplGetReplacement
 // the image must be regenerated
 // TODO/LATER: another aspect could be used
 if ( nCurState == embed::EmbedStates::LOADED )
-bSwitchBackToLoaded = sal_True;
+bSwitchBackToLoaded = true;
 
 OUString aMediaType;
 xStream = svt::EmbeddedObjectRef::GetGraphicReplacementStream(
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 3f09fe8..438427d 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -91,7 +91,7 @@ public:
 SvXMLGraphicInputStream( const OUString 
rGraphicId );
 virtual ~SvXMLGraphicInputStream();
 
-sal_BoolExists() const { return mxStmWrapper.is(); 
}
+boolExists() const { return mxStmWrapper.is(); 
}
 };
 
 SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString rGraphicId )
@@ -222,7 +222,7 @@ public:
 SvXMLGraphicOutputStream();
 virtual ~SvXMLGraphicOutputStream();
 
-sal_BoolExists() const { return mxStmWrapper.is(); 
}
+boolExists() const { return mxStmWrapper.is(); 
}
 const GraphicObjectGetGraphicObject();
 };
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 9cb97d9..4d74dbd 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -220,7 +220,7 @@ bool SvxXMLXTableExportComponent::save(
 INetURLObject aURLObj( rURL );
 bool bToStorage = aURLObj.GetProtocol() == INET_PROT_NOT_VALID; // a 
relative path
 
-sal_Bool bSaveAsStorage = xTable-getElementType() == ::getCppuType((const 
OUString*)0);
+bool bSaveAsStorage = xTable-getElementType() == ::getCppuType((const 
OUString*)0);
 
 if( pOptName )
 *pOptName = rURL;
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 99d3e13..c5746f3

Re: [Libreoffice-qa] [LibreOffice-QA] Conference Call 2013-04-19 - Agenda Minutes

2013-04-21 Thread Jean-Baptiste Faure

Hi,

Le 21/04/2013 00:40, Bjoern Michaelsen a écrit :
[...]
 
 This project was started out of the needs of the NL project -- in that case it
 has to ensure in some way to stay reasonably responsive. Note also that a
 mailing list is precisely _NOT_ what is needed here, as then there is nobody
 feeling responsible for it. I would be happy with either Sophie or Charles
 naming one or two people as the contact persons to the NL community in this
 case if they are overloaded themselves (which they are), but not with a 
 mailing
 list -- esp. not one of a community that Sophie describes as NL projects are
 always shy about what they are doing.

You can add me as contact person for FR community.

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
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] [LibreOffice-QA] Conference Call 2013-04-19 - Agenda Minutes

2013-04-21 Thread Sophie Gautier

Hi all,
On 21/04/2013 00:40, Bjoern Michaelsen wrote:
 Hi,
 
 On Sat, Apr 20, 2013 at 11:29:59AM +0200, Rainer Bielefeld wrote:
 Currently I see a tendency that the QA calls generate
 decisions and want to change proceedings without knowing enough
 concerning existing proceedings
 
 You are kindly invited to join the call to improve the situation. AFAIK we 
 even
 changed the timeslot of the call already multiple times trying to accomodate 
 more
 participants.
 
 The advisable way would be to ask the French QA team via mailing list to
 leave some notes in the Wiki how they proceed (or how they plan to proceed).
 If then someone has ideas for improvements he can start a discussion with the
 team within the team (as a newbee there). And only with very good urgent
 reasons (coordinations needs between such sub-communities or whatever) a
 discussion may be started on international level.
 
 This project was started out of the needs of the NL project -- in that case it
 has to ensure in some way to stay reasonably responsive. Note also that a
 mailing list is precisely _NOT_ what is needed here, as then there is nobody
 feeling responsible for it.

This FR QA list is not a discuss list but a working list and each member
invested on QA feels responsible of the work done here. Again, some
teams may work in different ways.

 I would be happy with either Sophie or Charles
 naming one or two people as the contact persons to the NL community in this
 case if they are overloaded themselves (which they are), but not with a 
 mailing
 list -- esp. not one of a community that Sophie describes as NL projects are
 always shy about what they are doing.

You didn't read what I was talking about (culture and communication), I
was not talking about responsiveness and responsibility. I don't think
that overwhelming another member is the good way to go. But as
Jean-Baptiste volunteered, the problem is solved.

Kind regards
Sophie


-- 
Sophie Gautier sophie.gaut...@documentfoundation.org
Tel:+33683901545
Membership  Certification Committee Member - Co-founder
The Document Foundation
___
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] [LibreOffice-QA] Conference Call 2013-04-19 - Agenda Minutes

Hi Jean-Baptiste,

On Sun, Apr 21, 2013 at 09:50:15AM +0200, Jean-Baptiste Faure wrote:
Hi,

Le 21/04/2013 00:40, Bjoern Michaelsen a écrit :
[...]

This project was started out of the needs of the NL project -- in that case
it
has to ensure in some way to stay reasonably responsive. Note also that a
mailing list is precisely _NOT_ what is needed here, as then there is nobody
feeling responsible for it. I would be happy with either Sophie or Charles
naming one or two people as the contact persons to the NL community in this
case if they are overloaded themselves (which they are), but not with a
mailing
list -- esp. not one of a community that Sophie describes as NL projects
are
always shy about what they are doing.

You can add me as contact person for FR community.

Thanks, thats awesome! I amended that to the notes at:

https://wiki.documentfoundation.org/QA/Meetings/2013/April_19#NEW_ITEM:_Get_French_BSA_Operational_.28Robinson.29

note that QA doesnt requests you to do all the work yourself, feel free to
quickly delegate to others if you are timerestrainted. Basically, we just want
a good line of communication here. ;)

Best,

Bjoern
___
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] New QA Site - Press Release?

2013-04-21 Thread Joel Madero


Hi All,

As some of you know the QA team has started to make a new site (thanks 
to Florian :) ). The site will be on qa.libreoffice.org (currently not 
available to the public but we hope to go live this week).


I'm not sure if someone from marketing wants to do some kind of 
statement about this. The main goal for the page is to make a 
professional page where content which doesn't change often can be housed 
(ie. things outside of wiki which we use for things that change 
frequently). We as a team felt like it would be more professional and 
easier to navigate for new contributors if we created our own subpage on 
the qa.libreoffice.org url. Furthermore we wanted to give shout outs 
to members who have contributed a lot as a small token of our gratitude 
for their contributions to the project. The QA Team site will contain 
short bios and a photo of QA members which have demonstrated commitment 
to the project for some length of time and will continue contributing 
into the foreseeable future. These bios will be about the person, not 
about the project, this is to highlight the community as a whole 
(including our lives outside of LibreOffice).


Some other content that will be on the page is a general overview of QA 
work, how to's for things like our mailing list and #libreoffice-qa IRC 
channel, and OS specific content such as parallel installs on different 
OS' (required for triaging purposes), the SI-GUI for Windows (created by 
Florian) and links to tinderbox directories.


We hope to encourage new contributors to get involved and this will be 
our attempt to make a nice launching site for people thinking that 
they want to contribute to LibreOffice to get involved with QA.



If someone wants to tackle a short press release please let us know and 
if there are questions don't hesitate to ask.



Thanks all!


Joel
___
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] New text for NEEDINFO Changes

2013-04-21 Thread Joel Madero


Hi All,

Did just a little work on the text for NEEDINFO, starting the first test 
of 50 bugs this week, if there are any comments please send them my way. 
Thanks again Florian for getting this text together :)


Dear Sir or Madam,

This bug has been in NEEDINFO state for more than 180 days (6 months). 
The requested information is important to push this issue forward 
towards a resolution. Please provide the missing information as soon as 
possible and then mark the bug as UNCONFIRMED.


It is possible that the bug was stuck in NEEDINFO state by mistake or 
that the requested information has already been added. If this is the 
case please put the bug back to UNCONFIRMED.


As part of our regular QA workflow we will be closing this bug as 
INVALID in 30 days if the information has not been provided and the bug 
has not been put back to UNCONFIRMED status. If the bug is put into 
INVALID status but you are able to append the requested information, 
feel free to open the bug back up as UNCONFIRMED.


Lastly, because the bug has been in NEEDINFO status for such a length of 
time, if possible, please confirm that the bug is still present in a 
newer release and leave a comment stating the latest version that has 
been tested -- please DO NOT change the Version field on the bug.



The LibreOffice QA team



Best Regards,
Joel



___
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] Addressing regressions within a release

On Fri, Apr 19, 2013 at 04:54:36PM -0400, Robinson Tryon wrote:
 As brought-up by Bjoern during the meeting, it's good for us if we can
 identify how many regressions have been introduced during the course
 of a (minor) release series of LibreOffice.
 
 https://wiki.documentfoundation.org/QA/Meetings/2013/May_3#PENDING_ITEM:_Regressions_within_a_release
 
 One good way to tackle this problem would be to bibisect any bug
 marked as a regression and try to date it to before the X.X.0 point
 release.
 
 Joel - How much work would it be to bibisect the regressions for each
 release? Aside from initial triage/repro, what other QA tasks should
 take priority over this work?

fyi: I added the relevant queries to the minutes at:

 
https://wiki.documentfoundation.org/QA/Meetings/2013/April_19#NEW_ITEM:_Regressions_within_a_release_.28Bjoern.29

-- its currently some 60 bugs to check.

Best,

Bjoern
___
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] New text for NEEDINFO Changes

2013-04-21 Thread Rainer Bielefeld


Joel Madero schrieb:

This bug has been in NEEDINFO state for more than 180 days


Hi,

this text IMHO is much too elaborated and prim, please do not use it.

If you plan such actions please leave a related description in the Wiki, 
most here do not have the time to find all scattered info in various 
threads. Currently I haven't a clue how the text will be used.
As personal Mail? As comment in The bug? For comments in the Bug please 
consider that queries have an important role for bug wrangling, and the 
text uses several possible key words like

regular, information, time, ...

Please limit the comment to 1 line + a link to text in the Wiki 
concerning more info!


And BTW, still nobody was able to contribute a plausible explication 
concerning the benefit of these auto-closes (except hope that some users 
will contribute more useful info, but my experience is that most of them 
only write still in version ...) - or did I miss something?


CU


Rainer
___
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] [ANN] LibreOffice 4.0.3 RC1 available

2013-04-21 Thread Thorsten Behrens

Dear Community,

due to a build issue on Mac, that resulted in non-working python
extensions, just pushed and published new Mac x86 install sets for
4.0.3 RC1. The source tarballs, lang packs and all other platforms
remain unmodified. Apologies for the mistake.

With kind regards,

-- Thorsten


signature.asc
Description: Digital signature
___
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] New text for NEEDINFO Changes

2013-04-21 Thread Pedro

Hi Joel, all


jmadero wrote
 On 04/21/2013 10:45 AM, Rainer Bielefeld wrote:
 this text IMHO is much too elaborated and prim, please do not use it.
 
 After long discussions and email threads it seems like *most* people 
 agree that NEEDINFO should be a temporary status
 
 Users have some responsibility to help us help them ;)

I agree with the three sentences above :)

Your nice message has too much information ;)

And I agree that 6 months (plus 1 month) is more than enough time to wait
for further details. 

Emptying the queue from the QA side is stimulating for both QA and users
(they see something is being done). It should also be stimulating for
developers who can see the list of things to-do growing shorter instead of
being a never ending, always increasing huge list of items to be solved...

Just my 2 or 3 cents ;)



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-New-text-for-NEEDINFO-Changes-tp4051386p4051433.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-bugs] [Bug 63764] New: Windows XP Uninstaller Has Square Characters

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

  Priority: medium
Bug ID: 63764
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Windows XP Uninstaller Has Square Characters
  Severity: critical
Classification: Unclassified
OS: All
  Reporter: jmadero@gmail.com
  Hardware: All
Status: UNCONFIRMED
   Version: 4.0.2.2 release
 Component: Libreoffice
   Product: LibreOffice

Created attachment 78287
  -- https://bugs.freedesktop.org/attachment.cgi?id=78287action=edit
What uninstaller looks like

Steps:

1. Install LibreOffice on Windows XP (other Windows machines might be affected
also but definitely XP)
2. Uninstall LibreOffice

Observed: Square characters, no text at all in uninstaller (see attached)

Expected: Correct characters

Looks very unprofessional so I set it to Critical, I am almost positive that
this is a duplicate but I can't find the dupe (apologies). IMO Uninstaller
working/looking incorrectly borders on blocker.

CC'ing Michael,  Andras to make sure the issue is seen and hopefully solved as
I can confirm it on 4.0.3 tinderbox as well.

-- 
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 63764] Windows XP Uninstaller Has Square Characters

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
   Priority|medium  |high
 CC||jmadero@gmail.com,
   ||michael.me...@novell.com,
   ||tima...@gmail.com
 Ever confirmed|0   |1

-- 
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 63765] New: TDF Site: Dead links on Contribute to the Foundation

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

  Priority: medium
Bug ID: 63765
CC: webs...@global.libreoffice.org
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: TDF Site: Dead links on Contribute to the Foundation
  Severity: minor
Classification: Unclassified
OS: All
  Reporter: libreoff...@bielefeldundbuss.de
   URL: http://www.documentfoundation.org/contribution/
  Hardware: Other
Status: UNCONFIRMED
   Version: unspecified
 Component: WWW
   Product: LibreOffice

I found not working links:
a) Develop http://www.documentfoundation.org/develop/
b) group http://www.facebook.com/group.php?gid=159921240700930

-- 
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 63754] Behaviour after uninstalling the Java RE

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

--- Comment #4 from Joel Madero jmadero@gmail.com ---
So I just did a test:

Installed LibreOffice 4.0.2.2 release on Windows XP, did standard install with
JRE installed

Uninstalled JRE

Ran LibreOffice

No problems at all for me, worked fine. This makes me suspect it's extensions
of some kind tricking your system. So solution:

Backup and then delete your profile, uninstall LibreOffice entirely, ensure
that everything JRE related is gone. Reinstall LibreOffice.

I'm leaving this as UNCONFIRMED but please let us know if that solves the
problem.

-- 
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 63724] At startup the display is garbled, not the items to choose

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

Joel Madero jmadero@gmail.com changed:

   What|Removed |Added

 CC||bjoern.michaelsen@canonical
   ||.com, jmadero@gmail.com

--- Comment #2 from Joel Madero jmadero@gmail.com ---
@Bjoern - Ubuntu related, any ideas?

-- 
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 42482] Importing PowerPoint with tables results in poor display

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

Florian Reisinger reisi...@gmail.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

--- Comment #5 from Florian Reisinger reisi...@gmail.com ---
Seems to work with Version 4.0.1.2 (Build ID:
84102822e3d61eb989ddd325abf1ac077904985)

-- 
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 63723] FILESAVE: exporting drawing objects and text boxes (problem in MS project and then in Impress too)