date:20130829

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

2013-08-29 Thread Stephan Bergmann

 configure.ac |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 9fed8a5e4a4c45d6a08260e9480ca6b43254b120
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 08:51:01 2013 +0200

Do not silently ignore --enable-libc++

Change-Id: Ifbabb338739ae452bee6cac73e4b2046356a4d17

diff --git a/configure.ac b/configure.ac
index c8ae2d6..bda7c01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2670,6 +2670,9 @@ if test $_os = Darwin; then
 AC_MSG_CHECKING([what compiler to use])
 case $with_macosx_sdk in
 10.6)
+if test $enable_libc__ = yes; then
+AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
+fi
 # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain 
Lion)?
 if test $(echo $MACOSX_SDK_PATH | cut -c1-23) = 
/Applications/Xcode.app; then
 CC=`xcrun -find gcc` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH
@@ -2682,7 +2685,10 @@ if test $_os = Darwin; then
 LIBTOOL=libtool
 ;;
 10.7|10.8|10.9)
-if test $enable_libc__ = yes -a 
$with_macosx_version_min_required != 10.6; then
+if test $enable_libc__ = yes; then
+if test $with_macosx_version_min_required = 10.6; then
+AC_MSG_ERROR([--enable-libc++ requires 
--with-macosx-version-min-required = 10.7])
+fi
 # Use libc++ instead of libstdc++ when possible
 # and also compile as C++11
 stdlib=-std=c++11 -stdlib=libc++
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Stephan Bergmann

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

New commits:
commit ef7ccbbf1f639ef7762a5c2de41a06826efbab25
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 09:27:04 2013 +0200

Better error output

Change-Id: I728507ee23015a9aab2423226fdd737749be0166

diff --git a/solenv/gbuild/GeneratedPackage.mk 
b/solenv/gbuild/GeneratedPackage.mk
index 2c0f992..e0c5036 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -44,7 +44,7 @@ define gb_GeneratedPackage__check_dirs
 $(if $(PACKAGE_DIRS),,$(call gb_Ouput_error,no dirs were added))
 $(foreach pair,$(PACKAGE_DIRS),\
$(if $(wildcard $(PACKAGE_SOURCEDIR)/$(call 
gb_GeneratedPackage__get_srcdir,$(pair))),,\
-   $(call gb_Output_error,source dir $(call 
gb_GeneratedPackage__get_srcdir,$(pair)) does not exist) \
+   $(call gb_Output_error,source dir $(PACKAGE_SOURCEDIR)/$(call 
gb_GeneratedPackage__get_srcdir,$(pair)) does not exist) \
) \
 )
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

2013-08-29 Thread Caolán McNamara

 vcl/source/gdi/outdev3.cxx |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 6ae2a7521f5ea34d052e7eb51a63f936d1d06aae
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Aug 28 20:22:26 2013 +0100

Resolves: fdo#68192 always recode from trad symbol to apple symbol

Even if the symbol font bit isn't set, the oox import route lacks the 
ability
to state that the bullet font is a font of symbol encoding. If the font is 
not
available on the system we go into fallback logic to state that famous 
symbol
fonts are in symbol encoding. But there is a symbol font on mac so its not
unknown and that doesn't happen. And the mac symbol font is not actually in
symbol encoding (seeing as it's all rearranged into the correct unicode
positions) so the recode logic is skipped in this special case to map the
microsoft/adobe private use area chars to the modern code points where they
were moved in the apple font.

I guess one alternative possible solution is to lookup all the fonts used 
in a
openxml doc using the fonttable stream where the charset info is available. 
But
seeing as it should only affect one particular font lets just move the 
encoder
test outside the issymbol block.

(cherry picked from commit b129867306ce918f4f8fbf9ec5f7dce86e52c9d2)

Conflicts:
vcl/source/gdi/outdev3.cxx

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

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index f7640f8..0350c83 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2420,22 +2420,23 @@ ImplFontEntry* ImplFontCache::GetFontEntry( 
ImplDevFontList* pFontList,
 pEntry = pFontData-CreateFontInstance( aFontSelData );
 
 // if we found a different symbol font we need a symbol conversion 
table
-if( pFontData-IsSymbolFont() )
+if( pFontData-IsSymbolFont() || aFontSelData.IsSymbolFont() )
 {
 if( aFontSelData.maTargetName != aFontSelData.maSearchName )
 pEntry-mpConversion = ConvertChar::GetRecodeData( 
aFontSelData.maTargetName, aFontSelData.maSearchName );
+}
+
 #ifdef MACOSX
-//It might be better to dig out the font version of the target font
-//to see if it's a modern re-coded apple symbol font in case that
-//font shows up on a different platform
-if (!pEntry-mpConversion 
-aFontSelData.maTargetName.EqualsIgnoreCaseAscii(symbol) 
-aFontSelData.maSearchName.EqualsIgnoreCaseAscii(symbol))
-{
+//It might be better to dig out the font version of the target font
+//to see if it's a modern re-coded apple symbol font in case that
+//font shows up on a different platform
+if (!pEntry-mpConversion 
+aFontSelData.maTargetName.EqualsIgnoreCaseAscii(symbol) 
+aFontSelData.maSearchName.EqualsIgnoreCaseAscii(symbol))
+{
 pEntry-mpConversion = ConvertChar::GetRecodeData( 
OUString(Symbol), OUString(AppleSymbol) );
-}
-#endif
 }
+#endif
 
 // add the new entry to the cache
 maFontInstanceList[ aFontSelData ] = pEntry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

2013-08-29 Thread Caolán McNamara

 vcl/source/gdi/outdev3.cxx |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 43288da5bfcaf5f7be8191194e635570ef7426d0
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Aug 28 20:22:26 2013 +0100

Resolves: fdo#68192 always recode from trad symbol to apple symbol

Even if the symbol font bit isn't set, the oox import route lacks the 
ability
to state that the bullet font is a font of symbol encoding. If the font is 
not
available on the system we go into fallback logic to state that famous 
symbol
fonts are in symbol encoding. But there is a symbol font on mac so its not
unknown and that doesn't happen. And the mac symbol font is not actually in
symbol encoding (seeing as it's all rearranged into the correct unicode
positions) so the recode logic is skipped in this special case to map the
microsoft/adobe private use area chars to the modern code points where they
were moved in the apple font.

I guess one alternative possible solution is to lookup all the fonts used 
in a
openxml doc using the fonttable stream where the charset info is available. 
But
seeing as it should only affect one particular font lets just move the 
encoder
test outside the issymbol block.

Change-Id: Ic5bd3ec15c8d8d99e2cab0fb67cc4bc33081c756
(cherry picked from commit b129867306ce918f4f8fbf9ec5f7dce86e52c9d2)
Reviewed-on: https://gerrit.libreoffice.org/5669
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6548d0c..e911761 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2292,18 +2292,19 @@ ImplFontEntry* ImplFontCache::GetFontEntry( 
ImplDevFontList* pFontList,
 {
 if( aFontSelData.maTargetName != aFontSelData.maSearchName )
 pEntry-mpConversion = ConvertChar::GetRecodeData( 
aFontSelData.maTargetName, aFontSelData.maSearchName );
+}
+
 #ifdef MACOSX
-//It might be better to dig out the font version of the target font
-//to see if it's a modern re-coded apple symbol font in case that
-//font shows up on a different platform
-if (!pEntry-mpConversion 
-aFontSelData.maTargetName.equalsIgnoreAsciiCase(symbol) 
-aFontSelData.maSearchName.equalsIgnoreAsciiCase(symbol))
-{
-pEntry-mpConversion = ConvertChar::GetRecodeData( 
OUString(Symbol), OUString(AppleSymbol) );
-}
-#endif
+//It might be better to dig out the font version of the target font
+//to see if it's a modern re-coded apple symbol font in case that
+//font shows up on a different platform
+if (!pEntry-mpConversion 
+aFontSelData.maTargetName.equalsIgnoreAsciiCase(symbol) 
+aFontSelData.maSearchName.equalsIgnoreAsciiCase(symbol))
+{
+pEntry-mpConversion = ConvertChar::GetRecodeData( 
OUString(Symbol), OUString(AppleSymbol) );
 }
+#endif
 
 // add the new entry to the cache
 maFontInstanceList[ aFontSelData ] = pEntry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Laurent Balland-Poirier

 sd/source/ui/inc/sdpreslt.hxx|2 -
 svx/source/tbxctrls/fillctrl.cxx |   64 ---
 svx/source/tbxctrls/linectrl.cxx |   54 
 3 files changed, 55 insertions(+), 65 deletions(-)

New commits:
commit 65ec892aaa533932f2a2aad2be6d402c4940e686
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Mon Aug 26 20:56:45 2013 +0200

fdo#39468 Translate German comments

patch for svx/source/tbxctrls/fillctrl.cxx

Change-Id: Ie3fcfa21d19037b001775886fbb187c2773556be

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 8de3238..aef36ce 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -191,7 +191,7 @@ void SvxFillToolBoxControl::StateChanged(
 }
 else
 {
-// leerer oder uneindeutiger Status
+// empty or ambiguous status
 if( nSID == SID_ATTR_FILL_STYLE )
 {
 pFillTypeLB-SetNoSelection();
@@ -235,7 +235,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
 
 XFillStyle eXFS = (XFillStyle)pStyleItem-GetValue();
 
-// Pruefen, ob Fuellstil schon vorher aktiv war
+// Check if the fill style was already active
 //if( eTmpXFS != eXFS )
 if( (XFillStyle) eLastXFS != eXFS )
 pFillControl-SelectFillTypeHdl( NULL );
@@ -259,8 +259,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
  pFillAttrLB-GetSelectEntryColor() != aColor )
 pFillAttrLB-SelectEntry( aColor );
 
-// NEU
-// Pruefen, ob Eintrag nicht in der Liste ist
+// Check if the entry is not in the list
 if( pFillAttrLB-GetSelectEntryPos() ==
 LISTBOX_ENTRY_NOTFOUND ||
 pFillAttrLB-GetSelectEntryColor() != aColor )
@@ -269,7 +268,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
 String aTmpStr;
 if( nCount  0 )
 {
-//Letzter Eintrag wird auf temporaere Farbe 
geprueft
+// Last entry gets tested against temporary color
 aTmpStr = pFillAttrLB-GetEntry( nCount - 1 );
 if(  aTmpStr.GetChar(0) == TMP_STR_BEGIN 
  aTmpStr.GetChar(aTmpStr.Len()-1) == 
TMP_STR_END )
@@ -286,7 +285,6 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
 //pFillAttrLB-SetUpdateMode( sal_True );
 pFillAttrLB-SelectEntryPos( nPos );
 }
-// NEU
 }
 else
 pFillAttrLB-SetNoSelection();
@@ -299,15 +297,14 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
 {
 String aString( pGradientItem-GetName() );
 pFillAttrLB-SelectEntry( aString );
-// NEU
-// Pruefen, ob Eintrag nicht in der Liste ist
+// Check if the entry is not in the list
 if( pFillAttrLB-GetSelectEntry() != aString )
 {
 sal_uInt16 nCount = pFillAttrLB-GetEntryCount();
 String aTmpStr;
 if( nCount  0 )
 {
-//Letzter Eintrag wird auf temporaeren Eintrag 
geprueft
+// Last entry gets tested against temporary entry
 aTmpStr = pFillAttrLB-GetEntry( nCount - 1 );
 if(  aTmpStr.GetChar(0) == TMP_STR_BEGIN 
  aTmpStr.GetChar(aTmpStr.Len()-1) == 
TMP_STR_END )
@@ -336,7 +333,6 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
 aGradientList.Remove( 0 );
 delete pEntry;
 }
-// NEU
 }
 else
 pFillAttrLB-SetNoSelection();
@@ -349,15 +345,14 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* 
pState )
 {
 String aString( pHatchItem-GetName() );
 pFillAttrLB-SelectEntry( aString );
-// NEU
-// Pruefen, ob Eintrag nicht in der Liste ist
+// Check if the entry is not in the list
 if( pFillAttrLB-GetSelectEntry() != aString )
 {
 sal_uInt16 nCount = pFillAttrLB-GetEntryCount();
 String aTmpStr;
 if( nCount  0 )
 {
-

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

2013-08-29 Thread Noel Grandin

 sfx2/source/bastyp/helper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 511354504cfc2c8f002752775d5bb336b01bd6ab
Author: Noel Grandin n...@peralex.com
Date:   Thu Aug 29 09:47:05 2013 +0200

fix windows build after my OUString changes

Change-Id: Icbab6e710bd369ba0daaa679a01988f4a7b51703

diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index dfc3a23..e663714 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -169,7 +169,7 @@ std::vector OUString  
SfxContentHelper::GetHelpTreeViewContents( const OUStrin
 aRow += \t;
 aRow += xContentAccess-queryContentIdentifierString();
 aRow += \t;
-aRow += bFolder ? 1 : 0;
+aRow += bFolder ? OUString(1) : OUString(0);
 aProperties.push_back( aRow );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 57/c7320e1ec93e028491687c3f91a29f3005ab16

2013-08-29 Thread Caolán McNamara

 57/c7320e1ec93e028491687c3f91a29f3005ab16 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5066c4421fbe5eee9fdb26b3424fc10166b497ec
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 08:57:26 2013 +0100

Notes added by 'git notes add'

diff --git a/57/c7320e1ec93e028491687c3f91a29f3005ab16 
b/57/c7320e1ec93e028491687c3f91a29f3005ab16
new file mode 100644
index 000..bcffe5d
--- /dev/null
+++ b/57/c7320e1ec93e028491687c3f91a29f3005ab16
@@ -0,0 +1 @@
+prefer: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Noel Grandin

 sfx2/source/doc/new.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1eed6b36a3496317fb2a88139ddab045e89e620
Author: Noel Grandin n...@peralex.com
Date:   Thu Aug 29 10:08:58 2013 +0200

more windows fix after my OUString changes

MSVC having trouble with the OUString const-char-* overloads and
the ternary operator.

Change-Id: Iae88dfe26288b1b6d059b8166349686280f97348

diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index f9dd4d3..7b52d8c 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -559,9 +559,9 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
 SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl()
 {
 OUString rExtra = pAntiImpl-GetExtraData();
-rExtra = MORE_BTN(GetState()) ? Y : N;
+rExtra = MORE_BTN(GetState()) ? OUString(Y) : OUString(N);
 rExtra += |;
-rExtra += aPreviewBtn.IsChecked() ? Y : N;
+rExtra += aPreviewBtn.IsChecked() ? OUString(Y) : OUString(N);
 
 delete pMoreBt;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Noel Grandin

 sfx2/source/dialog/filedlghelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bd1e6bbd208287944b76915b875cef4bc135842
Author: Noel Grandin n...@peralex.com
Date:   Thu Aug 29 10:02:14 2013 +0200

fix windows build after my OUString changes

missed a chunk inside an #if defined(WNT) block

Change-Id: I8c49d2c92f77471e8d0c7c46491f6faba7fbc677

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index a1ea3a2..6daab91 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1920,7 +1920,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
 }
 
 #if defined(WNT)
-if ( aExtensions.Len()  240 )
+if ( aExtensions.getLength()  240 )
 aExtensions = FILEDIALOG_FILTER_ALL;
 #endif
 sal_Bool bIsInOpenMode = isInOpenMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source

2013-08-29 Thread Andre Fischer

 sfx2/source/sidebar/DeckLayouter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 98bd1aded3ffa1df24bfec28624bdf5129533c45
Author: Andre Fischer a...@apache.org
Date:   Thu Aug 29 07:34:34 2013 +

123091: Request repaints of panels on every deck layouting.

diff --git a/sfx2/source/sidebar/DeckLayouter.cxx 
b/sfx2/source/sidebar/DeckLayouter.cxx
index 7154b52..1bd129a 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -262,6 +262,7 @@ sal_Int32 DeckLayouter::PlacePanels (
 
 // Place the panel.
 rPanel.SetPosSizePixel(0, nY, nWidth, nPanelHeight);
+rPanel.Invalidate();
 
 nY += nPanelHeight;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: testtools/CustomTarget_bridgetest.mk

2013-08-29 Thread Stephan Bergmann

 testtools/CustomTarget_bridgetest.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 6e3913b5dd6450b2f1b1115b6430393e98f1cdc2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 10:18:55 2013 +0200

Fix testtools/CustomTarget_bridgetest.mk scripts for Mac OS X

Change-Id: I0727ee99d06cec185918b1ca10fc46f7ec14928f

diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index a6f8c99..3f3312f 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -27,7 +27,8 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
 $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
-   echo $(call gb_Executable_get_target_for_build,uno) \
+   echo $(if $(filter MACOSX,$(OS)), 
$(gb_Helper_LIBRARY_PATH_VAR)=\$${$(gb_Helper_LIBRARY_PATH_VAR):+\$$$(gb_Helper_LIBRARY_PATH_VAR):}$(OUTDIR)/lib)
 \
+   $(call gb_Executable_get_target_for_build,uno) \
-s com.sun.star.test.bridge.CppTestObject \
-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test' \
--singleaccept \
@@ -58,7 +59,7 @@ 
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo JAVA_HOME=$(JAVA_HOME) \
-   LD_LIBRARY_PATH=$(OUTDIR)/lib \
+   
$(gb_Helper_LIBRARY_PATH_VAR)=\$${$(gb_Helper_LIBRARY_PATH_VAR):+\$$$(gb_Helper_LIBRARY_PATH_VAR):}$(OUTDIR)/lib
 \
$(call gb_Executable_get_target_for_build,uno) \
-s com.sun.star.test.bridge.BridgeTest \
-env:LO_BUILD_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
@@ -72,7 +73,8 @@ 
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
 $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
-   echo $(call gb_Executable_get_target_for_build,uno) \
+   echo $(if $(filter MACOSX,$(OS)), 
$(gb_Helper_LIBRARY_PATH_VAR)=\$${$(gb_Helper_LIBRARY_PATH_VAR):+\$$$(gb_Helper_LIBRARY_PATH_VAR):}$(OUTDIR)/lib)
 \
+   $(call gb_Executable_get_target_for_build,uno) \
-s com.sun.star.test.bridge.BridgeTest -- \
-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test' \
-env:LO_BUILD_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

www.lists.freedesktop.org

2013-08-29 Thread Gracy Patterson

div dir=ltrHi,brdiv class=gmail_quotediv dir=ltrdiv  
dir=ltrdivdivbr/divdivI came across your website and wanted to

 send you a quick note. With a few simple changes to make your site more
 SEO-friendly I’m sure you can convert more visitors into leads and get
it placed higher in the organic search results, for keywords that matter
 to you the most./div
divbr/divdivWe’re an Australian based company with a great
in-house technical team who really know their stuff about search engine
optimization. /divdivbr/divdivWould
 you like a bit more information about how to give your website a boost
with better SEO? Please feel free to drop me an email or you can contact
 me via our website./div
divbr/divdivBest Regards/divdivGracy  
Pattersonbr/divdivSEO/Web Specialistbr/divdivbfont  
size=1a href=mailto:angel...@immaculateseo.com;  
target=_blanks...@immaculateseo.com/abrbrimg alt=Inline image 1  
src=cid:inlineImages0br


/font/b/div

div
font size=1bbr


/b/font/divdivfont size=1bspan  
style=color:rgb(61,133,198)brspan style=color:rgb(111,168,220)AUS  
Headquarterbr/span/span/b/fontspan  
style=color:rgb(111,168,220)font size=1font size=1Australian  
Technology Park, Locomotive Street, Eveleigh br





NSW 2015/fontbrbbrInternational Headquarterbr/b/fontfont  
size=1font size=1501 19th Street, N.W., Washington, D.C. 20431br




/font/font/spandivspan style=color:rgb(111,168,220)font  
size=1Office Phone: 206-202-2907/fontbfont size=1br



/font/b/span/divdiv style=text-align:centerfont size=1span  
style=color:rgb(111,168,220)/spanspan  
style=color:rgb(159,197,232)brbra  
href=mailto:rem...@immaculateseo.com;  
target=_blankrem...@immaculateseo.com/a/spanbspan  
style=color:rgb(61,133,198)br


/span/b/font/divfont size=1bspan  
style=color:rgb(61,133,198)/span/b/font/div



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

LibreOffice Gerrit News 2013-08-29

2013-08-29 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

+ Parsing 'presobj' properties from 'objectlist.xml': gsoc-impresslayout
  in https://gerrit.libreoffice.org/5652 from Vishv Brahmbhatt
+ startcenter: Add toggle to view templates in Start Center
  in https://gerrit.libreoffice.org/5543 from Krisztian Pinter
+ XubString-OUString
  in https://gerrit.libreoffice.org/5668 from Julien Nabet
+ docx export: add unit test for page size with page borders
  in https://gerrit.libreoffice.org/5665 from Pierre-Eric Pelloux-Prayer
+ docx export: simplify pgBorders handling, and fix pgSz bug
  in https://gerrit.libreoffice.org/5664 from Pierre-Eric Pelloux-Prayer
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey


* Merged changes on master for project core changed in the last 25 hours:

+ Last piece of SOLAR_JAVA to ENABLE_JAVA migration.
  in https://gerrit.libreoffice.org/5666 from Andrzej J.R. Hunt
+ fdo#68588 Move embeddeddbList into OGeneralPageWizard.
  in https://gerrit.libreoffice.org/5654 from Andrzej J.R. Hunt
+ fdo#57950: Remove some chained appends in i18nlangtag
  in https://gerrit.libreoffice.org/5601 from Jelle van der Waa
+ Fix windows libo crash with graphite fonts.
  in https://gerrit.libreoffice.org/5644 from Martin Hosken
+ typo fix
  in https://gerrit.libreoffice.org/5657 from Viktor Varga


* Abandoned changes on master for project core changed in the last 25 hours:

+ Try to simplify/optimize a bit
  in https://gerrit.libreoffice.org/5641 from Julien Nabet


* Open changes needing tweaks, but being untouched for more than a week:

+ Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn
+ fdo#66577: non-fractional widths with Core Text
  in https://gerrit.libreoffice.org/5023 from Khaled Hosny


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED][PATCH] fdo#39468 German comments for svx/source/tbxctrls/fillctrl.cxx

2013-08-29 Thread Ivan Timofeev

Thanks, pushed as well.

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-08-29 Thread bugzilla-daemon

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

Bug 60270 depends on bug 68192, which changed state.

Bug 68192 Summary: Writer incorrectly displays non-numbered list dot.
https://bugs.freedesktop.org/show_bug.cgi?id=68192

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

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

2013-08-29 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/PreparedStatement.cxx |   26 -
 connectivity/source/drivers/firebird/PreparedStatement.hxx |2 -
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit d5cb782f9e84e1371c5e0c829f5c564fa7edee40
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Aug 29 10:04:33 2013 +0100

Implement setTimestamp. (firebird-sdbc)

Change-Id: I0c009a99061de787cd250912406a74a75fbc260a

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 0a753db..c38e8d3 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -28,6 +28,7 @@
 #include cppuhelper/typeprovider.hxx
 #include osl/diagnose.h
 #include propertyids.hxx
+#include time.h
 
 #include com/sun/star/sdbc/DataType.hpp
 #include com/sun/star/lang/DisposedException.hpp
@@ -410,15 +411,22 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 
parameterIndex, const Time
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
 }
-// -
 
-void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, 
const DateTime aVal ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 nIndex, const 
DateTime rTimestamp)
+throw(SQLException, RuntimeException)
 {
-(void) parameterIndex;
-(void) aVal;
-::osl::MutexGuard aGuard( m_pConnection-getMutex() );
-checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+struct tm aCTime;
+aCTime.tm_sec = rTimestamp.Seconds;
+aCTime.tm_min = rTimestamp.Minutes;
+aCTime.tm_hour = rTimestamp.Hours;
+aCTime.tm_mday = rTimestamp.Day;
+aCTime.tm_mon = rTimestamp.Month;
+aCTime.tm_year = rTimestamp.Year;
+
+ISC_TIMESTAMP aISCTimestamp;
+isc_encode_timestamp(aCTime, aISCTimestamp);
 
+setValue ISC_TIMESTAMP (nIndex, aISCTimestamp, SQL_TIMESTAMP);
 }
 // -
 
commit e218242ebd8bbf5dbd5a995a6881cbdd2ee106e1
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Aug 29 09:49:37 2013 +0100

Pass by reference instead of value, fix template parameters. (firebird-sdbc)

We will also want to pass structs etc. into setValue hence we should pass
by reference.

Change-Id: Ia8aa02ca14414003c33cd8d070510759091b5ec9

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index fdbb0a4..0a753db 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -331,7 +331,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 
nIndex, sal_Bool x)
 }
 
 template typename T
-void OPreparedStatement::setValue(sal_Int32 nIndex, T nValue, ISC_SHORT nType)
+void OPreparedStatement::setValue(sal_Int32 nIndex, T nValue, ISC_SHORT nType)
 throw(SQLException)
 {
 MutexGuard aGuard( m_pConnection-getMutex() );
@@ -380,13 +380,13 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 
nIndex, sal_Int64 nValue)
 void SAL_CALL OPreparedStatement::setFloat(sal_Int32 nIndex, float nValue)
 throw(SQLException, RuntimeException)
 {
-setValue sal_Int64 (nIndex, nValue, SQL_FLOAT);
+setValue float (nIndex, nValue, SQL_FLOAT);
 }
 
 void SAL_CALL OPreparedStatement::setDouble(sal_Int32 nIndex, double nValue)
 throw(SQLException, RuntimeException)
 {
-setValue sal_Int64 (nIndex, nValue, SQL_DOUBLE); // TODO: SQL_D_FLOAT?
+setValue double (nIndex, nValue, SQL_DOUBLE); // TODO: SQL_D_FLOAT?
 }
 
 // -
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx 
b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index 5392a93..c32be80 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -78,7 +78,7 @@ namespace connectivity
  * Set a numeric value in the input SQLDA. If the destination
  * parameter is not of nType then an Exception will be thrown.
  */
-template typename T void setValue(sal_Int32 nIndex, T nValue, 
ISC_SHORT nType)
+template typename T void setValue(sal_Int32 nIndex, T nValue, 
ISC_SHORT nType)
 throw(::com::sun::star::sdbc::SQLException);
 void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = 
true);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Caolán McNamara

 editeng/source/editeng/editeng.cxx  |   24 
 editeng/source/editeng/editobj.cxx  |4 ++--
 editeng/source/editeng/editobj2.hxx |4 ++--
 editeng/source/editeng/impedit.hxx  |   12 ++--
 editeng/source/editeng/impedit2.cxx |   26 +-
 editeng/source/editeng/impedit4.cxx |6 +++---
 editeng/source/editeng/impedit5.cxx |4 ++--
 editeng/source/items/borderline.cxx |2 +-
 editeng/source/items/bulitem.cxx|2 +-
 include/editeng/borderline.hxx  |2 +-
 include/editeng/bulletitem.hxx  |2 +-
 include/editeng/editeng.hxx |   16 
 sfx2/source/doc/new.cxx |4 ++--
 13 files changed, 54 insertions(+), 54 deletions(-)

New commits:
commit 5c4b5c26b099c0655983841051b475ffa06c1e37
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 10:15:33 2013 +0100

orig code guarded against matching on the first char

as well as not matching anywhere

Change-Id: Id4e46943189e19421b6f9fbc38d51d542d9428b6

diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 7b52d8c..e92833a 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -286,7 +286,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, 
pBox )
 aTemplateLb.Clear();
 OUString aSel = aRegionLb.GetSelectEntry();
 sal_Int32 nc = aSel.indexOf('(');
-if (nc != -1)
+if (nc != -1  nc != 0)
 aSel = aSel.replaceAt(nc-1, 1, );
 if ( aSel.compareToIgnoreAsciiCase( SfxResId(STR_STANDARD).toString() ) == 
0 )
 aTemplateLb.InsertEntry(aNone);
@@ -374,7 +374,7 @@ sal_uInt16  SfxNewFileDialog_Impl::GetSelectedTemplatePos() 
const
 sal_uInt16 nEntry = aTemplateLb.GetSelectEntryPos();
 OUString aSel = aRegionLb.GetSelectEntry();
 sal_Int32 nc = aSel.indexOf('(');
-if (nc!= -1)
+if (nc != -1  nc != 0)
 aSel = aSel.replaceAt(nc-1, 1, );
 if ( aSel.compareToIgnoreAsciiCase(SfxResId(STR_STANDARD).toString()) != 0 
)
 nEntry++;
commit 9cbafe9085b226d0d109fed85d67ba4e0895974e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 08:43:17 2013 +0100

XubString-OUString

Change-Id: I6db7b9e86ea6d17b5ba0a883136e0e4dbdd9e0b3

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 142be57..95a7ac2 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -618,7 +618,7 @@ OUString EditEngine::GetText( LineEnd eEnd ) const
 return pImpEditEngine-GetEditDoc().GetText( eEnd );
 }
 
-XubString EditEngine::GetText( const ESelection rESelection, const LineEnd 
eEnd ) const
+OUString EditEngine::GetText( const ESelection rESelection, const LineEnd 
eEnd ) const
 {
 DBG_CHKTHIS( EditEngine, 0 );
 EditSelection aSel( pImpEditEngine-CreateSel( rESelection ) );
@@ -689,7 +689,7 @@ sal_uInt32 EditEngine::GetTextHeight( sal_Int32 nParagraph 
) const
  return nHeight;
 }
 
-XubString EditEngine::GetWord( sal_Int32 nPara, sal_uInt16 nIndex )
+OUString EditEngine::GetWord( sal_Int32 nPara, sal_uInt16 nIndex )
 {
 ESelection aESel( nPara, nIndex, nPara, nIndex );
 EditSelection aSel( pImpEditEngine-CreateSel( aESel ) );
@@ -1038,9 +1038,9 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent 
rKeyEvent, EditView* pEditVie
 EditSelection aCurSel( pEditView-pImpEditView-GetEditSelection() );
 DBG_ASSERT( !aCurSel.IsInvalid(), Blinde Selection in 
EditEngine::PostKeyEvent );
 
-String aAutoText( pImpEditEngine-GetAutoCompleteText() );
-if ( pImpEditEngine-GetAutoCompleteText().Len() )
-pImpEditEngine-SetAutoCompleteText( String(), sal_True );
+OUString aAutoText( pImpEditEngine-GetAutoCompleteText() );
+if (!pImpEditEngine-GetAutoCompleteText().isEmpty())
+pImpEditEngine-SetAutoCompleteText(OUString(), true);
 
 sal_uInt16 nCode = rKeyEvent.GetKeyCode().GetCode();
 KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction();
@@ -1295,7 +1295,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent 
rKeyEvent, EditView* pEditVie
 }
 else
 {
-if ( !aAutoText.Len() )
+if (aAutoText.isEmpty())
 {
 if ( 
pImpEditEngine-GetStatus().DoAutoCorrect() )
 aCurSel = pImpEditEngine-AutoCorrect( 
aCurSel, 0, !pEditView-IsInsertMode(), pFrameWin );
@@ -1703,10 +1703,10 @@ sal_uInt16 EditEngine::GetTextLen( sal_Int32 nPara ) 
const
 return 0;
 }
 
-XubString EditEngine::GetText( sal_Int32 nPara ) const
+OUString EditEngine::GetText( sal_Int32 nPara ) const
 {
 DBG_CHKTHIS( EditEngine, 0 );
-XubString aStr;
+OUString aStr;
 if ( 0 = nPara  nPara  pImpEditEngine-GetEditDoc().Count() )
 aStr = pImpEditEngine-GetEditDoc().GetParaAsString( nPara );
 return aStr;

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

2013-08-29 Thread Caolán McNamara

 sc/source/ui/app/inputhdl.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 99138b6400a4fb1216fc331b65d17419d98a4805
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 10:30:59 2013 +0100

GetChar-operator[]

Change-Id: I5ba3cf219d61b47ff0456e26e7f04aa42010a709

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 9fa2e0f..436991f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2251,9 +2251,9 @@ void ScInputHandler::UpdateFormulaMode()
 SfxApplication* pSfxApp = SFX_APP();
 
 if ( pEngine-GetParagraphCount() == 1 
- ( pEngine-GetText(0).GetChar(0) == '=' ||
-   pEngine-GetText(0).GetChar(0) == '+' ||
-   pEngine-GetText(0).GetChar(0) == '-' ) 
+ ( pEngine-GetText(0)[0] == '=' ||
+   pEngine-GetText(0)[0] == '+' ||
+   pEngine-GetText(0)[0] == '-' ) 
  !bProtected )
 {
 if (!bFormulaMode)
@@ -2408,9 +2408,9 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
 }
 }
 
-sal_Int32 nPara= pEngine-GetParagraphCount()-1;
-xub_StrLen nLen = pEngine-GetText(nPara).Len();
-sal_uInt16 nCount   = pEngine-GetViewCount();
+sal_Int32 nPara = pEngine-GetParagraphCount()-1;
+sal_Int32 nLen = pEngine-GetText(nPara).getLength();
+sal_uInt16 nCount = pEngine-GetViewCount();
 
 for (sal_uInt16 i=0; inCount; i++)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cannot install master~2013-08-28_09.03.22_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi

2013-08-29 Thread Andras Timar

Hi Regina,

On Wed, Aug 28, 2013 at 9:52 PM, Regina Henschel
rb.hensc...@t-online.de wrote:
 Hi all,

 when I try to install
 master~2013-08-28_09.03.22_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi
 on Windows 7 32bit, I get the error
 Internal Error 2721. CheckVersions

sn_tools.dll (which has CheckVersions) is missing from the Binary
table of the MSI, the reason in unknown to me at the moment, but I'll
try to reproduce the error in my build.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: javaunohelper/com javaunohelper/Jar_juh.mk odk/Package_javadoc.mk odk/source

2013-08-29 Thread Stephan Bergmann

 javaunohelper/Jar_juh.mk|1 
 javaunohelper/com/sun/star/comp/helper/UnoInfo.java |  107 
 odk/Package_javadoc.mk  |2 
 odk/source/com/sun/star/lib/loader/Loader.java  |   50 -
 4 files changed, 1 insertion(+), 159 deletions(-)

New commits:
commit 617c5e44e13eb12dd58559289bc83def9f2b77e9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 11:40:11 2013 +0200

[API CHANGE] Remove obsolete com.sun.star.comp.helper.UnoInfo

It had originally been used in the SDK's Simple Bootstrap for Java,
com.sun.star.lib.loader.Loader class, but only left in there for backwards
compatibility with pre--three-layer OOo versions (i.e.,  OOo 3) when that
Loader was switched to use the unoinfo executable with the fix for #i88687#
C++/Java Simple Bootstrap broken in 
e2b7ea631a5e7297346ec826527a019e2baca020
INTEGRATION: CWS sb87 (1.5.10); FILE MERGED: 2008/05/07 11:34:25 sb
1.5.10.1: #i88687# let Loader call new unoinfo instead of old juh.jar
UnoInfo.getJars.

Recent work in AOO to undo three-layer caused AOO to now accidentally use 
the
backwards-compatibility code, so AOO ran into a problem that they solved 
with a
change to com.sun.star.comp.helper.UnoInfo that LO erroneously merged in as
95ada2d65f6d20f2a04599ac132fa632d66d Related: #i122483# set correct
classpath, include unoil.jar.

The better approach is to get rid of that backwards-compatibility code and
remove the obsolete UnoInfo class.  While this is nominally incompatible, in
practice no other client code but the SDK's com.sun.star.lib.loader.Loader
should ever have used it (it should have been designed as a private 
interface
for just that one client from the start, anyway).  Java applications using
Simple Bootstrap and built against old versions of the SDK (post the fix
for #i88687# and its introduction of the unoinfo exectuable in OOo 3) will
continue to work against new LO versions (as the backwards-compatibility 
code
that would call the removed UnoInfo class will not be triggered anyway; and 
even
if it were, all resulting exceptions would be caught and the new code path 
using
the unoinfo executable be chosen then).  Likewise, Java applications using
Simple Bootstrap and built against the new SDK will continue to work 
against
old OOo/LO/AOO vesions as far back as the fix for #i88687# and its 
introduction
of the unoinfo exectuable in OOo 3.

Change-Id: I64824ed002c3ccdf6912eab67499beb0c423081e

diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index a4f1f4c..32f7449 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Jar_add_sourcefiles,juh,\
 javaunohelper/com/sun/star/comp/helper/ComponentContext \
 javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
 javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \
-javaunohelper/com/sun/star/comp/helper/UnoInfo \
 javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \
 
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \
 
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \
diff --git a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java 
b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
deleted file mode 100644
index 67a3594..000
--- a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package com.sun.star.comp.helper;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-/**
- * UnoInfo offers functionality to obtain the UNO jar files.
- */
-public final class UnoInfo {
-
-/**
- * do not instantiate
- */
-private UnoInfo() {}
-
-/**
- * Gets the URL base.
- *
- * @return the URL base
- */
-private static String getBase() {
-
-final String JUHJAR = /juh.jar;
-
-String base = null;
-
-URLClassLoader cl = (URLClassLoader)

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source

2013-08-29 Thread Gergo Mocsi

 basctl/source/basicide/baside2.hxx  |2 +-
 basctl/source/basicide/baside2b.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ea87494f8ec7f7995dc9050a3147529b096f8f56
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Thu Aug 29 12:04:06 2013 +0200

GSOC work, renaming+listbox right side fix

Fixed the small bug in positioning the listbox to the right side.
Function ResizeListBox was renamed to ResizeAndPositionListBox.

Change-Id: I3cea54ad5658ee1628935b4975f52fe78c1ff5c3

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 447d77d..9bafa51 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -529,7 +529,7 @@ public:
 void ClearListBox();
 void SetTextSelection( const TextSelection aSel );
 const TextSelection GetTextSelection() const;
-void ResizeListBox();
+void ResizeAndPositionListBox();
 void SelectFirstEntry(); //selects first entry in ListBox
 void ClearAndHide();
 /*
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 1bf8be1..5d713ec 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -874,7 +874,7 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const 
std::vector OUString  a
 }
 // show it
 pCodeCompleteWnd-Show();
-pCodeCompleteWnd-ResizeListBox();
+pCodeCompleteWnd-ResizeAndPositionListBox();
 pCodeCompleteWnd-SelectFirstEntry();
 // correct text selection, and set it
 aSel.GetStart().GetIndex() += 1;
@@ -2818,7 +2818,7 @@ const TextSelection 
CodeCompleteWindow::GetTextSelection() const
 return aTextSelection;
 }
 
-void CodeCompleteWindow::ResizeListBox()
+void CodeCompleteWindow::ResizeAndPositionListBox()
 {
 if( pListBox-GetEntryCount() = 1 )
 {// if there is at least one element inside
@@ -2856,9 +2856,9 @@ void CodeCompleteWindow::ResizeListBox()
 aPos.Y() -= aSize.getHeight() + nParentFontHeight + nCursorPad;
 }
 
-if( aVisArea.BottomLeft().getX() + aPos.getX() + aSize.getWidth()  
aBottomPoint.getX() )
+if( aVisArea.TopLeft().getX() + aPos.getX() + aSize.getWidth()  
aBottomPoint.getX() )
 {//clipped at the right side, move it a bit left
-aPos.X() -= aSize.getWidth();
+aPos.X() -= aSize.getWidth() + aVisArea.TopLeft().getX();
 }
 //set the position
 SetPosPixel( aPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cannot install master~2013-08-28_09.03.22_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi

2013-08-29 Thread Michael Stahl

On 29/08/13 12:04, Andras Timar wrote:
 Hi Regina,
 
 On Wed, Aug 28, 2013 at 9:52 PM, Regina Henschel
 rb.hensc...@t-online.de wrote:
 Hi all,

 when I try to install
 master~2013-08-28_09.03.22_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi
 on Windows 7 32bit, I get the error
 Internal Error 2721. CheckVersions

 sn_tools.dll (which has CheckVersions) is missing from the Binary
 table of the MSI, the reason in unknown to me at the moment, but I'll
 try to reproduce the error in my build.

the MSI custom actions were moved from scp2 to auto-install in
3f8c36caef76ee1f688d35d39ac5bffe5d0f8319
and accidentally renamed and the renaming was undone in
7666c262533415914b08ec3129fbbc52aa2e96e9
... but perhaps some of the special options in scp2 didn't survive
that and are still necessary for some extra magic to be enabled?

 -File gid_File_Lib_sn_tools
 -LIB_FILE_BODY;
 -Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
 -Dir = SCP2_OOO_LIB_DIR;
 -Name = sn_tools.dll;
 -End



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

Langpack FR 4.1 for OSX applescript launched mdfind scans whole disk from root folder

2013-08-29 Thread Alexander Thurgood

Hi all,

Is it intended that for 4.1 the applescript installer now scans every
file on the whole disk looking for the strings equal to 'LibreOffice*'
and not equal to 'LibreOffice Language Pack.app' ?

The applescript in the French 4.1 langpack (and I assume in other
languages) contains the lines :

set the found_ooos_all to (do shell script mdfind \kMDItemContentType
== 'com.apple.application-bundle'  kMDItemDisplayName ==
'LibreOffice*'  kMDItemDisplayName != 'LibreOffice Language
Pack.app'\)  
  chooseMyOwn

set found_ooos_all_paragraphs to paragraphs in found_ooos_all

set found_ooos to {}
repeat with currentApp in found_ooos_all_paragraphs
if currentApp does not start with /Volumes then
copy currentApp to the end of found_ooos
end if
end repeat


whereas the 4.0.5 langpack contains :

set found_ooos_all to 
-- command might return an error if spotlight is disabled completely
try
set found_ooos_all to (do shell script mdfind \kMDItemContentType ==
'com.apple.application-bundle'  kMDItemDisplayName == 'LibreOffice*'
 kMDItemDisplayName != 'LibreOffice Language Pack.app'\)
end try
set found_ooos_all to found_ooos_all  
  chooseMyOwn

set found_ooos_all_paragraphs to paragraphs in found_ooos_all

set found_ooos to {}
repeat with currentApp in found_ooos_all_paragraphs
if currentApp does not start with /Volumes then
copy currentApp to the end of found_ooos
end if
end repeat



If a user runs the 4.1 langpack app installer from the publicly
available diskimage, it takes so long that it looks like the
installation has either failed or hung.

If I run, from the terminal :

mdfind kMDItemContentType == 'com.apple.application-bundle'  mdfind
kMDItemDisplayName == 'LibreOffice*'  mdfind kMDItemDisplayName !=
'LibreOffice Language Pack.app'

it takes about 30 mins to finish.


Alex



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

Re: fdo#39439 : Web search for UI strings

2013-08-29 Thread Caolán McNamara

On Sun, 2013-08-25 at 01:40 +0200, Mat M wrote:
 Hello
 
 I eventually reach a usable step in this issue [1].
 I don't know where to ask for my gerrit review. Looking at  
 libreoffice/website repo[2], you see recent activities on update,  
 tinderbox and master branches. Recent means after the obsolescence notice  
 [3] which is from 2012-07-20.
 So should I push my patch to dev-tools, website, github.com/tdf ?

So, what is your patch against ? I mean what does it patch, is it e.g. a
patch against opengrok or a command line search utility or something
else.

 [1] https://bugs.freedesktop.org/show_bug.cgi?id=39439
 [2] http://cgit.freedesktop.org/libreoffice/website/
 [3]  
 http://cgit.freedesktop.org/libreoffice/website/tree/THIS_IS_OBSOLETE_FIND_NEW_REPOSITORY_LOCATION_IN_HERE

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

[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk

2013-08-29 Thread Faisal M . Al-Otaibi

 cui/UIConfig_cui.mk  |1 
 cui/source/inc/cuires.hrc|6 
 cui/source/inc/helpid.hrc|1 
 cui/source/options/optlingu.cxx  |   45 +--
 cui/source/options/optlingu.hrc  |8 -
 cui/source/options/optlingu.src  |   62 +
 cui/uiconfig/ui/breaknumberoption.ui |  221 +++
 7 files changed, 270 insertions(+), 74 deletions(-)

New commits:
commit 943c60e5efe8c2eba5581a085d237bdaf4d00bc8
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Thu Aug 29 11:46:03 2013 +0300

Convert Hyphenation dialogs to .ui

Change-Id: I086a99c391185cb213ad63a66a954f8e66f8fc9e
Reviewed-on: https://gerrit.libreoffice.org/5672
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index a0d790c..7e46543 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/bitmaptabpage \
cui/uiconfig/ui/borderpage \
+   cui/uiconfig/ui/breaknumberoption \
cui/uiconfig/ui/cellalignment \
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index abf3728..e8960ba 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -161,7 +161,6 @@
 #define RID_SVXDLG_JAVA_CLASSPATH   (RID_SVX_START + 255)
 #define RID_SVXERR_JRE_NOT_RECOGNIZED   (RID_SVX_START + 256)
 #define RID_SVXERR_JRE_FAILED_VERSION   (RID_SVX_START + 257)
-#define RID_SVXDLG_LNG_ED_NUM_PREBREAK  (RID_SVX_START +  830)
 #define RID_SVXDLG_EDIT_MODULES (RID_SVX_START +  831)
 #define RID_SVXSTR_PATH_NAME_START  (RID_SVX_START + 1003)
 #define RID_SVXBMP_LOCK (RID_SVX_START + 118)
@@ -423,6 +422,11 @@
 #define RID_SVXSTR_DEL_SPACES_AT_STT_END(RID_SVX_START + 
1223)
 #define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 
1224)
 
+// from optlingu.src
+#define STR_NUM_PRE_BREAK_DLG   (RID_SVX_START + 
1225)
+#define STR_NUM_POST_BREAK_DLG  (RID_SVX_START + 
1226)
+#define STR_NUM_MIN_WORDLEN_DLG (RID_SVX_START + 
1227)
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 8354935..450a8be 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -32,7 +32,6 @@
 #define HID_CLB_LINGU_MODULES CUI_HID_CLB_LINGU_MODULES
 #define HID_CLB_LINGU_OPTIONS CUI_HID_CLB_LINGU_OPTIONS
 #define HID_EDIT_MODULES CUI_HID_EDIT_MODULES
-#define HID_LNGDLG_NUM_PREBREAK CUI_HID_LNGDLG_NUM_PREBREAK
 #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME 
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
 #define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
 #define HID_OPTIONS_JAVA_CLASSPATH CUI_HID_OPTIONS_JAVA_CLASSPATH
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3a497f5..d771d29 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -308,29 +308,48 @@ void BrwStringDic_Impl::Paint(
 
 class OptionsBreakSet : public ModalDialog
 {
-OKButtonaOKPB;
-CancelButtonaCancelPB;
-FixedLine   aValFL;
-NumericFieldaValNF;
+VclFrame*   m_pBeforeFrame;
+VclFrame*   m_pAfterFrame;
+VclFrame*   m_pMinimalFrame;
+NumericField*   m_pBreakNF;
 
 public:
 OptionsBreakSet(Window* pParent, int nRID) :
-ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
-aOKPB   (this, CUI_RES(BT_OK_PREBREAK)),
-aCancelPB   (this, CUI_RES(BT_CANCEL_PREBREAK)),
-aValFL  (this, CUI_RES(FL_NUMVAL_PREBREAK)),
-aValNF  (this, CUI_RES(ED_PREBREAK))
+ModalDialog(pParent, BreakNumberOption, 
cui/ui/breaknumberoption.ui)
 {
+get( m_pBeforeFrame, beforeframe);
+get( m_pAfterFrame, afterframe);
+get( m_pMinimalFrame, miniframe);
+get( m_pBreakNF, breaknumber);
+
 DBG_ASSERT( STR_NUM_PRE_BREAK_DLG   == nRID ||
 STR_NUM_POST_BREAK_DLG  == nRID ||
 STR_NUM_MIN_WORDLEN_DLG == nRID, unexpected RID );
 
-if (nRID != -1)
-aValFL.SetText( String( CUI_RES(nRID) ) );
-FreeResource();
+if ( nRID != -1 )
+{
+if( nRID == STR_NUM_PRE_BREAK_DLG )
+{
+m_pAfterFrame  -Hide();
+m_pMinimalFrame-Hide();
+}
+if( nRID == STR_NUM_POST_BREAK_DLG )
+{
+m_pBeforeFrame -Hide();
+m_pMinimalFrame-Hide();
+}
+if( nRID ==

Re: Cannot install master~2013-08-28_09.03.22_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi

2013-08-29 Thread Andras Timar

Hi,

On Thu, Aug 29, 2013 at 12:25 PM, Michael Stahl mst...@redhat.com wrote:
 On 29/08/13 12:04, Andras Timar wrote:
 Hi Regina,

 On Wed, Aug 28, 2013 at 9:52 PM, Regina Henschel
 rb.hensc...@t-online.de wrote:
 Hi all,

 when I try to install
 master~2013-08-28_09.03.22_LibreOfficeDev_4.2.0.0.alpha0_Win_x86.msi
 on Windows 7 32bit, I get the error
 Internal Error 2721. CheckVersions

 sn_tools.dll (which has CheckVersions) is missing from the Binary
 table of the MSI, the reason in unknown to me at the moment, but I'll
 try to reproduce the error in my build.

 the MSI custom actions were moved from scp2 to auto-install in
 3f8c36caef76ee1f688d35d39ac5bffe5d0f8319
 and accidentally renamed and the renaming was undone in
 7666c262533415914b08ec3129fbbc52aa2e96e9
 ... but perhaps some of the special options in scp2 didn't survive
 that and are still necessary for some extra magic to be enabled?


Yes, BINARYTABLE and BINARYTABLE_ONLY flags had a crucial role here.

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

Unable to build master with Visual Studio Express since last weekend

2013-08-29 Thread Niklas Johansson


This week I started to get this error:
/cygdrive/c/sources/libo-core/embeddedobj/Library_emboleobj.mk:11: *** 
Library emboleobj must be registered in Repository.mk.  Stop.

make: *** [build] Error 2

while trying to build master with Visual Studio Express.

This is my autogen.input:
--with-external-tar=/cygdrive/c/sources/lo-externalsrc
--with-junit=/cygdrive/c/sources/junit-4.10.jar
--with-ant-home=/cygdrive/c/sources/apache-ant-1.9.2
--enable-pch
--disable-ccache
--disable-activex
--disable-atl
--enable-debug

Sorry for not being able to fix this myself. I tried to pull and make 
clean few times during this week, just in case someone already fixed the 
problem, but without any luck.


--
Regards,
Niklas Johansson

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

[Libreoffice-commits] core.git: helpcontent2

2013-08-29 Thread Caolán McNamara

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

New commits:
commit a932be6923abb6b9e6edea35de067136b58ec6bf
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 11:54:41 2013 +0100

Updated core
Project: help  fad218bb130d6134c05206e0018ed50834829fd4

diff --git a/helpcontent2 b/helpcontent2
index 16b65fa..fad218b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 16b65faf0107a28c44eb590e3c4b008781929366
+Subproject commit fad218bb130d6134c05206e0018ed50834829fd4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig

2013-08-29 Thread Caolán McNamara

 cui/source/inc/cuires.hrc|5 -
 cui/source/options/optlingu.cxx  |  104 +++
 cui/source/options/optlingu.src  |   15 -
 cui/uiconfig/ui/breaknumberoption.ui |   86 
 4 files changed, 81 insertions(+), 129 deletions(-)

New commits:
commit bf431c912497d1f895d9d2f7bfe59adad7f093b7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 10:55:42 2013 +0100

lets just switch directly on the EID_OPTIONS

and remove the intermediate resource ids used
as proxies for them

Change-Id: I3ef542d1eaef274dbefed0b0bb76c6e413c6ce80

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index e8960ba..d7fd464 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -422,11 +422,6 @@
 #define RID_SVXSTR_DEL_SPACES_AT_STT_END(RID_SVX_START + 
1223)
 #define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 
1224)
 
-// from optlingu.src
-#define STR_NUM_PRE_BREAK_DLG   (RID_SVX_START + 
1225)
-#define STR_NUM_POST_BREAK_DLG  (RID_SVX_START + 
1226)
-#define STR_NUM_MIN_WORDLEN_DLG (RID_SVX_START + 
1227)
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d771d29..5ba3f76 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -306,53 +306,6 @@ void BrwStringDic_Impl::Paint(
 rDev.SetFont( aOldFont );
 }
 
-class OptionsBreakSet : public ModalDialog
-{
-VclFrame*   m_pBeforeFrame;
-VclFrame*   m_pAfterFrame;
-VclFrame*   m_pMinimalFrame;
-NumericField*   m_pBreakNF;
-
-public:
-OptionsBreakSet(Window* pParent, int nRID) :
-ModalDialog(pParent, BreakNumberOption, 
cui/ui/breaknumberoption.ui)
-{
-get( m_pBeforeFrame, beforeframe);
-get( m_pAfterFrame, afterframe);
-get( m_pMinimalFrame, miniframe);
-get( m_pBreakNF, breaknumber);
-
-DBG_ASSERT( STR_NUM_PRE_BREAK_DLG   == nRID ||
-STR_NUM_POST_BREAK_DLG  == nRID ||
-STR_NUM_MIN_WORDLEN_DLG == nRID, unexpected RID );
-
-if ( nRID != -1 )
-{
-if( nRID == STR_NUM_PRE_BREAK_DLG )
-{
-m_pAfterFrame  -Hide();
-m_pMinimalFrame-Hide();
-}
-if( nRID == STR_NUM_POST_BREAK_DLG )
-{
-m_pBeforeFrame -Hide();
-m_pMinimalFrame-Hide();
-}
-if( nRID == STR_NUM_MIN_WORDLEN_DLG )
-{
-m_pAfterFrame -Hide();
-m_pBeforeFrame-Hide();
-}
-}
-}
-
-NumericField   GetNumericFld()
-{
-return *m_pBreakNF;
-}
-};
-
-
 /*--
 Entry IDs for options listbox of dialog
 --*/
@@ -387,13 +340,55 @@ static const char * aEidToPropName[] =
 UPN_IS_HYPH_SPECIAL // EID_HYPH_SPECIAL
 };
 
-
-static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId )
+static inline OUString lcl_GetPropertyName( EID_OPTIONS eEntryId )
 {
 DBG_ASSERT( (unsigned int) eEntryId  SAL_N_ELEMENTS(aEidToPropName), 
index out of range );
 return OUString::createFromAscii( aEidToPropName[ (int) eEntryId ] );
 }
 
+class OptionsBreakSet : public ModalDialog
+{
+VclFrame*   m_pBeforeFrame;
+VclFrame*   m_pAfterFrame;
+VclFrame*   m_pMinimalFrame;
+NumericField*   m_pBreakNF;
+
+public:
+OptionsBreakSet(Window* pParent, sal_uInt16 nRID)
+: ModalDialog(pParent, BreakNumberOption,
+cui/ui/breaknumberoption.ui)
+{
+get(m_pBeforeFrame, beforeframe);
+get(m_pAfterFrame, afterframe);
+get(m_pMinimalFrame, miniframe);
+
+assert(EID_NUM_PRE_BREAK == nRID ||
+   EID_NUM_POST_BREAK == nRID ||
+   EID_NUM_MIN_WORDLEN == nRID); //unexpected ID
+
+if (nRID == EID_NUM_PRE_BREAK)
+{
+m_pBeforeFrame-Show();
+get(m_pBreakNF, beforebreak);
+}
+else if(nRID == EID_NUM_POST_BREAK)
+{
+m_pAfterFrame-Show();
+get(m_pBreakNF, afterbreak);
+}
+else if(nRID == EID_NUM_MIN_WORDLEN)
+{
+m_pMinimalFrame-Show();
+get(m_pBreakNF, wordlength);
+}
+}
+
+NumericField   GetNumericFld()
+{
+return *m_pBreakNF;
+}
+};
+
 // class OptionsUserData -
 
 class OptionsUserData
@@ -1788,16 +1783,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, 
pBtn )
 OptionsUserData aData( (sal_uLong)pEntry-GetUserData() );
 if(aData.HasNumericValue())

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

2013-08-29 Thread Caolán McNamara

 helpers/help_hid.lst |   12 --
 source/text/shared/01/05020300.xhp   |   58 +++
 source/text/shared/01/05340300.xhp   |   46 
 source/text/shared/optionen/01010400.xhp |5 +-
 4 files changed, 54 insertions(+), 67 deletions(-)

New commits:
commit fad218bb130d6134c05206e0018ed50834829fd4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 11:54:41 2013 +0100

numberformatpage-numberingformatpage

Change-Id: Idb74e753b64e3d575d5a951a0cdca6aae69f543d

diff --git a/source/text/shared/01/05020300.xhp 
b/source/text/shared/01/05020300.xhp
index c8ab7a0..9363b55 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -39,7 +39,7 @@
 /bookmark
   commentmw transferred format codes; to Calc guide 
Format_value_userdef.xhp and numers; and cells; to Calc guide 
Format_table.xhp. Changed currencies;/comment
   
-bookmark xml-lang=en-US 
branch=hid/cui/ui/numberformatpage/NumberFormatPage id=bm_id3150147 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/numberingformatpage/NumberingFormatPage id=bm_id3150147 
localize=false/
   
 bookmark xml-lang=en-US branch=hid/.uno:TableNumberFormatDialog 
id=bm_id2370759 localize=false/
   
@@ -49,9 +49,9 @@
 section id=howtoget
   embed href=text/shared/00/00040503.xhp#zahlen/
 /section
-bookmark xml-lang=en-US branch=hid/cui/ui/numberformatpage/categorylb 
id=bm_id3153312 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/numberingformatpage/categorylb 
id=bm_id3153312 localize=false/
   paragraph xml-lang=en-US id=hd_id3155392 role=heading level=2 
l10n=U oldref=3Category/paragraph
-  paragraph xml-lang=en-US id=par_id3150774 role=paragraph l10n=U 
oldref=4ahelp hid=cui/ui/numberformatpage/categorylbSelect a category 
from the list, and then select a formatting style in the emphFormat 
/emphbox./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3150774 role=paragraph l10n=U 
oldref=4ahelp hid=cui/ui/numberingformatpage/categorylbSelect a category 
from the list, and then select a formatting style in the emphFormat 
/emphbox./ahelp/paragraph
   
 switch select=appl
   
@@ -62,67 +62,67 @@
   
 /switch
   
-bookmark xml-lang=en-US branch=hid/cui/ui/numberformatpage/formatlb 
id=bm_id3155449 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/numberingformatpage/formatlb 
id=bm_id3155449 localize=false/
   paragraph xml-lang=en-US id=hd_id3155342 role=heading level=2 
l10n=U oldref=5Format/paragraph
-  paragraph xml-lang=en-US id=par_id3148491 role=paragraph l10n=U 
oldref=6ahelp hid=cui/ui/numberformatpage/formatlbSelect how you want 
the contents of the selected cell(s) to be displayed./ahelp The code for the 
selected option is displayed in the emphFormat Code/emph box./paragraph
+  paragraph xml-lang=en-US id=par_id3148491 role=paragraph l10n=U 
oldref=6ahelp hid=cui/ui/numberingformatpage/formatlbSelect how you want 
the contents of the selected cell(s) to be displayed./ahelp The code for the 
selected option is displayed in the emphFormat Code/emph box./paragraph
   
-bookmark xml-lang=en-US branch=hid/cui/ui/numberformatpage/currencylb 
id=bm_id3154381 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/numberingformatpage/currencylb 
id=bm_id3154381 localize=false/
   paragraph xml-lang=en-US id=hd_id3154811 role=heading level=3 
l10n=U oldref=97Currency category list boxes/paragraph
-  paragraph xml-lang=en-US id=par_id3148563 role=paragraph l10n=U 
oldref=98ahelp hid=cui/ui/numberformatpage/currencylbSelect a currency, 
and then scroll to the top of the emphFormat/emph list to view the 
formatting options for the currency./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3148563 role=paragraph l10n=U 
oldref=98ahelp hid=cui/ui/numberingformatpage/currencylbSelect a 
currency, and then scroll to the top of the emphFormat/emph list to view 
the formatting options for the currency./ahelp/paragraph
   section id=waehrungtext

paragraph xml-lang=en-US id=par_id3150866 role=note l10n=U 
oldref=99The format code for currencies uses the form [$xxx-nnn], where xxx 
is the currency symbol, and nnn the country code. Special banking symbols, such 
as EUR (for Euro), do not require the country code. The currency format is not 
dependent on the language that you select in theemph Language/emph box. 
/paragraph

   /section
   
-bookmark xml-lang=en-US branch=hid/cui/ui/numberformatpage/languagelb 
id=bm_id3148797 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/numberingformatpage/languagelb 
id=bm_id3148797 localize=false/
   paragraph xml-lang=en-US id=hd_id3154071 role=heading level=2 
l10n=U oldref=23Language/paragraph
-  paragraph xml-lang=en-US id=par_id3154138 role=paragraph l10n=U 
oldref=24ahelp hid=cui/ui/numberformatpage/languagelbSpecifies the 
language setting for the selected switchinline select=applcaseinline 
select=CALCcells 
+  paragraph xml-lang=en-US

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

2013-08-29 Thread Laurent Balland-Poirier

 source/text/shared/optionen/01060500.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee477f38f8f425f5bde8105be49b9a6d9e5c4321
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Sat Aug 24 07:52:54 2013 +0200

fdo#58942 Help Standard number format stands for General

Change-Id: Ifdd2022baaf3aaee2ddab5e47e5e4266c02e8ef8

diff --git a/source/text/shared/optionen/01060500.xhp 
b/source/text/shared/optionen/01060500.xhp
index ffbad49..43e95da 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -217,7 +217,7 @@
 bookmark xml-lang=en-US branch=hid/modules/scalc/ui/optcalculatepage/prec 
id=bm_id3147362 localize=false/
 paragraph xml-lang=en-US id=hd_id3145231 role=heading level=2 l10n=U
  oldref=53Decimal places/paragraph
-  paragraph xml-lang=en-US id=par_id3149568 role=paragraph 
l10n=CHG oldref=54ahelp 
hid=modules/scalc/ui/optcalculatepage/precDefines the number of decimals to 
be displayed for numbers with the emphStandard/emph number format. The 
numbers are displayed as rounded numbers, but are not saved as rounded 
numbers./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3149568 role=paragraph 
l10n=CHG oldref=54ahelp 
hid=modules/scalc/ui/optcalculatepage/precDefines the number of decimals to 
be displayed for numbers with the emphGeneral/emph number format. The 
numbers are displayed as rounded numbers, but are not saved as rounded 
numbers./ahelp/paragraph
 
 /body
 /helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][PATCH] fdo#58942 Help: replace Standard number format by General number format

2013-08-29 Thread Caolán McNamara

On Fri, 2013-08-23 at 23:12 -0700, Laurent BP wrote:
 Hello,
 
 Second try ;)
 
 I'd like to submit a small patch for Help for Tools  Options  LibreOffice
 Calc  Calculate
 https://help.libreoffice.org/Common/Calculate#Limit_decimals_for_general_number_format
 use General number format
 and 
 https://help.libreoffice.org/Common/Calculate#Decimal_places
 use Standard number format

pushed now, thanks for that.

C.

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

[Libreoffice-commits] core.git: helpcontent2

2013-08-29 Thread Laurent Balland-Poirier

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

New commits:
commit 1138f52d33bde427fba2fed0199e78210343
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Sat Aug 24 07:52:54 2013 +0200

Updated core
Project: help  ee477f38f8f425f5bde8105be49b9a6d9e5c4321

diff --git a/helpcontent2 b/helpcontent2
index fad218b..ee477f3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fad218bb130d6134c05206e0018ed50834829fd4
+Subproject commit ee477f38f8f425f5bde8105be49b9a6d9e5c4321
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_buildid.h.in config_host.mk.in configure.ac cui/Library_cui.mk cui/source

2013-08-29 Thread Petr Mladek

 config_host.mk.in   |1 -
 config_host/config_buildid.h.in |   10 ++
 configure.ac|3 ++-
 cui/Library_cui.mk  |1 -
 cui/source/dialogs/about.cxx|1 +
 5 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 28cc89aad16e8ea3c9eec7f45749c1cfaaf1d7af
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 13:14:29 2013 +0200

make the tinderbox information more reliable in the about dialog (fdo#58034)

Pass the information via config_host/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.

Change-Id: I058cbe162e7015cbea6c71253c20db097477708f

diff --git a/config_host.mk.in b/config_host.mk.in
index 094f730..3b586af 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -387,7 +387,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
 export nodep=@nodep@
 @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
 @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
-export EXTRA_BUILDID=@EXTRA_BUILDID@
 export OBJDUMP=@OBJDUMP@
 export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@
 export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@
diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in
new file mode 100644
index 000..04f03b8
--- /dev/null
+++ b/config_host/config_buildid.h.in
@@ -0,0 +1,10 @@
+/*
+Optional Build ID displayed in the about dialog
+*/
+
+#ifndef CONFIG_BUILDID_H
+#define CONFIG_BUILDID_H
+
+#undef EXTRA_BUILDID
+
+#endif
diff --git a/configure.ac b/configure.ac
index bda7c01..8647bdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12115,7 +12115,7 @@ if test -n $with_extra_buildid -a 
$with_extra_buildid != yes ; then
 else
 AC_MSG_RESULT([not set])
 fi
-AC_SUBST(EXTRA_BUILDID)
+AC_DEFINE_UNQUOTED([EXTRA_BUILDID], [$EXTRA_BUILDID])
 
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
@@ -12539,6 +12539,7 @@ if test -f config_host.mk; then
 fi
 
 AC_CONFIG_FILES([config_host.mk Makefile lo.xcent 
instsetoo_native/util/openoffice.lst])
+AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_folders.h])
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index aafede3..0a08baa 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_add_defs,cui,\
 $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
 $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
 $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
-$(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\$(EXTRA_BUILDID)\) \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,cui,\
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ee943f8..73fe04e 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -42,6 +42,7 @@
 #include sfx2/sfxuno.hxx
 #include sfx2/sfxcommands.h
 #include about.hxx
+#include config_buildid.h
 #include sfx2/sfxdefs.hxx
 #include sfx2/app.hxx
 #include rtl/ustrbuf.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] text alignment help text got detacted from the tabpage

2013-08-29 Thread via Code Review

Caolán McNamara has abandoned this change.

Change subject: text alignment help text got detacted from the tabpage
..


Patch Set 1: Abandoned

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Idb74e753b64e3d575d5a951a0cdca6aae69f543d
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: master
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

[PATCH] text alignment help text got detacted from the tabpage

2013-08-29 Thread via Code Review

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5676

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/76/5676/1

text alignment help text got detacted from the tabpage

(cherry picked from commit 2ce8cb8c7b0ee203f2df743849e959949ccc2fc1)

Change-Id: Idf28d8a969f01761e82b32c12ee2b9ab745719ed

numberformatpage-numberingformatpage

Change-Id: Idb74e753b64e3d575d5a951a0cdca6aae69f543d
(cherry picked from commit fad218bb130d6134c05206e0018ed50834829fd4)
---
M helpers/help_hid.lst
M source/text/shared/01/05020300.xhp
M source/text/shared/01/05340300.xhp
3 files changed, 52 insertions(+), 62 deletions(-)



diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a73fe62..100bf46 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7554,9 +7554,6 @@
 svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_FAVORITES,3388493437,
 svx_ListBox_RID_SVXFLOAT_3D_LB_MAT_SPECULAR,3388493431,
 svx_ListBox_RID_SVXFLOAT_3D_LB_SHADEMODE,3388493358,
-svx_ListBox_RID_SVXPAGE_ALIGNMENT_LB_FRAMEDIR,702189100,
-svx_ListBox_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN,702189068,
-svx_ListBox_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN,702189072,
 svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_LASTLINE,703778354,
 svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION,703778396,
 svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN,703778340,
@@ -7651,7 +7648,6 @@
 svx_MetricField_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY,3388496506,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_PERCENT_DIAGONAL,3388496414,
 svx_MetricField_RID_SVXFLOAT_3D_MTR_SLANT,3388496433,
-svx_MetricField_RID_SVXPAGE_ALIGNMENT_ED_INDENT,702192142,
 svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_ANGLE,701504019,
 svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_POS_X,701504007,
 svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_POS_Y,701504008,
@@ -7807,7 +7803,6 @@
 svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER,1237964819,
 svx_NumericField_RID_SVXFLOAT_3D_NUM_HORIZONTAL,3388495897,
 svx_NumericField_RID_SVXFLOAT_3D_NUM_VERTICAL,3388495899,
-svx_NumericField_RID_SVXPAGE_ALIGNMENT_NF_DEGREES,702191640,
 svx_NumericField_RID_SVXPAGE_AREA_NUM_FLD_STEPCOUNT,701634561,
 svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X,703207437,
 svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y,703207438,
@@ -8052,11 +8047,6 @@
 svx_TabPage_RID_SVXPAGE_TEXTANIMATION,703725568,
 svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320,
 svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL,702187035,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_HYPH,702187050,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_SHRINK,702187053,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_TXTSTACKED,702187029,
-svx_TriStateBox_RID_SVXPAGE_ALIGNMENT_BTN_WRAP,702187049,
 svx_TriStateBox_RID_SVXPAGE_AREA_TSB_ORIGINAL,701629958,
 svx_TriStateBox_RID_SVXPAGE_AREA_TSB_SCALE,701629953,
 svx_TriStateBox_RID_SVXPAGE_AREA_TSB_STEPCOUNT,701629955,
diff --git a/source/text/shared/01/05020300.xhp 
b/source/text/shared/01/05020300.xhp
index c8ab7a0..9363b55 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -39,7 +39,7 @@
 /bookmark
   commentmw transferred format codes; to Calc guide 
Format_value_userdef.xhp and numers; and cells; to Calc guide 
Format_table.xhp. Changed currencies;/comment
   
-bookmark xml-lang=en-US 
branch=hid/cui/ui/numberformatpage/NumberFormatPage id=bm_id3150147 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/numberingformatpage/NumberingFormatPage id=bm_id3150147 
localize=false/
   
 bookmark xml-lang=en-US branch=hid/.uno:TableNumberFormatDialog 
id=bm_id2370759 localize=false/
   
@@ -49,9 +49,9 @@
 section id=howtoget
   embed href=text/shared/00/00040503.xhp#zahlen/
 /section
-bookmark xml-lang=en-US branch=hid/cui/ui/numberformatpage/categorylb 
id=bm_id3153312 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/numberingformatpage/categorylb 
id=bm_id3153312 localize=false/
   paragraph xml-lang=en-US id=hd_id3155392 role=heading level=2 
l10n=U oldref=3Category/paragraph
-  paragraph xml-lang=en-US id=par_id3150774 role=paragraph l10n=U 
oldref=4ahelp hid=cui/ui/numberformatpage/categorylbSelect a category 
from the list, and then select a formatting style in the emphFormat 
/emphbox./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3150774 role=paragraph l10n=U 
oldref=4ahelp hid=cui/ui/numberingformatpage/categorylbSelect a category 
from the list, and then select a formatting style in the emphFormat 
/emphbox./ahelp/paragraph
   
 switch select=appl
   
@@ -62,67 +62,67 @@
   
 /switch
   
-bookmark xml-lang=en-US branch=hid/cui/ui/numberformatpage/formatlb 
id=bm_id3155449 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/numberingformatpage/formatlb 
id=bm_id3155449 localize=false/
   paragraph xml-lang=en-US id=hd_id3155342 role=heading level=2 
l10n=U oldref=5Format/paragraph
-  paragraph xml-lang=en-US

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - helpcontent2

2013-08-29 Thread Caolán McNamara

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

New commits:
commit 9000d1960d0ceae77ed236dc7c821a591f468fe3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 11:52:10 2013 +0100

Updated core
Project: help  0d8b37cd9e0b89d1136b09a81671c88fc91fee3e

diff --git a/helpcontent2 b/helpcontent2
index 2fbadc6..0d8b37c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2fbadc6dc2dc9ffb22764a41ec58cffb8674f926
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffiec-4-1' - 0 commits -

2013-08-29 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - config_host/config_buildid.h.in config_host.mk.in configure.ac cui/Library_cui.mk cui/source

2013-08-29 Thread Petr Mladek

 config_host.mk.in   |1 -
 config_host/config_buildid.h.in |   10 ++
 configure.ac|3 ++-
 cui/Library_cui.mk  |1 -
 cui/source/dialogs/about.cxx|1 +
 5 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit ea316c964a8e4405ccbfdd0f27b5e07ede2c5239
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 13:14:29 2013 +0200

make the tinderbox information more reliable in the about dialog (fdo#58034)

Pass the information via config_host/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 48667ca..9268c7b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -368,7 +368,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
 export nodep=@nodep@
 @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
 @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
-export EXTRA_BUILDID=@EXTRA_BUILDID@
 export OBJDUMP=@OBJDUMP@
 export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@
 export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@
diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in
new file mode 100644
index 000..04f03b8
--- /dev/null
+++ b/config_host/config_buildid.h.in
@@ -0,0 +1,10 @@
+/*
+Optional Build ID displayed in the about dialog
+*/
+
+#ifndef CONFIG_BUILDID_H
+#define CONFIG_BUILDID_H
+
+#undef EXTRA_BUILDID
+
+#endif
diff --git a/configure.ac b/configure.ac
index fd531de..1d5acd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11485,7 +11485,7 @@ if test -n $with_extra_buildid -a 
$with_extra_buildid != yes ; then
 else
 AC_MSG_RESULT([not set])
 fi
-AC_SUBST(EXTRA_BUILDID)
+AC_DEFINE_UNQUOTED([EXTRA_BUILDID], [$EXTRA_BUILDID])
 
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
@@ -11900,6 +11900,7 @@ if test -f config_host.mk; then
 fi
 
 AC_CONFIG_FILES([config_host.mk Makefile lo.xcent 
instsetoo_native/util/openoffice.lst])
+AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index ade10e4..987481b 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_Library_add_defs,cui,\
 $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
 $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
 $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
-$(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\$(EXTRA_BUILDID)\) \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,cui,\
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ee943f8..73fe04e 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -42,6 +42,7 @@
 #include sfx2/sfxuno.hxx
 #include sfx2/sfxcommands.h
 #include about.hxx
+#include config_buildid.h
 #include sfx2/sfxdefs.hxx
 #include sfx2/app.hxx
 #include rtl/ustrbuf.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - comphelper/source

2013-08-29 Thread Michael Stahl

 comphelper/source/misc/accessibleeventnotifier.cxx |   33 -
 1 file changed, 19 insertions(+), 14 deletions(-)

New commits:
commit 9888a00405dc320e12ca2fc12446b85572144795
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 27 21:43:48 2013 +0200

rhbz#1001768: avoid deadlock in AccessibleEventNotifier

revokeClientNotifyDisposing(): drop the static lclMutex before calling
pListeners-disposeAndClear(), which may want to acquire the SolarMutex
and deadlock.

Change-Id: Ib35fc7fad6596450a3b10d58d5193b9b55c575cb
(cherry picked from commit cafff1bbc4effac74bbd2607fb83dd2547c8fa2e)
Reviewed-on: https://gerrit.libreoffice.org/5659
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx 
b/comphelper/source/misc/accessibleeventnotifier.cxx
index e6e88de..14ac88c7 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -133,29 +133,34 @@ namespace comphelper
 void AccessibleEventNotifier::revokeClientNotifyDisposing( const TClientId 
_nClient,
 const Reference XInterface  _rxEventSource ) SAL_THROW( ( ) )
 {
-::osl::MutexGuard aGuard( lclMutex::get() );
+EventListeners * pListeners(0);
 
-ClientMap::iterator aClientPos;
-if ( !implLookupClient( _nClient, aClientPos ) )
-// already asserted in implLookupClient
-return;
+{
+// rhbz#1001768 drop the mutex before calling disposeAndClear
+::osl::MutexGuard aGuard( lclMutex::get() );
+
+ClientMap::iterator aClientPos;
+if (!implLookupClient(_nClient, aClientPos))
+// already asserted in implLookupClient
+return;
+
+// notify the listeners
+pListeners = aClientPos-second;
+
+// we do not need the entry in the clients map anymore
+// (do this before actually notifying, because some client
+// implementations have re-entrance problems and call into
+// revokeClient while we are notifying from here)
+Clients::get().erase(aClientPos);
+}
 
 // notify the disposing event for this client
 EventObject aDisposalEvent;
 aDisposalEvent.Source = _rxEventSource;
 
-// notify the listeners
-EventListeners* pListeners = aClientPos-second;
-
-// we do not need the entry in the clients map anymore
-// (do this before actually notifying, because some client 
implementations have re-entrance
-// problems and call into revokeClient while we are notifying from 
hereing)
-Clients::get().erase( aClientPos );
-
 // now really do the notification
 pListeners-disposeAndClear( aDisposalEvent );
 delete pListeners;
-
 }
 
 //-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Tor Lillqvist

 cui/source/dialogs/about.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c83ee34a642ead0007b69b2dd93e18d25e6606fa
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 14:50:10 2013 +0300

Include config_buildid.h for EXTRA_BUILDID

Fix loplugin error: checking whether a config macro EXTRA_BUILDID is 
defined.

Change-Id: Ieb04a8da4dc54b41f4df1d63b5e70ffb7ca7bb01

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 73fe04e..54d4fbf 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include config_buildid.h
+
 #include vcl/layout.hxx
 #include vcl/svapp.hxx
 #include vcl/msgbox.hxx
@@ -242,10 +244,11 @@ OUString AboutDialog::GetVersionString()
 sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId);
 }
 
-#ifdef EXTRA_BUILDID
-sVersion += \n;
-sVersion += EXTRA_BUILDID;
-#endif
+if (strlen(EXTRA_BUILDID)  0)
+{
+sVersion += \n;
+sVersion += EXTRA_BUILDID;
+}
 
 return sVersion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - editeng/source

2013-08-29 Thread Michael Stahl

 editeng/source/items/numitem.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 09a894477f326af5683a8f5e51038e0c88453806
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 28 23:19:43 2013 +0200

fdo#68648: SvxNumRule: serialize the aFmtsSet flags too

The constructor of SvxNumRule initializes aFmts[i] with a format but
always sets aFmtsSet[i] to false, so SvxNumRule::Store()
and SvxNumRule::SvxNumRule(SvStream rStream) need to be able
to round-trip that combination to prevent spurious numberings.

It is unlikely that this class is serialized in the table auto-format
files but i haven't checked; this change does not change the size of the
serialization so shouldn't cause trouble anyway.

(regression from a95cce27295f9cd255fa72eaded00972e3efb69b)

Change-Id: I589ea108ac069624aaa7b26cdc3bfe8182b15851
(cherry picked from commit 4b798d89a55714218dc9a7de161f93f9c4d6fc80)
Reviewed-on: https://gerrit.libreoffice.org/5671
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 973dd63..7090abc 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -694,15 +694,15 @@ SvxNumRule::SvxNumRule( SvStream rStream )
 for (sal_uInt16 i = 0; i  SVX_MAX_NUM; i++)
 {
 rStream  nTmp16;
-sal_Bool hasNumberingFormat = nTmp16;
+sal_Bool hasNumberingFormat = nTmp16  1;
+aFmtsSet[i] = nTmp16  2; // fdo#68648 reset flag
 if ( hasNumberingFormat ){
 aFmts[i] = new SvxNumberFormat( rStream );
-aFmtsSet[i] = sal_True;
 }
 else
 {
 aFmts[i] = 0;
-aFmtsSet[i] = sal_False;
+aFmtsSet[i] = sal_False; // actually only false is valid
 }
 }
 //second nFeatureFlags for new versions
@@ -727,9 +727,10 @@ SvStream SvxNumRule::Store( SvStream rStream )
 sal_Bool bConvertBulletFont = ( rStream.GetVersion() = 
SOFFICE_FILEFORMAT_50 )  ( rStream.GetVersion() );
 for(sal_uInt16 i = 0; i  SVX_MAX_NUM; i++)
 {
+sal_uInt16 nSetFlag(aFmtsSet[i] ? 2 : 0); // fdo#68648 store that too
 if(aFmts[i])
 {
-rStream  sal_uInt16(1);
+rStream  sal_uInt16(1 | nSetFlag);
 if(bConvertBulletFont  aFmts[i]-GetBulletFont())
 {
 if(!pConverter)
@@ -740,7 +741,7 @@ SvStream SvxNumRule::Store( SvStream rStream )
 aFmts[i]-Store(rStream, pConverter);
 }
 else
-rStream  sal_uInt16(0);
+rStream  sal_uInt16(0 | nSetFlag);
 }
 //second save of nFeatureFlags for new versions
 rStream(sal_uInt16)nFeatureFlags;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Langpack FR 4.1 for OSX applescript launched mdfind scans whole disk from root folder

2013-08-29 Thread Alexander Thurgood

Le 29/08/13 12:30, Alexander Thurgood a écrit :

Seems that commit bd242a8768b8e2f457af581c782ef8a9f2ba0be7 was
responsible for this change.


Alex


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/inc sw/source

2013-08-29 Thread Miklos Vajna

 sw/inc/IDocumentStatistics.hxx |6 --
 sw/inc/doc.hxx |7 ---
 sw/source/core/doc/doc.cxx |   21 -
 sw/source/ui/uiview/view2.cxx  |2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit 563d441f9401d8868fae0dc379e9b712019325e7
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jul 16 18:26:18 2013 +0200

fdo#63273 sw: let word count not update stat. fields

Updating fields would generate loads of selection change events and it's
not what we asked for.

Regression from ce14342c4292628a641a72d4f63d9c048e030c6a.

(cherry picked from commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3)

Change-Id: If237df1f31436357022ca8d77b924681e403abd8
Reviewed-on: https://gerrit.libreoffice.org/4943
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
(cherry picked from commit 699b7626222ea8be1c9713a7f5e274dbfbc029ff)

This also fixes fdo#67223.

Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx

diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 2c5a0501..950ea49 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -43,8 +43,9 @@
   * modified and returns a reference to the result.
   * \param bCompleteAsync if true will return a partial result,
   * and potentially trigger a timeout to complete the work.
+  * \param bFields if stat. fields should be updated
   */
-virtual const SwDocStat GetUpdatedDocStat(bool bCompleteAsync) = 0;
+virtual const SwDocStat GetUpdatedDocStat(bool bCompleteAsync, bool 
bFields) = 0;
 
 /// Set the document statistics
 virtual void SetDocStat(const SwDocStat rStat) = 0;
@@ -53,8 +54,9 @@
   * Updates the internal document's statistics
   * \param bCompleteAsync if true it may do part of the
   * work and trigger a timeout to complete it.
+  * \param bFields if stat. fields should be updated
   */
-virtual void UpdateDocStat(bool bCompleteAsync) = 0;
+virtual void UpdateDocStat(bool bCompleteAsync, bool bFields) = 0;
 
 protected:
 virtual ~IDocumentStatistics() {};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7f5488c..6bccac2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -909,9 +909,9 @@ public:
 */
 virtual void DocInfoChgd();
 virtual const SwDocStat GetDocStat() const;
-virtual const SwDocStat GetUpdatedDocStat(bool bCompleteAsync = false);
+virtual const SwDocStat GetUpdatedDocStat(bool bCompleteAsync = false, 
bool bFields = true);
 virtual void SetDocStat(const SwDocStat rStat);
-virtual void UpdateDocStat(bool bCompleteAsync = false);
+virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = 
true);
 
 /** IDocumentState
 */
@@ -2071,10 +2071,11 @@ private:
 
 /** continue computing a chunk of document statistics
   * \param nChars  number of characters to count before exiting
+  * \param bFields if stat. fields should be updated
   *
   * returns false when there is no more to calculate
   */
-bool IncrementalDocStatCalculate(long nChars);
+bool IncrementalDocStatCalculate(long nChars, bool bFields);
 
 /// Our own 'StatsUpdateTimer' calls the following method
 DECL_LINK( DoIdleStatsUpdate, Timer * );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index ad19161..667ef5c 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1157,11 +1157,11 @@ const SwDocStat SwDoc::GetDocStat() const
 return *pDocStat;
 }
 
-const SwDocStat SwDoc::GetUpdatedDocStat( bool bCompleteAsync )
+const SwDocStat SwDoc::GetUpdatedDocStat( bool bCompleteAsync, bool bFields )
 {
 if( pDocStat-bModified )
 {
-UpdateDocStat( bCompleteAsync );
+UpdateDocStat( bCompleteAsync, bFields );
 }
 return *pDocStat;
 }
@@ -1684,7 +1684,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
 }
 
 // returns true while there is more to do
-bool SwDoc::IncrementalDocStatCalculate(long nChars)
+bool SwDoc::IncrementalDocStatCalculate( long nChars, bool bFields )
 {
 pDocStat-Reset();
 pDocStat-nPara = 0; // default is 1!
@@ -1771,8 +1771,11 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars)
 }
 
 // optionally update stat. fields
-SwFieldType *pType = GetSysFldType(RES_DOCSTATFLD);
-pType-UpdateFlds();
+if (bFields)
+{
+SwFieldType *pType = GetSysFldType(RES_DOCSTATFLD);
+pType-UpdateFlds();
+}
 
 return nChars = 0;
 }
@@ -1780,7 +1783,7 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars)
 IMPL_LINK( SwDoc, DoIdleStatsUpdate, Timer *, pTimer )
 {
 (void)pTimer;
-if (IncrementalDocStatCalculate(32000))
+if (IncrementalDocStatCalculate(32000, true))

[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source

2013-08-29 Thread Eike Rathke

 i18nlangtag/qa/cppunit/test_languagetag.cxx   |   11 ++
 i18nlangtag/source/languagetag/simple-langtag.cxx |   89 +-
 2 files changed, 98 insertions(+), 2 deletions(-)

New commits:
commit 71902872bfffbbc73f11d5a12fae6115d9bd458b
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 14:05:32 2013 +0200

implemented missing replacement bits for Android build

Change-Id: I7492cb80f37dc99b3b4a16d2d812c9e301a1a4a7

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 915d5cb..fd55e0b 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -167,11 +167,19 @@ void TestLanguageTag::testAllTags()
 CPPUNIT_ASSERT( ca_ES_valencia.getScript() ==  );
 CPPUNIT_ASSERT( ca_ES_valencia.getLanguageAndScript() == ca );
 ::std::vector OUString  ca_ES_valencia_Fallbacks( 
ca_ES_valencia.getFallbackStrings());
+/* TODO: replacement doesn't handle variants yet. */
+#if USE_LIBLANGTAG
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks.size() == 4);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[0] == ca-ES-valencia);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[1] == ca-valencia);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[2] == ca-ES);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[3] == ca);
+#else
+CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks.size() == 3);
+CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[0] == ca-ES-valencia);
+CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[1] == ca-ES);
+CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[2] == ca);
+#endif
 /* TODO: conversion doesn't know this yet, once it does activate test. 
*/
 #if 0
 CPPUNIT_ASSERT( ca_ES_valencia.makeFallback().getBcp47() == 
ca-ES-valencia);
@@ -181,6 +189,8 @@ void TestLanguageTag::testAllTags()
 }
 
 {
+/* TODO: replacement doesn't handle variants yet. */
+#if USE_LIBLANGTAG
 OUString s_ca_valencia( ca-valencia );
 LanguageTag ca_valencia( s_ca_valencia, true );
 lang::Locale aLocale = ca_valencia.getLocale();
@@ -206,6 +216,7 @@ void TestLanguageTag::testAllTags()
 #else
 CPPUNIT_ASSERT( ca_valencia.makeFallback().getBcp47() == ca-ES);
 #endif
+#endif
 }
 
 {
diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx 
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index d96f721..eb92e42 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -19,10 +19,12 @@
 #include cstdlib
 #include cstring
 #include cstdio
+#include vector
 
 namespace {
 
 typedef int lt_bool_t;
+typedef void* lt_pointer_t;
 
 struct lt_error_t {
 void *something;
@@ -134,19 +136,87 @@ struct lt_region_t : public my_t_impl
 virtual ~lt_region_t() {}
 };
 
+struct lt_variant_t : public my_t_impl
+{
+explicit lt_variant_t() : my_t_impl() {}
+virtual ~lt_variant_t() {}
+};
+
+struct lt_list_t : public my_t_impl
+{
+lt_list_t* mpPrev;
+lt_list_t* mpNext;
+explicit lt_list_t() : my_t_impl(), mpPrev(NULL), mpNext(NULL) {}
+explicit lt_list_t( const lt_list_t r )
+:
+my_t_impl( r), mpPrev(NULL), mpNext(NULL)
+{
+}
+virtual ~lt_list_t()
+{
+if (mpPrev)
+mpPrev-mpNext = mpNext;
+if (mpNext)
+mpNext-mpPrev = mpPrev;
+}
+};
+
+static lt_pointer_t lt_list_value( const lt_list_t* p )
+{
+// Assuming only char* here.
+return p ? p-mpStr : NULL;
+}
+
+static const lt_list_t* lt_list_next( const lt_list_t* p )
+{
+return p ? p-mpNext : NULL;
+}
+
+static lt_list_t* my_copyList( const lt_list_t * pList )
+{
+lt_list_t* pNewList = NULL;
+lt_list_t* pLast = NULL;
+while (pList)
+{
+lt_list_t* p = new lt_list_t( *pList);
+if (!pNewList)
+pNewList = p;
+if (pLast)
+{
+pLast-mpNext = p;
+p-mpPrev = pLast;
+}
+pLast = p;
+pList = pList-mpNext;
+}
+return pNewList;
+}
+
+static void my_unrefList( lt_list_t* pList )
+{
+while (pList)
+{
+lt_list_t* pNext = pList-mpNext;
+pList-decRef();
+pList = pNext;
+}
+}
+
 struct lt_tag_t : public my_t_impl
 {
 lt_lang_t   maLanguage;
 lt_script_t maScript;
 lt_region_t maRegion;
-explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion() {}
+lt_list_t*  mpVariants;
+explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion(), 
mpVariants(NULL) {}
 virtual ~lt_tag_t() {}
 explicit lt_tag_t( const lt_tag_t r )
 :
 my_t_impl( r),
 maLanguage( r.maLanguage),
 maScript( r.maScript),
-maRegion( r.maRegion)
+maRegion( r.maRegion),
+mpVariants( my_copyList( r.mpVariants))
 {
 }
 lt_tag_t operator=( const

Re: Langpack FR 4.1 for OSX applescript launched mdfind scans whole disk from root folder

2013-08-29 Thread Alexander Thurgood

Le 29/08/13 12:30, Alexander Thurgood a écrit :

The official download for 4.1.1 :

http://download.documentfoundation.org/libreoffice/stable/4.1.1/mac/x86/LibreOffice_4.1.1_MacOS_x86_langpack_fr.dmg


still contains :

set the found_ooos_all to (do shell script mdfind \kMDItemContentType
== 'com.apple.application-bundle'  kMDItemDisplayName ==
'LibreOffice*'  kMDItemDisplayName != 'LibreOffice Language
Pack.app'\)  
  chooseMyOwn



Alex


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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - pyuno/zipcore vcl/source

2013-08-29 Thread Jürgen Schmidt

 pyuno/zipcore/python.cxx|   54 
 vcl/source/gdi/dibtools.cxx |   39 +++
 2 files changed, 39 insertions(+), 54 deletions(-)

New commits:
commit fc89249eddd42c5020307757a1e31a87b6302ec1
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Thu Aug 29 11:38:06 2013 +

#122864# merge fix from AOO401 branch

diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 04e4ec7..2fb708e 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -93,51 +93,46 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 exit(EXIT_FAILURE);
 }
 }
+
 wchar_t bootstrap[MY_LENGTH(Lvnd.sun.star.pathname:) + MAX_PATH] =
 Lvnd.sun.star.pathname:; //TODO: overflow
 wchar_t * bootstrapEnd = tools::buildPath(
 bootstrap + MY_LENGTH(Lvnd.sun.star.pathname:), path, pathEnd,
 MY_STRING(Lfundamental.ini));
-if (bootstrapEnd == NULL ||
-(tools::buildPath(path, path, pathEnd, MY_STRING(L..\\basis-link))
- == NULL))
+if (bootstrapEnd == NULL)
 {
 exit(EXIT_FAILURE);
 }
-pathEnd = tools::resolveLink(path);
-wchar_t path1[MAX_PATH];
-wchar_t * path1End = tools::buildPath(
-path1, path, pathEnd, MY_STRING(L\\program));
-if (path1End == NULL) {
-exit(EXIT_FAILURE);
-}
+
 wchar_t pythonpath2[MAX_PATH];
 wchar_t * pythonpath2End = tools::buildPath(
 pythonpath2, path, pathEnd,
-MY_STRING(L\\program\\python-core- MY_PYVERSION L\\lib));
+MY_STRING(Lpython-core- MY_PYVERSION L\\lib));
 if (pythonpath2End == NULL) {
 exit(EXIT_FAILURE);
 }
+
 wchar_t pythonpath3[MAX_PATH];
 wchar_t * pythonpath3End = tools::buildPath(
 pythonpath3, path, pathEnd,
 MY_STRING(
-L\\program\\python-core- MY_PYVERSION L\\lib\\site-packages));
+Lpython-core- MY_PYVERSION L\\lib\\site-packages));
 if (pythonpath3End == NULL) {
 exit(EXIT_FAILURE);
 }
+
 #ifdef __MINGW32__
 wchar_t pythonpath4[MAX_PATH];
 wchar_t * pythonpath4End = tools::buildPath(
 pythonpath4, path, pathEnd,
-MY_STRING(L\\program\\python-core- MY_PYVERSION 
L\\lib\\lib-dynload));
+MY_STRING(Lpython-core- MY_PYVERSION L\\lib\\lib-dynload));
 if (pythonpath4End == NULL) {
 exit(EXIT_FAILURE);
 }
 wchar_t pythonpath5[MAX_PATH];
 wchar_t * pythonpath5End = tools::buildPath(
 pythonpath5, path, pathEnd,
-MY_STRING(L\\program\\python-core- MY_PYVERSION 
L\\lib\\lib-dynload));
+MY_STRING(Lpython-core- MY_PYVERSION L\\lib\\lib-dynload));
 if (pythonpath5End == NULL) {
 exit(EXIT_FAILURE);
 }
@@ -145,7 +140,7 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 wchar_t pythonhome[MAX_PATH];
 wchar_t * pythonhomeEnd = tools::buildPath(
 pythonhome, path, pathEnd,
-MY_STRING(L\\program\\python-core- MY_PYVERSION));
+MY_STRING(Lpython-core- MY_PYVERSION));
 if (pythonhomeEnd == NULL) {
 exit(EXIT_FAILURE);
 }
@@ -154,26 +149,15 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 pythonexe, path, pathEnd,
 #ifdef __MINGW32__
 MY_STRING(
-L\\program\\python-core- MY_PYVERSION L\\bin\\python.bin));
+Lpython-core- MY_PYVERSION L\\bin\\python.bin));
 #else
 MY_STRING(
-L\\program\\python-core- MY_PYVERSION L\\bin\\python.exe));
+Lpython-core- MY_PYVERSION L\\bin\\python.exe));
 #endif
 if (pythonexeEnd == NULL) {
 exit(EXIT_FAILURE);
 }
-if (tools::buildPath(path, path, pathEnd, MY_STRING(L\\ure-link)) == 
NULL)
-{
-exit(EXIT_FAILURE);
-}
-pathEnd = tools::resolveLink(path);
-if (pathEnd == NULL) {
-exit(EXIT_FAILURE);
-}
-pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L\\bin));
-if (pathEnd == NULL) {
-exit(EXIT_FAILURE);
-}
+
 std::size_t clSize = MY_LENGTH(L\) + 4 * (pythonexeEnd - pythonexe) +
 MY_LENGTH(L\\0); //TODO: overflow
 // 4 * len: each char preceded by backslash, each trailing backslash
@@ -221,9 +205,11 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 }
 }
 wchar_t * value = new wchar_t[
-(pathEnd - path) + MY_LENGTH(L;) + (path1End - path1) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(value, L%s;%s%s%s, path, path1, n == 0 ? L : L;, orig);
+   (pathEnd - path) + MY_LENGTH(L;) +
+   (n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
+
+wsprintfW(value, L%s%s%s, path, n == 0 ? L : L;, orig);
+
 if (!SetEnvironmentVariableW(LPATH, value)) {
 exit(EXIT_FAILURE);
 }
@@ -258,11 +244,11 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 n == 0 ? L : L;, orig);
 #else
 value = new wchar_t[
-(path1End - path1) +

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

2013-08-29 Thread Petr Mladek

 cui/source/dialogs/about.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3d353c90e9c8fb109a940c05d21450a533eb00fa
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 14:11:36 2013 +0200

Remove duplicit include of config_buildid.h

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 54d4fbf..4243180 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include config_buildid.h
-
 #include vcl/layout.hxx
 #include vcl/svapp.hxx
 #include vcl/msgbox.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Eike Rathke

 i18nlangtag/source/languagetag/simple-langtag.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 139a7d5e5233e1f93a8639197990525f3cc1fd7f
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 14:16:53 2013 +0200

unused include vector

Change-Id: I85994d4636a171a8f023b757c02afa0ac236

diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx 
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index eb92e42..c767e17 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -19,7 +19,6 @@
 #include cstdlib
 #include cstring
 #include cstdio
-#include vector
 
 namespace {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source

2013-08-29 Thread Tor Lillqvist

 cui/source/dialogs/about.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ec88782903955574774c93fbad7891a6d4753e7e
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 14:50:10 2013 +0300

Fix loplugin error: checking whether a config macro EXTRA_BUILDID is 
defined.

Change-Id: Ieb04a8da4dc54b41f4df1d63b5e70ffb7ca7bb01

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 73fe04e..4243180 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -242,10 +242,11 @@ OUString AboutDialog::GetVersionString()
 sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId);
 }
 
-#ifdef EXTRA_BUILDID
-sVersion += \n;
-sVersion += EXTRA_BUILDID;
-#endif
+if (strlen(EXTRA_BUILDID)  0)
+{
+sVersion += \n;
+sVersion += EXTRA_BUILDID;
+}
 
 return sVersion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] buildbot.git: bin/push_nightlies.sh bin/tinbuild2 bin/tinbuild_internals.sh

2013-08-29 Thread Luboš Luňák

 bin/push_nightlies.sh |   55 +-
 bin/tinbuild2 |   14 +++
 bin/tinbuild_internals.sh |6 -
 3 files changed, 73 insertions(+), 2 deletions(-)

New commits:
commit 4e28560d60d702d03eb90ad909c9f4e3d22a6777
Author: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Date:   Thu Aug 29 14:18:05 2013 +0200

add support for uploading also windows .pdb debug info

-pdb option activates this for -r, needs a path to a dir where
the .pdb info is stored and updated, and needs symstore.exe installed.

diff --git a/bin/push_nightlies.sh b/bin/push_nightlies.sh
index d3a7b19..ac62788 100755
--- a/bin/push_nightlies.sh
+++ b/bin/push_nightlies.sh
@@ -15,6 +15,7 @@ usage ()
echo -t time   pull time of this checkout
echo -n name   name of this tinderbox
echo -l kbps   bandwidth limit for upload (KBps)
+   echo -p dirlocation of the pdb symbol store to update and upload
 }
 
 do_lock()
@@ -35,8 +36,11 @@ PULL_TIME=
 BANDWIDTH_LIMIT=20
 ASYNC=0
 STAGE_DIR=/tmp
+SYMBOLS_DIR=
+SYMSTORE=/cygdrive/c/Program Files/Debugging Tools for Windows (x64)/symstore
 
-while getopts aht:n:l: opt ; do
+
+while getopts aht:n:l:p: opt ; do
case $opt in
 a) ASYNC=1 ;;
h) usage; exit ;;
@@ -44,6 +48,7 @@ while getopts aht:n:l: opt ; do
t) PULL_TIME=${OPTARG// /_} ;;
n) BUILDER_NAME=${OPTARG// /_} ;;
l) BANDWIDTH_LIMIT=$OPTARG ;;
+   p) SYMBOLS_DIR=${OPTARG};;
?) usage; exit ;;
esac
 done
@@ -69,6 +74,8 @@ if [ -f config_host.mk ] ; then
 INPATH=$(grep INPATH= config_host.mk | sed -e s/.*=//)
 fi
 
+topdir=$PWD
+
 cd instsetoo_native/${INPATH}
 
 if [ $? != 0 ]; then
@@ -103,6 +110,46 @@ if [ -f ${core_dir}/build_info.txt ] ; then
 fi
 fi
 
+
+# Add pdb files for binaries of the given extension (exe,dll)
+# and type (Library/Executable) to the given list.
+add_pdb_files()
+{
+extension=$1
+type=$2
+list=$3
+for file in `find install/ -name *.${extension}`; do
+filename=`basename $file .${extension}`
+pdb=`echo workdir/*/LinkTarget/${type}/${filename}.pdb`
+if test -f $pdb; then
+echo `cygpath -w $pdb` $list
+fi
+done
+
+}
+
+if [ -n $SYMBOLS_DIR ] ; then
+pushd $topdir /dev/null
+ssh upl...@gimli.documentfoundation.org mkdir -p 
\/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/symbols\
 || exit 1
+echo update symbols
+rm -f symbols-pdb-list.txt
+mkdir -p $SYMBOLS_DIR
+add_pdb_files dll Library symbols-pdb-list.txt
+add_pdb_files exe Executable symbols-pdb-list.txt
+${SYMSTORE} add /f @symbols-pdb-list.txt /s `cygpath -w $SYMBOLS_DIR` /t 
LibreOffice /v $PULL_TIME
+rm symbols-pdb-list.txt
+
+# The maximum number of versions of symbols to keep, older revisions will 
be removed.
+# Unless the .dll/.exe changes, the .pdb should be shared, so with 
incremental tinderbox several revisions should
+# not be that space-demanding.
+KEEP_MAX_REVISIONS=5
+to_remove=`ls -1 ${SYMBOLS_DIR}/000Admin | grep -v '\.txt' | grep -v 
'\.deleted' | sort | head -n -${KEEP_MAX_REVISIONS}`
+for revision in $to_remove; do
+${SYMSTORE} del /i ${revision} /s `cygpath -w $SYMBOLS_DIR`
+done
+popd /dev/null
+fi
+
 if [ $ASYNC = 1 ] ; then
 (
 (
@@ -112,6 +159,9 @@ if [ $ASYNC = 1 ] ; then
ssh upl...@gimli.documentfoundation.org cd 
\/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/\  { 
rm current; ln -s \${PULL_TIME}\ current ; }
 fi
 rm -fr ${stage}/${tag}_*
+if [ -n $SYMBOLS_DIR ] ; then
+rsync --bwlimit=${BANDWIDTH} --delete -ave ssh ${SYMBOLS_DIR}/ 
upl...@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/symbols/
 || exit 1
+fi
 )# 200${lock_file?}
 ) 
 else
@@ -119,4 +169,7 @@ else
 if [ $? == 0 ] ; then
ssh upl...@gimli.documentfoundation.org cd 
\/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/\  { 
rm current; ln -s \${PULL_TIME}\ current ; }
 fi
+if [ -n $SYMBOLS_DIR ] ; then
+rsync --bwlimit=${BANDWIDTH} --delete -ave ssh ${SYMBOLS_DIR}/ 
upl...@gimli.documentfoundation.org:/srv/www/dev-builds.libreoffice.org/daily/${BRANCH}/${BUILDER_NAME}/symbols/
 || exit 1
+fi
 fi
diff --git a/bin/tinbuild2 b/bin/tinbuild2
index c2790c5..a13bc5b 100755
--- a/bin/tinbuild2
+++ b/bin/tinbuild2
@@ -12,6 +12,7 @@ BIN_DIR=$(dirname $0)
 PAUSE_SECONDS=$((15*60))
 PUSH_NIGHTLIES=0
 PUSH_TO_BIBISECT_REPO=0
+SYMBOLS_DIR=
 ARTIFACTDIR=
 SEND_MAIL=all
 LOCK=1
@@ -118,6 +119,7 @@ Options:
-n   run with nice, can be combined with -i
-p profile profile to use.
-r bandwidth push the build nightly at a rate limited by badnwidth (in 
kB/s)
+   -pdb dir   if -r is used, and update and upload also .pdb symbol

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

2013-08-29 Thread Eike Rathke

 i18nlangtag/source/languagetag/simple-langtag.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 74d4f612af484735fae9c48b9cd7e609dab7fe64
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 14:33:00 2013 +0200

don't leak variants

Change-Id: I03d1f7411ef46c41e19349297fa83e17ac81492e

diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx 
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index c767e17..153500a 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -208,7 +208,10 @@ struct lt_tag_t : public my_t_impl
 lt_region_t maRegion;
 lt_list_t*  mpVariants;
 explicit lt_tag_t() : my_t_impl(), maLanguage(), maScript(), maRegion(), 
mpVariants(NULL) {}
-virtual ~lt_tag_t() {}
+virtual ~lt_tag_t()
+{
+my_unrefList( mpVariants);
+}
 explicit lt_tag_t( const lt_tag_t r )
 :
 my_t_impl( r),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] buildbot.git: bin/tinbuild_phases.sh

2013-08-29 Thread Petr Mladek

 bin/tinbuild_phases.sh |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit e4951ebbcab8754fa388fee7d6b3ea889c6add33
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 14:43:45 2013 +0200

Pass the extra buildid info via configure rather than by make (fdo#58034)

We want to pass the information via the header file, so it works
also in incremental builds.

diff --git a/bin/tinbuild_phases.sh b/bin/tinbuild_phases.sh
index 38a652c..39954e7 100644
--- a/bin/tinbuild_phases.sh
+++ b/bin/tinbuild_phases.sh
@@ -18,6 +18,11 @@ pre_autogen()
 do_autogen()
 {
 if [ ${retval} = 0 ] ; then
+export EXTRA_BUILDID=
+if [ ${build_type} = tb ] ; then
+current_timestamp=$(sed -e s/ /_/ 
${METADATA_DIR?}/tb_${B}_current-git-timestamp.log)
+EXTRA_BUILDID=TinderBox: $TINDER_NAME, Branch:${B}, Time: 
$current_timestamp
+fi
 if ! $NICE ./autogen.sh ${DISTRO_CONFIG:+ 
--with-distro=${DISTRO_CONFIG}} tb_${B}_autogen.log 21 ; then
 report_log=tb_${B}_autogen.log
 report_msgs=autogen/configure failed - error is:
@@ -47,19 +52,15 @@ do_clean()
 do_make()
 {
 optdir=
-if [ ${build_type} = tb ] ; then
-current_timestamp=$(sed -e s/ /_/ 
${METADATA_DIR?}/tb_${B}_current-git-timestamp.log)
-EXTRA_BUILDID=TinderBox: $TINDER_NAME, Branch:${B}, Time: 
$current_timestamp
-fi
 if [ ${retval} = 0 ] ; then
-if ! $NICE $WATCHDOG ${MAKE?} EXTRA_BUILDID=$EXTRA_BUILDID -s 
$target tb_${B}_build.log 21 ; then
+if ! $NICE $WATCHDOG ${MAKE?} -s $target tb_${B}_build.log 21 ; then
 report_log=tb_${B}_build.log
 report_msgs=build failed - error is:
 retval=1
 else
 # if we want to populate bibisect we need to 'install'
 if [ ${build_type} = tb -a $PUSH_TO_BIBISECT_REPO != 0 ] ; 
then
-if ! $NICE $WATCHDOG ${MAKE?} EXTRA_BUILDID=$EXTRA_BUILDID 
-s install-tb tb_${B}_build.log 21 ; then
+if ! $NICE $WATCHDOG ${MAKE?} -s install-tb 
tb_${B}_build.log 21 ; then
 report_log=tb_${B}_build.log
 report_msgs=build failed - error is:
 retval=1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Petr Mladek

 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d9b62a48d75e596888fcf10f5f73fed93e7b88a3
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 14:50:58 2013 +0200

Allow to set EXTRA_BUILDID also via environment variable (fdo#58034)

This is much easier with tinderboxed that work with static autogen.input

Change-Id: Ifb0b7884bbad14a286023b3dbd7d1d2a12f36787

diff --git a/configure.ac b/configure.ac
index 8647bdd..682d5dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12107,10 +12107,12 @@ AC_SUBST(PROGRESSTEXTCOLOR)
 AC_SUBST(PROGRESSTEXTBASELINE)
 
 
-EXTRA_BUILDID=
 AC_MSG_CHECKING([for extra build ID])
 if test -n $with_extra_buildid -a $with_extra_buildid != yes ; then
 EXTRA_BUILDID=$with_extra_buildid
+fi
+# in tinderboxes, it is easier to set EXTRA_BUILDID via the environment 
variable instead of configure switch
+if test -n $EXTRA_BUILDID ; then
 AC_MSG_RESULT([$EXTRA_BUILDID])
 else
 AC_MSG_RESULT([not set])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-macosx.patch.1 scp2/InstallModule_firebird.mk scp2/source solenv

2013-08-29 Thread Stephan Bergmann

 firebird/ExternalPackage_firebird.mk  |8 -
 firebird/ExternalProject_firebird.mk  |   10 -
 firebird/firebird-macosx.patch.1  |  156 --
 scp2/InstallModule_firebird.mk|4 
 scp2/source/firebird/file_firebird.scp|   28 +
 scp2/source/firebird/module_firebird.scp  |5 
 solenv/bin/macosx-change-install-names.pl |4 
 7 files changed, 68 insertions(+), 147 deletions(-)

New commits:
commit 2c8cd0cae2e6051e056c561006aca1acd819e6cc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 14:17:39 2013 +0200

Clean up ExternalProject_firebird even further for Mac OS X

Change-Id: I4a874c0a71c156786f1a6905aadc0bab572a0a7b

diff --git a/firebird/ExternalPackage_firebird.mk 
b/firebird/ExternalPackage_firebird.mk
index 0571cd4..3778d52 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/firebird/ExternalPackage_firebird.mk
@@ -14,14 +14,12 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,firebird,firebird))
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib))
-else
-ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib))
+else ifeq ($(OS),MACOSX)
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
 else
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5))
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/ExternalProject_firebird.mk 
b/firebird/ExternalProject_firebird.mk
index bcfbe40..296848e 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -45,10 +45,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--disable-superserver \
--with-system-icu --without-fbsample 
--without-fbsample-db \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
-export CHANGE_INSTALL_NAMES_APP=$(PERL) 
$(SOLARENV)/bin/macosx-change-install-names.pl app NONE \
-export CHANGE_INSTALL_NAMES_SHL=$(PERL) 
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
 $(gb_Helper_set_ld_path) $(MAKE) firebird_embedded \
+   $(if $(filter MACOSX,$(OS)), $(PERL) \
+   $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+   
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
)
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/firebird-macosx.patch.1 b/firebird/firebird-macosx.patch.1
index 2e437ab..adede1c 100644
--- a/firebird/firebird-macosx.patch.1
+++ b/firebird/firebird-macosx.patch.1
@@ -1,126 +1,4 @@
 # -*- Mode: Diff -*-
-diff -ur firebird.org/builds/posix/Makefile.in.codes 
firebird/builds/posix/Makefile.in.codes
 firebird.org/builds/posix/Makefile.in.codes2013-07-12 
20:55:46.0 +0200
-+++ firebird/builds/posix/Makefile.in.codes2013-07-15 11:43:26.0 
+0200
-@@ -63,7 +63,7 @@
- 
- $(BIN)/codes$(EXEC_EXT): $(CODES_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
-   $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) 
$(ICU_LIBS)
--
-+  $(CHANGE_INSTALL_NAMES_APP) $@
- 
- # Rebuild ids.h
- $(SRC_ROOT)/include/gen/ids.h:$(SRC_ROOT)/misc/ids.m 
$(SRC_ROOT)/jrd/relations.h
-diff -ur firebird.org/builds/posix/Makefile.in.examples 
firebird/builds/posix/Makefile.in.examples
 firebird.org/builds/posix/Makefile.in.examples 2013-07-12 
20:55:46.0 +0200
-+++ firebird/builds/posix/Makefile.in.examples 2013-07-15 11:50:37.0 
+0200
-@@ -129,6 +129,7 @@
- 
- $(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_Objects) 
$(LIBFBSTATIC_A) 
-   $(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) $(COMMON_Objects) -o $@ 
-L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
-+  $(CHANGE_INSTALL_NAMES_APP) $@
- 
- $(EXAMPLES_DEST)/empbuild.c:  $(EXAMPLES_DEST)/empbuild.fdb 
$(EXAMPLES_DEST)/empbuild.e
- 
-@@ -147,6 +148,7 @@
- 
- $(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_Objects) 
$(LIBFBSTATIC_A) 
-   $(EXE_LINK) $(LINK_OPTS) $(INTLBLD_Objects) $(COMMON_Objects) -o $@ 
-L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
-+

[Libreoffice-commits] core.git: scp2/InstallScript_setup_osl.mk

2013-08-29 Thread Stephan Bergmann

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

New commits:
commit 5cff947699658e5606903bd2aa97f1bd531ef6f8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 15:03:52 2013 +0200

firebird is conditional

Change-Id: Ia497f9799a1ca0c77f14e2f4a4a8ecddc917f447

diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 59369b9..72c789d 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/impress \
scp2/math \
scp2/ooo \
-   scp2/firebird \
+   $(if $(filter TRUE,$(ENABLE_FIREBIRD_SDBC)),\
+   scp2/firebird \
+   ) \
scp2/python \
scp2/ure \
scp2/writer \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/table-style-parprop.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   11 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   38 +++
 3 files changed, 49 insertions(+)

New commits:
commit 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Aug 29 14:17:09 2013 +0200

bnc#816593 DOCX filter: import paragraph spacing from table style

Change-Id: I9dce59ecd8a2d2bfadb8c7273cd46c6c0cf17774

diff --git a/sw/qa/extras/ooxmlimport/data/table-style-parprop.docx 
b/sw/qa/extras/ooxmlimport/data/table-style-parprop.docx
new file mode 100755
index 000..1c68c70
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/table-style-parprop.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 3c13f05..64c0764 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -128,6 +128,7 @@ public:
 void testGroupshapeRotation();
 void testBnc780044Spacing();
 void testTableAutoNested();
+void testTableStyleParprop();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -222,6 +223,7 @@ void Test::run()
 {groupshape-rotation.docx, Test::testGroupshapeRotation},
 {bnc780044_spacing.docx, Test::testBnc780044Spacing},
 {table-auto-nested.docx, Test::testTableAutoNested},
+{table-style-parprop.docx, Test::testTableStyleParprop},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1508,6 +1510,15 @@ void Test::testTableAutoNested()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(23051), 
getPropertysal_Int32(xTables-getByIndex(1), Width));
 }
 
+void Test::testTableStyleParprop()
+{
+// The problem was that w:spacing's w:after=0 (a paragraph property) 
wasn't imported from table style.
+uno::Referencetext::XTextTable xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xCell(xTable-getCellByName(A1), 
uno::UNO_QUERY);
+// This was 353, the document default, i.e. paragraph property from table 
style had no effect.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getPropertysal_Int32(getParagraphOfText(1, xCell-getText()), 
ParaBottomMargin));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3d99fa2..250ea42 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -19,9 +19,12 @@
 #include DomainMapperTableHandler.hxx
 #include DomainMapper_Impl.hxx
 #include StyleSheetTable.hxx
+#include com/sun/star/beans/XPropertyState.hpp
+#include com/sun/star/container/XEnumerationAccess.hpp
 #include com/sun/star/table/TableBorderDistances.hpp
 #include com/sun/star/table/TableBorder.hpp
 #include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/XCellRange.hpp
 #include com/sun/star/text/HoriOrientation.hpp
 #include com/sun/star/text/RelOrientation.hpp
 #include com/sun/star/text/SizeType.hpp
@@ -779,6 +782,22 @@ RowPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetRowProperties()
 return aRowProperties;
 }
 
+// Apply paragraph property to each paragraph within a cell.
+static void lcl_ApplyCellParaProps(uno::Referencetable::XCell xCell, 
uno::Any aBottomMargin)
+{
+uno::Referencecontainer::XEnumerationAccess xEnumerationAccess(xCell, 
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xEnumeration = 
xEnumerationAccess-createEnumeration();
+while (xEnumeration-hasMoreElements())
+{
+uno::Referencebeans::XPropertySet 
xParagraph(xEnumeration-nextElement(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertyState xPropertyState(xParagraph, 
uno::UNO_QUERY);
+// Don't apply in case direct formatting is already present.
+// TODO: probably paragraph style has priority over table style here.
+if (xPropertyState.is()  
xPropertyState-getPropertyState(ParaBottomMargin) == 
beans::PropertyState_DEFAULT_VALUE)
+xParagraph-setPropertyValue(ParaBottomMargin, aBottomMargin);
+}
+}
+
 void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
 {
 #ifdef DEBUG_DMAPPER_TABLE_HANDLER
@@ -825,6 +844,25 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 
 if (xTable.is())
 m_xTableRange = xTable-getAnchor( );
+
+// OOXML table style may container paragraph properties, apply 
these now.
+for (int i = 0; i  aTableInfo.aTableProperties.getLength(); 
++i)
+{
+if (aTableInfo.aTableProperties[i].Name == 
ParaBottomMargin)
+{
+uno::Referencetable::XCellRange xCellRange(xTable,

Re: Langpack FR 4.1 for OSX applescript launched mdfind scans whole disk from root folder

2013-08-29 Thread Christian Lohmaier

Hi Alexander, *,

On Thu, Aug 29, 2013 at 12:30 PM, Alexander Thurgood
alex.thurg...@gmail.com wrote:
 Hi all,

 Is it intended that for 4.1 the applescript installer now scans every
 file on the whole disk looking for the strings equal to 'LibreOffice*'
 and not equal to 'LibreOffice Language Pack.app' ?

No - and it doesn't do that.

 set the found_ooos_all to (do shell script mdfind \kMDItemContentType
 == 'com.apple.application-bundle'  kMDItemDisplayName ==
 'LibreOffice*'  kMDItemDisplayName != 'LibreOffice Language
 Pack.app'\)  
   chooseMyOwn

mdfind is the commandline tool for spotlight, that should use the
spotlight db only, not do a full manual scan, just as the locate
command on linux would do.

 whereas the 4.0.5 langpack contains :

 set found_ooos_all to 
 -- command might return an error if spotlight is disabled completely
 try
 set found_ooos_all to (do shell script mdfind \kMDItemContentType ==
 'com.apple.application-bundle'  kMDItemDisplayName == 'LibreOffice*'
  kMDItemDisplayName != 'LibreOffice Language Pack.app'\)
 end try
 set found_ooos_all to found_ooos_all  
   chooseMyOwn

That is just an additional try .. end try around that call to not
abort the whole installation script just because the mdfind command
cannot be executed, for example when spotlight is disabled.
Without that try, the script would just terminate, and not allow the
user to install the langaugepack.

 If I run, from the terminal :

 mdfind kMDItemContentType == 'com.apple.application-bundle'  mdfind
 kMDItemDisplayName == 'LibreOffice*'  mdfind kMDItemDisplayName !=
 'LibreOffice Language Pack.app'

 it takes about 30 mins to finish.

Well - as the command has been the same for years, then something in
your spotlight configuration did change. Maybe there is a setting to
always have it do a full scan instead of using the cache.

But your command also is not equivalent to the command used by the
script. You run mdfind multiple times with different search strings,
while the script runs mdfind once with multiple search strings.

mdfind kMDItemContentType == 'com.apple.application-bundle' 
kMDItemDisplayName == 'LibreOffice*'  kMDItemDisplayName !=
'LibreOffice Language Pack.app'

is what the script runs. And that should be pretty fast.

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

Re: Langpack FR 4.1 for OSX applescript launched mdfind scans whole disk from root folder

2013-08-29 Thread Christian Lohmaier

Hi Alexander,

On Thu, Aug 29, 2013 at 2:09 PM, Alexander Thurgood
alex.thurg...@gmail.com wrote:
 Le 29/08/13 12:30, Alexander Thurgood a écrit :

 The official download for 4.1.1 :

 still contains :

 set the found_ooos_all to (do shell script mdfind \kMDItemContentType
 == 'com.apple.application-bundle'  kMDItemDisplayName ==
 'LibreOffice*'  kMDItemDisplayName != 'LibreOffice Language
 Pack.app'\)  
   chooseMyOwn


If it really contains the line without the try .. end try block
around, then it is a bug in the buildsystem / the build then did not
pick up the version from the sourcecode but used an older copy.
http://cgit.freedesktop.org/libreoffice/core/commit/setup_native/scripts/osx_install_languagepack.applescript?h=libreoffice-4.1.1.2-hotfix1id=80328f390eceb32e1530ca182e6b135c3a0b0264

the commit that added the try around is included in the tag-

Please double-check whether this is really the case.

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

[Libreoffice-commits] core.git: firebird/ExternalPackage_firebird.mk firebird/firebird-rpath.patch.0 firebird/UnpackedTarball_firebird.mk scp2/source

2013-08-29 Thread Stephan Bergmann

 firebird/ExternalPackage_firebird.mk |5 +---
 firebird/UnpackedTarball_firebird.mk |1 
 firebird/firebird-rpath.patch.0  |   11 +
 scp2/source/firebird/file_firebird.scp   |   37 ---
 scp2/source/firebird/module_firebird.scp |6 -
 5 files changed, 19 insertions(+), 41 deletions(-)

New commits:
commit cfdfd1ad7652ee3699115618465a85e3431b33f3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 16:03:14 2013 +0200

Simplify and fix the embedded Firebird on Linux

Change-Id: Ibd29bb964cd090cbfd958a9e54658249e8ce4317

diff --git a/firebird/ExternalPackage_firebird.mk 
b/firebird/ExternalPackage_firebird.mk
index 3778d52..6419c30 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/firebird/ExternalPackage_firebird.mk
@@ -17,9 +17,8 @@ $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5))
-$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
+$(eval $(call 
gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/UnpackedTarball_firebird.mk 
b/firebird/UnpackedTarball_firebird.mk
index 8370f31..46baf71 100644
--- a/firebird/UnpackedTarball_firebird.mk
+++ b/firebird/UnpackedTarball_firebird.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
firebird/firebird-icu.patch.1 \
+   firebird/firebird-rpath.patch.0 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
diff --git a/firebird/firebird-rpath.patch.0 b/firebird/firebird-rpath.patch.0
new file mode 100644
index 000..a92f006
--- /dev/null
+++ b/firebird/firebird-rpath.patch.0
@@ -0,0 +1,11 @@
+--- builds/posix/make.defaults
 builds/posix/make.defaults
+@@ -255,7 +255,7 @@
+ 
+ LIB_PLATFORM_RPATH = -Wl,-rpath,$(1)
+ ifeq ($(strip @BINRELOC_CFLAGS@),)
+-LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst 
intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@))
++LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN')
+ else
+ LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'ORIGIN/../$(1)')
+ endif
diff --git a/scp2/source/firebird/file_firebird.scp 
b/scp2/source/firebird/file_firebird.scp
index a5784a3..3f89147 100644
--- a/scp2/source/firebird/file_firebird.scp
+++ b/scp2/source/firebird/file_firebird.scp
@@ -20,43 +20,16 @@
 
 #ifndef SYSTEM_FIREBIRD
 
-/*File gid_File_Firebird
-TXT_FILE_BODY;
-Dir = gid_Dir_Brand_Root;
-Name = firebird.filelist;
-Styles = (FILELIST,USE_INTERNAL_RIGHTS);
-End*/
-
-#if !defined MACOSX
-
-File gid_File_Firebird_Lib_252
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_LIB_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2));
-  #endif
-End
-
-File gid_File_Firebird_Lib_25
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_LIB_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5));
-  #endif
-End
-
-#endif
-
 File gid_File_Firebird_Lib
 LIB_FILE_BODY;
 Styles = (PACKED);
 Dir = SCP2_OOO_LIB_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT2(libfbembed,UNXSUFFIX));
+  #if defined MACOSX
+Name = libfbembed.dylib;
+  #elif defined UNX
+Name = STRING(CONCAT3(libfbembed,UNXSUFFIX,.2.5));
   #else
-   Name = ifbembed.dll;
+Name = ifbembed.dll;
   #endif
 End
 
diff --git a/scp2/source/firebird/module_firebird.scp 
b/scp2/source/firebird/module_firebird.scp
index de1b41d..88c0eb4 100644
--- a/scp2/source/firebird/module_firebird.scp
+++ b/scp2/source/firebird/module_firebird.scp
@@ -23,15 +23,9 @@
 Module gid_Module_Firebird
 PackageInfo = packinfo_office.txt;
 ParentID = gid_Module_Root_Brand;
-Dirs = ();
 Files = (
-#if defined UNX  !defined MACOSX
-File gid_File_Firebird_Lib_252,
-File gid_File_Firebird_Lib_25,
-#endif
 File gid_File_Firebird_Lib
 );
-Unixlinks = ();
 Styles = (HIDDEN_ROOT);
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Dave McKellar

 src/lib/CDRDocumentStructure.h |1 +
 src/lib/CDRParser.cpp  |   19 +++
 src/lib/CDRParser.h|1 +
 3 files changed, 21 insertions(+)

New commits:
commit cbebfbaff8b7826bc631bbf51eb9a06ee5121326
Author: Dave McKellar dmckel...@gmail.com
Date:   Thu Aug 29 09:54:09 2013 -0400

Added initial support for the udta fourcc.

diff --git a/src/lib/CDRDocumentStructure.h b/src/lib/CDRDocumentStructure.h
index 70cc373..1d42b33 100644
--- a/src/lib/CDRDocumentStructure.h
+++ b/src/lib/CDRDocumentStructure.h
@@ -126,6 +126,7 @@
 #define CDR_FOURCC_txsm 0x6d737874
 #define CDR_FOURCC_txtj 0x6a747874
 
+#define CDR_FOURCC_udta 0x61746475
 #define CDR_FOURCC_uidr 0x72646975
 #define CDR_FOURCC_uil  0x206c6975
 #define CDR_FOURCC_url  0x206c7275
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index ec76a21..79c587f 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -761,6 +761,9 @@ void libcdr::CDRParser::readRecord(unsigned fourCC, 
unsigned length, WPXInputStr
   case CDR_FOURCC_txsm:
 readTxsm(input, length);
 break;
+  case CDR_FOURCC_udta:
+readUdta(input);
+break;
   case CDR_FOURCC_styd:
 readStyd(input);
 break;
@@ -3279,6 +3282,22 @@ void libcdr::CDRParser::readTxsm5(WPXInputStream *input)
 m_collector-collectText(textId, stlId, textData, charDescriptions, 
charStyles);
 }
 
+void libcdr::CDRParser::readUdta(WPXInputStream *input)
+{
+  CDR_DEBUG_MSG((libcdr::CDRParser::readUdta\n));
+  input-seek(6, WPX_SEEK_CUR); // Not sure what these 6 bytes are for.  Font 
id?
+  std::vectorunsigned char name;
+  unsigned short c;
+  for (;;)
+  {
+   if ((c = readU16(input)) == 0) break;
+name.push_back((unsigned char)(c  0xff));
+name.push_back((unsigned char)(c  8));
+  }
+  WPXString fieldName;
+  appendCharacters(fieldName, name);
+}
+
 void libcdr::CDRParser::readStyd(WPXInputStream *input)
 {
   CDR_DEBUG_MSG((libcdr::CDRParser::readStyd\n));
diff --git a/src/lib/CDRParser.h b/src/lib/CDRParser.h
index 7b159f1..10405ef 100644
--- a/src/lib/CDRParser.h
+++ b/src/lib/CDRParser.h
@@ -109,6 +109,7 @@ private:
   void readTxsm16(WPXInputStream *input);
   void readTxsm6(WPXInputStream *input);
   void readTxsm5(WPXInputStream *input);
+  void readUdta(WPXInputStream *input);
   void readArtisticText(WPXInputStream *input);
   void readParagraphText(WPXInputStream *input);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Stephan Bergmann

 connectivity/source/commontools/ConnectionWrapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2410b3c3ddc6fea02dadd56b39bb1181312c383a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 16:05:01 2013 +0200

TPropertyValueLessFunctor must actually compare for 

Change-Id: I584a410d90531a0f7b784e62f94c39e715713cf1

diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx 
b/connectivity/source/commontools/ConnectionWrapper.cxx
index 4b9f620..1287acf 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -187,7 +187,7 @@ namespace
 {}
 bool operator() (const ::com::sun::star::beans::PropertyValue lhs, 
const ::com::sun::star::beans::PropertyValue rhs) const
 {
-return !!(lhs.Name.equalsIgnoreAsciiCase( rhs.Name ));
+return lhs.Name.compareToIgnoreAsciiCase(rhs.Name)  0;
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Fridrich Štrba

 src/lib/CDRParser.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 624ebbdb53cd792cb0458f9444250e59e7321c05
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Aug 29 16:05:29 2013 +0200

astyle action

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 79c587f..49c6ddd 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3290,7 +3290,7 @@ void libcdr::CDRParser::readUdta(WPXInputStream *input)
   unsigned short c;
   for (;;)
   {
-   if ((c = readU16(input)) == 0) break;
+if ((c = readU16(input)) == 0) break;
 name.push_back((unsigned char)(c  0xff));
 name.push_back((unsigned char)(c  8));
   }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

2013-08-29 Thread Michael Stahl

 sw/source/ui/docvw/edtwin.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 43003812ca085a642d262d5cbf1a63f8df043d40
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 28 14:28:40 2013 +0200

fdo#67358: sw: fix line painting artifacts when resizing columns

SwEditWin::MouseButtonDown(): for unknown reasons invalidating the
window here causes the column resizing lines to not be removed after the
resize is done, so disable it.

(regression from 289185fd02d6d9734b6dbde01f15c4e6c5beacbb)

Change-Id: If3ba0a72c53c5c2734fb905ae35d62f6a3e8938b
(cherry picked from commit a2c67975c03010b90c706523293f180c1f29e229)
Reviewed-on: https://gerrit.libreoffice.org/5661
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 8576258..6e208f0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2742,7 +2742,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
 rSh.SetShowHeaderFooterSeparator( Footer, false );
 
 // Repaint everything
-rSh.GetWin()-Invalidate();
+// FIXME fdo#67358 for unknown reasons this causes painting
+// problems when resizing table columns, so disable it
+//rSh.GetWin()-Invalidate();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2013-08-29 Thread Michael Meeks

* Present:
+ Bjoern, Eike, Andras, Michael M, Cloph, Thorsten, Kohei, Tsahi,
  Stephan, Robinson, Lionel, Cedric, Caolan
* Completed Action Items:
+ Major / API incompatibility release timing ? (Bjoern)
   [ discuss this at the conference ]
+ poke fdo admins for own BZ instance (Thorsten)
   [ Tollef swamped, but willing  able to do it, timeframe later this year,
  estimate is a few days of work ]
+ dig out the URL for GSOC travel funding (Cedric)
   [ no URL for that, but acknowledgement from Carol, Students to ask for 
re-imbursement
 to Google for up to $500 - just need to mail her with the receipts, it 
goes onto
 their card ]
+ upgrade 3.6 users to 4.0.5 once that is out (Cloph)
   [ update switched on 3.6 - 4.0.5 and 4.1 - 4.1.0, in a few
 days update to 4.1.1 - waiting on feedback.
 Makes sense - have some slow mirrors (Thorsten) ]
+ Submit conference talks
* http://conference.libreoffice.org/2013/en/call-for-papers
+ Calc talk (Kohei)
+ Silverstripe 3 talk (Cloph)
+ release engineering overview (Cloph)
+ New tools for QA engagement (Robinson)
+ Howto get involved in QA (Robinson / Joel)
+ UX / design talk / plan meet-up (Mirek) - Kendy to poke ?
* Pending Action Items:
+ roll out Easy Hack rotation, incrementally improve afterwards (Robinson)
   [ still reducing the delta between Robinson test  Florian's deployed 
server
 getting close though ]
+ switch to pure sidebar mode in master - but not enabled by
  default, except in Impress (Caolan)
+ come up with a proposal on what still needs improving in sidebar land 
(Astron)
+ Submit conference talks
* http://conference.libreoffice.org/2013/en/call-for-papers
+ overview of long-term cleanups (Caolan) 1/2 talk
+ perhaps invite Tom Tromey for a gdb talk (Caolan)
+ Server installation GUI (Florian Reisinger)
+ People submitting late talks: please poke Thorsten/Florian/Andy
+ otherwise they might be missed.
* Release Engineering update (Cloph)
+ 4.1.1 status
+ released today; out and being downloaded left  right.
+ no deadline this week (a small break)
+ 4.1.2 RC1 - next Monday - branch-off
+ how does the release schedule look during the conference ? (Michael)
+ 4.0.6 is after the conf (Cloph)
+ 4.1.2 complete before conference week (final release)
+ how did it go ? easier ? (Michael)
+ manual version error, but otherwise better (Cloph)
+ already pretty automated, using Petr's script (thanks)
* UX input (Astron/Mirek)
* New commit access bits:
+ Jesus Corrius - he missed the fdo migration (somehow)
* Heads up for 4.1.2 change (Stephan)
+ changes some URE library names, not completely private, but
  used around the place. Adding 'lo' suffix to avoid name conflict
  with windows / system libraries
+ https://gerrit.libreoffice.org/#/c/5667/
+ couple of tricky bits: sal_textenc / sunjavaplugin libs dlopen'ed by 
name, but it works
  and needs someone to review / ack it.
AI:+ review / merge (Andras)
* QA update (Robinson)
+ good progress on the QA list, addressing various projects
+ still working on recruiting - pause until mid September.
+ unconfirmed creeping up slightly in the short term.
+ 3x of the 3.6 MABs still left to be migrated.
+ https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+162-113(+49 overall)
 many thanks to the top five bug squashers:
ign_christian 12
Maxim 10
tommy279
Thomas van der Meulen  8
Andras Timar   8
* Open 4.2 MAB
+ 5/6 5/6 6/6 7/7 2/2 2/2 1/1
+ https://bugs.freedesktop.org/show_bug.cgi?id=65675
* Open 4.1 MAB
+ 17/89 15/85 15/81 13/77 8/68 11/64 3/55 7/52 7/48 2/42 4/39 5/37 7/32
   19%   18%   19%   17%  12%   17%   5%  14%  15%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1
* Open 4.0 MAB
+ 50/180 52/180 44/171 32/157 14/138 13/137 12/137 12/135 12/134 12/133
   28%29%26%20%10% 9% 9% 9% 9% 9%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1
* Open 3.6 MAB
+ 7/178 9/179 22/190 60/245 62/244 60/243 62/243 60/241 57/238 63/237 
65/236
   4%5% 12%   25%25%25%25%25%24%27%
28%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=6hide_resolved=1
* Bibisected bugs open: whiteboard 'bibsected'
+ 36/167 37/137 41/137 33/128 33/125 34/124 34/123 36/122 38/119 37/114 
39/114
+ http://bit.ly/VQfF3Q
* all bugs tagged with 'regression'
+ 343(+12) bugs open of 1919(+26) total
* ~Component   count net *

Re: Langpack FR 4.1 for OSX applescript launched mdfind scans whole disk from root folder

2013-08-29 Thread Alexander Thurgood

Le 29/08/13 15:33, Christian Lohmaier a écrit :

Hi Christian,

Well, there is something really strange going on and I can't nail it down.

I just tried re-starting the langpack installation for 4.1.0 - this time
it didn't stall, but it didn't display the successful installation
dialog either.

So I shut it down again, unmounted the image, remounted the image and
re-installed the langpack again. This time I got the installation
successful dialog at the end.

Bizarre, bizarre.

Also, 4.1.1 langpack FR seems to install seamlessly now.


In the 4.1.1 dmg :
set found_ooos_all to 
-- command might return an error if spotlight is disabled completely
try
set found_ooos_all to (do shell script mdfind \kMDItemContentType ==
'com.apple.application-bundle'  kMDItemDisplayName == 'LibreOffice*'
 kMDItemDisplayName != 'LibreOffice Language Pack.app'\)
end try
set found_ooos_all to found_ooos_all  
  chooseMyOwn

set found_ooos_all_paragraphs to paragraphs in found_ooos_all

set found_ooos to {}
repeat with currentApp in found_ooos_all_paragraphs
if currentApp does not start with /Volumes then
copy currentApp to the end of found_ooos
end if
end repeat


In the 4.1.0 dmg :
set the found_ooos_all to (do shell script mdfind \kMDItemContentType
== 'com.apple.application-bundle'  kMDItemDisplayName ==
'LibreOffice*'  kMDItemDisplayName != 'LibreOffice Language
Pack.app'\)  
  chooseMyOwn

set found_ooos_all_paragraphs to paragraphs in found_ooos_all

set found_ooos to {}
repeat with currentApp in found_ooos_all_paragraphs
if currentApp does not start with /Volumes then
copy currentApp to the end of found_ooos
end if
end repeat




So there is definitely a difference in the scripts between 4.1.0 and
4.1.1, where 4.1.0 doesn't contain the try block.


Alex


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/inc sw/source

2013-08-29 Thread Michael Stahl

 sw/inc/crstate.hxx|2 -
 sw/source/core/layout/trvlfrm.cxx |   45 +++---
 2 files changed, 43 insertions(+), 4 deletions(-)

New commits:
commit 2ab0e4df9951009d68614583c0db3527e07f7bab
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 28 14:16:38 2013 +0200

fdo#66215: sw: fix clicking on text above background fly

SwPageFrm::GetCrsrOfst() tries to compare the distance to the closest
text vs. fly but does not do it right because GetCharRect()
returns just a line of width 1 on the left edge of the character;
try to figure out the entire area covered by the character via 2 calls
to GetCrsrOfst(), which gives much better clickability.

(regression from e8fbe97900f13305b17015d9044993bde4adab36)

Change-Id: I825e86daf65692dfb962ad576772c5f543d02d19
(cherry picked from commit edd2db1c783bd571ff796a5298385cacc91877b9)
Reviewed-on: https://gerrit.libreoffice.org/5660
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 6c8c86f..7bd3cb4 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -143,7 +143,7 @@ struct SwCrsrMoveState
 sal_Bool bRealWidth;/// Calculation of the width required
 sal_Bool b2Lines;   /// Check 2line portions and fill p2Lines
 sal_Bool bNoScroll; /// No scrolling of undersized textframes
-sal_Bool bPosMatchesBounds; /** GetCrsrOfst should not return the next
+bool bPosMatchesBounds; /** GetCrsrOfst should not return the next
position if screen position is inside 
second
have of bound rect */
 
diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 0d9fd9c..fcaa4af 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -19,6 +19,7 @@
 
 #include hintids.hxx
 #include hints.hxx
+#include comphelper/flagguard.hxx
 #include tools/bigint.hxx
 #include tools/line.hxx
 #include editeng/opaqitem.hxx
@@ -287,10 +288,48 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point 
rPoint,
 if ( pTextNd )
 {
 SwCntntFrm* pTextFrm = pTextNd-getLayoutFrm( getRootFrm( ) );
-SwRect rTextRect;
-pTextFrm-GetCharRect( rTextRect, aTextPos );
 
-nTextDistance = lcl_getDistance( rTextRect, rPoint );
+// try this again but prefer the previous position
+SwCrsrMoveState aMoveState;
+SwCrsrMoveState *const pState((pCMS) ? pCMS : aMoveState);
+comphelper::FlagRestorationGuard g(
+pState-bPosMatchesBounds, true);
+SwPosition prevTextPos(*pPos);
+SwLayoutFrm::GetCrsrOfst(prevTextPos, aPoint, pState);
+
+SwRect aTextRect;
+pTextFrm-GetCharRect(aTextRect, prevTextPos);
+
+if (prevTextPos.nContent  pTextNd-Len())
+{
+// aRextRect is just a line on the left edge of the
+// previous character; to get a better measure from
+// lcl_getDistance, extend that to a rectangle over
+// the entire character.
+SwPosition const nextTextPos(prevTextPos.nNode,
+SwIndex(prevTextPos.nContent, +1));
+SwRect nextTextRect;
+pTextFrm-GetCharRect(nextTextRect, nextTextPos);
+SWRECTFN(pTextFrm);
+if ((aTextRect.*fnRect-fnGetTop)() ==
+(nextTextRect.*fnRect-fnGetTop)()) // same line?
+{
+// need to handle mixed RTL/LTR portions somehow
+if ((aTextRect.*fnRect-fnGetLeft)() 
+(nextTextRect.*fnRect-fnGetLeft)())
+{
+(aTextRect.*fnRect-fnSetRight)(
+(nextTextRect.*fnRect-fnGetLeft)());
+}
+else // RTL
+{
+(aTextRect.*fnRect-fnSetLeft)(
+(nextTextRect.*fnRect-fnGetLeft)());
+}
+}
+}
+
+nTextDistance = lcl_getDistance(aTextRect, rPoint);
 bValidTextDistance = true;
 
 // If the text position is a clickable field, then that should 
have priority.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Petr Mladek

 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 181d0a163f8c8f744077021eb550f0e6304fb4da
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 14:50:58 2013 +0200

Allow to set EXTRA_BUILDID also via environment variable (fdo#58034)

This is much easier with tinderboxed that work with static autogen.input

Change-Id: Ifb0b7884bbad14a286023b3dbd7d1d2a12f36787
Reviewed-on: https://gerrit.libreoffice.org/5679
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/configure.ac b/configure.ac
index 1d5acd2..059b3e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11477,10 +11477,12 @@ AC_SUBST(PROGRESSTEXTCOLOR)
 AC_SUBST(PROGRESSTEXTBASELINE)
 
 
-EXTRA_BUILDID=
 AC_MSG_CHECKING([for extra build ID])
 if test -n $with_extra_buildid -a $with_extra_buildid != yes ; then
 EXTRA_BUILDID=$with_extra_buildid
+fi
+# in tinderboxes, it is easier to set EXTRA_BUILDID via the environment 
variable instead of configure switch
+if test -n $EXTRA_BUILDID ; then
 AC_MSG_RESULT([$EXTRA_BUILDID])
 else
 AC_MSG_RESULT([not set])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - config/config_buildid.h.in config_host.mk.in configure.ac cui/Library_cui.mk cui/source .gitignore

2013-08-29 Thread Petr Mladek

 .gitignore   |1 +
 config/config_buildid.h.in   |   10 ++
 config_host.mk.in|1 -
 configure.ac |7 +--
 cui/Library_cui.mk   |1 -
 cui/source/dialogs/about.cxx |   10 ++
 6 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 8b665b58af200b51ec6d884168d3781899ed5ba0
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 15:41:59 2013 +0200

make the tinderbox information more reliable in the about dialog (fdo#58034)

Pass the information via config/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.

Also allow to set EXTRA_BUILDID also via environment variable. This is much
easier with tinderboxed that work with static autogen.input.

Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74
Reviewed-on: https://gerrit.libreoffice.org/5680
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/.gitignore b/.gitignore
index 9aef00e..5ea06d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@
 /config.log
 /config.status
 /config.parms
+/config/config_buildid.h
 /config/config_version.h
 /config_host.mk
 /config_host.mk.last
diff --git a/config/config_buildid.h.in b/config/config_buildid.h.in
new file mode 100644
index 000..04f03b8
--- /dev/null
+++ b/config/config_buildid.h.in
@@ -0,0 +1,10 @@
+/*
+Optional Build ID displayed in the about dialog
+*/
+
+#ifndef CONFIG_BUILDID_H
+#define CONFIG_BUILDID_H
+
+#undef EXTRA_BUILDID
+
+#endif
diff --git a/config_host.mk.in b/config_host.mk.in
index bcb016d..eae77d5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -418,7 +418,6 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
 export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_SHELL=@BASH@
-export EXTRA_BUILDID=@EXTRA_BUILDID@
 export OOO_VENDOR=@OOO_VENDOR@
 export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
 export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
diff --git a/configure.ac b/configure.ac
index 21b68cb..3f685c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11853,15 +11853,17 @@ else
 fi
 AC_SUBST(STARTCENTER_SPACE_BITMAP)
 
-EXTRA_BUILDID=
 AC_MSG_CHECKING([for extra build ID])
 if test -n $with_extra_buildid -a $with_extra_buildid != yes ; then
 EXTRA_BUILDID=$with_extra_buildid
+fi
+# in tinderboxes, it is easier to set EXTRA_BUILDID via the environment 
variable instead of configure switch
+if test -n $EXTRA_BUILDID ; then
 AC_MSG_RESULT([$EXTRA_BUILDID])
 else
 AC_MSG_RESULT([not set])
 fi
-AC_SUBST(EXTRA_BUILDID)
+AC_DEFINE_UNQUOTED([EXTRA_BUILDID], [$EXTRA_BUILDID])
 
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
@@ -12273,6 +12275,7 @@ else
 fi
 
 AC_CONFIG_FILES([config_host.mk])
+AC_CONFIG_HEADERS([config/config_buildid.h])
 AC_CONFIG_HEADERS([config/config_version.h])
 AC_OUTPUT
 
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index b367ad1..c9c00a9 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_defs,cui,\
 $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
 $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
 $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
-$(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\$(EXTRA_BUILDID)\) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,cui))
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index f7332b9..8684df7 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -48,6 +48,7 @@
 #include sfx2/sfxcommands.h
 #include about.hxx
 #include about.hrc
+#include config_buildid.h
 #include sfx2/sfxdefs.hxx
 #include sfx2/app.hxx
 #include rtl/ustrbuf.hxx
@@ -474,10 +475,11 @@ rtl::OUString AboutDialog::GetVersionString()
 sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId);
 }
 
-#ifdef EXTRA_BUILDID
-sVersion += \n;
-sVersion += EXTRA_BUILDID;
-#endif
+if (strlen(EXTRA_BUILDID)  0)
+{
+sVersion += \n;
+sVersion += EXTRA_BUILDID;
+}
 
 return sVersion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - config/config_buildid.h.in config_host.mk.in configure.ac cui/Library_cui.mk cui/source .gitignore

2013-08-29 Thread Petr Mladek

 .gitignore   |1 +
 config/config_buildid.h.in   |   10 ++
 config_host.mk.in|1 -
 configure.ac |7 +--
 cui/Library_cui.mk   |1 -
 cui/source/dialogs/about.cxx |   10 ++
 6 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit e372338807be890f02ae5d7eb56c795df3516c71
Author: Petr Mladek pmla...@suse.cz
Date:   Thu Aug 29 15:41:59 2013 +0200

make the tinderbox information more reliable in the about dialog (fdo#58034)

Pass the information via config/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.

Also allow to set EXTRA_BUILDID also via environment variable. This is much
easier with tinderboxed that work with static autogen.input.

Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74
Reviewed-on: https://gerrit.libreoffice.org/5680
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/.gitignore b/.gitignore
index 9aef00e..5ea06d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@
 /config.log
 /config.status
 /config.parms
+/config/config_buildid.h
 /config/config_version.h
 /config_host.mk
 /config_host.mk.last
diff --git a/config/config_buildid.h.in b/config/config_buildid.h.in
new file mode 100644
index 000..04f03b8
--- /dev/null
+++ b/config/config_buildid.h.in
@@ -0,0 +1,10 @@
+/*
+Optional Build ID displayed in the about dialog
+*/
+
+#ifndef CONFIG_BUILDID_H
+#define CONFIG_BUILDID_H
+
+#undef EXTRA_BUILDID
+
+#endif
diff --git a/config_host.mk.in b/config_host.mk.in
index 4f1842d..85bfa89 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -429,7 +429,6 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
 export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_SHELL=@BASH@
-export EXTRA_BUILDID=@EXTRA_BUILDID@
 export OOO_VENDOR=@OOO_VENDOR@
 export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
 export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
diff --git a/configure.ac b/configure.ac
index e05fc81..1131679 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11970,15 +11970,17 @@ else
 fi
 AC_SUBST(STARTCENTER_SPACE_BITMAP)
 
-EXTRA_BUILDID=
 AC_MSG_CHECKING([for extra build ID])
 if test -n $with_extra_buildid -a $with_extra_buildid != yes ; then
 EXTRA_BUILDID=$with_extra_buildid
+fi
+# in tinderboxes, it is easier to set EXTRA_BUILDID via the environment 
variable instead of configure switch
+if test -n $EXTRA_BUILDID ; then
 AC_MSG_RESULT([$EXTRA_BUILDID])
 else
 AC_MSG_RESULT([not set])
 fi
-AC_SUBST(EXTRA_BUILDID)
+AC_DEFINE_UNQUOTED([EXTRA_BUILDID], [$EXTRA_BUILDID])
 
 OOO_VENDOR=
 AC_MSG_CHECKING([for vendor])
@@ -12390,6 +12392,7 @@ else
 fi
 
 AC_CONFIG_FILES([config_host.mk])
+AC_CONFIG_HEADERS([config/config_buildid.h])
 AC_CONFIG_HEADERS([config/config_version.h])
 AC_OUTPUT
 
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index b367ad1..c9c00a9 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_defs,cui,\
 $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
 $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
 $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
-$(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\$(EXTRA_BUILDID)\) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,cui))
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index b70754f..a7ddbb4 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -48,6 +48,7 @@
 #include sfx2/sfxcommands.h
 #include about.hxx
 #include about.hrc
+#include config_buildid.h
 #include sfx2/sfxdefs.hxx
 #include sfx2/app.hxx
 #include rtl/ustrbuf.hxx
@@ -489,10 +490,11 @@ rtl::OUString AboutDialog::GetVersionString()
 sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId);
 }
 
-#ifdef EXTRA_BUILDID
-sVersion += \n;
-sVersion += EXTRA_BUILDID;
-#endif
+if (strlen(EXTRA_BUILDID)  0)
+{
+sVersion += \n;
+sVersion += EXTRA_BUILDID;
+}
 
 return sVersion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source

2013-08-29 Thread Eike Rathke

 i18nlangtag/qa/cppunit/test_languagetag.cxx   |   11 -
 i18nlangtag/source/languagetag/simple-langtag.cxx |  129 +-
 2 files changed, 104 insertions(+), 36 deletions(-)

New commits:
commit 9b98e25ce1e76a86ecf1dce71349e13ce1c1e6d5
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 17:31:52 2013 +0200

handle variants in replacement code

Change-Id: I57da3bcd415c060b1e785e0d1cf3966de819c196

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index fd55e0b..915d5cb 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -167,19 +167,11 @@ void TestLanguageTag::testAllTags()
 CPPUNIT_ASSERT( ca_ES_valencia.getScript() ==  );
 CPPUNIT_ASSERT( ca_ES_valencia.getLanguageAndScript() == ca );
 ::std::vector OUString  ca_ES_valencia_Fallbacks( 
ca_ES_valencia.getFallbackStrings());
-/* TODO: replacement doesn't handle variants yet. */
-#if USE_LIBLANGTAG
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks.size() == 4);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[0] == ca-ES-valencia);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[1] == ca-valencia);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[2] == ca-ES);
 CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[3] == ca);
-#else
-CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks.size() == 3);
-CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[0] == ca-ES-valencia);
-CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[1] == ca-ES);
-CPPUNIT_ASSERT( ca_ES_valencia_Fallbacks[2] == ca);
-#endif
 /* TODO: conversion doesn't know this yet, once it does activate test. 
*/
 #if 0
 CPPUNIT_ASSERT( ca_ES_valencia.makeFallback().getBcp47() == 
ca-ES-valencia);
@@ -189,8 +181,6 @@ void TestLanguageTag::testAllTags()
 }
 
 {
-/* TODO: replacement doesn't handle variants yet. */
-#if USE_LIBLANGTAG
 OUString s_ca_valencia( ca-valencia );
 LanguageTag ca_valencia( s_ca_valencia, true );
 lang::Locale aLocale = ca_valencia.getLocale();
@@ -216,7 +206,6 @@ void TestLanguageTag::testAllTags()
 #else
 CPPUNIT_ASSERT( ca_valencia.makeFallback().getBcp47() == ca-ES);
 #endif
-#endif
 }
 
 {
diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx 
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index 153500a..a9588ea 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -95,7 +95,7 @@ struct my_t_impl : public my_ref
 else
 mpStr = NULL;
 }
-void append( const char* str, const char* stop )
+virtual void append( const char* str, const char* stop )
 {
 if (str  str  stop)
 {
@@ -110,7 +110,7 @@ struct my_t_impl : public my_ref
 mpStr = p;
 }
 }
-void zero()
+virtual void zero()
 {
 g_free( mpStr);
 mpStr = NULL;
@@ -162,8 +162,9 @@ struct lt_list_t : public my_t_impl
 
 static lt_pointer_t lt_list_value( const lt_list_t* p )
 {
-// Assuming only char* here.
-return p ? p-mpStr : NULL;
+// This may look odd, but in this implementation the list element itself
+// holds the char* mpStr to be obtained with lt_variant_get_tag()
+return static_castlt_pointer_t(const_castlt_list_t*(p));
 }
 
 static const lt_list_t* lt_list_next( const lt_list_t* p )
@@ -201,24 +202,72 @@ static void my_unrefList( lt_list_t* pList )
 }
 }
 
+static void my_appendToList( lt_list_t** ppList, lt_list_t* pEntry )
+{
+if (ppList)
+{
+if (!*ppList)
+*ppList = pEntry;
+else
+{
+lt_list_t* pThat = *ppList;
+for (lt_list_t* pNext = pThat-mpNext; pNext; pNext = 
pThat-mpNext)
+pThat = pNext;
+pThat-mpNext = pEntry;
+pEntry-mpPrev = pThat;
+}
+}
+}
+
+// my_t_impl has a superfluous mpStr here, but simplifies things much in the
+// parser.
+struct my_t_list : public my_t_impl
+{
+lt_list_t* mpList;
+explicit my_t_list() : my_t_impl(), mpList(NULL) {}
+explicit my_t_list( const my_t_list r ) : my_t_impl( r), mpList( 
my_copyList( r.mpList)) {}
+virtual ~my_t_list()
+{
+my_unrefList( mpList);
+}
+my_t_list operator=( const my_t_list r )
+{
+if (this == r)
+return *this;
+my_t_impl::operator=( r);
+lt_list_t* pList = my_copyList( r.mpList);
+my_unrefList( mpList);
+mpList = pList;
+}
+virtual void append( const char* str, const char* stop )
+{
+lt_list_t* p = new lt_list_t;
+p-assign( str, stop);
+my_appendToList( mpList, p);
+}
+virtual void zero()
+{
+my_t_impl::zero();
+my_unrefList( mpList);
+mpList = NULL;
+}
+};
+
 struct lt_tag_t : public my_t_impl
 {
 lt_lang_t

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

2013-08-29 Thread Dave McKellar

 src/lib/CDRParser.cpp |   21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit a727df96747c093a00bd7562353fa9d9488a9313
Author: Dave McKellar dmckel...@gmail.com
Date:   Thu Aug 29 10:19:12 2013 -0400

Made my udta change only apply to Corel Draw X4

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 49c6ddd..9308ff3 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3285,17 +3285,20 @@ void libcdr::CDRParser::readTxsm5(WPXInputStream *input)
 void libcdr::CDRParser::readUdta(WPXInputStream *input)
 {
   CDR_DEBUG_MSG((libcdr::CDRParser::readUdta\n));
-  input-seek(6, WPX_SEEK_CUR); // Not sure what these 6 bytes are for.  Font 
id?
-  std::vectorunsigned char name;
-  unsigned short c;
-  for (;;)
+  if (m_version == 1400)
   {
-if ((c = readU16(input)) == 0) break;
-name.push_back((unsigned char)(c  0xff));
-name.push_back((unsigned char)(c  8));
+input-seek(6, WPX_SEEK_CUR); // Not sure what these bytes are for.  Field 
id?
+std::vectorunsigned char name;
+unsigned short c;
+for (;;)
+{
+  if ((c = readU16(input)) == 0) break;
+  name.push_back((unsigned char)(c  0xff));
+  name.push_back((unsigned char)(c  8));
+}
+WPXString fieldName;
+appendCharacters(fieldName, name);
   }
-  WPXString fieldName;
-  appendCharacters(fieldName, name);
 }
 
 void libcdr::CDRParser::readStyd(WPXInputStream *input)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - avmedia/Library_avmediavlc.mk configure.ac

2013-08-29 Thread Tor Lillqvist

 avmedia/Library_avmediavlc.mk |2 +-
 configure.ac  |   16 +++-
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 778db6dcd701a53c3923238997e953e3f32ab909
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 19:03:58 2013 +0300

Add missing line continuation character

Change-Id: Ic8b786fea97361c7abaa6b57f03a3987bc7db002

diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index e7075a1..86f2778 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediavlc))
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_defs,avmediavlc,\
--DWINNT
+-DWINNT \
 ))
 endif
 
commit c30715aee927721cf6648fece4f81872e7f5cf5e
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 18:57:33 2013 +0300

VLC is not related to gstreamer

Change-Id: I3b88c1e12a254766f4d8c1de27d0cc9bd2ccbacf

diff --git a/configure.ac b/configure.ac
index 682d5dd..89ce3f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10104,19 +10104,17 @@ AC_SUBST(GSTREAMER_0_10_LIBS)
 AC_SUBST(ENABLE_GSTREAMER_0_10)
 
 dnl ===
-dnl Check whether the VLC libraries are available.
+dnl Check whether to build the VLC avmedia backend
 dnl ===
 
 ENABLE_VLC=
 
-if test $build_gstreamer = yes; then
-AC_MSG_CHECKING([whether to enable the new VLC avmedia backend])
-if test x$enable_vlc != xno; then
-ENABLE_VLC=TRUE
-AC_MSG_RESULT([yes])
-else
-AC_MSG_RESULT([no])
-fi
+AC_MSG_CHECKING([whether to enable the VLC avmedia backend])
+if test $_os != iOS -a $_os != Android -a $enable_vlc = yes; then
+ENABLE_VLC=TRUE
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_VLC)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmediavlc.mk

2013-08-29 Thread Tor Lillqvist

 avmedia/Library_avmediagst.mk  |6 --
 avmedia/Library_avmediagst_0_10.mk |6 --
 avmedia/Library_avmediavlc.mk  |6 --
 3 files changed, 18 deletions(-)

New commits:
commit 54202019eae37b4bfd6023d58b699f45404e1ce3
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 19:16:33 2013 +0300

I doubt -DWINNT is needed

Change-Id: Ic88b4705c4fa79ac5be325c1a4d3cc881d514b6c

diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 1308e5f..08f4bca 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -22,12 +22,6 @@ $(eval $(call 
gb_Library_use_external,avmediagst,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,avmediagst))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_defs,avmediagst,\
-   -DWINNT
-))
-endif
-
 $(eval $(call gb_Library_use_libraries,avmediagst,\
comphelper \
cppu \
diff --git a/avmedia/Library_avmediagst_0_10.mk 
b/avmedia/Library_avmediagst_0_10.mk
index e7fab92..bbb0d73 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -24,12 +24,6 @@ $(eval $(call gb_Library_use_externals,avmediagst_0_10,\
 
 $(eval $(call gb_Library_use_sdk_api,avmediagst_0_10))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_defs,avmediagst_0_10,\
-   -DWINNT
-))
-endif
-
 $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\
comphelper \
cppu \
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 86f2778..b19eac9 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -20,12 +20,6 @@ $(eval $(call 
gb_Library_use_external,avmediavlc,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,avmediavlc))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_defs,avmediavlc,\
--DWINNT \
-))
-endif
-
 $(eval $(call gb_Library_use_externals,avmediavlc,\
boost_headers \
boostsystem \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Stephan Bergmann

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

New commits:
commit 9831afe569490b09143a1f98263ee7d0e1faa323
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 29 18:27:04 2013 +0200

Fix MSC build of firebird

Change-Id: I3c747b36529058b980f88aea014c0a6d27014664

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 81f20da..ac68d36 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -266,6 +266,6 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
 
 # need windows path with backslashes here
-gb_Helper_set_ld_path := PATH=$(shell cygpath -w $(OUTDIR)/bin)
+gb_Helper_set_ld_path := PATH=$(shell cygpath -w 
$(OUTDIR)/bin)$${PATH:+:$$PATH}
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Eike Rathke

 i18nlangtag/source/languagetag/languagetag.cxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 38840e360b394cea0919f8b351fafbfc13fd3422
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 18:26:41 2013 +0200

these FIXME comments are now obsolete

Change-Id: I81b4214555d715bf597dc5dbe6b7cfaf53a344d8

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index ca4fa41..887a58e 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -666,9 +666,6 @@ void LanguageTag::convertBcp47ToLang()
 }
 else
 {
-/* FIXME: this is temporary. If we support locales that consist not
- * only of language and country, e.g. added script, this probably needs
- * to be adapted. */
 if (!mbInitializedLocale)
 convertBcp47ToLocale();
 convertLocaleToLang();
@@ -692,9 +689,6 @@ void LanguageTag::convertLangToLocale()
 
 void LanguageTag::convertLangToBcp47()
 {
-/* FIXME: this is temporary. If we support locales that consist not only of
- * language and country, e.g. added script, this probably needs to be
- * adapted. */
 if (!mbInitializedLocale)
 convertLangToLocale();
 convertLocaleToBcp47();
@@ -1464,9 +1458,6 @@ com::sun::star::lang::Locale 
LanguageTag::convertToLocale( LanguageType nLangID,
 if (!bResolveSystem  lcl_isSystem( nLangID))
 return lang::Locale();
 
-/* FIXME: this is temporary until code base is converted to not use
- * MsLangId::convert...() anymore. After that, proper new method has to be
- * implemented to allow I18NLANGTAG_QLT and script tag and such. */
 return MsLangId::Conversion::convertLanguageToLocale( nLangID, 
bResolveSystem);
 }
 
@@ -1477,9 +1468,6 @@ LanguageType LanguageTag::convertToLanguageType( const 
com::sun::star::lang::Loc
 if (rLocale.Language.isEmpty()  !bResolveSystem)
 return LANGUAGE_SYSTEM;
 
-/* FIXME: this is temporary until code base is converted to not use
- * MsLangId::convert...() anymore. After that, proper new method has to
- * be implemented to allow I18NLANGTAG_QLT and sript tag and such. */
 return MsLangId::Conversion::convertLocaleToLanguage( rLocale);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] buildbot.git: tb/tb_phases.sh

2013-08-29 Thread Norbert Thiebaud

 tb/tb_phases.sh |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 6da7ea9e812431b8454a3994225a7bc85f289ed9
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Aug 29 11:26:08 2013 -0500

Fix EXTRA_BUILDID setup.

diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index 34c4e14..39fbace 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -21,7 +21,14 @@ pre_autogen()
 
 canonical_do_autogen()
 {
+local current_timestamp=
+
 if [ ${R} = 0 ] ; then
+export EXTRA_BUILDID=
+if [ ${TB_TYPE?} = tb ] ; then
+current_timestamp=$(sed -e s/ /_/ 
${TB_METADATA_DIR?}/${P?}_current-git-timestamp.log)
+export EXTRA_BUILDID=TinderBox: ${TB_NAME?}, 
Branch:${TB_BRANCH?}, Time: $current_timestamp
+fi
 if ! ${TB_NICE} ${TB_GIT_DIR?}/autogen.sh  tb_${P?}_autogen.log 
21 ; then
 tb_REPORT_LOG=tb_${P?}_autogen.log
 tb_REPORT_MSGS=autogen/configure failed - error is:
@@ -77,17 +84,10 @@ canonical_post_clean()
 
 canonical_do_make()
 {
-local current_timestamp=
 local optdir=
-local extra_buildid=
 
 tb_OPT_DIR=
-if [ ${TB_TYPE?} = tb ] ; then
-current_timestamp=$(sed -e s/ /_/ 
${TB_METADATA_DIR?}/${P?}_current-git-timestamp.log)
-extra_buildid=TinderBox: ${TB_NAME?}, Branch:${TB_BRANCH?}, Time: 
$current_timestamp
-fi
 if [ ${R} = 0 ] ; then
-export EXTRA_BUILDID=$extra_buildid
 # we for MAKE_RESTARTS=1 because 1/ we know thta Makefile is up to date
 # and 2/ the 'restart' mechanism in make is messed-up by the fact that 
we trap SIGINT
 if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} MAKE_RESTARTS=1  -sr  
tb_${P?}_build.log 21 ; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/formula

2013-08-29 Thread Julien Nabet

 include/formula/grammar.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d9a3381eb586b31d305102b40aea4bf543b42ec7
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 29 18:39:01 2013 +0200

Add GRAM_ENGLISH_XL_OOX as supported

See comment //! When adding new values adapt isSupported() below as well
of this same file
@Eike: ;-)

Change-Id: Ifa70be0d88208499bef809cc234c86cb6045bcd3

diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 75556d5..610cf46 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -186,6 +186,7 @@ public:
 case GRAM_NATIVE_XL_R1C1 :
 case GRAM_ENGLISH_XL_A1  :
 case GRAM_ENGLISH_XL_R1C1:
+case GRAM_ENGLISH_XL_OOX :
 return true;
 default:
 return extractFormulaLanguage( eGrammar) == GRAM_EXTERNAL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mirroring gtk buttons

2013-08-29 Thread Caolán McNamara

On Fri, 2013-08-16 at 18:41 +0200, Khaled Hosny wrote:
 On Fri, Aug 16, 2013 at 03:44:12PM +0100, Caolán McNamara wrote:
  On Tue, 2013-07-30 at 04:28 +0200, Khaled Hosny wrote:
   So I got fed up and tried this. Setting LANGUAGE in GtkData::Init()
   indeed fixes the issue, but calling Application::GetSettings() there
   throws a DeploymentException, apparently that code is executed too
   early, before InitVCL() is called.
  
  So the good news is that they theory would work ?

Pretty tricky, lots of pieces need other pieces initialized before each
other and its hard to find a way through, but how about the attached, it
seems to work for me.

C.
From 1e6bd5fa03e5114f167c5f9ff3852e3c6e174165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
Date: Thu, 29 Aug 2013 17:06:16 +0100
Subject: [PATCH] wait until we know the UI language before initializing gtk

so that we can set LANGUAGE to get RTL mirroring for RTL
UI languages even under a LTR system locale

Change-Id: I31fce6f1620d7fb35a489c771285b15ba05773df
---
 vcl/inc/salinst.hxx |  3 +++
 vcl/inc/unx/gtk/gtkinst.hxx |  4 ++-
 vcl/source/app/svmain.cxx   |  2 ++
 vcl/unx/gtk/app/gtkinst.cxx | 59 -
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index ba9a9b5..6fcb1e2 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -65,6 +65,9 @@ public:
 SalInstance() {}
 virtual ~SalInstance();
 
+//called directly after Application::Init
+virtual voidAfterAppInit() {}
+
 // Frame
 // DisplayName for Unix ???
 virtual SalFrame*   CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index cf901cc..4787b21 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -66,7 +66,8 @@ class GtkInstance : public X11SalInstance
 public:
 GtkInstance( SalYieldMutex* pMutex );
 virtual ~GtkInstance();
-voidInit();
+voidEnsureInit();
+virtual void AfterAppInit();
 
 virtual SalFrame*   CreateFrame( SalFrame* pParent, sal_uLong nStyle );
 virtual SalFrame*   CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
@@ -110,6 +111,7 @@ public:
   private:
 std::vectorGtkSalTimer *  m_aTimers;
 boolIsTimerExpired();
+boolbNeedsInit;
 
 mutable boost::shared_ptrvcl::unx::GtkPrintWrapper m_pPrintWrapper;
 };
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index f9d571f..fdfe580 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -282,6 +282,8 @@ bool InitVCL()
 // soffice/sfx implementation creates the global service manager
 pSVData-mpApp-Init();
 
+pSVData-mpDefInst-AfterAppInit();
+
 // Fetch AppFileName and make it absolute before the workdir changes...
 OUString aExeFileName;
 osl_getExecutableFile( aExeFileName.pData );
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index caca819..115550b 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -21,6 +21,7 @@
 #include stack
 #include string.h
 #include osl/module.h
+#include osl/process.h
 #include unx/gtk/gtkdata.hxx
 #include unx/gtk/gtkinst.hxx
 #include unx/salobj.h
@@ -122,14 +123,8 @@ extern C
 fprintf( stderr, creating GtkSalInstance 0x%p\n, pInstance );
 #endif
 
-// initialize SalData
-GtkData *pSalData = new GtkData( pInstance );
-pSalData-Init();
-pSalData-initNWF();
-
-pInstance-Init();
-
-InitAtkBridge();
+//Create SalData, this does not leak
+/*GtkData *pSalData =*/ new GtkData( pInstance );
 
 return pInstance;
 }
@@ -172,13 +167,37 @@ GtkInstance::GtkInstance( SalYieldMutex* pMutex )
 #else
 : X11SalInstance( pMutex )
 #endif
+, bNeedsInit(true)
 {
 }
 
-// This has to happen after gtk_init has been called by saldata.cxx's
-// Init or our handlers just get clobbered.
-void GtkInstance::Init()
+//We want to defer initializing gtk until we are after uno has been
+//bootstrapped so we can ask the config what the UI language is so that we can
+//force that in as $LANGUAGE to get gtk to render widgets RTL if we have a RTL
+//UI in a LTR locale
+void GtkInstance::AfterAppInit()
 {
+OUString aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(.UTF-8));
+if (!aLocaleString.isEmpty())
+{
+OUString envVar(LANGUAGE);
+osl_setEnvironment(envVar.pData, aLocaleString.pData);
+}
+EnsureInit();
+}
+
+void GtkInstance::EnsureInit()
+{
+if (!bNeedsInit)
+return;
+// initialize SalData
+GtkData *pSalData = GetGtkSalData();
+pSalData-Init();
+pSalData-initNWF();
+
+InitAtkBridge();
+
+bNeedsInit

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

2013-08-29 Thread Andre Fischer

 sfx2/source/sidebar/DeckLayouter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4529d6e11a214cec4596a159a60d2b8a5f171697
Author: Andre Fischer a...@apache.org
Date:   Thu Aug 29 07:34:34 2013 +

Resolves: #i123091# Request repaints of panels on every deck layouting

(cherry picked from commit 98bd1aded3ffa1df24bfec28624bdf5129533c45)

Conflicts:
sfx2/source/sidebar/DeckLayouter.cxx

Change-Id: I7f9b9d0cf3305cafafcb752a5e1da84f341b59c9

diff --git a/sfx2/source/sidebar/DeckLayouter.cxx 
b/sfx2/source/sidebar/DeckLayouter.cxx
index 37dbd294..fccd797 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -257,6 +257,7 @@ sal_Int32 DeckLayouter::PlacePanels (
 
 // Place the panel.
 rPanel.setPosSizePixel(0, nY, nWidth, nPanelHeight);
+rPanel.Invalidate();
 
 nY += nPanelHeight;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2 librelogo/source

2013-08-29 Thread László Németh

 helpcontent2|2 
 librelogo/source/ChangeLog  |   15 ++
 librelogo/source/LibreLogo/LibreLogo.py |   69 +---
 3 files changed, 70 insertions(+), 16 deletions(-)

New commits:
commit a7fdd474161ba8ab34945bc9a32c7a33de6eaf9a
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Thu Aug 29 18:36:16 2013 +0200

LibreLogo fixes (eg. fdo#68713 fix SVG cropping), see ChangeLog

Change-Id: Ibb1cb41f526b4117e2d7ef39a2101286511bf48f

diff --git a/helpcontent2 b/helpcontent2
index ee477f3..cd613f0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ee477f38f8f425f5bde8105be49b9a6d9e5c4321
+Subproject commit cd613f0ea88364547616207dcc8a44bc65fbbae8
diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 9a9af0c..6453e71 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,18 @@
+2013-08-29 LÃ¡szlÃ³ NÃ©meth:
+* fix bad selection of invisible turtle after HIDETURTLE CLEARSCREEN
+* fix SVG cropping in LibreOffice 4.1
+* fix vertical positions of labels in SVG export using RectangleShape
+* fix double stroke-width attributes in SVG export
+* LABEL supports relative positioning vector [X, Y, 'text'], where X, Y
+  0: center, eg. as the default positioning: LABEL [0, 0, 'text']
+  1: left or bottom aligned to the turtle position and angle
+ -1: right or top aligned to the turtle position and angle
+  n: n * text_width/2 or text_height/2
+* simple SVG SMIL (animation) support using SLEEP, for example:
+  PICTURE 'animation.svg' [ CIRCLE 5 SLEEP 1000 CIRCLE 20 ]
+* relative FORWARD (heading = y axis) with vector arg.: FORWARD [20, 10]
+* rounded linejoint of turtle shape
+
 2013-07-15 LÃ¡szlÃ³ NÃ©meth:
 * optional named PICTURE blocks: PICTURE 'name' [ CIRCLE 5 ]
 * save PICTURE as cropped SVG file using path names, for example:
diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index e3213ec..e5f3dba 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -72,6 +72,8 @@ class __Doc__:
 except:
 self.drawpage = doc.DrawPages.getByIndex(0) # Draw, Impress
 self.shapecache = {}
+self.shapecount = itertools.count()
+self.time = 0
 self.zoomvalue = 0
 self.initialize()
 
@@ -461,7 +463,7 @@ def __initialize__():
 _.pencolor = shape.LineColor + (int(255.0 * 
shape.LineTransparence/100)  24)
 if shape.LineWidth != round((1 + _.pen * 2) * __PT_TO_TWIP__ / 
__MM10_TO_TWIP__) and shape.LineWidth != round(__LINEWIDTH__ / 
__MM10_TO_TWIP__):
 _.pensize = shape.LineWidth * __MM10_TO_TWIP__
-shape.LineJoint = __MITER__
+shape.LineJoint = __ROUNDED__
 shape.Shadow = True
 shape.FillColor, transparence = __splitcolor__(_.areacolor)
 shape.FillTransparence = min(95, transparence)
@@ -687,12 +689,14 @@ def __checkhalt__():
 
 def __cs__(select = True):
 turtle = __getshape__(__TURTLE__)
-if turtle:
+visible = False
+if turtle and turtle.Visible:
 __visible__(turtle, False)
+visible = True
 if _.doc.CurrentController.select(_.drawpage) and \
 _.doc.CurrentController.getSelection().ImplementationName == 
com.sun.star.drawing.SvxShapeCollection:
 __dispatcher__(.uno:Delete)
-if turtle:
+if turtle and visible:
 __visible__(turtle, True)
 if select:
 _.doc.CurrentController.select(_.drawpage)
@@ -755,7 +759,10 @@ def rotate(shapename, deg):
 def forward(n):
 if type(n) == list:
 pos = position()
-position([pos[0] + n[0], pos[1] + n[1]])
+angle = heading()
+dx = n[1] * sin((pi/180) * angle) + n[0] * sin((pi/180)*(angle + 90))
+dy = n[1] * cos((pi/180) * angle) + n[0] * cos((pi/180)*(angle + 90))
+position([pos[0] + dx, pos[1] - dy])
 else:
 __go__(__TURTLE__, -n * __PT_TO_TWIP__)
 
@@ -792,6 +799,7 @@ def __draw__(d):
 _.drawpage.add(shape)
 if __group__:
 __group__.add(shape)
+_.shapecache[next(_.shapecount)] = str(_.time)
 return shape
 
 def __zoom__():
@@ -1016,18 +1024,31 @@ def rectangle(l):
 __boxshape__(Rectangle, l)
 
 def label(st):
-turtle = __getshape__(__TURTLE__)
-shape = __draw__(TextShape)
-shape.RotateAngle = turtle.RotateAngle
-pos = turtle.getPosition()
-pos.X = pos.X + turtle.BoundRect.Width / 2.0
-pos.Y = pos.Y + turtle.BoundRect.Height / 2.0
-shape.setSize(__Size__(1, 1))
+if type(st) != type([]):
+st = [0, 0, st]
+# get text size 
+shape = _.doc.createInstance( com.sun.star.drawing.TextShape)
 shape.TextAutoGrowWidth = True
-text(shape, st)
-shape.setPosition(__Point__(pos.X - shape.BoundRect.Width/2, pos.Y - 
shape.BoundRect.Height/2))
-__visible__(shape,

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fc/89249eddd42c5020307757a1e31a87b6302ec1

2013-08-29 Thread Caolán McNamara

 fc/89249eddd42c5020307757a1e31a87b6302ec1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6d31452599041207591bfe49bde18be13f99
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 17:45:08 2013 +0100

Notes added by 'git notes add'

diff --git a/fc/89249eddd42c5020307757a1e31a87b6302ec1 
b/fc/89249eddd42c5020307757a1e31a87b6302ec1
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/fc/89249eddd42c5020307757a1e31a87b6302ec1
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Caolán McNamara

 98/bd1aded3ffa1df24bfec28624bdf5129533c45 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f5d61ba6dd54c4fa3e8390790add258d6a43c9ff
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 17:44:41 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'feature/table-style' - 8 commits - sw/inc sw/source

2013-08-29 Thread Alex Ivan

 sw/inc/doc.hxx|3 +++
 sw/source/core/doc/docnew.cxx |5 +
 sw/source/core/doc/swtblfmt.cxx   |3 +++
 sw/source/core/doc/tblafmt.cxx|9 +++--
 sw/source/core/doc/tblrwcl.cxx|8 +++-
 sw/source/core/docnode/ndcopy.cxx |9 -
 sw/source/core/docnode/ndtbl.cxx  |   14 ++
 sw/source/core/undo/untbl.cxx |   13 +++--
 sw/source/ui/table/tautofmt.cxx   |4 +---
 9 files changed, 55 insertions(+), 13 deletions(-)

New commits:
commit 452435c85c5fbe1e62ec81bc39deccb646a78bf6
Author: Alex Ivan alexni...@yahoo.com
Date:   Thu Aug 29 19:02:57 2013 +0300

Reapply table style after merging tables

The undo part was inadvertedly already fixed since it used the
same mechanics as some of the previously fixed undo actions.

Change-Id: I75380513945a6b84fa8f18ab77c756b4e8c358c1

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 8133065..d67ca3a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3390,6 +3390,9 @@ sal_Bool SwDoc::MergeTable( const SwPosition rPos, 
sal_Bool bWithPrev, sal_uInt
 if( !pDelTblNd )
 return sal_False;
 
+SwTableFmt* pStyle = 
(SwTableFmt*)pTblNd-GetTable().GetTableFmt()-GetRegisteredIn();
+SwTable rTable = (bWithPrev ? pDelTblNd : pTblNd)-GetTable();
+
 if( pTblNd-GetTable().ISA( SwDDETable ) ||
 pDelTblNd-GetTable().ISA( SwDDETable ))
 return sal_False;
@@ -3427,6 +3430,8 @@ sal_Bool SwDoc::MergeTable( const SwPosition rPos, 
sal_Bool bWithPrev, sal_uInt
 }
 if( bRet )
 {
+SwTableFmt::AssignFormatParents( pStyle, rTable );
+
 SetModified();
 SetFieldsDirty( true, NULL, 0 );
 }
commit 758c691d749b3e2770a4b7a14579e5bbfde5114a
Author: Alex Ivan alexni...@yahoo.com
Date:   Thu Aug 29 18:15:44 2013 +0300

Reapply table style after spliting table and undo

Change-Id: I32fea8b4679809070a47368de65d57ce5df7ed9d

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index e6d5821..8133065 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3153,6 +3153,9 @@ sal_Bool SwDoc::SplitTable( const SwPosition rPos, 
sal_uInt16 eHdlnMode,
 // TL_CHART2: need to inform chart of probably changed cell names
 UpdateCharts( rTbl.GetFrmFmt()-GetName() );
 
+SwTableFmt::AssignFormatParents( 
(SwTableFmt*)rTbl.GetTableFmt()-GetRegisteredIn(), rTbl );
+SwTableFmt::AssignFormatParents( 
(SwTableFmt*)rTbl.GetTableFmt()-GetRegisteredIn(), pNew-GetTable() );
+
 SetFieldsDirty( true, NULL, 0 );
 
 return 0 != pNew;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 661ed33..5fa3d2a 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2927,6 +2927,12 @@ void SwUndoSplitTbl::UndoImpl(::sw::UndoRedoContext  
rContext)
 pTblNd-GetTable().RestoreRowSpan( *mpSaveRowSpan );
 }
 ClearFEShellTabCols();
+
+pTblNd = rIdx.GetNode().FindTableNode();
+if( pTblNd )
+SwTableFmt::AssignFormatParents( (SwTableFmt*)pTblNd-GetTable().
+  GetTableFmt()-GetRegisteredIn(),
+  pTblNd-GetTable() );
 }
 
 void SwUndoSplitTbl::RedoImpl(::sw::UndoRedoContext  rContext)
commit 49d18eb95929b4d0fadfaa5ba553049922bd4fb4
Author: Alex Ivan alexni...@yahoo.com
Date:   Thu Aug 29 15:26:02 2013 +0300

Reapply table styles after merging/spliting cells and corresponding undos

Change-Id: I0a0f1cd1ec05487230af568ab3350de04d98bfb6

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0a09ccd..e6d5821 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2112,6 +2112,8 @@ sal_Bool SwDoc::SplitTbl( const SwSelBoxes rBoxes, 
sal_Bool bVert, sal_uInt16 n
 delete pUndo;
 }
 
+SwTableFmt::AssignFormatParents( 
(SwTableFmt*)rTbl.GetTableFmt()-GetRegisteredIn(), rTbl );
+
 return bRet;
 }
 
@@ -2217,6 +2219,10 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM rPam )
 ::ClearFEShellTabCols();
 SetRedlineMode_intern( eOld );
 }
+
+SwTableFmt::AssignFormatParents( 
(SwTableFmt*)rTable.GetTableFmt()-GetRegisteredIn(),
+ rTable );
+
 GetIDocumentUndoRedo().EndUndo( UNDO_TABLE_MERGE, NULL );
 return nRet;
 }
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index afba0c2..661ed33 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2076,6 +2076,9 @@ CHECKTABLE(pTblNd-GetTable())
 
 CHECKTABLE(pTblNd-GetTable())
 ClearFEShellTabCols();
+
+SwTableFmt::AssignFormatParents( 
(SwTableFmt*)pTblNd-GetTable().GetTableFmt()-GetRegisteredIn(),
+ pTblNd-GetTable() );
 }
 
 void

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

2013-08-29 Thread Armin Le Grand

 vcl/source/gdi/dibtools.cxx |   39 +++
 1 file changed, 19 insertions(+), 20 deletions(-)

New commits:
commit f84d2ce5453af7d20b0fc84d470a7661c3a7bca0
Author: Armin Le Grand a...@apache.org
Date:   Thu Aug 29 11:25:32 2013 +

Resolves: #i122920# Corrected minor aspects of DIB clipboard exchange format

(cherry picked from commit 95212768770c2206b18e9fb929a79fae24f4a6d8)

Change-Id: Iff78cd8bb37748424210d5b5e3979afb5d85978d

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 6a15ade..85d0d9b 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -382,12 +382,12 @@ void ImplDecodeRLE( sal_uInt8* pBuffer, DIBV5Header 
rHeader, BitmapWriteAccess
 while ( !bEndDecoding  ( nY = 0L ) );
 }
 
-bool ImplReadDIBBits(SvStream rIStm, DIBV5Header rHeader, BitmapWriteAccess 
rAcc, BitmapWriteAccess* pAccAlpha, bool bTopDown)
+bool ImplReadDIBBits(SvStream rIStm, DIBV5Header rHeader, BitmapWriteAccess 
rAcc, BitmapWriteAccess* pAccAlpha, bool bTopDown, bool rAlphaUsed)
 {
 const sal_uLong nAlignedWidth = AlignedWidth4Bytes(rHeader.nWidth * 
rHeader.nBitCount);
-sal_uInt32 nRMask(0);
-sal_uInt32 nGMask(0);
-sal_uInt32 nBMask(0);
+sal_uInt32 nRMask(( rHeader.nBitCount == 16 ) ? 0x7c00UL : 
0x00ffUL);
+sal_uInt32 nGMask(( rHeader.nBitCount == 16 ) ? 0x03e0UL : 
0xff00UL);
+sal_uInt32 nBMask(( rHeader.nBitCount == 16 ) ? 0x001fUL : 
0x00ffUL);
 bool bNative(false);
 bool bTCMask(!pAccAlpha  ((16 == rHeader.nBitCount) || (32 == 
rHeader.nBitCount)));
 bool bRLE((RLE_8 == rHeader.nCompression  8 == rHeader.nBitCount) || 
(RLE_4 == rHeader.nCompression  4 == rHeader.nBitCount));
@@ -424,21 +424,12 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header 
rHeader, BitmapWriteAccess r
 else
 {
 // Read color mask
-if(bTCMask)
+if(bTCMask  BITFIELDS == rHeader.nCompression)
 {
-if(BITFIELDS == rHeader.nCompression)
-{
-rIStm.SeekRel( -12L );
-rIStm  nRMask;
-rIStm  nGMask;
-rIStm  nBMask;
-}
-else
-{
-nRMask = ( rHeader.nBitCount == 16 ) ? 0x7c00UL : 
0x00ffUL;
-nGMask = ( rHeader.nBitCount == 16 ) ? 0x03e0UL : 
0xff00UL;
-nBMask = ( rHeader.nBitCount == 16 ) ? 0x001fUL : 
0x00ffUL;
-}
+rIStm.SeekRel( -12L );
+rIStm  nRMask;
+rIStm  nGMask;
+rIStm  nBMask;
 }
 
 if(bRLE)
@@ -595,6 +586,7 @@ bool ImplReadDIBBits(SvStream rIStm, DIBV5Header rHeader, 
BitmapWriteAccess r
 aMask.GetColorAndAlphaFor32Bit( aColor, 
aAlpha, (sal_uInt8*) pTmp32++ );
 rAcc.SetPixel( nY, nX, aColor );
 pAccAlpha-SetPixelIndex(nY, nX, 
sal_uInt8(0xff) - aAlpha);
+rAlphaUsed |= bool(0xff != aAlpha);
 }
 }
 }
@@ -719,6 +711,8 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, 
Bitmap* pBmpAlpha, sal_uLon
 }
 
 // read bits
+bool bAlphaUsed(false);
+
 if(!pIStm-GetError())
 {
 if(nOffset)
@@ -726,7 +720,7 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, 
Bitmap* pBmpAlpha, sal_uLon
 pIStm-SeekRel(nOffset - (pIStm-Tell() - nStmPos));
 }
 
-bRet = ImplReadDIBBits(*pIStm, aHeader, *pAcc, pAccAlpha, 
bTopDown);
+bRet = ImplReadDIBBits(*pIStm, aHeader, *pAcc, pAccAlpha, 
bTopDown, bAlphaUsed);
 
 if(bRet  aHeader.nXPelsPerMeter  aHeader.nYPelsPerMeter)
 {
@@ -752,6 +746,11 @@ bool ImplReadDIBBody( SvStream rIStm, Bitmap rBmp, 
Bitmap* pBmpAlpha, sal_uLon
 if(bAlphaPossible)
 {
 aNewBmpAlpha.ReleaseAccess(pAccAlpha);
+
+if(!bAlphaUsed)
+{
+bAlphaPossible = false;
+}
 }
 
 if(bRet)
@@ -1227,7 +1226,7 @@ bool ImplWriteDIBBody(const Bitmap rBitmap, SvStream 
rOStm, BitmapReadAccess
 if(pAccAlpha) // only write DIBV5 when asked to do so
 {
 aHeader.nV5CSType = 0x57696E20; // LCS_WINDOWS_COLOR_SPACE
-aHeader.nV5Intent = 0x0008; // LCS_GM_ABS_COLORIMETRIC
+aHeader.nV5Intent = 0x0004; // LCS_GM_IMAGES
 
 rOStm  aHeader.nV5RedMask;
 rOStm  aHeader.nV5GreenMask;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 95/212768770c2206b18e9fb929a79fae24f4a6d8

2013-08-29 Thread Caolán McNamara

 95/212768770c2206b18e9fb929a79fae24f4a6d8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f8c0efda7adc6bd58030e3627737c44536a4e71b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 18:12:50 2013 +0100

Notes added by 'git notes add'

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

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

2013-08-29 Thread Tor Lillqvist

 firebird/ExternalProject_firebird.mk   |5 -
 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f6fcc5b79ca72e0145b1798bbfa3d686bdf07042
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 20:22:55 2013 +0300

Set PATH for running the Cygwin Make

Our normal gb_Helper_set_path sets PATH in Windows syntax, which is
fine when running out own build-time tools (which obviously are not
Cygwin programs), but not when running the Cygwin Make.

Change-Id: I5563e2f5a01beb05db56792dfd56116832d2ec36

diff --git a/firebird/ExternalProject_firebird.mk 
b/firebird/ExternalProject_firebird.mk
index 296848e..bf6b453 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -46,7 +46,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--with-system-icu --without-fbsample 
--without-fbsample-db \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter IOS 
ANDROID,$(OS)),--disable-shared,--disable-static) \
-$(gb_Helper_set_ld_path) $(MAKE) firebird_embedded \
+$(if $(filter WNT,$(OS)),\
+  PATH=$(shell cygpath -u $(OUTDIR)/bin):$$PATH,\
+  $(gb_Helper_set_ld_path)) \
+  $(MAKE) firebird_embedded \
$(if $(filter MACOSX,$(OS)), $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \

$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
commit 8dd3de6e73db87e9742d1179408e57746299cb4f
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Aug 29 20:06:39 2013 +0300

Revert Fix MSC build of firebird

Better (?) fix coming.

This reverts commit 9831afe569490b09143a1f98263ee7d0e1faa323.

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index ac68d36..81f20da 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -266,6 +266,6 @@ gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
 
 # need windows path with backslashes here
-gb_Helper_set_ld_path := PATH=$(shell cygpath -w 
$(OUTDIR)/bin)$${PATH:+:$$PATH}
+gb_Helper_set_ld_path := PATH=$(shell cygpath -w $(OUTDIR)/bin)
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/source

2013-08-29 Thread Armin Le Grand

 svx/source/svdraw/svdmrkv.cxx |   45 --
 1 file changed, 26 insertions(+), 19 deletions(-)

New commits:
commit 5960cf3dc57dc455bc98343dfafccafaf808ecdc
Author: Armin Le Grand a...@apache.org
Date:   Thu Aug 29 16:32:05 2013 +

i123003 Corrected Handle/Overlay visualization when TextEdit is active

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index bbf283b..cf22dd4 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -718,34 +718,41 @@ void SdrMarkView::SetMarkHandles()
 }
 }
 
-// #122142# for captions in TextEdit, force to FrameHdls to get the 
special text selection
-if(!bFrmHdl  pMarkedObj  bSingleTextObjMark  dynamic_cast 
SdrCaptionObj* (pMarkedObj))
+// check if text edit or ole is active and handles need to be 
suppressed. This may be the case
+// when a single object is selected
+// Using a strict return statement is okay here; no handles means *no* 
handles.
+if(pMarkedObj)
 {
-bFrmHdl = true;
-}
-
-if (bFrmHdl)
-{
-Rectangle aRect(GetMarkedObjRect());
+// formally #i33755#: If TextEdit is active the EditEngine will 
directly paint
+// to the window, so suppress Overlay and handles completely; a 
text frame for
+// the active text edit will be painted by the repaitnt mechanism 
in
+// SdrObjEditView::ImpPaintOutlinerView in this case. This needs 
to be reworked
+// in the future
+// Also formally #122142#: Pretty much the same for 
SdrCaptionObj's in calc.
+if(((SdrView*)this)-IsTextEdit())
+{
+const SdrTextObj* pSdrTextObj = dynamic_cast const 
SdrTextObj* (pMarkedObj);
 
-// #i33755#
-const sal_Bool bHideHandlesWhenInTextEdit(
-((SdrView*)this)-IsTextEdit()
- pMarkedObj
- pMarkedObj-ISA(SdrTextObj)
- ((SdrTextObj*)pMarkedObj)-IsInEditMode());
+if(pSdrTextObj  pSdrTextObj-IsInEditMode())
+{
+return;
+}
+}
 
-// #i118524# if inplace activated OLE is selected,
-// suppress handles
-bool bHideHandlesWhenOleActive(false);
+// formally #i118524#: if inplace activated OLE is selected, 
suppress handles
 const SdrOle2Obj* pSdrOle2Obj = dynamic_cast const SdrOle2Obj* 
(pMarkedObj);
 
 if(pSdrOle2Obj  (pSdrOle2Obj-isInplaceActive() || 
pSdrOle2Obj-isUiActive()))
 {
-bHideHandlesWhenOleActive = true;
+return;
 }
+}
+
+if (bFrmHdl)
+{
+Rectangle aRect(GetMarkedObjRect());
 
-if(!aRect.IsEmpty()  !bHideHandlesWhenInTextEdit  
!bHideHandlesWhenOleActive)
+if(!aRect.IsEmpty())
 { // sonst nix gefunden
 if( bSingleTextObjMark )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-08-29 Thread Eike Rathke

 i18nlangtag/source/isolang/isolang.cxx  |   20 +++-
 i18nlangtag/source/isolang/mslangid.cxx |8 
 2 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit e57a73cc6bedcb8f176e1804792a7ea1fd88796b
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 20:51:45 2013 +0200

convertLanguageToLocale: last resort en-US if resolve requested

Change-Id: I8ebdfe34765292f14642ec8c2721621e5638a17a

diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 6e816ee..8f398e5 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -153,9 +153,17 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType( 
LanguageType nLang, sa
 {
 // Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
 // but not LANGUAGE_SYSTEM or others.
+LanguageType nOrigLang = nLang;
 if (bResolveSystem || nLang == LANGUAGE_DONTKNOW)
 nLang = MsLangId::getRealLanguage( nLang);
 convertLanguageToLocaleImpl( nLang, aLocale);
+if (bResolveSystem  aLocale.Language.isEmpty()  
simplifySystemLanguages( nOrigLang) == LANGUAGE_SYSTEM)
+{
+// None found but resolve requested, last resort is en-US.
+aLocale.Language = en;
+aLocale.Country  = US;
+aLocale.Variant  = OUString();
+}
 }
 return aLocale;
 }
commit 83d6ce0b1eb6229a518d79a1064a75956a0380f1
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 29 20:09:47 2013 +0200

adapted comments

Change-Id: I830947d867d77b8e58b6e4722ceb3b7993292dad

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index b2c9da5..d3ababc 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -96,10 +96,12 @@ struct IsoLangOtherEntry
 // ---
 
 // Entries for languages are lower case, for countries upper case, as
-// recommended by rfc4646 (obsoletes rfc3066 (obsoletes rfc1766)).
-// convertIsoNamesToLanguage() is case insensitive
+// recommended by rfc5646 (obsoletes rfc4646 (obsoletes rfc3066 (obsoletes
+// rfc1766))). convertIsoNamesToLanguage(), convertLocaleToLanguageImpl()
+// and lookupFallbackLocale() are case insensitive.
 //
-// Sort order: Most used first.
+// Sort order: Most used first and within one language the default fallback
+// locale of that language first.
 //
 // The default entry for a LangID - ISO mapping has to be first. For
 // conversion of legacy mappings one LangID can map to multiple ISO codes, and
@@ -115,18 +117,18 @@ struct IsoLangOtherEntry
 // entry matching the language and not having a country is returned, regardless
 // of whether being sorted before or after other entries of the same language
 // with some country. To obtain a _locale_ (not language only) in the order
-// given, convertLocaleToLanguageWithFallback() must be called.
+// given, lookupFallbackLocale() must be called.
 
 // If the sequence instead was
 
 // LANGUAGE_ENGLISH_US, en, US
 // LANGUAGE_ENGLISH,en, 
 
-// in a convertIsoNamesToLanguage() call en-US is still converted to
-// LANGUAGE_ENGLISH_US, but en is _also_ converted to LANGUAGE_ENGLISH_US
-// because no country was passed and it is the first entry to match the
-// language, see code. A call with en-ZZ (not in table) would still result in
-// LANGUAGE_ENGLISH.
+// in a convertIsoNamesToLanguage() call en-US would still be converted to
+// LANGUAGE_ENGLISH_US, but en would _also_ be converted to
+// LANGUAGE_ENGLISH_US because no country was passed and it is the first entry
+// to match the language, see code. A call with en-ZZ (not in table) would
+// still result in LANGUAGE_ENGLISH.
 
 /* erAck: 2007-07-05T20:01+0200  TODO: The entire suite's primary language
  * only usage and locale fall back should be cleaned up and made consistent. I
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

build difficulty

2013-08-29 Thread dk122


I am unable to build (after `make clean`) master 139a7d2 (pulled today
around 12:30 UTC).  The messages are, line-wrapped for e-mail, ...

/home/terry/lo_hacking/git/libo2/workdir/unxlngi6/UnpackedTarball/
boost/boost/noncopyable.hpp:27:21:
error: boost::noncopyable_::noncopyable::noncopyable() declared
with non-public access cannot be defaulted in the class body
/home/terry/lo_hacking/git/libo2/workdir/unxlngi6/UnpackedTarball/
boost/boost/noncopyable.hpp:28:22:
error: boost::noncopyable_::noncopyable::~noncopyable()
declared with non-public access cannot be defaulted in the class body

I have to suspect that this has something to do with commit 4910c54
Update the bundled boost to 1.54 combined with the fact that I am
building on an old release, ubuntu-natty (11.04) 32-bit.

Suggestions welcome.

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

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

2013-08-29 Thread Armin Le Grand

 svx/source/svdraw/svdmrkv.cxx |   46 --
 1 file changed, 27 insertions(+), 19 deletions(-)

New commits:
commit b1a6dbc2dd118627360282dd304e24263c3bca51
Author: Armin Le Grand a...@apache.org
Date:   Thu Aug 29 16:32:05 2013 +

Resolves: #i123003# Corrected Handle/Overlay visualization...

when TextEdit is active

(cherry picked from commit 5960cf3dc57dc455bc98343dfafccafaf808ecdc)

Conflicts:
svx/source/svdraw/svdmrkv.cxx

Change-Id: I05c9c3d10ba3e9b29a1a759a18dbb19d85016640

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index cefe73b..896b19a 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -624,33 +624,41 @@ void SdrMarkView::SetMarkHandles()
 // correct position )
 Point aGridOff = GetGridOffset();
 
-// #i122142# for captions in TextEdit, force to FrameHdls to get the 
special text selection
-if(!bFrmHdl  pMarkedObj  bSingleTextObjMark  dynamic_cast 
SdrCaptionObj* (pMarkedObj))
+// check if text edit or ole is active and handles need to be 
suppressed. This may be the case
+// when a single object is selected
+// Using a strict return statement is okay here; no handles means *no* 
handles.
+if(pMarkedObj)
 {
-bFrmHdl = true;
-}
+// formally #i33755#: If TextEdit is active the EditEngine will 
directly paint
+// to the window, so suppress Overlay and handles completely; a 
text frame for
+// the active text edit will be painted by the repaitnt mechanism 
in
+// SdrObjEditView::ImpPaintOutlinerView in this case. This needs 
to be reworked
+// in the future
+// Also formally #122142#: Pretty much the same for 
SdrCaptionObj's in calc.
+if(((SdrView*)this)-IsTextEdit())
+{
+const SdrTextObj* pSdrTextObj = dynamic_cast const 
SdrTextObj* (pMarkedObj);
 
-if (bFrmHdl)
-{
-Rectangle aRect(GetMarkedObjRect());
-// #i33755#
-const bool bHideHandlesWhenInTextEdit(
-((SdrView*)this)-IsTextEdit()
- pMarkedObj
- pMarkedObj-ISA(SdrTextObj)
- ((SdrTextObj*)pMarkedObj)-IsInEditMode());
-
-// #i118524# if inplace activated OLE is selected,
-// suppress handles
-bool bHideHandlesWhenOleActive(false);
+if(pSdrTextObj  pSdrTextObj-IsInEditMode())
+{
+return;
+}
+}
+
+// formally #i118524#: if inplace activated OLE is selected, 
suppress handles
 const SdrOle2Obj* pSdrOle2Obj = dynamic_cast const SdrOle2Obj* 
(pMarkedObj);
 
 if(pSdrOle2Obj  (pSdrOle2Obj-isInplaceActive() || 
pSdrOle2Obj-isUiActive()))
 {
-bHideHandlesWhenOleActive = true;
+return;
 }
+}
+
+if (bFrmHdl)
+{
+Rectangle aRect(GetMarkedObjRect());
 
-if(!aRect.IsEmpty()  !bHideHandlesWhenInTextEdit  
!bHideHandlesWhenOleActive)
+if(!aRect.IsEmpty())
 { // otherwise nothing is found
 if( bSingleTextObjMark )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 59/60cf3dc57dc455bc98343dfafccafaf808ecdc

2013-08-29 Thread Caolán McNamara

 59/60cf3dc57dc455bc98343dfafccafaf808ecdc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 61612de53b99c639022cf2cd3d705804884f99af
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 29 20:04:39 2013 +0100

Notes added by 'git notes add'

diff --git a/59/60cf3dc57dc455bc98343dfafccafaf808ecdc 
b/59/60cf3dc57dc455bc98343dfafccafaf808ecdc
new file mode 100644
index 000..24ce528
--- /dev/null
+++ b/59/60cf3dc57dc455bc98343dfafccafaf808ecdc
@@ -0,0 +1 @@
+merged as: b1a6dbc2dd118627360282dd304e24263c3bca51
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build difficulty

2013-08-29 Thread Kohei Yoshida


On 08/29/2013 09:56 AM, dk...@torfree.net wrote:

I am unable to build (after `make clean`) master 139a7d2 (pulled today
around 12:30 UTC). The messages are, line-wrapped for e-mail, ...

/home/terry/lo_hacking/git/libo2/workdir/unxlngi6/UnpackedTarball/
boost/boost/noncopyable.hpp:27:21:
error: ‘boost::noncopyable_::noncopyable::noncopyable()’ declared
with non-public access cannot be defaulted in the class body
/home/terry/lo_hacking/git/libo2/workdir/unxlngi6/UnpackedTarball/
boost/boost/noncopyable.hpp:28:22:
error: ‘boost::noncopyable_::noncopyable::~noncopyable()’
declared with non-public access cannot be defaulted in the class body

I have to suspect that this has something to do with commit 4910c54
Update the bundled boost to 1.54 combined with the fact that I am
building on an old release, ubuntu-natty (11.04) 32-bit.

Suggestions welcome.


Try this change

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk

index c9adf88..4b7e413 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -66,6 +66,7 @@ gb_CXXFLAGS_COMMON := \
-fmessage-length=0 \
-fno-common \
-pipe \
+ -DBOOST_NO_DEFAULTED_FUNCTIONS \

ifneq ($(HAVE_THREADSAFE_STATICS),TRUE)
gb_CXXFLAGS_COMMON += -fno-threadsafe-statics

I'm having the same issue on my machine running a slightly antiquated 
version of openSUSE (11.4), and this change fixes it for me.


Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

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

2013-08-29 Thread Rene Engelhard

 configure.ac |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 0d5b9f1ad4b132d8d0cc22af1f524f971c0166db
Author: Rene Engelhard r...@debian.org
Date:   Thu Aug 29 21:23:49 2013 +0200

check for boost = 1.47 and SHA512_CTX (openssl = 0.9.8) in configure

Change-Id: If070d0bcafb208bb8d4104e48540cc1b2bf23db6

diff --git a/configure.ac b/configure.ac
index 89ce3f7..ef10c70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8523,7 +8523,7 @@ AC_MSG_CHECKING([which boost to use])
 if test $with_system_boost = yes; then
 AC_MSG_RESULT([external])
 SYSTEM_BOOST=YES
-AX_BOOST_BASE
+AX_BOOST_BASE(1.47)
 AX_BOOST_DATE_TIME
 mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 
's/\.dll$//'`
 libo_MINGW_TRY_DLL([$mingw_boost_date_time_dll])
@@ -9139,6 +9139,12 @@ if test $enable_openssl = yes; then
 if test $with_system_openssl = yes; then
 libo_MINGW_CHECK_DLL([libssl])
 libo_MINGW_CHECK_DLL([libcrypto])
+AC_MSG_CHECKING([whether openssl supports SHA512])
+AC_LANG_PUSH([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include openssl/sha.h]],[[
+   SHA512_CTX context;
+]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no, openssl too old. Need = 
0.9.8.])])
+AC_LANG_POP(C)
 fi
 else
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build difficulty

2013-08-29 Thread Stephan van den Akker

Hi Terry and Kohei,

Running openSUSE 11.4 as well, having the same problem as you two.
Over on #libreoffice-dev the suggestion was that my compiler and my
system boost libs are too old. I'm currently trying their suggestion
of:
1 - building boost 1.47 from source
2 - building LO with this boost version

I chose boost version 1.47 because is is the oldest version that has
all the functionality needed by LO. I is old enough to be compatible
with my compiler.

Kohei: Can you explain what your change does? I might try that too.

2013/8/29 Kohei Yoshida kohei.yosh...@suse.de:
 On 08/29/2013 09:56 AM, dk...@torfree.net wrote:

 I am unable to build (after `make clean`) master 139a7d2 (pulled today
 around 12:30 UTC). The messages are, line-wrapped for e-mail, ...

 /home/terry/lo_hacking/git/libo2/workdir/unxlngi6/UnpackedTarball/
 boost/boost/noncopyable.hpp:27:21:
 error: ‘boost::noncopyable_::noncopyable::noncopyable()’ declared
 with non-public access cannot be defaulted in the class body
 /home/terry/lo_hacking/git/libo2/workdir/unxlngi6/UnpackedTarball/
 boost/boost/noncopyable.hpp:28:22:
 error: ‘boost::noncopyable_::noncopyable::~noncopyable()’
 declared with non-public access cannot be defaulted in the class body

 I have to suspect that this has something to do with commit 4910c54
 Update the bundled boost to 1.54 combined with the fact that I am
 building on an old release, ubuntu-natty (11.04) 32-bit.

 Suggestions welcome.


 Try this change

 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
 b/solenv/gbuild/platform/com_GCC_defs.mk
 index c9adf88..4b7e413 100644
 --- a/solenv/gbuild/platform/com_GCC_defs.mk
 +++ b/solenv/gbuild/platform/com_GCC_defs.mk
 @@ -66,6 +66,7 @@ gb_CXXFLAGS_COMMON := \
 -fmessage-length=0 \
 -fno-common \
 -pipe \
 + -DBOOST_NO_DEFAULTED_FUNCTIONS \

 ifneq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_CXXFLAGS_COMMON += -fno-threadsafe-statics

 I'm having the same issue on my machine running a slightly antiquated
 version of openSUSE (11.4), and this change fixes it for me.

 Kohei

 --
 Kohei Yoshida, LibreOffice Calc hacker, SUSE.


 ___
 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: build difficulty

2013-08-29 Thread Kohei Yoshida


On 08/29/2013 03:27 PM, Stephan van den Akker wrote:

Kohei: Can you explain what your change does? I might try that too.
No idea exactly, other than that it avoids the lines that cause error in 
my build.  I got the idea by reading the offending boost header file 
boost/boost/noncopyable.hpp.


Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

Unit-Test Query [GSOC: Slide Layout Extendibility]

2013-08-29 Thread Vishv Brahmbhatt

Hi,

- In the current build system,we have some config XML files at *sd/xml*
and their corresponding test-profile copies are at *
test/usertemplate/user/config/soffice.cfg/simpress*.

- And using test-profile at test/user-template,'Package_unittest.mk'
creates a new copy at
unittest/install/share/config/soffice.cfg/simpress/.

-  *Unit-test* refers to the files at unittest/install for further
checking/testing during build.

-So can unit-test directly use sd/xml as a test-profile and then create
a new copy at unittest/install/share/config/soffice.cfg/simpress/ ? And
so that we can probably avoid duplicate config files at
test/user-template?

It would be great,if someone can guide me in this matter.

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

Re: build difficulty

2013-08-29 Thread Kohei Yoshida


On 08/29/2013 03:30 PM, Kohei Yoshida wrote:

On 08/29/2013 03:27 PM, Stephan van den Akker wrote:

Kohei: Can you explain what your change does? I might try that too.
No idea exactly, other than that it avoids the lines that cause error 
in my build.  I got the idea by reading the offending boost header 
file boost/boost/noncopyable.hpp.


Having said that, if I were to guess, I think that macro would avoid 
using the new C++11 only syntax that boost now uses by default, and 
achieves the same effect using the pre-C++11 syntax equivalent.


Normally we would add some sort of configure check for such C++11 syntax 
and take appropriate steps.  But since by my own admission I'm running 
an OS that's considered too old, I just use my local fix to get around 
this problem.  And I really really need to upgrade my openSUSE 
installation on my machine... ;-)


Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

Re: build difficulty

2013-08-29 Thread Stephan van den Akker

Kohei, don't let me down. I spend most of the day educating the masses
on #libreoffice-dev that 11.4 is not *antiquated* of *end of life*,
but beautifully Evergreen.

2013/8/29 Kohei Yoshida kohei.yosh...@suse.de:
 On 08/29/2013 03:30 PM, Kohei Yoshida wrote:

 On 08/29/2013 03:27 PM, Stephan van den Akker wrote:

 Kohei: Can you explain what your change does? I might try that too.

 No idea exactly, other than that it avoids the lines that cause error in
 my build.  I got the idea by reading the offending boost header file
 boost/boost/noncopyable.hpp.


 Having said that, if I were to guess, I think that macro would avoid using
 the new C++11 only syntax that boost now uses by default, and achieves the
 same effect using the pre-C++11 syntax equivalent.

 Normally we would add some sort of configure check for such C++11 syntax and
 take appropriate steps.  But since by my own admission I'm running an OS
 that's considered too old, I just use my local fix to get around this
 problem.  And I really really need to upgrade my openSUSE installation on my
 machine... ;-)


 Kohei

 --
 Kohei Yoshida, LibreOffice Calc hacker, SUSE.

 ___
 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

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

2013-08-29 Thread Kohei Yoshida

 sc/source/ui/view/gridwin4.cxx |2 --
 sc/source/ui/view/tabview4.cxx |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 391a57ef65687f2e373bac8d410e551aafa780ec
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Aug 29 15:53:28 2013 -0400

Update visible ranges when updating the scroll bars.

That seems like the right place to update visible ranges, rather than
right before drawing the grid pane.

Change-Id: I230bfa753fca7bcd040bd55dba16dfa613d2e8f0

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index b5c76fd..621b0f5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -401,8 +401,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 
 OSL_ENSURE( ValidCol(nX2)  ValidRow(nY2), GridWin Draw Bereich zu 
gross );
 
-UpdateVisibleRange();
-
 if (nX2  maVisibleRange.mnCol1 || nY2  maVisibleRange.mnRow1)
 return;
 // unsichtbar
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 8140d51..e8f29a2 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -439,6 +439,8 @@ void ScTabView::UpdateScrollBars()
 ScRange aVisible( nPosX, nPosY, nTab, nEndX, nEndY, nTab );
 if ( pDoc-SetVisibleSpellRange( aVisible ) )
 SC_MOD()-AnythingChanged();// if visible area has 
changed
+
+UpdateVisibleRange();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 4 >

1 - 100 of 315 matches

Mail list logo