[PATCH] Applied fdo#46808 to offapi/auth module

2012-08-09 Thread Gerrit
>From Jean-Tiare Le Bigot :

Jean-Tiare Le Bigot has uploaded a new change for review.

Change subject: Applied fdo#46808 to offapi/auth module
..

Applied fdo#46808 to offapi/auth module

For auth module, this is more like a cosmetic change :)
Anyway, all the tests passes and this is one more module
migrated.

Change-Id: Iaef3b4ab8c29526be8d0a388fc17e6af5d293c81
---
M offapi/UnoApi_offapi.mk
M offapi/com/sun/star/auth/SSOManagerFactory.idl
M offapi/com/sun/star/auth/SSOPasswordCache.idl
M offapi/type_reference/types.rdb
4 files changed, 32 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/385/1
--
To view, visit https://gerrit.libreoffice.org/385
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaef3b4ab8c29526be8d0a388fc17e6af5d293c81
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jean-Tiare Le Bigot 

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


[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc

2012-08-09 Thread Thomas Arnhold
 binfilter/bf_svtools/source/misc/tl_strascii.cxx |   77 --
 binfilter/bf_svtools/source/misc/tl_tustring.cxx |  261 ---
 binfilter/inc/bf_tools/string.hxx|   22 -
 3 files changed, 360 deletions(-)

New commits:
commit d1d1079c087329d647dee89627e8d830e2b496f0
Author: Thomas Arnhold 
Date:   Fri Aug 10 04:10:03 2012 +0200

callcatcher: strip string methods down

Change-Id: Ibbe214d69068cbfaf8ae667ba96fa677e7a9242a

diff --git a/binfilter/bf_svtools/source/misc/tl_strascii.cxx 
b/binfilter/bf_svtools/source/misc/tl_strascii.cxx
index 853749a..4baf7ef 100644
--- a/binfilter/bf_svtools/source/misc/tl_strascii.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strascii.cxx
@@ -394,65 +394,6 @@ UniString& UniString::InsertAscii( const char* pAsciiStr, 
xub_StrLen nIndex )
 
 // ---
 
-UniString& UniString::ReplaceAscii( xub_StrLen nIndex, xub_StrLen nCount,
-const sal_Char* pAsciiStr, xub_StrLen 
nStrLen )
-{
-DBG_CHKTHIS( UniString, DbgCheckUniString );
-DBG_ASSERT( pAsciiStr, "UniString::ReplaceAscii() - pAsciiStr is NULL" );
-
-// Wenn Index groessergleich Laenge ist, dann ist es ein Append
-if ( nIndex >= mpData->mnLen )
-{
-AppendAscii( pAsciiStr, nStrLen );
-return *this;
-}
-
-// Ist es eine Zuweisung
-if ( (nIndex == 0) && (nCount >= mpData->mnLen) )
-{
-AssignAscii( pAsciiStr, nStrLen );
-return *this;
-}
-
-// Reicht ein Erase
-if ( nStrLen == STRING_LEN )
-nStrLen = ImplStringLen( pAsciiStr );
-if ( !nStrLen )
-return Erase( nIndex, nCount );
-
-// nCount darf nicht ueber das Stringende hinnausgehen
-if ( nCount > mpData->mnLen - nIndex )
-nCount = static_cast< xub_StrLen >(mpData->mnLen-nIndex);
-
-// Reicht eine zeichenweise Zuweisung
-if ( nCount == nStrLen )
-{
-ImplCopyData();
-ImplCopyAsciiStr( mpData->maStr+nIndex, pAsciiStr, nStrLen );
-return *this;
-}
-
-// Ueberlauf abfangen
-sal_Int32 n = ImplGetCopyLen( mpData->mnLen-nCount, nStrLen );
-
-// Neue Daten anlegen
-STRINGDATA* pNewData = ImplAllocData( mpData->mnLen-nCount+n );
-
-// String kopieren
-memcpy( pNewData->maStr, mpData->maStr, nIndex*sizeof( STRCODE ) );
-ImplCopyAsciiStr( pNewData->maStr+nIndex, pAsciiStr, n );
-memcpy( pNewData->maStr+nIndex+n, mpData->maStr+nIndex+nCount,
-(mpData->mnLen-nIndex-nCount+1)*sizeof( STRCODE ) );
-
-// Alte Daten loeschen und Neue zuweisen
-STRING_RELEASE((STRING_TYPE *)mpData);
-mpData = pNewData;
-
-return *this;
-}
-
-// ---
-
 StringCompare UniString::CompareToAscii( const sal_Char* pAsciiStr,
  xub_StrLen nLen ) const
 {
@@ -609,24 +550,6 @@ xub_StrLen UniString::SearchAndReplaceAscii( const 
sal_Char* pAsciiStr, const Un
 return nSPos;
 }
 
-// ---
-
-void UniString::SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const 
UniString& rRepStr )
-{
-DBG_CHKTHIS( UniString, DbgCheckUniString );
-DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, STRING_LEN ),
-"UniString::SearchAndReplaceAllAscii() - pAsciiStr include 
characters > 127" );
-
-xub_StrLen nCharLen = ImplStringLen( pAsciiStr );
-xub_StrLen nSPos = SearchAscii( pAsciiStr, 0 );
-while ( nSPos != STRING_NOTFOUND )
-{
-Replace( nSPos, nCharLen, rRepStr );
-nSPos = nSPos + rRepStr.Len();
-nSPos = SearchAscii( pAsciiStr, nSPos );
-}
-}
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx 
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 65c7b3e..58ea369 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -125,32 +125,6 @@ double UniString::ToDouble() const
 
 // ---
 
-xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-sal_Int32   nLen = mpData->mnLen;
-const STRCODE*  pStr = mpData->maStr;
-pStr += nIndex;
-while ( nIndex < nLen )
-{
-STRCODE c = *pStr;
-const STRCODE*  pCompStr = pChars;
-while ( *pCompStr )
-{
-if ( *pCompStr == c )
-return nIndex;
-++pCompStr;
-}
-++pStr,
-++nIndex;
-}
-
-return STRING_NOTFOUND;
-}
-
-// ---
-
 xub_StrLen STRING::SearchAndReplace( STRCODE c, STRCODE cRep, xub_StrLen 
nIndex )
 {
 DBG_CHKTHIS( STRING, DBGCHECK

[Libreoffice-commits] .: unusedcode.easy

2012-08-09 Thread Thomas Arnhold
 unusedcode.easy |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 2c2d6e261c538cc8f78a6b69d1d1d8cb0f4ab0c0
Author: Thomas Arnhold 
Date:   Fri Aug 10 04:00:06 2012 +0200

unusedcode.easy: update list

Change-Id: I6ca3925c380a73a2c5360caaeefac3f0c18ac437

diff --git a/unusedcode.easy b/unusedcode.easy
index 4cfcc41..1d38a7a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -61,16 +61,7 @@ binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned 
short, unsigned sho
 binfilter::SdrViewUserMarker::SdrViewUserMarker(binfilter::SdrPaintView*)
 binfilter::ShellResource::~ShellResource()
 binfilter::SoDll::~SoDll()
-binfilter::String::EqualsIgnoreCaseAscii(binfilter::String const&, unsigned 
short, unsigned short) const
-binfilter::String::EqualsIgnoreCaseAscii(unsigned short const*) const
-binfilter::String::GetQuotedToken(unsigned short, binfilter::String const&, 
unsigned short, unsigned short&) const
-binfilter::String::GetQuotedTokenCount(binfilter::String const&, unsigned 
short) const
-binfilter::String::ReplaceAscii(unsigned short, unsigned short, char const*, 
unsigned short)
-binfilter::String::Reverse()
 binfilter::String::Search(unsigned short const*, unsigned short) const
-binfilter::String::SearchAndReplaceAll(binfilter::String const&, 
binfilter::String const&)
-binfilter::String::SearchAndReplaceAllAscii(char const*, binfilter::String 
const&)
-binfilter::String::SearchChar(unsigned short const*, unsigned short) const
 binfilter::SvObjectServerList::Remove(SvGlobalName const&)
 binfilter::SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short)
 binfilter::SvStringsISort::Seek_Entry(binfilter::String*, unsigned short*) 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: gerrit and Change-IDs - is everyone supposed to manually install a commit-hook?

2012-08-09 Thread Bjoern Michaelsen
On Fri, Aug 10, 2012 at 02:16:37AM +0200, Christian Lohmaier wrote:
> So is everyone supposed to install a commit-hook locally?

yes.

> Or how is it supposed to work?

Usually one of the initial scripts (./download ?) do that for you. To be safe, 
you can always run

 ./g -z

which should do the trick.

Best,

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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-09 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #75 from Boostland  2012-08-10 00:38:31 UTC ---
Please add this long standing bug
Bug 40421 - PRINTING shapes with transparent(?) Bitmap background loses bezier
curves

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] .: 3 commits - android/experimental

2012-08-09 Thread Iain Billett
 
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
 |  205 +++---
 1 file changed, 69 insertions(+), 136 deletions(-)

New commits:
commit 9031cd89e35be17fb4e6150f5100defca36dfafc
Author: Iain Billett 
Date:   Fri Aug 10 01:17:23 2012 +0100

Some minor bug fixes and code clean-up.

Change-Id: I857407ac46ce51be5ee3eab26e9af75afc612a41

diff --git 
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
 
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index b7a41ad..edfb13b 100644
--- 
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++ 
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -160,7 +160,6 @@ public class DocumentLoader
 flipper.setOutAnimation(outToLeft);
 
 documentViewer.nextPage();
-//((PageViewer)flipper.getChildAt((flipper.getDisplayedChild() 
+ PAGECACHE_PLUSMINUS) % 
PAGECACHE_SIZE)).display(((PageViewer)flipper.getCurrentView()).currentPageNumber
 + PAGECACHE_PLUSMINUS);
 return true;
 } else if (event2.getX() - event1.getX() > 120) {
 if (((PageViewer)flipper.getCurrentView()).currentPageNumber 
== 0)
@@ -177,9 +176,6 @@ public class DocumentLoader
 flipper.setOutAnimation(outToRight);
 
 documentViewer.prevPage();
-
-//((PageViewer)flipper.getChildAt((flipper.getDisplayedChild() 
+ PAGECACHE_SIZE - PAGECACHE_PLUSMINUS) % 
PAGECACHE_SIZE)).display(((PageViewer)flipper.getCurrentView()).currentPageNumber
 - PAGECACHE_PLUSMINUS);
-
 return true;
 }
 return false;
@@ -670,7 +666,6 @@ public class DocumentLoader
 progressView = new ProgressBar( DocumentLoader.this, null, 
android.R.attr.progressBarStyleHorizontal);
 progressView.setProgress( 10 );
 
-//flipper = new ViewFlipper(DocumentLoader.this);
 ViewFlipper flipper = (ViewFlipper)findViewById( R.id.page_flipper 
);
 flipper.addView( waitView , 0 , matchParent);
 flipper.showNext();
@@ -752,30 +747,10 @@ public class DocumentLoader
 Log.i(TAG, "onPostExecute: " + result);
 if (result == -1)
 return;
-//flipper = new ViewFlipper(this);
-//flipper = (ViewFlipper)findViewById( R.id.page_flipper );
-//matchParent = new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 
ViewGroup.LayoutParams.MATCH_PARENT);
-//flipper.removeViewAt( 0 );
 documentViewer = new DocumentViewer( (ViewFlipper)findViewById( 
R.id.page_flipper ) );
-//documentViewer.open(0);
-
-//currentPage = 0;
-//openPageWithPrefetching( currentPage );
-
-/*
-//open method? set current page = 0?
-flipper.addView(new PageViewer(0), 0, matchParent);
-for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
-flipper.addView(new PageViewer(i+1), i+1, matchParent);
-for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
-flipper.addView(new PageViewer(-1), PAGECACHE_PLUSMINUS + i+1, 
matchParent);
-  */  
 ll = (LinearLayout)findViewById( R.id.navigator);
 inflater = (LayoutInflater) 
getApplicationContext().getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
-
-   
-   
for( int i = 0; i < result.intValue() ; i++ ){
ThumbnailView thumb = new ThumbnailView( i , 
(int)(120.0f / Math.sqrt(2) ) , 120 );
final int pos = i;
@@ -783,9 +758,6 @@ public class DocumentLoader

@Override
public void onClick(View v) {
-   // TODO Auto-generated method 
stub
-   Log.d("nav" , Integer.toString( 
pos ) );
-//openPageWithPrefetching( pos );
 documentViewer.open( pos );
}
});
@@ -799,11 +771,9 @@ public class DocumentLoader
 private String TAG = "DocumentViewer";
 private int currentPage;
 private ViewFlipper viewFlipper;
-//int pageCount;
 private int lastPage;
 private final int firstPage = 0;
-private final int CACHE_PLUSMINUS = 2;
-private final int CACHE_SIZE = 2*CACHE_PLUSMINUS + 1;
+private final int CACHE_SIZE = 5;
 private ViewGroup.LayoutParams matchParent = new 
ViewGroup.LayoutParams(
 ViewGroup.LayoutParams.MATCH_PARENT,

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

2012-08-09 Thread Kohei Yoshida
 sc/inc/queryentry.hxx  |   40 ++---
 sc/source/core/tool/queryentry.cxx |   40 ++---
 2 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 81cfa56fb42b67edf50f942f0e1aafd459a8a298
Author: Kohei Yoshida 
Date:   Thu Aug 9 20:23:13 2012 -0400

Reverting copyright notices to original LGPL.

These files do contains at least several lines from the Oracle-authored
source files.

Change-Id: I4f4a8e1487cacb6de92c409bd2b63149840bdf4d

diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 5c88730..021a449 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -1,30 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+/*
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * Major Contributor(s):
- *   Copyright (C) 2011 Kohei Yoshida 
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- * All Rights Reserved.
+ * This file is part of OpenOffice.org.
  *
- * For minor contributions see the git repository.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ /
 
 #ifndef __SC_QUERYENTRY_HXX__
 #define __SC_QUERYENTRY_HXX__
diff --git a/sc/source/core/tool/queryentry.cxx 
b/sc/source/core/tool/queryentry.cxx
index 1f9be97..7abb8fa 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -1,30 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+/*
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * Major Contributor(s):
- *   Copyright (C) 2011 Kohei Yoshida 
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- * All Rights Reserved.
+ * This file is part of OpenOffice.org.
  *
- * For minor contributions see the git repository.
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
+ * OpenOffice.org is distributed

gerrit and Change-IDs - is everyone supposed to manually install a commit-hook?

2012-08-09 Thread Christian Lohmaier
Hi *,

pushing a commit to gerrit isn't as simple as outlined in the wiki, as
./logerrit submit isn't enough, since gerrit complains with

"ERROR: missing Change-Id in commit message"

it is nice enough to provide a suggestion that can be added to the
commit message using git commit --amend and/orgit rebase -i, but
that's quite an annoyance.

So is everyone supposed to install a commit-hook locally? Or how is it
supposed to work?

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


[PATCH] cosmetics

2012-08-09 Thread Gerrit
>From Christian Lohmaier :

Christian Lohmaier has uploaded a new change for review.

Change subject: cosmetics
..

cosmetics

Change-Id: Ie3f95efe013306637adbb336234266b10421ca24
---
M liblangtag/makefile.mk
1 file changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/384/1
--
To view, visit https://gerrit.libreoffice.org/384
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3f95efe013306637adbb336234266b10421ca24
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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


[PATCH] help XCode 2.5 resolve @loader_path/libfoo.dylib

2012-08-09 Thread Gerrit
>From Christian Lohmaier :

Christian Lohmaier has uploaded a new change for review.

Change subject: help XCode 2.5 resolve @loader_path/libfoo.dylib
..

help XCode 2.5 resolve @loader_path/libfoo.dylib

Change-Id: I81837acd40f306c2db03f54f3896b79bb7fcbb08
---
M RepositoryExternal.mk
M liblangtag/makefile.mk
2 files changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/383/1
--
To view, visit https://gerrit.libreoffice.org/383
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81837acd40f306c2db03f54f3896b79bb7fcbb08
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier 

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


[Libreoffice-commits] .: 2 commits - sc/inc sc/source

2012-08-09 Thread Markus Mohrhard
 sc/inc/document.hxx  |4 ++--
 sc/inc/table.hxx |   10 +-
 sc/source/core/data/document.cxx |4 ++--
 sc/source/core/data/table1.cxx   |   10 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 067dca9c3e70091850dbb1d374170c2fce708e84
Author: Markus Mohrhard 
Date:   Thu Aug 9 23:48:48 2012 +0200

make more calc methods const

Change-Id: Ifc4775546ded8f524379946eb799dbbb314f7e8c

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7b8e48b..ba23156 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -955,9 +955,9 @@ public:
 SCCOL nEndCol, SCROW nEndRow, 
SCTAB nEndTab,
 ScDirection eDir );
 
-SC_DLLPUBLIC void   FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB 
nTab, ScMoveDirection eDirection );
+SC_DLLPUBLIC void   FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB 
nTab, ScMoveDirection eDirection ) const;
 SC_DLLPUBLIC void   GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB 
nTab, SCsCOL nMovX, SCsROW nMovY,
-bool bMarked, bool bUnprotected, const 
ScMarkData& rMark );
+bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const;
 
 boolGetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
 const ScMarkData& rMark );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2d073de..f4709bf 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -426,7 +426,7 @@ public:
 
 voidFindAreaPos( SCCOL& rCol, SCROW& rRow, ScMoveDirection 
eDirection ) const;
 voidGetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW 
nMovY,
-bool bMarked, bool bUnprotected, const 
ScMarkData& rMark );
+bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const;
 
 voidLimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& 
rEndCol, SCROW& rEndRow );
 
@@ -813,7 +813,7 @@ private:
 sal_uLong nFillCount, FillDir eFillDir, ScProgress* 
pProgress );
 
 boolValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
-bool bMarked, bool bUnprotected );
+bool bMarked, bool bUnprotected ) const;
 
 voidAutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL 
nEndCol, SCROW nEndRow,
 const ScPatternAttr& rAttr, sal_uInt16 
nFormatNo);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index c160b68..d660686 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5310,7 +5310,7 @@ SCSIZE ScDocument::GetEmptyLinesInBlock( SCCOL nStartCol, 
SCROW nStartRow, SCTAB
 }
 
 
-void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, 
ScMoveDirection eDirection )
+void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, 
ScMoveDirection eDirection ) const
 {
 if (ValidTab(nTab) && nTab < static_cast(maTabs.size()) && 
maTabs[nTab])
 maTabs[nTab]->FindAreaPos( rCol, rRow, eDirection );
@@ -5318,7 +5318,7 @@ void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, 
SCTAB nTab, ScMoveDirect
 
 
 void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL 
nMovX, SCsROW nMovY,
-bool bMarked, bool bUnprotected, const 
ScMarkData& rMark )
+bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const
 {
 OSL_ENSURE( !nMovX || !nMovY, "GetNextPos: nur X oder Y" );
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 1cfa06b..1ca2760 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1182,7 +1182,7 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, 
ScMoveDirection eDirection
 }
 
 bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
-bool bMarked, bool bUnprotected )
+bool bMarked, bool bUnprotected ) const
 {
 if (!ValidCol(nCol) || !ValidRow(nRow))
 return false;
@@ -1215,7 +1215,7 @@ bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const 
ScMarkData& rMark,
 }
 
 void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
-bool bMarked, bool bUnprotected, const 
ScMarkData& rMark )
+bool bMarked, bool bUnprotected, const 
ScMarkData& rMark ) const
 {
 if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt?
 bUnprotected = false;
commit 8f92384031e332024ba39693b855bde67e033ac9
Author: Markus Mohrhard 
Date:   Thu Aug 9 21:26:42 2012 +0200

make some methods const

Change-Id: I45dfad63c

[PATCH] Change in core[libreoffice-3-5]: fdo#53154: fix report design wizard crash:

2012-08-09 Thread Gerrit
>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#53154: fix report design wizard crash:
..

fdo#53154: fix report design wizard crash:

As described by Stephan in the bug report, the XAggregation usage in
OSection of SvxFmDrawPage is broken; replace it by explicit forwarding
of the XDrawPage, XShapeGrouper, XFormsSupplier2 methods; it seems
to fix the crash here.  Also get rid of horrid refcount manipulation
etc. while at it.

Change-Id: Ib08830d2092bd2026db5b57c1c2e165b946889b3
(cherry picked from commit 8ec791316c1d90b25e85c94ad105e9cc62e568e2)
---
M reportdesign/inc/UndoEnv.hxx
M reportdesign/source/core/api/Section.cxx
M reportdesign/source/core/inc/Section.hxx
3 files changed, 82 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/382/1
--
To view, visit https://gerrit.libreoffice.org/382
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib08830d2092bd2026db5b57c1c2e165b946889b3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl 

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


[PATCH] Change in core[libreoffice-3-6]: fdo#53154: fix report design wizard crash:

2012-08-09 Thread Gerrit
>From Michael Stahl :

Michael Stahl has uploaded a new change for review.

Change subject: fdo#53154: fix report design wizard crash:
..

fdo#53154: fix report design wizard crash:

As described by Stephan in the bug report, the XAggregation usage in
OSection of SvxFmDrawPage is broken; replace it by explicit forwarding
of the XDrawPage, XShapeGrouper, XFormsSupplier2 methods; it seems
to fix the crash here.  Also get rid of horrid refcount manipulation
etc. while at it.

Change-Id: Ib08830d2092bd2026db5b57c1c2e165b946889b3
(cherry picked from commit 8ec791316c1d90b25e85c94ad105e9cc62e568e2)
---
M reportdesign/inc/UndoEnv.hxx
M reportdesign/source/core/api/Section.cxx
M reportdesign/source/core/inc/Section.hxx
3 files changed, 82 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/381/1
--
To view, visit https://gerrit.libreoffice.org/381
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib08830d2092bd2026db5b57c1c2e165b946889b3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

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


[Libreoffice-commits] .: 3 commits - fpicker/source reportdesign/inc reportdesign/source

2012-08-09 Thread Michael Stahl
 fpicker/source/win32/folderpicker/MtaFop.cxx  |6 
 reportdesign/inc/UndoEnv.hxx  |2 
 reportdesign/source/core/api/ReportDefinition.cxx |6 
 reportdesign/source/core/api/Section.cxx  |  147 --
 reportdesign/source/core/inc/Section.hxx  |   46 +-
 reportdesign/source/core/inc/Tools.hxx|2 
 6 files changed, 126 insertions(+), 83 deletions(-)

New commits:
commit 0abceaaf623cb358b45c106b9f2af87a931ff9a6
Author: Michael Stahl 
Date:   Thu Aug 9 23:52:35 2012 +0200

refactor reportdesign::OSection construction

Indended to solve a problem that turned out to be imaginary.

Change-Id: I185887f6e45869102ac600717a0bb7564ebdb7e5

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 1e8433b..e67d75c 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -661,7 +661,7 @@ OReportDefinition::OReportDefinition(uno::Reference< 
uno::XComponentContext > co
 {
 init();
 m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext);
-m_pImpl->m_xDetail = new OSection(this,m_aProps->m_xContext);
+m_pImpl->m_xDetail = 
OSection::createOSection(this,m_aProps->m_xContext);
 
m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL,m_aProps->m_xContext->getServiceManager()));
 }
 osl_decrementInterlockedCount( &m_refCount );
@@ -682,7 +682,7 @@ OReportDefinition::OReportDefinition(uno::Reference< 
uno::XComponentContext > co
 m_aProps->setShape(_xShape,this,m_refCount);
 init();
 m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext);
-m_pImpl->m_xDetail = new OSection(this,m_aProps->m_xContext);
+m_pImpl->m_xDetail = 
OSection::createOSection(this,m_aProps->m_xContext);
 
m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL,m_aProps->m_xContext->getServiceManager()));
 }
 osl_decrementInterlockedCount( &m_refCount );
@@ -703,7 +703,7 @@ OReportDefinition::OReportDefinition(const 
OReportDefinition& _rCopy)
 OGroups* pGroups = new OGroups(this,m_aProps->m_xContext);
 m_pImpl->m_xGroups = pGroups;
 pGroups->copyGroups(_rCopy.m_pImpl->m_xGroups);
-m_pImpl->m_xDetail = new OSection(this,m_aProps->m_xContext);
+m_pImpl->m_xDetail = 
OSection::createOSection(this,m_aProps->m_xContext);
 
OSection::lcl_copySection(_rCopy.m_pImpl->m_xDetail,m_pImpl->m_xDetail);
 
 setPageHeaderOn(_rCopy.m_pImpl->m_xPageHeader.is());
diff --git a/reportdesign/source/core/api/Section.cxx 
b/reportdesign/source/core/api/Section.cxx
index 8142bef..0bde01b 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -52,6 +52,7 @@ namespace reportdesign
 using namespace com::sun::star;
 using namespace comphelper;
 DBG_NAME( rpt_OSection )
+
 // 
-
 uno::Sequence< ::rtl::OUString> lcl_getGroupAbsent()
 {
@@ -64,31 +65,6 @@ uno::Sequence< ::rtl::OUString> lcl_getGroupAbsent()
 }
 
 // 
-
-OSection::OSection( const uno::Reference< report::XGroup >& _xParent
-   ,const uno::Reference< uno::XComponentContext >& context
-   ,bool /*_bPageSection*/)
-:SectionBase(m_aMutex)
-,SectionPropertySet(context,static_cast< Implements 
>(IMPLEMENTS_PROPERTY_SET),lcl_getGroupAbsent())
-,m_aContainerListeners(m_aMutex)
-,m_xContext(context)
-,m_xGroup(_xParent)
-,m_nHeight(3000)
-,m_nBackgroundColor(COL_TRANSPARENT)
-,m_nForceNewPage(report::ForceNewPage::NONE)
-,m_nNewRowOrCol(report::ForceNewPage::NONE)
-,m_bKeepTogether(sal_False)
-,m_bCanGrow(sal_False)
-,m_bCanShrink(sal_False)
-,m_bRepeatSection(sal_False)
-,m_bVisible(sal_True)
-,m_bBacktransparent(sal_True)
-,m_bInRemoveNotify(false)
-,m_bInInsertNotify(false)
-{
-DBG_CTOR( rpt_OSection,NULL);
-init();
-}
-// 
-
 uno::Sequence< ::rtl::OUString> lcl_getAbsent(bool _bPageSection)
 {
 if ( _bPageSection )
@@ -112,15 +88,40 @@ uno::Sequence< ::rtl::OUString> lcl_getAbsent(bool 
_bPageSection)
 
 return uno::Sequence< ::rtl::OUString 
>(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
+
+uno::Reference OSection::createOSection(
+const uno::Reference< report::XReportDefinition >& xParentDef,
+const uno::Reference< uno::XComponentContext >& context,
+bool const bPageSection)
+{
+OSection *const pNew =
+new OSection(xParentDef, 0, context, lcl_getAbsent(bPageSection));
+pNew->init();
+return pNew;
+}
+
+uno::Reference OSection::createOSection(
+const uno::Reference< report::XGroup >& xParentGroup,
+const uno::Reference< uno::XComponentContext >& context,
+  

[Libreoffice-commits] .: sw/inc sw/source unusedcode.easy

2012-08-09 Thread Julien Nabet
 sw/inc/viewsh.hxx  |4 
 sw/source/core/view/viewsh.cxx |1 -
 unusedcode.easy|1 -
 3 files changed, 6 deletions(-)

New commits:
commit c5cab0a3193ee286134b0d94dd68ccb7d2835381
Author: Julien Nabet 
Date:   Thu Aug 9 23:01:21 2012 +0200

Bin ViewShell::getIDocumentFieldsAccess()

Change-Id: Ib5c49b06a6aab7d578030c3486c9cab91c7f9b28

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index ab0e014..63ae581 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -324,10 +324,6 @@ public:
 const IDocumentLayoutAccess* getIDocumentLayoutAccess() const;
   IDocumentLayoutAccess* getIDocumentLayoutAccess();
 
-/** Provides access to the document fields administration interface
- */
-const IDocumentFieldsAccess* getIDocumentFieldsAccess() const;
-
 /** Provides access to the content operations interface
  */
 IDocumentContentOperations* getIDocumentContentOperations();
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index fb9de45..59c60e7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2471,7 +2471,6 @@ const IDocumentRedlineAccess* 
ViewShell::getIDocumentRedlineAccess() const { ret
 IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() { return pDoc; }
 const IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() const { 
return pDoc; }
 IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() { return pDoc; }
-const IDocumentFieldsAccess* ViewShell::getIDocumentFieldsAccess() const { 
return pDoc; }
 IDocumentContentOperations* ViewShell::getIDocumentContentOperations() { 
return pDoc; }
 IDocumentStylePoolAccess* ViewShell::getIDocumentStylePoolAccess() { return 
pDoc; }
 const IDocumentStatistics* ViewShell::getIDocumentStatistics() const { return 
pDoc; }
diff --git a/unusedcode.easy b/unusedcode.easy
index 0a25bec..4cfcc41 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -36,7 +36,6 @@ 
ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference&)
 VCLXPrinterServer::getImplementationId()
 VCLXPrinterServer::getTypes()
-ViewShell::getIDocumentFieldsAccess() const
 VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction 
const&, Point const&, boost::shared_array const&)
 Window::PostUserEvent(unsigned long&, unsigned long, void*)
 X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, 
unsigned long)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PROPOSED] Changes to General Options FDO#40656

2012-08-09 Thread Joel Madero
Hi All,

This is in response to FDO#40656:
https://bugs.freedesktop.org/show_bug.cgi?id=40656

In order to accomplish this I need to move some things around. I did the
visual changes - didn't do any of the functional changes yet, nor did I
ensure that spacing and what not is perfect. Looking for general input
before I put the time that is needed into this. Thanks all.

Image of Changes:
https://wiki.documentfoundation.org/images/1/1a/-PROPOSED-_General_Options_Change.pdf


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


[Libreoffice-commits] .: 2 commits - configure.in README.cross

2012-08-09 Thread Tor Lillqvist
 README.cross |4 
 configure.in |   16 
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 3dd05633bf29dcad613d6787c2a57ea2db2216f7
Author: Tor Lillqvist 
Date:   Thu Aug 9 23:57:15 2012 +0300

Can use simpler autogen.lastrun now

Change-Id: I66101c025469e9df72c331b981e48893f6a5ac3d

diff --git a/README.cross b/README.cross
index 891b6a5..6b24da2 100644
--- a/README.cross
+++ b/README.cross
@@ -342,16 +342,12 @@ will probably drive you insane.
 Here is an autogen.lastrun for Android, when cross-compiling from Mac
 OS X 10.8 with Xcode 4.4.1:
 
-CC_FOR_BUILD=xcrun clang -arch i386
-CXX_FOR_BUILD=xcrun clang++ -arch i386
---build=x86_64-apple-darwin11
 --disable-zenity
 --enable-debug
 --enable-werror
 --with-android-ndk=/Users/tml/android-ndk-r8b
 --with-android-ndk-toolchain-version=4.6
 --with-android-sdk=/Users/tml/android-sdk-macosx
---with-build-platform-configure-options=--with-macosx-sdk=10.8 
--with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8
 --with-distro=LibreOfficeAndroid
 --without-doxygen
 --without-helppack-integration
commit 13df2ce5c4ebeb270146678956b97a5a95053a55
Author: Tor Lillqvist 
Date:   Thu Aug 9 23:42:17 2012 +0300

Don't check $cross_compiling until it has been detected more reliably

Change-Id: I00b2a29d30bee2e71b0a04790b6de48bbbacae8a

diff --git a/configure.in b/configure.in
index 0f56209..0436625 100644
--- a/configure.in
+++ b/configure.in
@@ -66,14 +66,6 @@ dnl do this before argument processing to allow for platform 
dependent defaults
 dnl ===
 AC_CANONICAL_HOST
 
-if test "$cross_compiling" = "yes"; then
-CROSS_COMPILING=YES
-else
-CROSS_COMPILING=
-BUILD_TYPE="$BUILD_TYPE NATIVE"
-fi
-AC_SUBST(CROSS_COMPILING)
-
 AC_PROG_EGREP
 # AC_PROG_EGREP doesn't set GREP on all systems as well
 AC_PATH_PROG(GREP, grep)
@@ -2761,6 +2753,14 @@ AC_SUBST(ENABLE_DIRECTX)
 AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
+if test "$cross_compiling" = "yes"; then
+CROSS_COMPILING=YES
+else
+CROSS_COMPILING=
+BUILD_TYPE="$BUILD_TYPE NATIVE"
+fi
+AC_SUBST(CROSS_COMPILING)
+
 dnl ===
 dnl  Test the gcc version
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements3' - 4 commits - sax/qa

2012-08-09 Thread Artur Dorda
 sax/qa/cppunit/test_converter.cxx |   61 ++
 1 file changed, 61 insertions(+)

New commits:
commit cc77be47187d9cb624b527933caedbfc4c35ec2c
Author: Artur Dorda 
Date:   Thu Aug 9 22:42:09 2012 +0200

'measure to string' test covered in test_converter.cxx

Change-Id: If764eb4d87db93dc2907bc21fb1b9f10687a7ee4

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index a95d1be..ad146e2 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -333,6 +333,7 @@ void doTestMeasureToString(char const*const pis, sal_Int32 
nMeasure, sal_Int16 c
 
 void ConverterTest::testMeasure()
 {
+//check all the measure units
 doTestStringToMeasure(1000, "10mm", MeasureUnit::MM_100TH, -1, 4321);
 doTestStringToMeasure(200, "20mm", MeasureUnit::MM_10TH, 12, 4567);
 doTestStringToMeasure(300, "300", MeasureUnit::MM, 31, 555);
@@ -353,7 +354,22 @@ void ConverterTest::testMeasure()
 doTestStringToMeasure(600, "600px", MeasureUnit::PIXEL, 10, 4321);
 doTestStringToMeasure(777, "777", MeasureUnit::APPFONT, 10, 4321);
 doTestStringToMeasure(8, "8", MeasureUnit::SYSFONT, 10, 432100);
-doTestMeasureToString("60mm", 6000, MeasureUnit::MM_100TH, 
MeasureUnit::MM_10TH);
+//strange values (negative, too large etc.)
+doTestStringToMeasure(-539222987, "1234567890mm", MeasureUnit::MM_10TH, 
12, 12345678901);
+doTestStringToMeasure(-300, "-300", MeasureUnit::MM, -1000, 555);
+doTestStringToMeasure(1305424328, "-999px", 
MeasureUnit::PIXEL, -888, 555);   //really crazy numbers...
+
+doTestMeasureToString("6mm", 600, MeasureUnit::MM_100TH, MeasureUnit::MM);
+doTestMeasureToString("0.005cm", 5, MeasureUnit::MM_100TH, 
MeasureUnit::CM);// zeros in the front doesn't count
+doTestMeasureToString("3mm", 30, MeasureUnit::MM_10TH, MeasureUnit::MM);
+doTestMeasureToString("6.66cm", 666, MeasureUnit::MM_10TH, 
MeasureUnit::CM);
+doTestMeasureToString("-157.3pt", -555, MeasureUnit::MM_10TH, 
MeasureUnit::POINT);
+doTestMeasureToString("174976.378in", 4000, MeasureUnit::MM_10TH, 
MeasureUnit::INCH);//let's check accuracy
+doTestMeasureToString("40%", 40, MeasureUnit::PERCENT, 
MeasureUnit::PERCENT);
+doTestMeasureToString("70.56mm", 4000, MeasureUnit::TWIP, MeasureUnit::MM);
+doTestMeasureToString("979.928cm", 50, MeasureUnit::TWIP, 
MeasureUnit::CM);
+doTestMeasureToString("111.1pt", , MeasureUnit::TWIP, 
MeasureUnit::POINT);
+doTestMeasureToString("385.7986in", 50, MeasureUnit::TWIP, 
MeasureUnit::INCH);
 }
 CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
 
commit ad5a002cb882cb57ee13722df078a22666ccf9fa
Author: Artur Dorda 
Date:   Thu Aug 9 13:12:44 2012 +0200

Added testing 'measure to string' function

Change-Id: I36de98025ec72230cd960191ab47ab39ce965cc5

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index 55d3749..a95d1be 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -322,6 +322,15 @@ void doTestStringToMeasure(sal_Int32 rValue, char 
const*const pis, sal_Int16 nTa
 CPPUNIT_ASSERT_EQUAL(rValue, nVal);
 }
 
+void doTestMeasureToString(char const*const pis, sal_Int32 nMeasure, sal_Int16 
const nSourceUnit, sal_Int16 const nTargetUnit)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+::rtl::OUStringBuffer buf;
+Converter::convertMeasure(buf, nMeasure, nSourceUnit, nTargetUnit);
+OSL_TRACE("%s", ::rtl::OUStringToOString(buf.getStr(), 
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+
 void ConverterTest::testMeasure()
 {
 doTestStringToMeasure(1000, "10mm", MeasureUnit::MM_100TH, -1, 4321);
@@ -344,6 +353,7 @@ void ConverterTest::testMeasure()
 doTestStringToMeasure(600, "600px", MeasureUnit::PIXEL, 10, 4321);
 doTestStringToMeasure(777, "777", MeasureUnit::APPFONT, 10, 4321);
 doTestStringToMeasure(8, "8", MeasureUnit::SYSFONT, 10, 432100);
+doTestMeasureToString("60mm", 6000, MeasureUnit::MM_100TH, 
MeasureUnit::MM_10TH);
 }
 CPPUNIT_TEST_SUITE_REGISTRATION(ConverterTest);
 
commit dab32b53652ab3a4c5108a7e3bf5df1590dd810e
Author: Artur Dorda 
Date:   Thu Aug 9 01:41:22 2012 +0200

All the MeasureUnit values are covered in converter test

Change-Id: I6c447bb3948566ad10d9935397089ed1fceac1da

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index aca9976..55d3749 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -324,7 +324,26 @@ void doTestStringToMeasure(sal_Int32 rValue, char 
const*const pis, sal_Int16 nTa
 
 void ConverterTest::testMeasure()
 {
-doTestStringToMeasure(1000, "10mm", MeasureUnit::MM_100TH, 1, 4321);
+doTestStringToMeasure(1000, "10mm", MeasureUnit::MM_100TH, -1, 4321);
+do

Re: minutes of ESC call ...

2012-08-09 Thread Bjoern Michaelsen
On Thu, Aug 09, 2012 at 06:34:18PM +0200, Bjoern Michaelsen wrote:
> On Thu, Aug 09, 2012 at 04:13:48PM +0100, Michael Meeks wrote:
> > + [pending] notify all committers when we have a nice simple, minimal
> >   statement of what is required for gerrit written (Bjoern)
> > + reviews done
> 
> as you might have noted: done (finally).

meh -- never leave a spam script with u+x in your ~ and have it in your bash 
history.

If you got this twice, just ignore the second mail.

Best,

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


[Libreoffice-commits] .: Branch 'feature/mork' - connectivity/Library_mork.mk connectivity/source

2012-08-09 Thread David Ostrovsky
 connectivity/Library_mork.mk |6 +
 connectivity/source/drivers/mork/MCatalog.cxx|  111 +++
 connectivity/source/drivers/mork/MCatalog.hxx|   55 +++
 connectivity/source/drivers/mork/MColumns.cxx|   87 ++
 connectivity/source/drivers/mork/MColumns.hxx|   51 ++
 connectivity/source/drivers/mork/MConnection.cxx |   18 +++
 connectivity/source/drivers/mork/MConnection.hxx |7 +
 connectivity/source/drivers/mork/MDriver.cxx |4 
 connectivity/source/drivers/mork/MDriver.hxx |4 
 connectivity/source/drivers/mork/MStatement.cxx  |   11 --
 connectivity/source/drivers/mork/MStatement.hxx  |2 
 connectivity/source/drivers/mork/MTables.cxx |   86 +
 connectivity/source/drivers/mork/MTables.hxx |   48 +
 13 files changed, 479 insertions(+), 11 deletions(-)

New commits:
commit 8a8e6ace18b88d12a521609db286ddf6f1bc37b0
Author: David Ostrovsky 
Date:   Thu Aug 9 22:21:16 2012 +0200

mork driver: adding missing stuff

Change-Id: I923cd4d3cbd90315099ab5ceff3761ab3cbdebf9

diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk
index 7066342..388dd91 100644
--- a/connectivity/Library_mork.mk
+++ b/connectivity/Library_mork.mk
@@ -33,19 +33,23 @@ $(eval $(call gb_Library_use_libraries,mork, \
 $(eval $(call gb_Library_use_sdk_api,mork))
 
 $(eval $(call gb_Library_add_exception_objects,mork, \
+connectivity/source/drivers/mork/MColumns \
 connectivity/source/drivers/mork/MNSFolders \
 connectivity/source/drivers/mork/MNSINIParser \
 connectivity/source/drivers/mork/MNSProfileDiscover \
 connectivity/source/drivers/mork/MorkParser \
-connectivity/source/drivers/mork/MDriver \
+connectivity/source/drivers/mork/MCatalog \
 connectivity/source/drivers/mork/MConnection \
 connectivity/source/drivers/mork/MDatabaseMetaData \
 connectivity/source/drivers/mork/MDatabaseMetaDataHelper \
+connectivity/source/drivers/mork/MDriver \
 connectivity/source/drivers/mork/MStatement \
 connectivity/source/drivers/mork/MResultSet \
 connectivity/source/drivers/mork/MResultSetMetaData \
 connectivity/source/drivers/mork/MPreparedStatement \
 connectivity/source/drivers/mork/MServices \
+connectivity/source/drivers/mork/MTable \
+connectivity/source/drivers/mork/MTables \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx 
b/connectivity/source/drivers/mork/MCatalog.cxx
new file mode 100644
index 000..005037c
--- /dev/null
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -0,0 +1,111 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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 .
+ */
+
+#include "MCatalog.hxx"
+#include "MConnection.hxx"
+#include "MTables.hxx"
+#include 
+#include 
+#include 
+
+// -
+using namespace connectivity::mork;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace ::cppu;
+
+// -
+OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
+,m_pConnection(_pCon)
+,m_xMetaData(m_pConnection->getMetaData(  ))
+{
+//  osl_incrementInterlockedCount( &m_refCount );
+//  refreshTables();
+//  refreshViews();
+//  refreshGroups();
+//  refreshUsers();
+//  osl_decrementInterlockedCount( &m_refCount );
+}
+// -
+void OCatalog::refreshTables()
+{
+TStringVector aVector;
+Sequence< ::rtl::OUString > aTypes(1);
+aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
+Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
+::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM("%"))

[GSOC-UPDATE](09.08) Impress Remote

2012-08-09 Thread Andrzej J. R. Hunt

Hi everyone,

Today's progress:
- Finally managed to get the client listing box in the dialog 
implemented, based on that from the Extension Manager. Still requires 
some polishing for better styling (and still needs unused code removed). 
Early screen attached.
- Finally managed to get my Windows build to start (although building 
VERY slowly).


That means that tomorrow I can finally get round to doing the actual 
pairing of impress and the app.


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


[Libreoffice-commits] .: 2 commits - configure.in vcl/aqua

2012-08-09 Thread Tor Lillqvist
 configure.in   |5 -
 vcl/aqua/source/window/salframeview.mm |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 01346afea4a45a2470716d5a7ba18fcce14c475b
Author: Tor Lillqvist 
Date:   Thu Aug 9 22:48:43 2012 +0300

Check MACOSX_SDK_VERSION, not MAC_OS_X_VERSION_MIN_REQUIRED

Change-Id: Ifd752925d3758a215983fe8f0ac877ab23a77915

diff --git a/vcl/aqua/source/window/salframeview.mm 
b/vcl/aqua/source/window/salframeview.mm
index 7127bf0..74f1685 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1596,7 +1596,7 @@ private:
 return 0;
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+#if MACOSX_SDK_VERSION < 1050
 - (long)conversationIdentifier
 #else
 - (NSInteger)conversationIdentifier
commit 620138a1b7c78a3ab3852dcfd8bd48bfa147e7a4
Author: Tor Lillqvist 
Date:   Thu Aug 9 22:12:39 2012 +0300

Building the internal Python fails when using a more modern Mac SDK

Change-Id: Iaa63d9b027bc8cb25334303243f761df127c79d5

diff --git a/configure.in b/configure.in
index 637058f..0f56209 100644
--- a/configure.in
+++ b/configure.in
@@ -6830,7 +6830,10 @@ no|disable)
 dnl MinGW cross-compilation setups.)
 AC_MSG_RESULT([internal])
 enable_python=internal
-elif test $_os = Darwin -a \( "$with_macosx_version_min_required" = 10.4 
-o "$with_macosx_version_min_required" = 10.5 \); then
+elif test $_os = Darwin -a \( "$with_macosx_version_min_required" = 10.4 
-o "$with_macosx_version_min_required" = 10.5 \) \
+-a \( "$with_macosx_sdk" = 10.4 -o 
"$with_macosx_sdk" = 10.5 \); then
+# When building against a more recent SDK the ionternal Python can't 
be compiled, I can't be bothered to fix that for now,
+# building against a recent SDK is only for developer's own builds 
anyway.
 AC_MSG_RESULT([internal, the Python in Mac OS X 
$with_macosx_version_min_required is incompatible with Python3-ified pyuno])
 enable_python=internal
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PUSHED] a few lines of German translation

2012-08-09 Thread Michael Meeks
Hi Daniel,

On Thu, 2012-08-09 at 18:33 +0200, Daniel Herde wrote:
> Please review the translation of the german comments in some of the 
> source files in dbaccess/source. More will follow.

Thanks for that ! :-) much appreciated.

We could really use an MPL/LGPLv3+ dual-license statement on the public
list that we can link into:

http://wiki.documentfoundation.org/Development/Developers

Otherwise this is great. Some of the original German comments are
sometimes a bit cute / un-necessary:


//   class FooBaa //


class FooBaa {

};

Doesn't really need or want a pretty comment like that - so feel free
to clean-out redundant cruft like that as you go - vspace is rather
valuable. Other junk like:

// Berschrieben: berschrieben
rtl::OUString FooBaa::getDescription()
{
}

Can also just be removed. (my pseudo-German is 20 years out of date
hope it makes sense ;-)

Otherwise - this is excellent.

Thanks for your contribution !

Michael.

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

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


[Libreoffice-commits] .: 3 commits - avmedia/Library_avmediagst.mk avmedia/Module_avmedia.mk avmedia/source config_host.mk.in configure.in dbaccess/source distro-configs/LibreOfficeAndroid.conf distro

2012-08-09 Thread Michael Meeks
 Repository.mk|1 
 avmedia/Library_avmediagst.mk|8 
 avmedia/Module_avmedia.mk|6 
 avmedia/source/gstreamer/avmediagstreamer_0_10.component |6 
 avmedia/source/gstreamer/gst_0_10.cxx|   15 +
 avmedia/source/gstreamer/gstplayer.cxx   |  155 +++
 avmedia/source/gstreamer/gstplayer.hxx   |4 
 avmedia/source/gstreamer/gstuno.cxx  |   17 +
 avmedia/source/inc/mediamisc.hxx |   11 -
 avmedia/source/viewer/mediawindowbase_impl.cxx   |   21 +-
 config_host.mk.in|3 
 configure.in |   41 +++
 dbaccess/source/ui/control/marktree.cxx  |4 
 dbaccess/source/ui/control/sqledit.cxx   |   11 -
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx  |   14 -
 dbaccess/source/ui/dlg/adtabdlg.cxx  |4 
 dbaccess/source/ui/dlg/dbfindex.cxx  |   28 +-
 dbaccess/source/ui/dlg/queryfilter.cxx   |   10 
 dbaccess/source/ui/dlg/queryorder.cxx|2 
 distro-configs/LibreOfficeAndroid.conf   |1 
 distro-configs/LibreOfficeAndroidX86.conf|1 
 distro-configs/LibreOfficeLinux.conf |2 
 distro-configs/LibreOfficeOpenBSD.conf   |2 
 distro-configs/LibreOfficeiOS.conf   |1 
 distro-configs/OxygenOfficeLinux.conf|2 
 postprocess/packcomponents/makefile.mk   |4 
 scp2/InstallModule_ooo.mk|3 
 scp2/source/ooo/file_library_ooo.scp |6 
 scp2/source/ooo/module_hidden_ooo.scp|   19 -
 svx/source/sdr/contact/viewcontact.cxx   |2 
 30 files changed, 281 insertions(+), 123 deletions(-)

New commits:
commit b803fa2579256979bac83f0b193f2c30d524d76b
Author: Daniel Herde 
Date:   Thu Aug 9 18:25:53 2012 +0200

translated the german comments in a bunch of source files in dbaccess/source

Change-Id: I2d4b10d96668502a4fe84af70d43bd3abaa5ed23

diff --git a/dbaccess/source/ui/control/marktree.cxx 
b/dbaccess/source/ui/control/marktree.cxx
index e1b17b0..830f138 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -193,7 +193,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
 void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 {
 SvButtonState eState = GetCheckButtonState( _pEntry);
-if (GetModel()->HasChildren(_pEntry)) // Falls Kinder, dann diese auch 
checken
+if (GetModel()->HasChildren(_pEntry)) // if it has children, check those 
too
 {
 SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry);
 SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry);
@@ -208,7 +208,7 @@ void 
OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 while(pEntry)
 {
 SetCheckButtonState(pEntry,eState);
-if(GetModel()->HasChildren(pEntry))   // Falls Kinder, dann diese auch 
checken
+if(GetModel()->HasChildren(pEntry))   // if it has children, check 
those too
 {
 SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry);
 SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry);
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 0ce5c2b..289960a 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -134,7 +134,7 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
 rController.InvalidateFeature(SID_CUT);
 rController.InvalidateFeature(SID_COPY);
 
-// Ist dies ein Cut, Copy, Paste Event?
+// Is this a cut, copy, paste event?
 KeyFuncType aKeyFunc = rKEvt.GetKeyCode().GetFunction();
 if( 
(aKeyFunc==KEYFUNC_CUT)||(aKeyFunc==KEYFUNC_COPY)||(aKeyFunc==KEYFUNC_PASTE) )
 m_bAccelAction = sal_True;
@@ -149,10 +149,9 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
 sal_Bool OSqlEdit::IsInAccelAct()
 {
 DBG_CHKTHIS(OSqlEdit,NULL);
-// Das Cut, Copy, Paste per Accel. fuehrt neben der Aktion im Edit im View
-// auch die entsprechenden Slots aus. Die  Aktionen finden also zweimal 
statt.
-// Um dies zu verhindern, kann im View beim SlotExec diese Funktion
-// aufgerufen werden.
+// Cut, Copy, Paste by Accel. runs the action in the Edit but also the
+// corresponding slot in the View. Therefore, the action occurs twice.
+// To prevent this, SlotExec in View can call this function.
 
 return m_bAccelAction;
 }
@@ -220,7 +219,7 @@ void OSqlEdit::SetText(const String& rNewText)
 {
 DBG_CHKTHIS(OSqlEdit,NULL);
 if (m_timerUndoActionCreation

[Libreoffice-commits] .: i18npool/source

2012-08-09 Thread Eike Rathke
 i18npool/source/languagetag/languagetag.cxx|4 ++--
 i18npool/source/languagetag/simple-langtag.cxx |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b844b3d6b17ad9e77615923bc5d024dd1769a80a
Author: Eike Rathke 
Date:   Thu Aug 9 21:37:38 2012 +0200

lt_tag_dump() only used to debug [-Werror=unused-function]

diff --git a/i18npool/source/languagetag/languagetag.cxx 
b/i18npool/source/languagetag/languagetag.cxx
index d7c6b0f..caaf0cc 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -13,6 +13,8 @@
 #include 
 #include 
 
+//#define erDEBUG
+
 #if !defined(ANDROID) && !defined(IOS)
 #include 
 #else
@@ -24,8 +26,6 @@
 #include "simple-langtag.cxx"
 #endif
 
-//#define erDEBUG
-
 using rtl::OUString;
 using rtl::OString;
 using rtl::OUStringBuffer;
diff --git a/i18npool/source/languagetag/simple-langtag.cxx 
b/i18npool/source/languagetag/simple-langtag.cxx
index 7fd735e..d05ab42 100644
--- a/i18npool/source/languagetag/simple-langtag.cxx
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -397,6 +397,7 @@ static void lt_tag_dump(const lt_tag_t *tag)
 fprintf( stderr, "SimpleLangtag   region: %s\n", tag->maRegion.mpStr);
 }
 #endif
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'feature/gstreamer-1.0'

2012-08-09 Thread Michael Meeks
New branch 'feature/gstreamer-1.0' available with the following commits:
commit fa050f539e25d30e98cc66958343b5d788b727ff
Author: Michael Meeks 
Date:   Mon Jul 30 15:15:58 2012 +0200

gstreamer: make gstreamer 1.0 and 0.10 dual compile

Add fallback activation of an _OLD media component to the core.
Compile both a 0.10 and 1.0 version of the gstreamer component

Change-Id: I91f65d05391cb2d7e02f9cff18f96178a128705O1

commit 8fb2eff0c40c979ba2d3f4c3dc081bae85316909
Author: Tim-Philipp Müller 
Date:   Sun Jul 29 19:14:05 2012 +0200

tentative initial attempt at re-work for new playbin

Change-Id: I257bdda8469be624d0cbeab21cff2c2e1c94cc6f

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


[Libreoffice-commits] .: Branch 'feature/gstreamer-1.0' - 0 commits -

2012-08-09 Thread Michael Meeks
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] .: 2 commits - dictionaries/prj

2012-08-09 Thread David Tardon
 dictionaries/prj/tests.mk |   28 
 1 file changed, 28 deletions(-)

New commits:
commit a4ce46e8826a26a90839b25c9c08c7bff039f525
Author: David Tardon 
Date:   Thu Aug 9 21:03:13 2012 +0200

drop stray dmake makefile

Change-Id: Ic6e78aabb4320e124ae058ba6b03c92c2c447042

diff --git a/dictionaries/prj/tests.mk b/dictionaries/prj/tests.mk
deleted file mode 100644
index 7048dd6..000
--- a/dictionaries/prj/tests.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is tbehr...@novell.com
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*
-
-ALLTAR : test1
-test1 .PHONY :
-   @echo Validating thesaurus file
-   $(COMMAND_ECHO) PERL_UNICODE=0 ..$/util$/th_check.pl *.dat
commit 6d6d642d5f2e069206193743deed872332e396d8
Author: David Tardon 
Date:   Thu Aug 9 21:01:44 2012 +0200

really use gbuild for this

Change-Id: I11c6fe5e1e6658ce8290f66d5c237ea042e640bf

diff --git a/dictionaries/prj/dmake b/dictionaries/prj/dmake
deleted file mode 100644
index e69de29..000
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: configure.in

2012-08-09 Thread Tor Lillqvist
 configure.in |  249 +++
 1 file changed, 168 insertions(+), 81 deletions(-)

New commits:
commit cfb0e026bc7ced94a986a8380171bf26b70dd193
Author: Tor Lillqvist 
Date:   Thu Aug 9 20:53:15 2012 +0300

Automagic Mac SDK location/version detection

The intent is that with no SDK related configure options, an optimal
SDK and 10.4 as minimum OS will be chosen. A warning is displayed if
building a LO that will not (either definitely not, or probably not)
run on 10.4, as 10.4 continues to be our minimum supported OS.

Change-Id: I6683aa43362881a135637e878bfc469591ab9d20

diff --git a/configure.in b/configure.in
index 2708f5b..fb50dee 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-2dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil -*-
+2dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 
-*-
 dnl configure.in serves as input for the GNU autoconf package
 dnl in order to create a configure script.
 
@@ -2048,24 +2048,25 @@ AC_ARG_WITH(macosx-sdk,
 
   e. g.: --with-macosx-sdk=10.4
 
-  there are 3 options to controle the MacOSX build:
-  --with-macosx-sdk (refered as 'sdl' below)
+  there are 3 options to control the MacOSX build:
+  --with-macosx-sdk (refered as 'sdk' below)
   --with-macosx-version-min-required (refered as 'min' 
below)
   --with-macosx-version-max-allowed (refered as 'max' 
below)
 
   the connection between these value and the default 
they take is as follow:
-  ( ? means not specified on the command line, 
constraint: x <= y <= z)
+  ( ? means not specified on the command line, s means 
the SDK version found,
+  constraint: x <= y <= z)
 
   ==
command line  || config result
   ==
   min  | max  | sdk  || min  | max  | sdk  |
-  ?| ?| ?|| 10.4 | 10.4 | 10.4 |
-  ?| ?| 10.x || 10.4 | 10.4 | 10.x |
-  ?| 10.x | ?|| 10.4 | 10.x | 10.x |
+  ?| ?| ?|| 10.4 | 10.s | 10.s |
+  ?| ?| 10.x || 10.4 | 10.x | 10.x |
+  ?| 10.x | ?|| 10.4 | 10.s | 10.s |
   ?| 10.x | 10.y || 10.4 | 10.x | 10.y |
-  10.x | ?| ?|| 10.x | 10.x | 10.x |
-  10.x | ?| 10.y || 10.x | 10.x | 10.y |
+  10.x | ?| ?|| 10.x | 10.s | 10.s |
+  10.x | ?| 10.y || 10.x | 10.y | 10.y |
   10.x | 10.y | ?|| 10.x | 10.y | 10.y |
   10.x | 10.y | 10.z || 10.x | 10.y | 10.z |
 
@@ -2075,6 +2076,12 @@ AC_ARG_WITH(macosx-sdk,
 
   Note: MACOSX_DEPLOYMENT_TARGET will be set to the 
value of 'min'.
 
+  Note that even if in theory using a 
--with-macosx-version-max-allowed
+  (i.e. the MAC_OS_X_VERSION_MAX_ALLOWED macro) less 
than the SDK version
+  should work, in practice Apple doesn't seem to test 
that, and at least
+  compiling with -DMAC_OS_X_VERSION_MAX_ALLOWED=1060 
against the 10.7 SDK
+  fails in a couple of places. Just because of 
oversights in ifdefs in the SDK
+  headers, but still.
 ],
 ,)
 
@@ -2452,121 +2459,201 @@ fi
 
 
 dnl ===
-dnl  Test MacOSX sdk and version requirement
+dnl Check / find MacOSX SDK and compiler, version checks
 dnl ===
 if test "$_os" = "Darwin"; then
 
-if test "$with_macosx_version_min_required" = ""; then
-with_macosx_version_min_required="10.4"
-fi
-
-if test "$with_macosx_version_max_allowed" = ""; then
-with_macosx_version_max_allowed="$with_macosx_version_min_required"
-fi
-
-if test "$with_macosx_sdk" = ""; then
-with_macosx_sdk="$with_macosx_version_max_allowed"
+# If no --with-macox-sdk option is given, first look for the 10.4u
+# SDK (which is distributed with the obsolete Xcode 3), then the
+# 10.6, 10.7 and 10.8 SDKs, in that order. (Don't bother looking
+# for the 10.5 SDK, unlikely somebody would have that but not
+# 10.6, I think.) If not found in some (old) default locations,
+# try the xcode-select tool.
+
+# The intent is that for "most" Mac-based develo

[Libreoffice-commits] .: 2 commits - android/experimental i18npool/source

2012-08-09 Thread Tor Lillqvist
 android/experimental/LibreOffice4Android/Makefile |1 +
 i18npool/source/languagetag/simple-langtag.cxx|3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b57899ae39192f8f5edeba99808376612ffc48dd
Author: Tor Lillqvist 
Date:   Thu Aug 9 21:42:10 2012 +0300

Mkdir before copying

Change-Id: I8e1a3c62bee096252acb04d7be100caaac25a87c

diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 18eba3e..1365407 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -225,6 +225,7 @@ build-ant: copy-stuff properties
echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties
 # ActionBarSherlock uses the v4 support library, apparently one needs to copy
 # it like this for it to be found
+   mkdir -p ../../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar 
../../abs-lib/libs
 #
 # Copy jar files we need
commit 705ba19317b8a80df521ba02789cf17efa4a2460
Author: Tor Lillqvist 
Date:   Thu Aug 9 18:13:24 2012 +0300

WaE: unused function

Change-Id: I292de75fbc5dd83bfeefc242e8ac699ab7b6fad8

diff --git a/i18npool/source/languagetag/simple-langtag.cxx 
b/i18npool/source/languagetag/simple-langtag.cxx
index 7131749..7fd735e 100644
--- a/i18npool/source/languagetag/simple-langtag.cxx
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -387,6 +387,7 @@ static const gchar *lt_region_get_tag(const lt_region_t 
*region)
 return region ? region->mpStr : NULL;
 }
 
+#ifdef erDEBUG
 static void lt_tag_dump(const lt_tag_t *tag)
 {
 fprintf( stderr, "\n");
@@ -395,7 +396,7 @@ static void lt_tag_dump(const lt_tag_t *tag)
 fprintf( stderr, "SimpleLangtag   script: %s\n", tag->maScript.mpStr);
 fprintf( stderr, "SimpleLangtag   region: %s\n", tag->maRegion.mpStr);
 }
-
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: git review

2012-08-09 Thread Bjoern Michaelsen
On Thu, Aug 09, 2012 at 08:57:01AM -0500, Norbert Thiebaud wrote:
> no it would not, because if I swith to branch 3-5... what version do I
> have then ?

If you switch -- the same. ./download would install it into solenv/bin, which
is not changed by git checkout. Also I would suggest to backport that to all
branches -- it wont affect the build anyway, so should be easy to review.

> not to mention have n-copy of it (I do have typically half-a dozen of
> clone of core...)... yeah the src directory can be share... still. I
> tend to do make clean a lot... so I would have to rebuild it every
> time to make sure it is there when I need it ?

Well, I doubt that small script is the right place to start to look of build
dir size. Even killing autodoc will help a lot more.

Best,

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


Re: [PATCH] a few lines of German translation

2012-08-09 Thread Daniel Herde
Hey Philipp, thanks for the quick response.

> I will take care of you patch. However, before I'll integrate it,
> could you please send a license statement to the mailing list that we
> than can link under
> ?

The patch submitted in my previous mail
(0001-translated-the-german-comments-in-a-bunch-of-source-.patch) is
licensed under LGPLv3+ and MPL. All my future contributions to
libreoffice are submitted unter these licenses, unless stated
otherwise.

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


Re: minutes of ESC call ...

2012-08-09 Thread Bjoern Michaelsen
Hi,

On Thu, Aug 09, 2012 at 12:43:13PM -0400, Kohei Yoshida wrote:
> Sure, but gerrit already spams the mailing list. 

I would be more open to turn that down (e.g. by reducing it to one daily mail).

> I don't see the need to duplicate that in bugzilla.

Bugzilla is way more targeted though: It does not spam the world but a smaller
audience (which is CC'ed). Im open to make these easily mail-filterable for
those core devs who dont want the additional traffic. But as Michael pointed
out its ~5 mails per day for the whole project, so even someone who is
subscribed to a lot of those would maybe get 1 or 2 a day.

> >>I'm also equally concerned about fragmenting our discussion
> >>platforms. Even without gerrit, splitting the discussion between the
> >>mailing list and bugzilla was (to me) hard enough.  Adding gerrit to
> >>the mix will make matters worse.  I would rather we encourage
> >>everyone to keep the discussions on the mailing list, instead of
> >>splitting it in now three different platforms, and adding lots of
> >>noisy automatic linking between them.
> >
> >If there is anything that is cluttered its the mailing lists.
> 
> Yes, and I want to keep the cluttering just to the mailing list.
> Why do we have to also clutter bugzilla in addition?

Because non-core devs dont read the high traffic -dev list. But they might be
rather highly motivated to work towards their pet issue (on which they are
subscribed).

> Yes, but this will also increase stress on core developers too.  I
> know we are in for encouraging more developers, but not at the
> expense of stressing the existing developers.  We need to balance
> that somehow.

See above. Even if you are subscribed to a lot of bugs this will give you give
1 daily extra mail which you can easily filter. But it will give others who
deeply care about this issue a hint that there is an opportunity to get
involved here in a way that they care about.

To put it differently: If you dont even want a mail about a patch being
proposed to fix a bug, I would seriously reinvestigate the policy that gets you
CC'ed on these bugs. Essentially there is no other notfication that can be that
important.
 
> So, I have to be honest.  I'm still not entirely sold on gerrit, and
> my passion for gerrit is not as great as some of the others who are
> totally sold.  I just try to remain neutral and want to see how this
> plays out first before making more drastic changes. 

I suggest the thesis that that will only make us stay in the workflow
equivalent of the uncanny valley(*) longer than needed for the pain of
everyone.

Best,

Bjoern

(*) http://en.wikipedia.org/wiki/Uncanny_valley
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/unx

2012-08-09 Thread Antonio Fernandez
 vcl/inc/unx/gtk/gtksalmenu.hxx|   19 +-
 vcl/unx/gtk/window/gtksalmenu.cxx |  109 +++---
 2 files changed, 60 insertions(+), 68 deletions(-)

New commits:
commit 9259bc34b95f8bc090477f9c74fed6f6d5cfb00e
Author: Antonio Fernandez 
Date:   Thu Aug 9 19:01:52 2012 +0100

Items are now correctly enabled and disabled.

Change-Id: I93e3e4bf804ff1ec95368f2918581af33d22263c

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index bb62969..3e30323 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -38,22 +38,23 @@
 
 #include 
 
+
 class GtkSalMenuItem;
-class GtkSalMenuSection;
+
+typedef std::vector< GtkSalMenuItem* > GtkSalMenuSection;
 
 class GtkSalMenu : public SalMenu
 {
 private:
-//static GLOActionGroup*  pCurrentActionGroup;
 sal_BoolmbMenuBar;
 
 virtual void publishMenu( GMenuModel*, GActionGroup* );
 
+GtkSalMenuItem* GetSalMenuItem( sal_uInt16 nId );
+
 public:
 std::vector< GtkSalMenuSection* >   maSections;
-std::vector< GtkSalMenuItem* >  maItems;
 GtkSalMenuSection*  mpCurrentSection;
-GActionEntry*   mpActionEntry;
 
 Menu*   mpVCLMenu;
 GtkSalMenu* mpParentSalMenu;
@@ -87,16 +88,6 @@ public:
 virtual const GtkSalFrame* getFrame() const;
 };
 
-class GtkSalMenuItem;
-
-class GtkSalMenuSection
-{
-public:
-std::vector< GtkSalMenuItem* >  maItems;
-
-virtual ~GtkSalMenuSection();
-};
-
 class GtkSalMenuItem : public SalMenuItem
 {
 public:
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 4016a08..74ad97a 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -111,15 +111,15 @@ dispatchAction (GSimpleAction   *action,
 
 GMenuModel *generateMenuModelAndActions( GtkSalMenu*, GLOActionGroup* );
 
-GMenuModel *generateSectionMenuModel( GtkSalMenuSection *pSection, 
GLOActionGroup *pActionGroup )
+GMenuModel *generateSectionMenuModel( GtkSalMenuSection* pSection, 
GLOActionGroup* pActionGroup )
 {
 if ( !pSection )
 return NULL;
 
 GMenu *pSectionMenuModel = g_menu_new();
 
-for (sal_uInt16 i = 0; i < pSection->maItems.size(); i++) {
-GtkSalMenuItem *pSalMenuItem = pSection->maItems[ i ];
+for (sal_uInt16 i = 0; i < pSection->size(); i++) {
+GtkSalMenuItem *pSalMenuItem = pSection->at( i );
 GMenuItem *pMenuItem = pSalMenuItem->mpMenuItem;
 
 if (pSalMenuItem->mpSubMenu) {
@@ -144,18 +144,18 @@ GMenuModel *generateMenuModelAndActions( GtkSalMenu 
*pMenu, GLOActionGroup *pAct
 
 GMenu *pMenuModel = g_menu_new();
 
-for (sal_uInt16 i = 0; i < pMenu->maItems.size(); i++) {
-GtkSalMenuItem *pSalMenuItem = pMenu->maItems[ i ];
-GMenuItem *pMenuItem = pSalMenuItem->mpMenuItem;
+//for (sal_uInt16 i = 0; i < pMenu->maItems.size(); i++) {
+//GtkSalMenuItem *pSalMenuItem = pMenu->maItems[ i ];
+//GMenuItem *pMenuItem = pSalMenuItem->mpMenuItem;
 
-if (pSalMenuItem->mpSubMenu) {
-GMenuModel *pSubmenu = generateMenuModelAndActions( 
pSalMenuItem->mpSubMenu, pActionGroup );
-g_menu_item_set_submenu( pMenuItem, pSubmenu );
-}
+//if (pSalMenuItem->mpSubMenu) {
+//GMenuModel *pSubmenu = generateMenuModelAndActions( 
pSalMenuItem->mpSubMenu, pActionGroup );
+//g_menu_item_set_submenu( pMenuItem, pSubmenu );
+//}
 
-g_menu_append_item( pMenuModel, pMenuItem );
-g_lo_action_group_insert( pActionGroup, pSalMenuItem->mpAction );
-}
+//g_menu_append_item( pMenuModel, pMenuItem );
+//g_lo_action_group_insert( pActionGroup, pSalMenuItem->mpAction );
+//}
 
 for (sal_uInt16 i = 0; i < pMenu->maSections.size(); i++) {
 GtkSalMenuSection *pSection = pMenu->maSections[ i ];
@@ -212,29 +212,56 @@ void GtkSalMenu::publishMenu( GMenuModel *pMenu, 
GActionGroup *pActionGroup )
 g_dbus_connection_export_action_group( pSessionBus, GTK_MENU_OBJ_PATH, 
pActionGroup, NULL);
 }
 
+
+// FIXME: HIGHLY IMPROVABLE CODE
+GtkSalMenuItem* GtkSalMenu::GetSalMenuItem( sal_uInt16 nId )
+{
+for ( sal_uInt16 i = 0; i < maSections.size(); i++ )
+{
+GtkSalMenuSection* pSection = maSections[ i ];
+
+for ( sal_uInt16 j = 0; j < pSection->size(); j++ )
+{
+GtkSalMenuItem* pSalMenuItem = pSection->at( j );
+
+if ( pSalMenuItem->mnId == nId ) {
+return pSalMenuItem;
+}
+
+if ( pSalMenuItem->mpSubMenu )
+{
+pSalMenuItem = pSalMenuItem->mpSubMenu->GetSalMenuItem( nId );
+if (pSalMenuItem) {
+return pSalMenuItem;
+}
+}
+}
+}
+
+return NULL;
+}
+
 GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar 

Re: [PATCH] a few lines of German translation

2012-08-09 Thread Philipp Riemer
Hey Daniel,

2012/8/9 Daniel Herde :
> Please review the translation of the german comments in some of the source
> files in dbaccess/source. More will follow.
>
> Thanks, Daniel.

Thank you very much!

I will take care of you patch. However, before I'll integrate it,
could you please send a license statement to the mailing list that we
than can link under
?

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


[Libreoffice-commits] .: sc/inc sc/source unusedcode.easy

2012-08-09 Thread Julien Nabet
 sc/inc/document.hxx  |4 
 sc/source/core/data/document.cxx |   19 ---
 unusedcode.easy  |2 --
 3 files changed, 25 deletions(-)

New commits:
commit 49ab16c9ad3eb0d27f8c66f2b535a8495671878f
Author: Julien Nabet 
Date:   Thu Aug 9 19:34:13 2012 +0200

Bin 2 other functions

ScDocument::GetFormattedAndUsedArea(short, short&, int&) const
ScDocument::InitializeAllNoteCaptions(bool)

Change-Id: I210815aef7c4096b040af841444dc65dd5138606

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8fcdc6d..7b8e48b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -816,9 +816,6 @@ public:
 /** Creates the captions of all uninitialized cell notes in the specified 
sheet.
 @param bForced  True = always create all captions, false = skip when 
Undo is disabled. */
 voidInitializeNoteCaptions( SCTAB nTab, bool bForced = false );
-/** Creates the captions of all uninitialized cell notes in all sheets.
-@param bForced  True = always create all captions, false = skip when 
Undo is disabled. */
-voidInitializeAllNoteCaptions( bool bForced = false );
 
 voidSetDrawPageSize(SCTAB nTab);
 
@@ -935,7 +932,6 @@ public:
 SCCOL& rEndCol, SCROW& rEndRow, bool 
bIncludeOld, bool bOnlyDown ) const;
 SC_DLLPUBLIC bool   GetCellArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow ) const;
 SC_DLLPUBLIC bool   GetTableArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow ) const;
-SC_DLLPUBLIC void   GetFormattedAndUsedArea( SCTAB nTab, SCCOL& 
rEndCol, SCROW& rEndRow ) const;
 SC_DLLPUBLIC bool   GetPrintArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow,
 bool bNotes = true ) const;
 SC_DLLPUBLIC bool   GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, 
SCROW nEndRow,
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 58f834f..c160b68 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -940,19 +940,6 @@ bool ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow ) cons
 return false;
 }
 
-void ScDocument::GetFormattedAndUsedArea( SCTAB nTab, SCCOL& rEndCol, SCROW& 
rEndRow ) const
-{
-if (VALIDTAB(nTab) && nTab < static_cast (maTabs.size()))
-if (maTabs[nTab])
-{
-maTabs[nTab]->GetPrintArea( rEndCol, rEndRow, true, true );
-return;
-}
-
-rEndCol = 0;
-rEndRow = 0;
-}
-
 bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& 
rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const
 {
 if (!ValidTab(nTab) || nTab >= static_cast (maTabs.size()) || 
!maTabs[nTab])
@@ -3266,12 +3253,6 @@ void ScDocument::InitializeNoteCaptions( SCTAB nTab, 
bool bForced )
 maTabs[ nTab ]->InitializeNoteCaptions( bForced );
 }
 
-void ScDocument::InitializeAllNoteCaptions( bool bForced )
-{
-for( SCTAB nTab = 0; nTab < static_cast(maTabs.size()); ++nTab )
-InitializeNoteCaptions( nTab, bForced );
-}
-
 void ScDocument::SetDirty()
 {
 bool bOldAutoCalc = GetAutoCalc();
diff --git a/unusedcode.easy b/unusedcode.easy
index 4681351..0a25bec 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -11,8 +11,6 @@ ScCompressedArray::Remove(int, unsigned 
long)
 ScCompressedArray::ScCompressedArray(int, unsigned short 
const&, unsigned long)
 ScCompressedArray::ScCompressedArray(int, unsigned short 
const*, unsigned long)
 ScCompressedArray::SetValue(int, unsigned short const&)
-ScDocument::GetFormattedAndUsedArea(short, short&, int&) const
-ScDocument::InitializeAllNoteCaptions(bool)
 ScTabView::HideCursor()
 
ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const&)
 ScVbaFormat::getAddIndent()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Help Locating Base Code

2012-08-09 Thread Joel Madero
Thanks to everyone. I have successfully done my first backtrace :) It was
unrelated but I see things that make sense  :) now time to try to locate
this dialog and the trigger that is affecting image linking.


Joel

On Wed, Aug 8, 2012 at 11:49 PM, Jan Holesovsky  wrote:

> Hi Joel,
>
> Joel Madero píše v St 08. 08. 2012 v 18:35 -0700:
>
> > Thanks for the advice. Unfortunately every time I run "run" and get into
> > database I get a segfault in gdb.
> >
> > Program received signal SIGSEGV, Segmentation fault.
> > [Switching to Thread 0x7fffc2d06700 (LWP 4977)]
>
> To see where it crashed, do 'bt' in gdb - that will show you backtrace
> of the crash.  If it looks unrelated, do 'thread apply all bt' which
> will show backtrace of all threads.
>
> > Not sure why. Also mine looks nothing like Lionel's did when he ran gdb.
> > Mine looks more like this:
>
> After issuing 'bt' (Lionel's "and look at the backtrace"), you should
> see something similar to Lionel's output :-)
>
> All the best,
> Kendy
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] do not serialize tail_build unless there is 'all' target

2012-08-09 Thread Gerrit
>From Matúš Kukan :

Matúš Kukan has uploaded a new change for review.

Change subject: do not serialize tail_build unless there is 'all' target
..

do not serialize tail_build unless there is 'all' target

Otherwise running 'make .all' is broken.

Change-Id: Id987d9aefbcfff6fba5f18a04c30f9a2f58ad00b
---
M Module_tail_build.mk
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/378/1
--
To view, visit https://gerrit.libreoffice.org/378
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id987d9aefbcfff6fba5f18a04c30f9a2f58ad00b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 

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


[PATCH] gbuild: introduce dependency on resource files for unit test...

2012-08-09 Thread Gerrit
>From Matúš Kukan :

Matúš Kukan has uploaded a new change for review.

Change subject: gbuild: introduce dependency on resource files for unit tests
..

gbuild: introduce dependency on resource files for unit tests

Change-Id: Ife7cd28d403363cf2c6643a91e0d92a833d0dfed
---
M dbaccess/CppunitTest_dbaccess_macros_test.mk
M sc/CppunitTest_sc_annotationshapeobj.mk
M sc/CppunitTest_sc_cellrangeobj.mk
M sc/CppunitTest_sc_chart_regression_test.mk
M sc/CppunitTest_sc_databaserangeobj.mk
M sc/CppunitTest_sc_datapilotfieldobj.mk
M sc/CppunitTest_sc_datapilottableobj.mk
M sc/CppunitTest_sc_editfieldobj_cell.mk
M sc/CppunitTest_sc_editfieldobj_header.mk
M sc/CppunitTest_sc_filters_test.mk
M sc/CppunitTest_sc_macros_test.mk
M sc/CppunitTest_sc_namedrangeobj.mk
M sc/CppunitTest_sc_namedrangesobj.mk
M sc/CppunitTest_sc_subsequent_filters_test.mk
M sc/CppunitTest_sc_tableautoformatfield.mk
M sc/CppunitTest_sc_tablesheetobj.mk
M sc/CppunitTest_sc_tablesheetsobj.mk
M sc/CppunitTest_sc_ucalc.mk
M solenv/gbuild/AllLangResTarget.mk
M starmath/CppunitTest_starmath_qa_cppunit.mk
M sw/CppunitTest_sw_filters_test.mk
M sw/CppunitTest_sw_swdoc_test.mk
22 files changed, 2 insertions(+), 97 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/379/1
--
To view, visit https://gerrit.libreoffice.org/379
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife7cd28d403363cf2c6643a91e0d92a833d0dfed
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 

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


[PATCH] gbuild: missing dep on $(OUTDIR)/unittest/registry for tests

2012-08-09 Thread Gerrit
>From Matúš Kukan :

Matúš Kukan has uploaded a new change for review.

Change subject: gbuild: missing dep on $(OUTDIR)/unittest/registry for tests
..

gbuild: missing dep on $(OUTDIR)/unittest/registry for tests

Change-Id: Ic80f57946e7b3f9c1bd99ed65955cf3c280063d2
---
M solenv/gbuild/CppunitTest.mk
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/380/1
--
To view, visit https://gerrit.libreoffice.org/380
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic80f57946e7b3f9c1bd99ed65955cf3c280063d2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 

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


[Libreoffice-commits] .: cpputools/Module_cpputools.mk

2012-08-09 Thread Michael Meeks
 cpputools/Module_cpputools.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b5b855c3f9b026dfd2f3163c63df784944e4f038
Author: Michael Meeks 
Date:   Thu Aug 9 18:07:09 2012 +0100

android: don't try to package binaries we havn't built

diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 7051b96..4a2609f 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -35,19 +35,21 @@ $(eval $(call gb_Module_add_targets,cpputools,\
 StaticLibrary_uno \
 ))
 else
+
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,cpputools,\
 Executable_regcomp \
 Executable_regsingleton \
 Executable_uno \
 ))
-endif
 
 ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,cpputools,\
 Package_bin \
 ))
 endif
+
+endif
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] a few lines of German translation

2012-08-09 Thread Daniel Herde
Please review the translation of the german comments in some of the 
source files in dbaccess/source. More will follow.


Thanks, Daniel.
>From 4b9ecc71b6d55cfae7c68ce56f8a7634197872b3 Mon Sep 17 00:00:00 2001
From: Daniel Herde 
Date: Thu, 9 Aug 2012 18:25:53 +0200
Subject: [PATCH] translated the german comments in a bunch of source files in
 dbaccess/source

---
 dbaccess/source/ui/control/marktree.cxx |4 ++--
 dbaccess/source/ui/control/sqledit.cxx  |   11 -
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx |   14 ++--
 dbaccess/source/ui/dlg/adtabdlg.cxx |4 ++--
 dbaccess/source/ui/dlg/dbfindex.cxx |   28 +++
 dbaccess/source/ui/dlg/queryfilter.cxx  |   10 
 dbaccess/source/ui/dlg/queryorder.cxx   |2 +-
 7 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/dbaccess/source/ui/control/marktree.cxx 
b/dbaccess/source/ui/control/marktree.cxx
index e1b17b0..830f138 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -193,7 +193,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
 void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 {
 SvButtonState eState = GetCheckButtonState( _pEntry);
-if (GetModel()->HasChildren(_pEntry)) // Falls Kinder, dann diese auch 
checken
+if (GetModel()->HasChildren(_pEntry)) // if it has children, check those 
too
 {
 SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry);
 SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry);
@@ -208,7 +208,7 @@ void 
OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
 while(pEntry)
 {
 SetCheckButtonState(pEntry,eState);
-if(GetModel()->HasChildren(pEntry))   // Falls Kinder, dann diese auch 
checken
+if(GetModel()->HasChildren(pEntry))   // if it has children, check 
those too
 {
 SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry);
 SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry);
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 0ce5c2b..e249fce 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -134,7 +134,7 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
 rController.InvalidateFeature(SID_CUT);
 rController.InvalidateFeature(SID_COPY);
 
-// Ist dies ein Cut, Copy, Paste Event?
+// Is this a cut, copy, paste event?
 KeyFuncType aKeyFunc = rKEvt.GetKeyCode().GetFunction();
 if( 
(aKeyFunc==KEYFUNC_CUT)||(aKeyFunc==KEYFUNC_COPY)||(aKeyFunc==KEYFUNC_PASTE) )
 m_bAccelAction = sal_True;
@@ -149,10 +149,9 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
 sal_Bool OSqlEdit::IsInAccelAct()
 {
 DBG_CHKTHIS(OSqlEdit,NULL);
-// Das Cut, Copy, Paste per Accel. fuehrt neben der Aktion im Edit im View
-// auch die entsprechenden Slots aus. Die  Aktionen finden also zweimal 
statt.
-// Um dies zu verhindern, kann im View beim SlotExec diese Funktion
-// aufgerufen werden.
+// Cut, Copy, Paste by Accel. runs the action in the Edit but also the 
+// corresponding slot in the View. Therefore, the action occurs twice.
+// To prevent this, SlotExec in View can call this function.
 
 return m_bAccelAction;
 }
@@ -220,7 +219,7 @@ void OSqlEdit::SetText(const String& rNewText)
 {
 DBG_CHKTHIS(OSqlEdit,NULL);
 if (m_timerUndoActionCreation.IsActive())
-{   // die noch anstehenden Undo-Action erzeugen
+{   // create the trailing undo-actions
 m_timerUndoActionCreation.Stop();
 LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL);
 }
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index ab4b150..d057f13 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -320,47 +320,47 @@ DBG_NAME(OTextConnectionHelper)
 Control* pErrorWin = NULL;
 String aDelText(m_aFieldSeparator.GetText());
 if(!aDelText.Len())
-{   // Kein FeldTrenner
+{   // No FieldSeparator
 aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
 
aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText());
 pErrorWin = &m_aFieldSeparator;
 }
 else if (!m_aDecimalSeparator.GetText().Len())
-{   // kein Decimaltrenner
+{   // No DecimalSeparator
 aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
 
aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText());
 pErrorWin = &m_aDecimalSeparator;
 }
 else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText())
-{   // Feld und TextTrenner duerfen nicht gleich sein
+{   // Field and TextSe

[Libreoffice-commits] .: writerfilter/source

2012-08-09 Thread Miklos Vajna
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   40 +
 1 file changed, 40 insertions(+)

New commits:
commit 4305bed5581d3d987353850a547a28d05026a92e
Author: Miklos Vajna 
Date:   Thu Aug 9 18:17:49 2012 +0200

Related: fdo#51112 import RTF_CLSHDNG

Change-Id: Iaa4efa2f4f70fc09e6deb6b7c6aea6f37757f1ab

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 530554b..e2c96c0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -102,6 +102,12 @@ static void lcl_putNestedAttribute(RTFSprms& rSprms, Id 
nParent, Id nId, RTFValu
 if (!pParent.get())
 {
 RTFSprms aAttributes;
+if (nParent == NS_ooxml::LN_CT_TcPrBase_shd)
+{
+// RTF default is 'auto', see 
writerfilter::dmapper::CellColorHandler
+aAttributes.set(NS_ooxml::LN_CT_Shd_color, RTFValue::Pointer_t(new 
RTFValue(0x0a)));
+aAttributes.set(NS_ooxml::LN_CT_Shd_fill, RTFValue::Pointer_t(new 
RTFValue(0x0a)));
+}
 RTFValue::Pointer_t pParentValue(new RTFValue(aAttributes));
 rSprms.set(nParent, pParentValue, bOverwrite);
 pParent = pParentValue;
@@ -3026,6 +3032,40 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 if 
(!m_aStates.top().aParagraphSprms.find(NS_sprm::LN_PDxaLeft1).get())
 m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PDxaLeft1, 
RTFValue::Pointer_t(new RTFValue(0)));
 break;
+case RTF_CLSHDNG:
+{
+int nValue = -1;
+switch (nParam)
+{
+case 500: nValue = 2; break;
+case 1000: nValue = 3; break;
+case 1200: nValue = 27; break;
+case 1500: nValue = 28; break;
+case 2000: nValue = 4; break;
+case 2500: nValue = 5; break;
+case 3000: nValue = 6; break;
+case 3500: nValue = 43; break;
+case 3700: nValue = 44; break;
+case 4000: nValue = 7; break;
+case 4500: nValue = 46; break;
+case 5000: nValue = 8; break;
+case 5500: nValue = 49; break;
+case 6000: nValue = 9; break;
+case 6200: nValue = 51; break;
+case 6500: nValue = 52; break;
+case 7000: nValue = 10; break;
+case 7500: nValue = 11; break;
+case 8000: nValue = 12; break;
+case 8500: nValue = 57; break;
+case 8700: nValue = 58; break;
+case 9000: nValue = 13; break;
+case 9500: nValue = 60; break;
+default: break;
+}
+if (nValue != -1)
+lcl_putNestedAttribute(m_aStates.top().aTableCellSprms, 
NS_ooxml::LN_CT_TcPrBase_shd, NS_ooxml::LN_CT_Shd_val, RTFValue::Pointer_t(new 
RTFValue(nValue)));
+}
+break;
 default:
 SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle value '" 
<< lcl_RtfToString(nKeyword) << "'");
 aSkip.setParsed(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: minutes of ESC call ...

2012-08-09 Thread Kohei Yoshida

On 08/09/2012 12:17 PM, Bjoern Michaelsen wrote:

On Thu, Aug 09, 2012 at 11:37:10AM -0400, Kohei Yoshida wrote:

On 08/09/2012 11:13 AM, Michael Meeks wrote:

* bugzilla / gerrit integration (Bjoern)
+ concern about getting spammed a lot from calc guys.x
+ postpone discussion for next week.


Just to voice my opinion, I too would be reluctant to see this
integration.  We core devs already receive tons of mails from
bugzilla many of which are pretty much noise.  And I'm personally
not very fond of this type of automatic messages cluttering bugzilla
comments.


The proposal is to send a comment to bugzilla for the _first_ upload of a patch
to gerrit. That is _one_ comment per bug maximum. So not much clutter there. In 
fact,
if we do not automate this, people might do it manually in 90% of the time,
leaving you with both some extra noise _and_ uncertainty if there is a patch
lurking on gerrit. Worst scenario of all.


Sure, but gerrit already spams the mailing list.  I don't see the need 
to duplicate that in bugzilla.






I'm also equally concerned about fragmenting our discussion
platforms. Even without gerrit, splitting the discussion between the
mailing list and bugzilla was (to me) hard enough.  Adding gerrit to
the mix will make matters worse.  I would rather we encourage
everyone to keep the discussions on the mailing list, instead of
splitting it in now three different platforms, and adding lots of
noisy automatic linking between them.


If there is anything that is cluttered its the mailing lists.


Yes, and I want to keep the cluttering just to the mailing list.  Why do 
we have to also clutter bugzilla in addition?


The review

traffic there is largely discouraging non-core developers who just cant follow
it as is and arent invested enough to do sophisticated mail-filtering. Just
sending out the gerrit account notification, I noted that there are a lot of
volunteers using foo+libreoff...@example.com addresses. That is _not_ a good
sign about the current state of our communication.


Yes, but this will also increase stress on core developers too.  I know 
we are in for encouraging more developers, but not at the expense of 
stressing the existing developers.  We need to balance that somehow.



If the target is to declutter communication, moving patch reviewal to gerrit is
the best option as it allows more targeted communication (e.g. notification on
of the interested reviewers).


So, I have to be honest.  I'm still not entirely sold on gerrit, and my 
passion for gerrit is not as great as some of the others who are totally 
sold.  I just try to remain neutral and want to see how this plays out 
first before making more drastic changes.  But I can't help feeling that 
we are starting to push this a little too fast too quick.


Kohei

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


Re: notice: module dictionaries converted to gbuild

2012-08-09 Thread Andras Timar
Hi David,

2012/8/7 David Tardon 

> Hi all,
>
> this is just an announce that I have converted dictionaries to gbuild on
> branch feature/gbuild_dictionaries. I am not looking for testers this
> time, because there is no platform-dependent stuff there :-) I am just
> going to run a couple more rebuilds to ensure there are no missing deps
> and then push it into master.
>
> When testing the conversion--I wrote a script to compare the old and new
> content of all the dictionaries--I have identified several files that
> have not been packed into the extensions previously and I wonder if
> perhaps they should be. Anyone has any opinion? The list is here:
>

I think they were left out by mistake. On the other hand I wonder if we
could omit multiple instances GPL/LGPL text from bundled dictionary
packages, while we have a central LICENSE.odt covering for the
dictionaries, too.

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


Re: minutes of ESC call ...

2012-08-09 Thread Bjoern Michaelsen
On Thu, Aug 09, 2012 at 04:13:48PM +0100, Michael Meeks wrote:
>   + [pending] notify all committers when we have a nice simple, minimal
> statement of what is required for gerrit written (Bjoern)
>   + reviews done

as you might have noted: done (finally).

Best,

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


Re: minutes of ESC call ...

2012-08-09 Thread Kohei Yoshida

On 08/09/2012 12:08 PM, Michael Meeks wrote:


On Thu, 2012-08-09 at 11:37 -0400, Kohei Yoshida wrote:

Just to voice my opinion, I too would be reluctant to see this
integration.  We core devs already receive tons of mails from bugzilla
many of which are pretty much noise.


:-) I guess, there is no shortage of bugs to be CC'd on.


  And I'm personally not very fond of this type of automatic messages
cluttering bugzilla comments.


I love the "fixed in 3.6.1" type automated comments - they're -really-
useful for QA to see which versions a bug is fixed in and to set
expectations right I guess.


Yes.  That's the *only* automated messages that I like.  The rest I despise.



I suppose we could ask/pay Tollef to work on extending:

https://bugs.freedesktop.org/userprefs.cgi?tab=email

To add some flag magic for a new option for some the "ignore fixedin
XYZ" version stuff - but that's a bit of a PITA to maintain going
forward I suspect; I wonder if a mail filter could do the same.


I'm also equally concerned about fragmenting our discussion platforms.
Even without gerrit, splitting the discussion between the mailing list
and bugzilla was (to me) hard enough.


Yep - I guess auto-spamming can go too far; OTOH, it is rather relevant
that a fix for a bug has shown up and useful for a reporter to know that
there is a build of it to try out.


So, I'm still slightly confused about this.  What sort of automated 
messages will gerrit start sending out?  I was under the impression that 
gerrit will start notifying bugzilla about some relevant patches posted 
to gerrit & review discussions that go on there and so on.


 Also we fix on average ~6 bugs per

day though we want to raise that - so, even if they're all in calc - if
we get it right with a single new bugzilla comment that says:

"a gerrit branch, with a patch that fixes this bug was built
 for the specified platform >here<"

And then no further comments afterwards seems like it might be on the
acceptable side ?


Yes.  If we can limit the automated messages to just fixes that went 
into the repo, and available test builds, then I can personally see some 
value.  Anything else would be noise.


Kohei

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


Re: minutes of ESC call ...

2012-08-09 Thread Bjoern Michaelsen
On Thu, Aug 09, 2012 at 11:37:10AM -0400, Kohei Yoshida wrote:
> On 08/09/2012 11:13 AM, Michael Meeks wrote:
> >* bugzilla / gerrit integration (Bjoern)
> > + concern about getting spammed a lot from calc guys.x
> > + postpone discussion for next week.
> 
> Just to voice my opinion, I too would be reluctant to see this
> integration.  We core devs already receive tons of mails from
> bugzilla many of which are pretty much noise.  And I'm personally
> not very fond of this type of automatic messages cluttering bugzilla
> comments.

The proposal is to send a comment to bugzilla for the _first_ upload of a patch
to gerrit. That is _one_ comment per bug maximum. So not much clutter there. In 
fact,
if we do not automate this, people might do it manually in 90% of the time,
leaving you with both some extra noise _and_ uncertainty if there is a patch
lurking on gerrit. Worst scenario of all.


> I'm also equally concerned about fragmenting our discussion
> platforms. Even without gerrit, splitting the discussion between the
> mailing list and bugzilla was (to me) hard enough.  Adding gerrit to
> the mix will make matters worse.  I would rather we encourage
> everyone to keep the discussions on the mailing list, instead of
> splitting it in now three different platforms, and adding lots of
> noisy automatic linking between them.

If there is anything that is cluttered its the mailing lists. The review
traffic there is largely discouraging non-core developers who just cant follow
it as is and arent invested enough to do sophisticated mail-filtering. Just
sending out the gerrit account notification, I noted that there are a lot of
volunteers using foo+libreoff...@example.com addresses. That is _not_ a good
sign about the current state of our communication.

If the target is to declutter communication, moving patch reviewal to gerrit is
the best option as it allows more targeted communication (e.g. notification on
of the interested reviewers).

Best,

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


Re: minutes of ESC call ...

2012-08-09 Thread Michael Meeks

On Thu, 2012-08-09 at 11:37 -0400, Kohei Yoshida wrote:
> Just to voice my opinion, I too would be reluctant to see this 
> integration.  We core devs already receive tons of mails from bugzilla 
> many of which are pretty much noise.

:-) I guess, there is no shortage of bugs to be CC'd on.

>  And I'm personally not very fond of this type of automatic messages
> cluttering bugzilla comments.

I love the "fixed in 3.6.1" type automated comments - they're -really-
useful for QA to see which versions a bug is fixed in and to set
expectations right I guess.

I suppose we could ask/pay Tollef to work on extending:

https://bugs.freedesktop.org/userprefs.cgi?tab=email

To add some flag magic for a new option for some the "ignore fixedin
XYZ" version stuff - but that's a bit of a PITA to maintain going
forward I suspect; I wonder if a mail filter could do the same.

> I'm also equally concerned about fragmenting our discussion platforms. 
> Even without gerrit, splitting the discussion between the mailing list 
> and bugzilla was (to me) hard enough.

Yep - I guess auto-spamming can go too far; OTOH, it is rather relevant
that a fix for a bug has shown up and useful for a reporter to know that
there is a build of it to try out. Also we fix on average ~6 bugs per
day though we want to raise that - so, even if they're all in calc - if
we get it right with a single new bugzilla comment that says:

"a gerrit branch, with a patch that fixes this bug was built
 for the specified platform >here<"

And then no further comments afterwards seems like it might be on the
acceptable side ?

Anyhow - thanks for raising the issue ! :-)

ATB,

Michael.

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

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


[REVIEW 3-6] service manager dispose issue

2012-08-09 Thread Stephan Bergmann
 
"Related fdo#52639: Do not destroy Implementations with mutex locked" 
addresses a crash on exit documented at 
 "ReportBuilder: 
Creating a new report destroys .odb" (but apparently unrelated to that 
issue's main topic).  It is a regression introduced with the new service 
manager in LO 3.6.0, so please review and backport to libreoffice-3-6.


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


[Libreoffice-commits] .: liblangtag/makefile.mk

2012-08-09 Thread Michael Meeks
 liblangtag/makefile.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2b3762c577e7315a94dee0b5c94b5891e9a56dfd
Author: Michael Meeks 
Date:   Thu Aug 9 17:02:51 2012 +0100

disable un-needed GObject introspection pieces for liblangtag

This avoids the dumb parser trying to exec "ccache gcc" and failing.

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 8320e8f..f710476 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -60,6 +60,10 @@ my_data = $(my_install)$/share$/liblangtag
 
 CONFIGURE_FLAGS+= --prefix='/$(my_prefix)' --libdir='/$(my_prefix)/lib'
 
+# g-ir-scanner is dumb enough to turn CC=ccache gcc into trying
+# to execve an app literal of "ccache gcc" including the space.
+CONFIGURE_FLAGS+= --disable-introspection
+
 .IF "$(SYSTEM_LIBXML)"!="YES"
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external'
 .IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[bjoern.michael...@canonical.com: [URGENT] LibreOffice freedesktop -> gerrit switchover]

2012-08-09 Thread Bjoern Michaelsen
Hi developers,

you should all have received the mail below (with your data). If not, please
send us a email about it to:

 ger...@otrs.documentfoundation.org

Best,

Bjoern

- Forwarded message from bjoern.michael...@canonical.com -

Date: Thu,  9 Aug 2012 17:46:21 +0200 (CEST)
From: bjoern.michael...@canonical.com
To: bmichael...@kemper.freedesktop.org
Subject: [URGENT] LibreOffice freedesktop -> gerrit switchover

Hi Bjoern Michaelsen,

We're contacting you because you are a core developer /
committer to LibreOffice, and it is important to us to ensure that you
keep those commit rights. Unfortunately that will take two minutes of
your time to do some book-keeping, please can you help us with that ?

We're migrating our git repository to gerrit for many good
reasons you can read here:

 http://wiki.documentfoundation.org/images/8/85/Crowdsourcing_code_reviews.odp

To ensure that your commit access is transferred we need, at a minimum you to:

1. login to https://gerrit.libreoffice.org/ with OpenID(*) once
2. set your user name, either your IRC nick, or 'bmichaelsen'
is fine in the "Profile"
3. add your email address 'bjoern.michael...@canonical.com'
under "contact information"
4. up-load your ssh public key (as for freedesktop) - usually
these are in ~/.ssh and end '.pub'
5. Reply to this email - leaving a full-quote in the reply, and
correct this data if it is wrong:

Freedesktop account: bmichaelsen
Email address used on git: bjoern.michael...@canonical.com

6. We'll enable your account as a direct committer when we get that.

See

 https://wiki.documentfoundation.org/Development/gerrit/setup

for details on how to migrate your ssh config. You might want to
continue the last steps as described there to ensure with './logerrit test'
that everything is working fine for you. 

The default push location for LibreOffice will change on
August 15th, 2012 from freedesktop.org to this new gerrit instance. There are
exciting new (optional) review flows if you choose to use them, but you
can continue committing to master as before.

If there is any trouble with the above do not hesitate to drop us an email at:
   ger...@otrs.documentfoundation.org

Finally - thank you for your contribution to LibreOffice !

Best wishes,

  Bjoern, Norbert, David, Robert 

(*) You most likely already have an OpenID. Providers include:
google, yahoo, blogger, launchpad, flickr, wordpress, myspace

P.S.: Note that the email address you add has to be the one you use for git. If
we suggest a freedesktop email here, we failed to map you to any other git
account and you likely need to send us a correction.

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


Re: [PUSHED][PATCH] cosmetic patch for conditional formatting

2012-08-09 Thread Jean-Baptiste Faure
Le 01/08/2012 12:36, Jean-Baptiste Faure a écrit :
> Le 01/08/2012 12:11, Noel Power a écrit :
>> looks fine for me, pushed
> Thank you. I suggest to backport it to LO 3.6 for LO 3.6.1.
>
> Best regards.
> JBF
Hi,

Second try ;-)
I think this patch should be backported to LO 3.6.

Best regards.
JBF

>> On 31/07/12 09:17, Jean-Baptiste Faure wrote:
>>> Hi,
>>>
>>> here is a small patch to vertically align the fields in the conditional
>>> formatting dialog.
>>> Additionnaly it give more room for several strings which is useful for
>>> FR translation.
>>> To easily understand the code, I reordered it according to the lines in
>>> the dialog.
>>>
>>> Best regards.
>>> JBF
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>


-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.

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


[Libreoffice-commits] .: cppuhelper/source

2012-08-09 Thread Stephan Bergmann
 cppuhelper/source/defaultbootstrap.cxx |  101 ++---
 1 file changed, 56 insertions(+), 45 deletions(-)

New commits:
commit 142d3ec875b446b56d0071c59d00937dea0cdd61
Author: Stephan Bergmann 
Date:   Thu Aug 9 17:44:14 2012 +0200

Related fdo#52639: Do not destroy Implementations with mutex locked

Erasing from data_ member maps can destroy contained Implementations, which 
in
turn releases the UNO objects referenced from there, which in turn can cause
XComponents to dispose, which in turn can call arbitrary code, so must not 
be
done with rMutex locked.  Witness the backtrace at
 linked from fdo#52639
(where this fix appears otherwise unrelated to that issue's main topic).

Change-Id: If55a3841b761ec1d9a0ef61fe54784426c4ee442

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index 151a36e..c3bdba3 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -1346,7 +1346,7 @@ void ServiceManager::disposing(css::lang::EventObject 
const & Source)
 
 void ServiceManager::disposing() {
 std::vector< css::uno::Reference< css::lang::XComponent > > comps;
-css::uno::Reference< css::lang::XEventListener > listener;
+Data clear;
 {
 osl::MutexGuard g(rBHelper.rMutex);
 for (DynamicImplementations::const_iterator i(
@@ -1358,10 +1358,10 @@ void ServiceManager::disposing() {
 comps.push_back(i->second->component);
 }
 }
-data_.namedImplementations.clear();
-data_.dynamicImplementations.clear();
-data_.services.clear();
-data_.singletons.clear();
+data_.namedImplementations.swap(clear.namedImplementations);
+data_.dynamicImplementations.swap(clear.dynamicImplementations);
+data_.services.swap(clear.services);
+data_.singletons.swap(clear.singletons);
 }
 for (std::vector<
  css::uno::Reference< css::lang::XComponent > >::const_iterator i(
@@ -1733,25 +1733,30 @@ void ServiceManager::removeRdbFiles(std::vector< 
rtl::OUString > const & uris) {
 // The underlying data structures make this function somewhat inefficient,
 // but the assumption is that it is rarely called (and that if it is 
called,
 // it is called with a uris vector of size one):
-osl::MutexGuard g(rBHelper.rMutex);
-for (std::vector< rtl::OUString >::const_iterator i(uris.begin());
- i != uris.end(); ++i)
+std::vector< boost::shared_ptr< Implementation > > clear;
 {
-for (NamedImplementations::iterator j(
- data_.namedImplementations.begin());
- j != data_.namedImplementations.end();)
+osl::MutexGuard g(rBHelper.rMutex);
+for (std::vector< rtl::OUString >::const_iterator i(uris.begin());
+ i != uris.end(); ++i)
 {
-assert(j->second.get() != 0);
-if (j->second->info->uri == *i) {
-//TODO: The below leaves data_ in an inconsistent state upon
-// exceptions:
-removeFromImplementationMap(
-&data_.services, j->second->info->services, j->second);
-removeFromImplementationMap(
-&data_.singletons, j->second->info->singletons, j->second);
-data_.namedImplementations.erase(j++);
-} else {
-++j;
+for (NamedImplementations::iterator j(
+ data_.namedImplementations.begin());
+ j != data_.namedImplementations.end();)
+{
+assert(j->second.get() != 0);
+if (j->second->info->uri == *i) {
+clear.push_back(j->second);
+//TODO: The below leaves data_ in an inconsistent state 
upon
+// exceptions:
+removeFromImplementationMap(
+&data_.services, j->second->info->services, j->second);
+removeFromImplementationMap(
+&data_.singletons, j->second->info->singletons,
+j->second);
+data_.namedImplementations.erase(j++);
+} else {
+++j;
+}
 }
 }
 }
@@ -1763,6 +1768,7 @@ bool ServiceManager::removeLegacyFactory(
 bool removeListener)
 {
 assert(factoryInfo.is());
+boost::shared_ptr< Implementation > clear;
 css::uno::Reference< css::lang::XComponent > comp;
 {
 osl::MutexGuard g(rBHelper.rMutex);
@@ -1772,6 +1778,7 @@ bool ServiceManager::removeLegacyFactory(
 return isDisposed();
 }
 assert(i->second.get() != 0);
+clear = i->second;
 //TODO: The below leaves data_ in an inconsistent state upon 
exceptions:
 removeFromImplem

Re: minutes of ESC call ...

2012-08-09 Thread Kohei Yoshida

On 08/09/2012 11:13 AM, Michael Meeks wrote:

* bugzilla / gerrit integration (Bjoern)
+ concern about getting spammed a lot from calc guys.x
+ postpone discussion for next week.


Just to voice my opinion, I too would be reluctant to see this 
integration.  We core devs already receive tons of mails from bugzilla 
many of which are pretty much noise.  And I'm personally not very fond 
of this type of automatic messages cluttering bugzilla comments.


I'm also equally concerned about fragmenting our discussion platforms. 
Even without gerrit, splitting the discussion between the mailing list 
and bugzilla was (to me) hard enough.  Adding gerrit to the mix will 
make matters worse.  I would rather we encourage everyone to keep the 
discussions on the mailing list, instead of splitting it in now three 
different platforms, and adding lots of noisy automatic linking between 
them.


Just my opinion.

Kohei

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


minutes of ESC call ...

2012-08-09 Thread Michael Meeks
* Present
+ Kohei, Rainer, Cedric, Lionel, Eike, Astron, Andras,
  Stephan, Caolan, Michael, Thorsten, Norbert, Kendy,
  Michael S, Petr

* Completed Action Items
+ task selection for LibreOffice 4 wiki:
+ http://wiki.documentfoundation.org/Development/LibreOffice4
+ [ punted for now ]

* Pending Action Items
+ [pending] notify all committers when we have a nice simple, minimal
  statement of what is required for gerrit written (Bjoern)
+ reviews done
+ make bytemark windows box do release builds (Fridrich)
+ maildrop for Gerrit (Bjoern)
+ 3/4 done, in progress idly.
+ 4.0 issues (Everyone)
+ everyone interested in cleanups - claim your work until next 
ESC!
+ 
http://wiki.documentfoundation.org/Development/LibreOffice4
+ crediting: can we separate tempates in the credits page (Spaetz)
+ [ in progress ]

* Release Engineering update (Petr)
+ 3.6.0 update & post-mortem
+ all was quiet until the last two release candidates
+ only panicing at the last minute
+ was timing related / summertime ?
+ first-start / updating bug issue
+ underestimated
+ Stephan: bad timing, reported on Linux etc. used
  non-released builds between.
+ by chance, Michael fixed the windows build
+ prereg feature only used on Windows, fix for issues
  didn't make it into 3.6 from master.
+ systemic problem where people are encouraged to
  remove their user-installation vs. moveaside & make
  available.
AI: + update QA FAQs / challenge answers to encourage moving
  profiles away instead of deleting (Rainer)
+ user installs can have sensitive data though,
  care needed - but keep that around.
+ non-upgrades for profiles from dev / intermediate 
versions
+ removing user-profile inconsistent data hid 
issues
  and hurt testing too
+ Always create code to upgrade / never advise 
removal
  of inconsistent data.
+ Rainer happy to help with profiles.
+ suggest zero tolerance policy for upgrade issues during 
development
+ could have upgrade tinderbox (Bjoern)
+ be nice to have some unit tests too (Michael)
+ most important thing to get to better tests (Stephan)
+ standard test for how profile updates work (Rainer)
+ it ~never works, but put more focus on this
+ the problem was so frequent people got used to it.
+ adopt a near zero tolerance policy for upgrade issues during 
development
+ bibisect can cause problems (Bjoern)
+ agree - lots of ignoring of profile problems
  with WORKSFORME when profiles are removed (Rainer)
+ should not tolerate this.
+ collecting user-configuration - have a script / app to
  dump it as a .zip ?
AI: + file an easy-hack to ship a binary to dump it (Petr)
+ 2x days of performance issues on the main website
+ can cause issues
+ missing MSI signatures
+ Andras forgot; normally some RC tester checks/reports 
that
+ Thorsten added validation to upload scripts.
+ few native-lang projects deferred announce due to 
dictionaries bug
+ 3.6.1 RC1
+ pull the timeline in - do RC1 in 1 week instead
+ freeze / checkin deadline on Monday
+ RC2 in one extra week.
+ fixes the upgrade bug earlier.
+ 3.5.6 RC2
+ tagged this week / final version
+ builds being up-loaded / announce soon - on track.

* GSOC update (Cedric)
+ bit more than a week to go, make students aware it's almost over
+ pencils down / evaluations by August 20th

* UI / design update (Astron)
+ discussion about updated icons for gallery
+ ongoing options discussion
+ official git repo for artwork ?
+ should we re-use the old repository ? (no)
+ ongoing discussion around artwork licensing
+ new 'templates' repository created
+ can we push templates there ?
   

Will be working on generic XML import

2012-08-09 Thread Kohei Yoshida

Hi there,

This is just to let you guys know that, I'll be gearing up to work on 
generic XML import and export in the next few weeks, and probably more. 
 I mentioned this briefly in the blog I wrote yesterday:


http://kohei.us/2012/08/08/orcus-integration-into-libreoffice/

The plan is to do the implementation in the orcus library, and implement 
callbacks in LibreOffice proper.


The core of the feature involves enabling import and export of generic 
XML which relies on a separate schema file to define the structure of 
the content.  I will set up a good amount of test harness for this in 
the orcus library in order to keep the amount of filter test low in the 
libreoffice build while maintaining a healthy amount of testing for this 
new filter.


The specifics of the feature, especially on the UI side, is yet to be 
decided, and for now, I will focus on the backend loading portion of the 
work.


All the best,

Kohei

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


[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/inc vcl/source vcl/unx

2012-08-09 Thread Antonio Fernandez
 vcl/inc/vcl/menu.hxx  |   12 ++--
 vcl/source/window/menu.cxx|5 +
 vcl/unx/gtk/window/gtksalmenu.cxx |   97 +++---
 3 files changed, 50 insertions(+), 64 deletions(-)

New commits:
commit 17e0471b2a2bc15a6f20a26bd26c64404451e879
Author: Antonio Fernandez 
Date:   Thu Aug 9 15:58:03 2012 +0100

Most actions seem to work now. Enabled ImplSelectWithStart() for all builds.

Change-Id: Ib309112de07d125fbe3b61ea20d5e26d1016912b

diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index f98e87e..7538faf 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -298,11 +298,13 @@ public:
 Menu();
 Menu( sal_Bool bMenuBar );
 SAL_DLLPRIVATE Window*  ImplGetWindow() const { return pWindow; }
-#if defined(QUARTZ)
-// ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
-SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
-#endif
-public:
+//#if defined(QUARTZ)
+//// ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
+//SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
+//#endif
+void ImplSelectWithStart( Menu* pStartMenu = NULL );
+
+public:
 virtual ~Menu();
 
 virtual voidActivate();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 02fbe67..2361a18 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1146,7 +1146,8 @@ void Menu::Select()
 }
 }
 
-#if defined(QUARTZ)
+// FIXME: Workaround to make GLOMenu without defining macros.
+//#if defined(QUARTZ)
 void Menu::ImplSelectWithStart( Menu* pSMenu )
 {
 Menu* pOldStartedFrom = pStartedFrom;
@@ -1157,7 +1158,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
 pOldStartedFrom->pStartedFrom = pOldStartedStarted;
 pStartedFrom = pOldStartedFrom;
 }
-#endif
+//#endif
 
 void Menu::RequestHelp( const HelpEvent& )
 {
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index a7a3ba6..4016a08 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -4,6 +4,8 @@
 //#include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -18,6 +20,7 @@ dispatchAction (GSimpleAction   *action,
 gpointeruser_data)
 {
 cout << "ACTION: " << g_action_get_name( G_ACTION( action ) ) << " 
triggered." << endl;
+GTK_YIELD_GRAB();
 
 if ( user_data ) {
 GtkSalMenuItem *pSalMenuItem = static_cast< GtkSalMenuItem* >( 
user_data );
@@ -25,20 +28,43 @@ dispatchAction (GSimpleAction   *action,
 if ( !pSalMenuItem->mpSubMenu ) {
 const GtkSalFrame *pFrame = pSalMenuItem->mpParentMenu ? 
pSalMenuItem->mpParentMenu->getFrame() : NULL;
 
-if ( pFrame ) {
+if ( pFrame && !pFrame->GetParent() ) {
 ((PopupMenu*) pSalMenuItem->mpVCLMenu)->SetSelectedEntry( 
pSalMenuItem->mnId );
 SalMenuEvent aMenuEvt( pSalMenuItem->mnId, 
pSalMenuItem->mpVCLMenu );
 pFrame->CallCallback( SALEVENT_MENUCOMMAND, &aMenuEvt );
 }
+else if ( pSalMenuItem->mpVCLMenu )
+{
+// if an item from submenu was selected. the corresponding 
Window does not exist because
+// we use native popup menus, so we have to set the selected 
menuitem directly
+// incidentally this of course works for top level popup 
menus, too
+PopupMenu * pPopupMenu = dynamic_cast(pSalMenuItem->mpVCLMenu);
+if( pPopupMenu )
+{
+// FIXME: revise this ugly code
+
+// select handlers in vcl are dispatch on the original menu
+// if not consumed by the select handler of the current 
menu
+// however since only the starting menu ever came into 
Execute
+// the hierarchy is not build up. Workaround this by 
getting
+// the menu it should have been
+
+// get started from hierarchy in vcl menus
+GtkSalMenu* pParentMenu = pSalMenuItem->mpParentMenu;
+Menu* pCurMenu = pSalMenuItem->mpVCLMenu;
+while( pParentMenu && pParentMenu->mpVCLMenu )
+{
+pCurMenu = pParentMenu->mpVCLMenu;
+pParentMenu = pParentMenu->mpParentSalMenu;
+}
+
+pPopupMenu->SetSelectedEntry( pSalMenuItem->mnId );
+pPopupMenu->ImplSelectWithStart( pCurMenu );
+}
+else
+OSL_FAIL( "menubar item without frame !" );
+}
 }
-
-//if ( !pSalMenuItem->mpSubMenu ) {
-//if ( !pSalMenuItem->mpVCLMenu->IsMenuBar() ) {
-((PopupMenu*) 

Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread anwen
Thank you, Michael. This will solve my doubt with XDocumentEventBroadcaster.
I will publish my experience and c++ code with XTermination,
XGlobalEventBroadcaster/XEventListener, and also mutithread at
Openoffice/Libreoffice Extension developers forums after I finish the
project. Then others can benefit from my experience.

Best,
Wendi


Michael Stahl-2 wrote
> 
> On 09/08/12 15:56, anwen wrote:
>> I am also interested in XDocumentEventBroadcaster/XDocumentEventListener.
>> I
>> am wondering if you could correct my following code which tries to
>> register
>> a XDocumentListener with the XDocumentEventBroadcaster in a Calc
>> Extension.
>> I did some research on this topic. Most of examples initialize a
>> EventBroadcaster following a bootstrap() method which could not be used
>> in
>> Calc Extension.
> 
> i don't think documents implement XDocumentEventBroadcaster, but there
> is a GlobalEventBroadcaster service that you can get from the service
> factory:
> 
>  Object oGEB = m_xMSF.createInstance(
> "com.sun.star.frame.GlobalEventBroadcaster");
>  m_xGEB = UnoRuntime.queryInterface(XDocumentEventBroadcaster.class,
> oGEB);
> 
> iirc the DocumentEvent that your listener gets then contains something
> that identifies the document that the event is for.
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@.freedesktop
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4000212.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-08-09 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 43932, which changed state.

Bug 43932 Summary: PRINTING: Paper tray setting not accepted from "File -> 
Print..."
https://bugs.freedesktop.org/show_bug.cgi?id=43932

   What|Old Value   |New Value

 Resolution||FIXED
 Status|REOPENED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread Michael Stahl
On 09/08/12 15:56, anwen wrote:
> I am also interested in XDocumentEventBroadcaster/XDocumentEventListener. I
> am wondering if you could correct my following code which tries to register
> a XDocumentListener with the XDocumentEventBroadcaster in a Calc Extension.
> I did some research on this topic. Most of examples initialize a
> EventBroadcaster following a bootstrap() method which could not be used in
> Calc Extension.

i don't think documents implement XDocumentEventBroadcaster, but there
is a GlobalEventBroadcaster service that you can get from the service
factory:

 Object oGEB = m_xMSF.createInstance(
"com.sun.star.frame.GlobalEventBroadcaster");
 m_xGEB = UnoRuntime.queryInterface(XDocumentEventBroadcaster.class, oGEB);

iirc the DocumentEvent that your listener gets then contains something
that identifies the document that the event is for.


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


[Libreoffice-commits] .: sfx2/inc sfx2/source unusedcode.easy

2012-08-09 Thread Julien Nabet
 sfx2/inc/sfx2/thumbnailview.hxx   |1 -
 sfx2/source/control/thumbnailview.cxx |5 -
 unusedcode.easy   |1 -
 3 files changed, 7 deletions(-)

New commits:
commit 282917d574d6df820ddb5583b8bbf17fc7af6b7a
Author: Julien Nabet 
Date:   Thu Aug 9 16:23:21 2012 +0200

Bin ThumbnailView::ImplGetFirstItem()

Change-Id: I212af5f0f6d3ad4df6492c593da51eaa4b34948d

diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index a5102e3..9a9e516 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -312,7 +312,6 @@ protected:
 SFX2_DLLPRIVATE bool ImplScroll( const Point& rPos );
 SFX2_DLLPRIVATE size_t   ImplGetItem( const Point& rPoint, bool bMove 
= false ) const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetItem( size_t nPos );
-SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetFirstItem();
 SFX2_DLLPRIVATE sal_uInt16  ImplGetVisibleItemCount() const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetVisibleItem( sal_uInt16 
nVisiblePos );
 SFX2_DLLPRIVATE void ImplInsertItem( ThumbnailViewItem *const 
pItem, const size_t nPos );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index c736182..ad2f5b8 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -452,11 +452,6 @@ ThumbnailViewItem* ThumbnailView::ImplGetItem( size_t nPos 
)
 return ( nPos < mItemList.size() ) ? mItemList[nPos] : NULL;
 }
 
-ThumbnailViewItem* ThumbnailView::ImplGetFirstItem()
-{
-return mItemList.empty() ? NULL : mItemList[0];
-}
-
 sal_uInt16 ThumbnailView::ImplGetVisibleItemCount() const
 {
 sal_uInt16 nRet = 0;
diff --git a/unusedcode.easy b/unusedcode.easy
index ff81200..4681351 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -29,7 +29,6 @@ SvxPositionSizeTabPage::GetRect()
 TempFile::IsValid() const
 TextEngine::GetLeftMargin() const
 ThumbnailView::GetItemCount() const
-ThumbnailView::ImplGetFirstItem()
 ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString 
const&, unsigned long)
 ThumbnailView::LinkStubImplTimerHdl(void*, void*)
 ThumbnailView::SetColCount(unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-09 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on||43489

--- Comment #74 from Rainer Bielefeld  
2012-08-09 14:22:46 UTC ---
Add: "Bug 43489 - [Task] Incorrect behavior using existing User Profile for
upgrade" Due to results ESC call 2012-08-09

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-09 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Roman Eisele  changed:

   What|Removed |Added

 Depends on||52078

--- Comment #73 from Roman Eisele  2012-08-09 14:19:02 UTC ---
Added bug 52078 - "shlxthdl_x64.dll/shlxthdl.dll causes Windows Explorer to
CRASH 
repeatedly".

This bug is especially annoying, because it causes *repeated* Windows Explorer
crashes -- under certain circumstances, you can get into a nice crash loop
which can get stopped only by complicated actions (see e.g. comment no. 15 in
that bug report and the description in the dupliacte bug 52276).

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] .: 5 commits - Library_merged.mk postprocess/packcomponents RepositoryExternal.mk scripting/Module_scripting.mk scripting/Rdb_scriptproviderforbeanshell.mk scripting/Rdb_scriptpr

2012-08-09 Thread Matus Kukan
 Library_merged.mk  |5 ---
 RepositoryExternal.mk  |4 ---
 postprocess/packcomponents/makefile.mk |   33 -
 scripting/Module_scripting.mk  |   12 ++---
 scripting/Rdb_scriptproviderforbeanshell.mk|   16 
 scripting/Rdb_scriptproviderforjavascript.mk   |   16 
 solenv/gbuild/ComponentTarget.mk   |7 +
 solenv/gbuild/CppunitTest.mk   |   25 --
 solenv/gbuild/Rdb.mk   |   16 +---
 solenv/gbuild/extensions/pre_MergedLibsList.mk |2 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk  |3 --
 solenv/gbuild/platform/solaris.mk  |2 -
 solenv/gbuild/platform/unxgcc.mk   |2 -
 solenv/gbuild/platform/windows.mk  |2 -
 14 files changed, 48 insertions(+), 97 deletions(-)

New commits:
commit fe32762e119221d3738056b096a4ef054cdffa52
Author: Matúš Kukan 
Date:   Thu Aug 9 00:15:52 2012 +0200

tubes: add to libmerged to fix circular dependency

Probably it belongs in there anyway.

Change-Id: I3bf908de58e0e989e263323d2fdc432308c2cab8

diff --git a/Library_merged.mk b/Library_merged.mk
index 68874e1..cc54e95 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,merged,\
icuuc \
jpeg \
libxml2 \
+   telepathy \
zlib \
 ))
 
@@ -88,8 +89,4 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 endif
 
-ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Library_use_libraries,merged,tubes))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 08b3aa6..a07bdff 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1166,9 +1166,7 @@ endef
 
 else # !ENABLE_TELEPATHY
 
-define gb_LinkTarget__use_telepathy
-
-endef
+gb_LinkTarget__use_telepathy :=
 
 endif # ENABLE_TELEPATHY
 
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7bbf699..7a05039 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -58,6 +58,8 @@ gb_MERGEDLIBS := \
xmlscript \
xo \
 
+gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
+
 endif
 
 # vim: set noet sw=4 ts=4:
commit 772d15fb8ccdaa46fab0961712177baf915ed70d
Author: Matúš Kukan 
Date:   Wed Aug 8 21:21:48 2012 +0200

create these rdbs directly in scripting

Change-Id: I8a44de06f9a16308a5ff82ad77d059e5dde544f9

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 92139ec..4ced4c1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -412,36 +412,3 @@ $(MISC)/services.input : makefile.mk
 '$(my_components:^"":+".component")' 
\
 > $@
 
-.IF "$(ENABLE_SCRIPTING_BEANSHELL)" == "YES"
-ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb
-
-$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforbeanshell.input \
-
$(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component
-$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforbeanshell.input
-
-$(MISC)/scriptproviderforbeanshell.input : makefile.mk
-echo \
-
'component/scripting/java/ScriptProviderForBeanShell.component'
 \
-> $@
-.END
-
-.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" == "YES"
-ALLTAR : $(MISC)/scriptproviderforjavascript.rdb
-
-$(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforjavascript.input \
-
$(SOLARXMLDIR)/component/scripting/java/ScriptProviderForJavaScript.component
-$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/scriptproviderforjavascript.input
-
-$(MISC)/scriptproviderforjavascript.input : makefile.mk
-echo \
-
'component/scripting/java/ScriptProviderForJavaScript.component'
 \
-> $@
-.END
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 7312f51..bf385cd 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -36,11 +36,15 @@ $(eval $(call gb_Module_add_targets,scripting,\
Jar_Highlight \
Jar_MemoryUsage \
Jar_ScriptFramework \
-$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
-Jar_ScriptProviderForBeanShell) \
+   $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
+   Jar_ScriptProviderForBeanShell \
+   Rdb_scriptproviderforbeanshell \
+

[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source

2012-08-09 Thread Markus Mohrhard
 sc/inc/column.hxx|2 
 sc/inc/document.hxx  |2 
 sc/inc/global.hxx|8 ++
 sc/inc/table.hxx |6 +
 sc/qa/unit/ucalc.cxx |   36 --
 sc/source/core/data/column2.cxx  |   20 ++---
 sc/source/core/data/document.cxx |4 -
 sc/source/core/data/table1.cxx   |  134 ---
 sc/source/ui/vba/vbarange.cxx|   13 +--
 sc/source/ui/view/tabview2.cxx   |8 +-
 sc/source/ui/view/viewfun2.cxx   |4 -
 11 files changed, 163 insertions(+), 74 deletions(-)

New commits:
commit 5e0672f32ea6a4d3d6cf66874d0d7c0bdb3dec1d
Author: Markus Mohrhard 
Date:   Thu Aug 9 15:58:00 2012 +0200

remove useless variable

Change-Id: Ic04e11cd0768bc203188f0b5adb5f4b9725fd6d9

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index fbd84e7..d381db3 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1335,7 +1335,6 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow, 
bool bForward) const
 {
 if(bForward)
 {
-bool bFound = false;
 do
 {
 nRow++;
@@ -1362,13 +1361,12 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW 
nRow, bool bForward) const
 nRow = maItems[nIndex].nRow - 1;
 }
 }
-while(!bFound && nRow < MAXROW);
+while(nRow < MAXROW);
 
 return MAXROW;
 }
 else
 {
-bool bFound = false;
 do
 {
 nRow--;
@@ -1390,7 +1388,7 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow, 
bool bForward) const
 else
 nRow = maItems[nIndex-1].nRow + 1;
 }
-while(!bFound && nRow > 0);
+while(nRow > 0);
 
 return 0;
 }
commit a69d704dc0950ab62e260cb93eb5f37db45e2183
Author: Markus Mohrhard 
Date:   Thu Aug 9 15:56:00 2012 +0200

adapt unit test and activate all test cases

Change-Id: If5998c62709de0f95b2870327fca951cd81f2406

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index fc51b22..49beff8 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4617,27 +4617,27 @@ void Test::testFindAreaPosRowDown()
 
 SCCOL nCol = 0;
 SCROW nRow = 0;
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(1), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(2), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(5), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(6), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(MAXROW), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nCol);
@@ -4645,12 +4645,12 @@ void Test::testFindAreaPosRowDown()
 nCol = 1;
 nRow = 2;
 
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(3), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(1), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(6), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(1), nCol);
@@ -4678,29 +4678,27 @@ void Test::testFindAreaPosColRight()
 
 SCCOL nCol = 0;
 SCROW nRow = 0;
-pDoc->FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(1), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(2), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nRow);
-// BUG! This returns right now 4 because FindAreaPos does
-// not yet work correctly with hidden rows
-//CPPUNIT_ASSERT_EQUAL(static_cast(5), nCol);
+CPPUNIT_ASSERT_EQUAL(static_cast(5), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL(static_cast(0), nRow);
 CPPUNIT_ASSERT_EQUAL(static_cast(6), nCol);
 
-pDoc->FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc->FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
 
 CPPUNIT_ASSERT_EQUAL

[Libreoffice-commits] .: i18npool/source

2012-08-09 Thread Eike Rathke
 i18npool/source/languagetag/languagetag.cxx|  129 
 i18npool/source/languagetag/simple-langtag.cxx |  401 +
 2 files changed, 408 insertions(+), 122 deletions(-)

New commits:
commit 1150a1a8eb1759160b9d88e99d95e5ad082f40be
Author: Eike Rathke 
Date:   Thu Aug 9 16:06:41 2012 +0200

implemented simple liblangtag replacement for iOS and Android

diff --git a/i18npool/source/languagetag/languagetag.cxx 
b/i18npool/source/languagetag/languagetag.cxx
index 728e70a..d7c6b0f 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -15,128 +15,13 @@
 
 #if !defined(ANDROID) && !defined(IOS)
 #include 
-
-#elif defined(ANDROID) || defined(IOS)
-
-// Completely dummy implementation, once this actually starts getting used at
-// run-time will need to do something.
-
-// For iOS probably can use NSLocale, that should have more or less required
-// functionality. If it is good enough, it could be used for Mac OS X,
-// too. For Android, maybe java.util.Locale, although it definitely lacks in
-// functionality.
-
-typedef char gchar;
-typedef struct {
-char *message;
-} GError;
-
-static void g_free(void *p)
-{
-free(p);
-}
-
-static void g_error_free(GError *error)
-{
-(void) error;
-}
-
-typedef void lt_tag_t;
-typedef void lt_lang_t;
-typedef void lt_script_t;
-typedef void lt_region_t;
-
-static void lt_db_initialize(void)
-{
-}
-
-static void lt_db_finalize(void)
-{
-}
-
-static void lt_db_set_datadir(const char *dir)
-{
-(void) dir;
-}
-
-static lt_tag_t *lt_tag_new(void)
-{
-return NULL;
-}
-
-static lt_tag_t *lt_tag_copy(lt_tag_t *tag)
-{
-(void) tag;
-return NULL;
-}
-
-static void lt_tag_unref(lt_tag_t *tag)
-{
-(void) tag;
-}
-
-static int lt_tag_parse(lt_tag_t *tag,
-const char *tag_string,
-GError **error)
-{
-(void) tag;
-(void) tag_string;
-(void) error;
-
-return -1;
-}
-
-static char *lt_tag_canonicalize(lt_tag_t *tag,
- GError **error)
-{
-(void) tag;
-(void) error;
-
-return NULL;
-}
-
-static const lt_lang_t *lt_tag_get_language(const lt_tag_t  *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const lt_script_t *lt_tag_get_script(const lt_tag_t  *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const lt_region_t *lt_tag_get_region(const lt_tag_t  *tag)
-{
-(void) tag;
-
-return NULL;
-}
-
-static const gchar *lt_lang_get_tag(const lt_lang_t *lang)
-{
-(void) lang;
-
-return NULL;
-}
-
-static const gchar *lt_script_get_tag(const lt_script_t *script)
-{
-(void) script;
-
-return NULL;
-}
-
-static const gchar *lt_region_get_tag(const lt_region_t *region)
-{
-(void) region;
-
-return NULL;
-}
-
+#else
+/* Replacement code for LGPL phobic and Android systems.
+ * For iOS we could probably use NSLocale instead, that should have more or
+ * less required functionality. If it is good enough, it could be used for Mac
+ * OS X, too.
+ */
+#include "simple-langtag.cxx"
 #endif
 
 //#define erDEBUG
diff --git a/i18npool/source/languagetag/simple-langtag.cxx 
b/i18npool/source/languagetag/simple-langtag.cxx
new file mode 100644
index 000..7131749
--- /dev/null
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -0,0 +1,401 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+/** Cheap and cheesy replacement code for liblangtag on systems that do not
+allow / want LGPL code or dependencies on glib.
+
+XXX NOTE: This code does not check language tags for validity or if they
+are registered with IANA, does not canonicalize or strip default script
+tags if included nor does it do any other fancy stuff that liblangtag is
+capable of. It just makes depending code work without.
+ */
+
+#include 
+#include 
+#include 
+
+namespace {
+
+typedef char gchar;
+typedef void* gpointer;
+typedef int gint;
+typedef gint gboolean;
+
+struct GError {
+char *message;
+GError() : message(NULL) {}
+};
+
+static gpointer g_malloc(size_t s)
+{
+return malloc(s);
+}
+
+static void g_free(gpointer p)
+{
+if (p)
+free(p);
+}
+
+static void g_error_free(GError *error)
+{
+if (error)
+{
+g_free( error->message);
+g_free( error);
+}
+}
+
+struct my_ref
+{
+sal_uInt32 mnRef;
+explicit my_ref() : mnRef(1) {}
+virtual ~my_ref() {}
+void incRef() { ++mnRef; }
+void decRef() { if (--mnRef == 0) delete this; }
+};
+
+struct my_t_impl : public my_ref
+{
+gchar*  mpStr;
+explicit my_t_impl() : my_ref(), mpStr(NULL) {}
+virtual ~my_t_impl() { g_free( mpStr); }
+ 

[Libreoffice-commits] .: sc/source unusedcode.easy

2012-08-09 Thread Julien Nabet
 sc/source/filter/xml/xmlimprt.cxx |   37 -
 sc/source/filter/xml/xmlimprt.hxx |1 -
 unusedcode.easy   |1 -
 3 files changed, 39 deletions(-)

New commits:
commit 3e65ed611f25064aa865e1559fccfeebb0e3c411
Author: Julien Nabet 
Date:   Thu Aug 9 16:05:37 2012 +0200

Bin ScXMLImport::GetVisibleSheet()

Change-Id: I3d5d03f1b5d357d3db1e0c1833824c154178533a

diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 55693ef..dcf37b4 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3199,43 +3199,6 @@ void ScXMLImport::ProgressBarIncrement(bool bEditCell, 
sal_Int32 nInc)
 }
 }
 
-SCTAB ScXMLImport::GetVisibleSheet()
-{
-// Get the visible sheet number from model's view data (after settings 
were loaded),
-// or 0 (default: first sheet) if no settings available.
-
-uno::Reference xSupp(GetModel(), 
uno::UNO_QUERY);
-if (xSupp.is())
-{
-uno::Reference xIndex = xSupp->getViewData();
-if ( xIndex.is() && xIndex->getCount() > 0 )
-{
-uno::Any aAny( xIndex->getByIndex(0) );
-uno::Sequence aViewSettings;  // settings 
for (first) view
-if ( aAny >>= aViewSettings )
-{
-sal_Int32 nCount = aViewSettings.getLength();
-for (sal_Int32 i = 0; i < nCount; ++i)
-{
-if ( aViewSettings[i].Name.compareToAscii(SC_ACTIVETABLE) 
== 0 )
-{
-rtl::OUString sValue;
-if(aViewSettings[i].Value >>= sValue)
-{
-String sTabName(sValue);
-SCTAB nTab = 0;
-if (pDoc->GetTable(sTabName, nTab))
-return nTab;
-}
-}
-}
-}
-}
-}
-
-return 0;
-}
-
 void ScXMLImport::ExtractFormulaNamespaceGrammar(
 OUString& rFormula, OUString& rFormulaNmsp, FormulaGrammar::Grammar& 
reGrammar,
 const OUString& rAttrValue, bool bRestrictToExternalNmsp ) const
diff --git a/sc/source/filter/xml/xmlimprt.hxx 
b/sc/source/filter/xml/xmlimprt.hxx
index 65f7a5e..f3706d9 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1105,7 +1105,6 @@ public:
 void SetLabelRanges();
 void AddDefaultNote( const com::sun::star::table::CellAddress& aCell );
 
-SCTAB   GetVisibleSheet();
 /** Extracts the formula string, the formula grammar namespace URL, and a
 grammar enum value from the passed formula attribute value.
 
diff --git a/unusedcode.easy b/unusedcode.easy
index 11c9818..ff81200 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -19,7 +19,6 @@ ScVbaFormat::getAddIndent()
 ScVbaFormat::setAddIndent(com::sun::star::uno::Any 
const&)
 
ScVbaFormat::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const&)
 
ScXMLExport::HasDrawPages(com::sun::star::uno::Reference&)
-ScXMLImport::GetVisibleSheet()
 
SecurityEnvironment_NssImpl::getImplementation(com::sun::star::uno::Reference)
 SotStorage::GetProperty(String const&, String const&, 
com::sun::star::uno::Any&)
 SpinButton::SpinButton(Window*, ResId const&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: git review

2012-08-09 Thread Norbert Thiebaud
On Thu, Aug 9, 2012 at 8:11 AM, Bjoern Michaelsen
 wrote:
> On Thu, Aug 09, 2012 at 07:55:45AM -0500, Norbert Thiebaud wrote:
>> I know that michael disagree with me on that, but I prefer dev-tools
>> to be in ...  dev-tools.git
>> one can install it as he see fit. and you get the version you
>> want/need regardless where you are in the source tree...
>
> Well, putting it in ./download would be even better, as it would be living
> upstream at openstack.

no it would not, because if I swith to branch 3-5... what version do I
have then ?

not to mention have n-copy of it (I do have typically half-a dozen of
clone of core...)... yeah the src directory can be share... still. I
tend to do make clean a lot... so I would have to rebuild it every
time to make sure it is there when I need it ?


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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread anwen

anwen wrote
> 
> 
> BTW, I am not sure how to initialize a XDocumentEventBroadcaster which you
> mentioned previously in a Calc Extension. I tried this method: 
> Reference
> xCalc(m_xCC->getServiceManager()->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")),
> m_xCC), UNO_QUERY); But it did not work.
> 
> 

I am also interested in XDocumentEventBroadcaster/XDocumentEventListener. I
am wondering if you could correct my following code which tries to register
a XDocumentListener with the XDocumentEventBroadcaster in a Calc Extension.
I did some research on this topic. Most of examples initialize a
EventBroadcaster following a bootstrap() method which could not be used in
Calc Extension.

void SAL_CALL BLPAPIAddIn_Impl::addDocEvtListener() throw (RuntimeException)
{
// Reference xModel = UnoRuntime.queryInterface(XModel.class,
uno::UNO_QUERY);
Reference
xCalc(m_xCC->getServiceManager()->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")),
m_xCC), UNO_QUERY);

if (xCalc.is())
{   
Reference< XDocumentEventBroadcaster > xBroadcaster(xCalc, 
UNO_QUERY);
if (xBroadcaster.is())
{
Reference< XDocumentEventListener > xDocListener(

static_cast(new CalcListener()), UNO_QUERY);
xBroadcaster->addDocumentEventListener(xDocListener);
std::cout << "added an DocEvtListener" << std::endl;
}
}
}

Thanks a lot.




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4000189.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


ODF angle in draw:transform are in degrees

2012-08-09 Thread Regina Henschel

Hi,

there is a problem which I have not addressed in the Wiki (see other 
mail). As far as I see, the specification ODF 1.1 has no setting for the 
unit of the angles, but ODF 1.2 set it to "degrees". SVG has it in 
degrees too, so this setting is reasonable.


But our implementation uses "radians". So there are a lot of documents 
out, that have the angle in radians in the document.


Any idea how to proceed?

Kind regards
Regina

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


ODF angle problems continued

2012-08-09 Thread Regina Henschel

Hi all,

I have written a mail to OASIS, that I think that a lot of angle 
definitions are not clear enough. It seems that the committee is willing 
to discuss the problem. I have therefore started with section "19.228 
draw:transform" in spec ODF 1.2 part 1.


You find my concerns and suggestions on 
http://wiki.services.openoffice.org/wiki/User:Regina/MYDrafts4.


I plan to show that to the OASIS committee. But first I like to know 
your ideas. So please have a look.


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


[Libreoffice-commits] .: 2 commits - basic/source

2012-08-09 Thread Takeshi Abe
 basic/source/comp/exprnode.cxx |   12 +---
 basic/source/comp/exprtree.cxx |1 -
 basic/source/inc/expr.hxx  |1 -
 basic/source/inc/sbjsmeth.hxx  |3 ---
 4 files changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 414ecabbd56ab0ea7c041de4268e1c18187a070a
Author: Takeshi Abe 
Date:   Thu Aug 9 22:19:37 2012 +0900

Remove useless #ifndef guard

Change-Id: Iddb11ff11db0912832a73bd8b95438985383

diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 055c957..e53473a 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -37,10 +37,7 @@ public:
 TYPEINFO();
 };
 
-#ifndef __SB_SBJSCRIPTMETHODREF_HXX
-#define __SB_SBJSCRIPTMETHODREF_HXX
 SV_DECL_IMPL_REF(SbJScriptMethod)
-#endif
 
 #endif
 
commit 2eb40e3cecd2fa503c6717acfad59b51918b5aaf
Author: Takeshi Abe 
Date:   Thu Aug 9 22:05:53 2012 +0900

Remove a member variable no one reads

Change-Id: Iacb037bebaf1c3d77ab61be6342b42319b8a2e7b

diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 0abb1d0..1ca35fc 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -42,7 +42,6 @@ SbiExprNode::SbiExprNode( SbiParser* p, SbiExprNode* l, 
SbiToken t, SbiExprNode*
 nVal  = 0;
 eType = SbxVARIANT; // Nodes are always Variant
 eNodeType = SbxNODE;
-bComposite= sal_True;
 }
 
 SbiExprNode::SbiExprNode( SbiParser* p, double n, SbxDataType t )
@@ -73,9 +72,6 @@ SbiExprNode::SbiExprNode( SbiParser* p, const SbiSymDef& r, 
SbxDataType t, SbiEx
 aVar.pPar = l;
 aVar.pvMorePar = NULL;
 aVar.pNext= NULL;
-
-// Results of functions are at no time fixed
-bComposite= sal_Bool( aVar.pDef->GetProcDef() != NULL );
 }
 
 // #120061 TypeOf
@@ -107,7 +103,6 @@ void SbiExprNode::BaseInit( SbiParser* p )
 pLeft   = NULL;
 pRight  = NULL;
 pWithParent = NULL;
-bComposite  = sal_False;
 bError  = sal_False;
 }
 
@@ -222,7 +217,7 @@ void SbiExprNode::Optimize()
 CollectBits();
 }
 
-// Lifting of the composite- and error-bits
+// Lifting of the error-bits
 
 void SbiExprNode::CollectBits()
 {
@@ -230,13 +225,11 @@ void SbiExprNode::CollectBits()
 {
 pLeft->CollectBits();
 bError |= pLeft->bError;
-bComposite |= pLeft->bComposite;
 }
 if( pRight )
 {
 pRight->CollectBits();
 bError |= pRight->bError;
-bComposite |= pRight->bComposite;
 }
 }
 
@@ -267,7 +260,6 @@ void SbiExprNode::FoldConstants()
 String rr( pRight->GetString() );
 delete pLeft; pLeft = NULL;
 delete pRight; pRight = NULL;
-bComposite = sal_False;
 if( eTok == PLUS || eTok == CAT )
 {
 eTok = CAT;
@@ -341,7 +333,6 @@ void SbiExprNode::FoldConstants()
 nVal = 0;
 eType = SbxDOUBLE;
 eNodeType = SbxNUMVAL;
-bComposite = sal_False;
 sal_Bool bCheckType = sal_False;
 switch( eTok )
 {
@@ -431,7 +422,6 @@ void SbiExprNode::FoldConstants()
 pLeft = NULL;
 eType = SbxDOUBLE;
 eNodeType = SbxNUMVAL;
-bComposite = sal_False;
 switch( eTok )
 {
 case NEG:
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index c36e5a4..267576a 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -512,7 +512,6 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
 }
 }
 nParenLevel--;
-pRes->bComposite = sal_True;
 break;
 default:
 // keywords here are OK at the moment!
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index d59f56b..8580493 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -102,7 +102,6 @@ class SbiExprNode {  // operators (and 
operands)
 SbiNodeType  eNodeType;
 SbxDataType eType;
 SbiToken eTok;
-sal_Bool  bComposite;   // sal_True: composite expression
 sal_Bool  bError;   // sal_True: error
 void  FoldConstants();
 void  CollectBits();// converting numbers to strings
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: git review

2012-08-09 Thread d . ostrovsky

Quoting Norbert Thiebaud :


On Thu, Aug 9, 2012 at 7:04 AM, Bjoern Michaelsen


Thinking a bit about this, another possibility would be to do with  
git-review

as we do with other external stuff:
Downloading and installing a local copy in "./download". That would  
ensure it

to be universally available and be up to date.


I know that michael disagree with me on that, but I prefer dev-tools
to be in ...  dev-tools.git
one can install it as he see fit. and you get the version you
want/need regardless where you are in the source tree...


Well to put it in dev-tool is much less painfull as to put it elsewhere.
Note this tool must be in your PATH! For all branches.
And even if you switch the branches and no matter what your current  
directory is,

you must be able to say:
git review --dry-run

that it.
But who is the person who will put it in dev-tools once and update it  
all the time?

(Last time i contributed to git-review was today morning).
But even if that person (not me) or some cron jobs continuously  
synchronize it, the user must still update it.


So the user must now periodically update dev-tool to get the fresh version
of git-review? But then what is the difference to say git pull  
dev-tools/git-review or


sudo apt-get update upgrade (place here your distro command)
or (*)
sudo pip install git-review
sudo pip install --upgrade git-review
sudo pip uninstall git-review

(*) http://www.pip-installer.org/en/latest/index.html

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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread anwen
Thank you everyone for your kind and quick response.

Stephan, I checked the impl_sendNotifyTerminationEvent in desktop.cxx. Yes,
it is protected by TransactionGuard aTransaction( m_aTransactionManager,
E_HARDEXCEPTIONS ), the same as impl_sendQueryTerminationEvent, :-(


Stephan Bergmann-2 wrote
> 
> On 08/08/2012 08:34 PM, anwen wrote:
>> With the TerminateListener, I successfully get the desktop termination
>> event
>> by queryTermination() function. Although you told me that I could veto
>> this
>> termination signal by throwing TerminationVetoException. I am not sure
>> how
>> and where to handle the TerminationVetoException and re-call
>> XDesktop.terminate() to finally close the office. So I tried to handle
>> everything inside queryTermination().
> 
> I think you should execute your shutdown activies on notifyTermination, 
> not queryTermination.  The latter can be veto'ed by some other listener, 
> in which case Desktop would cancel the termination and continue running 
> (and notify you with queryTermination eventually followed by 
> notifyTermination again later on).
> 
>> However, deadlock happened sometimes again. Here is my analysis: this
>> function is called by the main thread and is protected by the SolarMutex.
>> If
>> a modified() function is called by the worker thread at the same time,
>> the
>> worker thread is waiting for the SolarMutex. Then the main thread tries
>> to
>> stop the worker thread by calling realtime_session->stop(). This session
>> is
>> designed with thread safe strategy by a third-party. It fails to close
>> the
>> worker thread because the worker thread is waiting for the Main thread to
>> release the SolarMutex.
> 
> That queryTermination is called with SolarMutex locked is a bug.  (Is 
> notifyTermination also called with SolarMutex locked?  Would need to 
> check, in framework/source/services/desktop.cxx.)  However, it might be 
> a bug not easy to fix without opening any number of pandora's boxes...
> 
> Stephan
> ___
> LibreOffice mailing list
> LibreOffice@.freedesktop
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 




--
View this message in context: 
http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4000178.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: git review

2012-08-09 Thread Bjoern Michaelsen
On Thu, Aug 09, 2012 at 07:55:45AM -0500, Norbert Thiebaud wrote:
> I know that michael disagree with me on that, but I prefer dev-tools
> to be in ...  dev-tools.git
> one can install it as he see fit. and you get the version you
> want/need regardless where you are in the source tree...

Well, putting it in ./download would be even better, as it would be living
upstream at openstack.

Best,

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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread Stephan Bergmann

On 08/09/2012 01:21 PM, Michael Stahl wrote:

WTF, there is an API to release SolarMutex? ... /me hides under desk


Yes, and its a gross, broken hack, never to be used.  (As the outer code 
that locked the SolarMutex presumably did so to be able to temporarily 
break invariants.  Now if inner code temporarily unlocks the SolarMutex, 
other code could observe broken invariants and fail, etc.)


Stephan

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


Re: [REVIEW 3-6] fdo#53006 Force reinstall of all bundled extensions on upgrade

2012-08-09 Thread Stephan Bergmann

On 08/03/2012 06:10 PM, Stephan Bergmann wrote:

On 08/03/2012 11:24 AM, Stephan Bergmann wrote:



"fdo#53006 Force reinstall of all bundled extensions on upgrade" are the
two commits from master to get this fixed, which I would love to see
backported to libreoffice-3-6.


Please do *not* backport that one to libreoffice-3-6 for now.  I just
got an idea that might obsolete it...


Finally got a new fix out, see 
 for details. 
With the one old commit from this thread still relevant, that means 
please review the three master commits


 
"Check for ComponentPackageImpl::isRegistered_ in the current rdb"


 
"Related fdo#53006: Do not instantiate service manager too early"


 
"fdo#53006: Remove user/extensions/bundled cache after upgrade"


for backporting to libreoffice-3-6.  (The last one needs one trivial 
tweak there, adding an "rtl::" prefix to a new occurrence of "OString" 
at desktop/soruce/app/app.cxx:33.)


...and this time, I /did/ test on Windows 3.6, too. -- Lets keep fingers 
crossed...


Petr, Björn, Rene:  With that fixed, prereg-affected Linux distros can 
probably undo 
 
"File force-refresh-of-bundled-extension-cache.diff of Package 
libreoffice" or its moral equivalent (if any) again.


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


Re: git review

2012-08-09 Thread Norbert Thiebaud
On Thu, Aug 9, 2012 at 7:04 AM, Bjoern Michaelsen
 wrote:
> On Wed, Aug 08, 2012 at 11:52:03PM +0200, Bjoern Michaelsen wrote:
>> > Like described in link above, you have three options here:
>> > pypi-system-wide, pypi-user-local and distro package.
>> > No other options please.
>>
>> Most people wont even know what pypi-system-wide is and dont want to know. 
>> And
>> they shouldnt need to.
>>
>> We will loose possible contributors that way. Not an option. Patch submittal
>> has to work hasslefree and out of the box. This is really critical: there has
>> to be no extra step at all for patch submittal otherwise we failed.
>
> Thinking a bit about this, another possibility would be to do with git-review
> as we do with other external stuff:
> Downloading and installing a local copy in "./download". That would ensure it
> to be universally available and be up to date.

I know that michael disagree with me on that, but I prefer dev-tools
to be in ...  dev-tools.git
one can install it as he see fit. and you get the version you
want/need regardless where you are in the source tree...

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


Re: [PUSHED 3-6, 3-5] n#759210: Certain smartart drawings weren't imported

2012-08-09 Thread Petr Mladek
Hi Korrawit,

it seems that we have somehow missed this request.

Korrawit Pruegsanusak píše v Po 16. 07. 2012 v 12:08 +0700:
> Hello all,
> 
> On Tue, Jul 10, 2012 at 8:59 PM, Korrawit Pruegsanusak
>  wrote:
> > The commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f also fix fdo#50907
> > on master, so I propose this review for the inclusion in both -3-6 and
> > -3-5 branches.
> [snip]
> > Last, sorry to say this, but I didn't have time to test if it could be
> > build or even fix the problem. (I didn't test in both branches, but
> > tested in master that this really fixes the problem, please see
> > comment 11 in fdo bugzilla).
> 
> I've tested a build in -3-6 branch, with the attached patch on top of
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=0054c76b0f3d5bdbaef73a696ce3cf930be9c16b
> and it really fix fdo#50907.

Yup, it worked and looked fine, so pushed to 3-6, see
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=dc29a85982a4b54657be3f448dd8d37d2144a020

> I didn't test with other pptx files, nor in -3-5 branch.

It caused some crashes there. After discussion with Muthu I added one
more fix and pushed it there as well, see:
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=0a7453043f35a9a49f0482168b48d378a099a238
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5&id=f3826fda8ac280d20f70ae273f20a438d6040453


Best Regards,
Petr

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


[Libreoffice-commits] .: solenv/bin

2012-08-09 Thread Michael Meeks
 solenv/bin/make_installer.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbf9794729337dd24ee11f85e052133db50d4d56
Author: Michael Meeks 
Date:   Thu Aug 9 13:42:45 2012 +0100

fix typo in make_installer.pl

Change-Id: Icc0f1d1e91c704282bfd18b6218bf0659cccb63e

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 38b4793..fce4522 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -625,7 +625,7 @@ for ( my $n = 0; $n <= 
$#installer::globals::languageproducts; $n++ )
 
 if (!($installer::globals::is_copy_only_project))
 {
-if ((( $installer::globals::iswindowsbuild ) && ( 
$installer::globals::packageformat ne "archive" ) && ( 
$installer::globals::packageformat ne "installed" ) ) || 
$insaller::globals::packageformat eq 'msi' )
+if ((( $installer::globals::iswindowsbuild ) && ( 
$installer::globals::packageformat ne "archive" ) && ( 
$installer::globals::packageformat ne "installed" ) ) || 
$installer::globals::packageformat eq 'msi' )
 {
 
installer::windows::msiglobal::set_global_code_variables($languagesarrayref, 
$languagestringref, $allvariableshashref, $alloldproperties);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - desktop/inc desktop/source offapi/com

2012-08-09 Thread Stephan Bergmann
 desktop/inc/app.hxx|4 
 desktop/source/app/app.cxx |  154 -
 desktop/source/app/check_ext_deps.cxx  |   19 +
 desktop/source/app/cmdlineargs.cxx |   74 +++---
 desktop/source/app/cmdlineargs.hxx |   34 +-
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |2 
 desktop/source/deployment/inc/dp_misc.h|3 
 desktop/source/deployment/manager/dp_extensionmanager.cxx  |9 
 desktop/source/deployment/manager/dp_extensionmanager.hxx  |1 
 desktop/source/deployment/manager/dp_manager.cxx   |   22 -
 desktop/source/deployment/manager/dp_manager.h |2 
 desktop/source/deployment/misc/dp_misc.cxx |7 
 desktop/source/pkgchk/unopkg/unopkg_app.cxx|2 
 offapi/com/sun/star/deployment/XExtensionManager.idl   |8 
 offapi/com/sun/star/deployment/XPackageManager.idl |8 
 15 files changed, 232 insertions(+), 117 deletions(-)

New commits:
commit 5300f6f711c2167931d45248c1b72dbce3a7df38
Author: Stephan Bergmann 
Date:   Thu Aug 9 13:29:22 2012 +0200

fdo#53006: Remove user/extensions/bundled cache after upgrade

... to clean out all sorts of inconsitencies that can have accrued there 
over
time apparently due to how the mechanism of copying share/prereg/bundled 
worked,
and to work around stale $BUNDLED_EXTENSIONS_PREREG references in a better 
way
than the previous 81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 "fdo#53006 Force
reinstall of all bundled extensions on upgrade."

See the comment on refreshBundledExtensionsDir for how, at least in theory, 
that
functionality could be removed again in the future.

This effectively reverts 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force
ExtensionManager resync when the implementation changes" and
81fd6b084b0f3c0eb5a97c77592f5ceb21d2dfb1 "fdo#53006 Force reinstall of all
bundled extensions on upgrade" (the latter at least on master; it had never 
been
cherry-picked to libreoffice-3-6), which it obsoletes.

Change-Id: I8f80c07a06ec9d53b03813338eeff7d7757c9d4d

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 06dc4c7..22866ef 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -126,14 +126,12 @@ class Desktop : public Application
 static sal_Bool isCrashReporterEnabled();
 
 // first-start (ever) related methods
-static bool newInstallation();
-
 static sal_Bool CheckExtensionDependencies();
 
 static void DoRestartActionsIfNecessary( sal_Bool 
bQuickStart );
 static void SetRestartState();
 
-voidSynchronizeExtensionRepositories(bool force);
+voidSynchronizeExtensionRepositories();
 voidSetSplashScreenText( const ::rtl::OUString& 
rText );
 voidSetSplashScreenProgress( sal_Int32 );
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c3152ee..84f60b8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -152,6 +152,145 @@ static sal_Bool _bCrashReporterEnabled = sal_True;
 static ::rtl::OUString getBrandSharePreregBundledPathURL();
 #endif
 
+namespace {
+
+void removeTree(OUString const & url) {
+osl::Directory dir(url);
+switch (dir.open()) {
+case osl::FileBase::E_None:
+break;
+case osl::FileBase::E_NOENT:
+return; //TODO: SAL_WARN if recursive
+default:
+throw css::uno::RuntimeException(
+"cannot open directory " + url,
+css::uno::Reference< css::uno::XInterface >());
+}
+for (;;) {
+osl::DirectoryItem i;
+osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+if (rc == osl::FileBase::E_NOENT) {
+break;
+}
+if (rc != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+"cannot iterate directory " + url,
+css::uno::Reference< css::uno::XInterface >());
+}
+osl::FileStatus stat(
+osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
+osl_FileStatus_Mask_FileURL);
+if (i.getFileStatus(stat) != osl::FileBase::E_None) {
+throw css::uno::RuntimeException(
+"cannot stat in directory " + url,
+css::uno::Reference< css::uno::XInterface >());
+}
+if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: 
symlinks
+removeTree(stat.getFileURL());
+} else {
+if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) 
{
+throw css::uno::RuntimeException(
+"cannot remove " + stat.getFileURL(),
+

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/inc oox/source

2012-08-09 Thread Petr Mladek
 oox/inc/oox/ppt/pptshapegroupcontext.hxx |1 
 oox/source/drawingml/diagram/diagram.cxx |   69 ---
 oox/source/ppt/pptshapegroupcontext.cxx  |   11 
 3 files changed, 47 insertions(+), 34 deletions(-)

New commits:
commit f3826fda8ac280d20f70ae273f20a438d6040453
Author: Muthu Subramanian 
Date:   Mon Jun 25 19:25:52 2012 +0530

n#759210: Certain smartart drawings weren't imported.

SmartArt info was reset, when there was a chart (e.g.)
in the same slide.

This also fixes fdo#50907.

Conflicts:

oox/source/drawingml/diagram/diagram.cxx

(cherry picked from commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f)

Signed-off-by: Petr Mladek 

diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx 
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 7e2a6d3..841e741 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -39,6 +39,7 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+voidimportExtDrawings();
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index d262dd8..d7ad02e 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -408,40 +408,44 @@ void loadDiagram( ShapePtr& pShape,
 pShape->addExtDrawingRelId( *aIt );
 }
 
-// layout
-if( rLayoutPath.getLength() > 0 )
+// extLst is present, lets bet on that and ignore the rest of the data 
from here
+if( !pData->getExtDrawings().size() )
 {
-rtl::Reference< core::FragmentHandler > xRef(
-new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   "DiagramLayout",
-   pShape,
-   xRef);
-}
+// layout
+if( !rLayoutPath.isEmpty() )
+{
+rtl::Reference< core::FragmentHandler > xRef(
+new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, 
pLayout ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+"DiagramLayout",
+pShape,
+xRef);
+}
 
-// style
-if( rQStylePath.getLength() > 0 )
-{
-rtl::Reference< core::FragmentHandler > xRef(
-new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram->getStyles() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   "DiagramQStyle",
-   pShape,
-   xRef);
-}
+// style
+if( !rQStylePath.isEmpty() )
+{
+rtl::Reference< core::FragmentHandler > xRef(
+new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram->getStyles() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+"DiagramQStyle",
+pShape,
+xRef);
+}
 
-// colors
-if( rColorStylePath.getLength() > 0 )
-{
-rtl::Reference< core::FragmentHandler > xRef(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram->getColors() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   "DiagramColorStyle",
-   pShape,
-   xRef);
+// colors
+if( !rColorStylePath.isEmpty() )
+{
+rtl::Reference< core::FragmentHandler > xRef(
+new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram->getColors() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+"DiagramColorStyle",
+pShape,
+xRef);
+}
 }
 
 // diagram loaded. now lump together & attach to shape
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index cf982cf..a33951c 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -115,6 +115,8 @@ Reference< XFastContextHandler > 
PPTShapeGroupContext::createFastChildContext( s
 break;
 case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
 {
+if( pGraphicShape )
+importExtDrawings();
 pGraphicShape = oox::drawingml::ShapePtr( new PPTShape( 
meShapeLocation, "com.sun.star.drawing.OLE2Shape" ) );
 xRet.set( new oox::drawingml::GraphicalObjectFrameContext( *this, 
mpGroupShapePtr, pGraphicShape, tr

upcoming IP change for VMs

2012-08-09 Thread Florian Effenberger

Hello,

sorry for crossposting on three lists, but I need to reach out to 
everyone affected.


Since we're running out of IPs for our virtual machines, we will migrate 
to a larger subnet in the next days. This will mean that everyone who 
runs a virtual machine and has set up rules based on the current IP 
address needs to adapt it.


We will change the IP on our side, and also the bridging to the VM as 
well as the DNS entries, whose TTL we will lower before to make the 
migration go smooth, but in case you made manual adaptions, we need your 
help, since deeply investigating every of the currently 13 VMs is a bit 
tedious. ;-)


If you have access to one or more of the TDF systems, and are not sure 
whether you are using a VM, the following might help:


- Do you have root access? If so, you most likely have VM.
- Is the hostname vmX(Y).documentfoundation.org? Then it's a VM.
- Try the host command on the command line to find out if your system is 
on a VM:

  - $ host gerrit.libreoffice.org
gerrit.libreoffice.org has address 176.9.46.25
  - $ host 176.9.46.25
25.46.9.176.in-addr.arpa domain name pointer vm2.documentfoundation.org

If you maintain a VM, *please* do ping us at 
hostmas...@documentfoundation.org directly so we can keep you in the 
loop. Do *not* reply to this list, do *not* write to me individually, 
but rather, write to hostmas...@documentfoundation.org


Plus, if you maintain a VM, please check where the IP address is stored, 
beside /etc/hosts and /etc/network/interfaces and possible firewall 
rules (ufw status resp. iptables -L -n), so you know where to change 
them when the switch happens.


Sorry for these inconveniences, and thanks for your work on LibreOffice!
Florian

--
Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender)
Tel: +49 8341 99660880 | Mobile: +49 151 14424108
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PUSHED] fdo#49750 Search Findbar's History

2012-08-09 Thread zolniatamas

Hi Kendy,

  Thanks for the correction! I'll pay attention these things in the future!


Regards,
Zolnai Tamás



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


binfilter, core, dev-tools, dictionaries, help, translations are now all on gerrit

2012-08-09 Thread Bjoern Michaelsen
Hi,

see $subject. All of the above repositories have been created on gerrit and are
synced from fdo.

IMPORTANT NOTE: If you remove branches on fdo you break the sync, so please
either wait with it until we are on gerrit or update:
 
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/syncgerrit;h=765bccfcc99759e263ddbc782de82a1630b596f5;hb=HEAD
and then drop a note at ger...@otrs.documentfoundation.org asking to deploy the
change. Some for adding branches, they wont get synced automatically.

Best,

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


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/inc oox/source

2012-08-09 Thread Petr Mladek
 oox/inc/oox/ppt/pptshapegroupcontext.hxx |1 
 oox/source/drawingml/diagram/diagram.cxx |   66 ---
 oox/source/ppt/pptshapegroupcontext.cxx  |   11 -
 3 files changed, 45 insertions(+), 33 deletions(-)

New commits:
commit dc29a85982a4b54657be3f448dd8d37d2144a020
Author: Muthu Subramanian 
Date:   Mon Jun 25 19:25:52 2012 +0530

n#759210: Certain smartart drawings weren't imported.

SmartArt info was reset, when there was a chart (e.g.)
in the same slide.

This also fixes fdo#50907.

(cherry picked from commit 11c5699dad06fb0d7fc0e458550a1dac82f8ee5f)

Signed-off-by: Petr Mladek 

diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx 
b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 7e2a6d3..841e741 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -39,6 +39,7 @@ class PPTShapeGroupContext : public 
::oox::drawingml::ShapeGroupContext
 SlidePersistPtr mpSlidePersistPtr;
 ShapeLocation   meShapeLocation;
 oox::drawingml::ShapePtrpGraphicShape;
+voidimportExtDrawings();
 
 public:
 PPTShapeGroupContext(
diff --git a/oox/source/drawingml/diagram/diagram.cxx 
b/oox/source/drawingml/diagram/diagram.cxx
index 8e6586d..002e20a 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -395,40 +395,44 @@ void loadDiagram( ShapePtr& pShape,
 pShape->addExtDrawingRelId( *aIt );
 }
 
-// layout
-if( !rLayoutPath.isEmpty() )
+// extLst is present, lets bet on that and ignore the rest of the data 
from here
+if( !pData->getExtDrawings().size() )
 {
-rtl::Reference< core::FragmentHandler > xRef(
-new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, pLayout ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   "DiagramLayout",
-   pShape,
-   xRef);
-}
+// layout
+if( !rLayoutPath.isEmpty() )
+{
+rtl::Reference< core::FragmentHandler > xRef(
+new DiagramLayoutFragmentHandler( rFilter, rLayoutPath, 
pLayout ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+"DiagramLayout",
+pShape,
+xRef);
+}
 
-// style
-if( !rQStylePath.isEmpty() )
-{
-rtl::Reference< core::FragmentHandler > xRef(
-new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram->getStyles() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   "DiagramQStyle",
-   pShape,
-   xRef);
-}
+// style
+if( !rQStylePath.isEmpty() )
+{
+rtl::Reference< core::FragmentHandler > xRef(
+new DiagramQStylesFragmentHandler( rFilter, rQStylePath, 
pDiagram->getStyles() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+"DiagramQStyle",
+pShape,
+xRef);
+}
 
-// colors
-if( !rColorStylePath.isEmpty() )
-{
-rtl::Reference< core::FragmentHandler > xRef(
-new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram->getColors() ));
-importFragment(rFilter,
-   loadFragment(rFilter,xRef),
-   "DiagramColorStyle",
-   pShape,
-   xRef);
+// colors
+if( !rColorStylePath.isEmpty() )
+{
+rtl::Reference< core::FragmentHandler > xRef(
+new ColorFragmentHandler( rFilter, rColorStylePath, 
pDiagram->getColors() ));
+importFragment(rFilter,
+loadFragment(rFilter,xRef),
+"DiagramColorStyle",
+pShape,
+xRef);
+}
 }
 
 // diagram loaded. now lump together & attach to shape
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 0529ec6..3dbf067 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -128,6 +128,8 @@ Reference< XFastContextHandler > 
PPTShapeGroupContext::createFastChildContext( s
 break;
 case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame
 {
+if( pGraphicShape )
+importExtDrawings();
 pGraphicShape = oox::drawingml::ShapePtr( new PPTShape( 
meShapeLocation, "com.sun.star.drawing.OLE2Shape" ) );
 xRet.set( new oox::drawingml::GraphicalObjectFrameContext( *this, 
mpGroupShapePtr, pGraphicShape, true ) );
 }
@@ -141,9 +143,9 @@ Reference< XFastContextHandler > 
PPTShapeGroupCo

Re: git review

2012-08-09 Thread Bjoern Michaelsen
On Wed, Aug 08, 2012 at 11:52:03PM +0200, Bjoern Michaelsen wrote:
> > Like described in link above, you have three options here:
> > pypi-system-wide, pypi-user-local and distro package.
> > No other options please.
> 
> Most people wont even know what pypi-system-wide is and dont want to know. And
> they shouldnt need to.
> 
> We will loose possible contributors that way. Not an option. Patch submittal
> has to work hasslefree and out of the box. This is really critical: there has
> to be no extra step at all for patch submittal otherwise we failed.

Thinking a bit about this, another possibility would be to do with git-review
as we do with other external stuff:
Downloading and installing a local copy in "./download". That would ensure it
to be universally available and be up to date.

Best,

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


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread Michael Meeks

On Thu, 2012-08-09 at 13:21 +0200, Michael Stahl wrote:
> On 09/08/12 12:50, Michael Meeks wrote:
> 
> > In case things arn't tangled enough - you can release the SolarMutex in
> > your current thread and give another thread a chance to get in using
> > XToolkit's "reschedule" method. Whether that is likely to make your life
> > only yet more tangled is unclear to me ;-)
> 
> WTF, there is an API to release SolarMutex? ... /me hides under desk

Um right ;-) well - at least - I -assume- it instantiates the relevant
Yield class which recursively drops the SolarMutex, then spins the
mainloop and after processing an event (prolly a cursor blink would be a
fall-back timeout ;-) it comes back, or perhaps doesn't come back
because another thread got ownership of the mainloop / solar-mutex.

Just another good example of why we badly need a minimal, small,
simple, easy-to-understand, Objects-with-methods-not-meta-interfaces,
cleanish API with an ABI break from the past ;-) [ and simultaneously
IMHO to adapt UNO to target a superset of well-defined
exposing-scripting functionality ].

ATB,

Michael.

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

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


[Libreoffice-commits] .: 3 commits - basic/inc basic/source cppcanvas/source sc/source sfx2/source unusedcode.easy xmlhelp/source

2012-08-09 Thread Caolán McNamara
 basic/inc/basic/sbstar.hxx|2 -
 basic/source/classes/sb.cxx   |   16 -
 basic/source/classes/sbunoobj.cxx |   20 ++--
 basic/source/runtime/step0.cxx|   20 ++--
 cppcanvas/source/wrapper/implsprite.cxx   |   21 -
 cppcanvas/source/wrapper/implsprite.hxx   |5 
 sc/source/core/tool/interpr1.cxx  |   13 +++---
 sfx2/source/doc/objxtor.cxx   |   12 +-
 unusedcode.easy   |1 
 xmlhelp/source/cxxhelp/provider/databases.cxx |   31 ++
 10 files changed, 54 insertions(+), 87 deletions(-)

New commits:
commit 7e071e5383560c1a85722b134f5a8637585999e5
Author: Caolán McNamara 
Date:   Thu Aug 9 12:40:36 2012 +0100

remove some unused methods

Change-Id: I8b89f49eff059f5650bfb531bcb568db1d97c3a3

diff --git a/cppcanvas/source/wrapper/implsprite.cxx 
b/cppcanvas/source/wrapper/implsprite.cxx
index 9e6ce32..9ff68ef 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -64,27 +64,6 @@ namespace cppcanvas
 OSL_ENSURE( mpTransformArbiter.get(), "ImplSprite::ImplSprite(): 
Invalid transformation arbiter");
 }
 
-ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas 
>&   rParentCanvas,
-const uno::Reference< 
rendering::XAnimatedSprite >& rSprite,
-const 
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) :
-mxGraphicDevice(),
-mxSprite( uno::Reference< rendering::XSprite >(rSprite,
-   uno::UNO_QUERY) ),
-mxAnimatedSprite( rSprite ),
-mpTransformArbiter( rTransformArbiter )
-{
-// Avoiding ternary operator in initializer list (Solaris
-// compiler bug, when function call and temporary is
-// involved)
-if( rParentCanvas.is() )
-mxGraphicDevice = rParentCanvas->getDevice();
-
-OSL_ENSURE( rParentCanvas.is() , "ImplSprite::ImplSprite(): 
Invalid canvas");
-OSL_ENSURE( mxGraphicDevice.is(), "ImplSprite::ImplSprite(): 
Invalid graphic device");
-OSL_ENSURE( mxSprite.is(), "ImplSprite::ImplSprite(): Invalid 
sprite");
-OSL_ENSURE( mpTransformArbiter.get(), "ImplSprite::ImplSprite(): 
Invalid transformation arbiter");
-}
-
 ImplSprite::~ImplSprite()
 {
 // hide the sprite on the canvas. If we don't hide the
diff --git a/cppcanvas/source/wrapper/implsprite.hxx 
b/cppcanvas/source/wrapper/implsprite.hxx
index d75cd7c..025d3e3 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -51,11 +51,6 @@ namespace cppcanvas
 const ::com::sun::star::uno::Reference<
   ::com::sun::star::rendering::XSprite >&  
 rSprite,
 const 
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
-ImplSprite( const ::com::sun::star::uno::Reference<
-  ::com::sun::star::rendering::XSpriteCanvas 
>& rParentCanvas,
-const ::com::sun::star::uno::Reference<
-  ::com::sun::star::rendering::XAnimatedSprite 
>& rSprite,
-const 
ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter );
 virtual ~ImplSprite();
 
 virtual void setAlpha( const double& rAlpha );
diff --git a/unusedcode.easy b/unusedcode.easy
index 5188d8f..11c9818 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -112,7 +112,6 @@ connectivity::mozab::MQueryHelper::next()
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
 connectivity::toString(com::sun::star::uno::Any const&)
-cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference
 const&, 
com::sun::star::uno::Reference 
const&, 
boost::shared_ptr 
const&)
 dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, 
rtl::OUString const&, 
com::sun::star::uno::Reference 
const&)
 formula::FormulaTokenIterator::First()
 jfw_plugin::VendorBase::createInstance()
commit 16f75f1f773035df36437763588d5a3acbb70935
Author: Caolán McNamara 
Date:   Thu Aug 9 12:32:07 2012 +0100

reduce static_initialization_and_destruction chain

Change-Id: I9fdefd428b858fd5581412d6f8e896a0eb680fef

diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 1b0cd71..6a75304 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -172,7 +172,7 @@ public:
 
 SbxObjectRef getRTL( void ) { return pRtl; }
 sal_Bool IsDocBasic(

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source

2012-08-09 Thread Stephan Bergmann
 oox/source/dump/dumperbase.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca8f6bb28283879b1f11af0991485bbc3ae74767
Author: Stephan Bergmann 
Date:   Mon Jul 23 10:28:03 2012 +0200

Bogus warning C4701: potentially uninitialized local variable

Change-Id: I51caaca911f71788940260bd63d3854526d7473f
(cherry picked from commit 6aff9717426db96f41ab04cd96da2b5d074625e1)

Signed-off-by: Stephan Bergmann 

diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 5ad2f6a..58285c4 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -343,7 +343,7 @@ void StringHelper::appendHex( OUStringBuffer& rStr, 
sal_Int64 nData, bool bPrefi
 static sal_uInt64
 lcl_ConvertDouble(double const f)
 {
-sal_uInt64 i;
+sal_uInt64 i = sal_uInt64();
 for (size_t j = 0; j < sizeof(double); ++j)
 {   // hopefully both endian independent and strict aliasing safe
 reinterpret_cast(&i)[j] = reinterpret_cast(&f)[j];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source

2012-08-09 Thread Stephan Bergmann
 desktop/source/deployment/dp_persmap.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 8f6ecf2c86c70835efca9537f862c56431be2f8b
Author: Michael Stahl 
Date:   Tue Jul 10 23:54:33 2012 +0200

warning C4702: unreachable code

Change-Id: Icec8f9e37fa679b25d9bd44de56c98477d758abc
(cherry picked from commit e940b0f5e2b57c67b93ffadd7063ec650aa7bcbf)

Signed-off-by: Stephan Bergmann 

diff --git a/desktop/source/deployment/dp_persmap.cxx 
b/desktop/source/deployment/dp_persmap.cxx
index 6c7cd94..fb7aeca 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -144,7 +144,9 @@ bool PersistentMap::get( OString * value, OString const & 
key ) const
 catch (DbException & exc) {
 throw_rtexc( exc.get_errno(), exc.what() );
 }
+#ifndef _MSC_VER
 return false; // avoiding warning
+#endif
 }
 
 
//__
@@ -192,7 +194,9 @@ bool PersistentMap::erase( OString const & key, bool 
flush_immediately )
 catch (DbException & exc) {
 throw_rtexc( exc.get_errno(), exc.what() );
 }
+#ifndef _MSC_VER
 return false; // avoiding warning
+#endif
 }
 
 
//__
@@ -231,7 +235,9 @@ t_string2string_map PersistentMap::getEntries() const
 catch (DbException & exc) {
 throw_rtexc( exc.get_errno(), exc.what() );
 }
+#ifndef _MSC_VER
 return t_string2string_map(); // avoiding warning
+#endif
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: solenv/gbuild

2012-08-09 Thread Michael Stahl
 solenv/gbuild/Configuration.mk  |   10 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 ++
 solenv/gbuild/platform/com_GCC_defs.mk  |2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 6292b12acf51a816fad3b3ea8073a58eb3c2
Author: Michael Stahl 
Date:   Thu Aug 9 13:08:17 2012 +0200

gbuild: add a kludge to get dictionaries to build in cygwin:

Due to the scourge of symlinked git repositories, building the
configuration files in dictionaries fails on cygwin because the native
xsltproc cannot understand cygwin symlinks; work around that with a
new gb_Helper_symlinked_native function.
Should be reverted once git sub modules liberate us from the scourge.

Change-Id: Idc48da9b60348dc66160219909479c3c83daeaf2

diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 53a11e1..61254ce 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -93,7 +93,7 @@ endef
 $(call gb_XcsTarget_get_target,%) : \
$(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \
$(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema)
-   $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^))
+   $(call gb_XcsTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcs,$^)))
 
 $(call gb_XcsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCS,1)
@@ -140,7 +140,7 @@ endef
 
 $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
$(gb_XcuTarget_XSLT_AllLang) 
$(gb_XcuDataTarget_DTD_ComponentUpdate)
-   $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^))
+   $(call gb_XcuDataTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
 
 $(call gb_XcuDataTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,2)
@@ -183,7 +183,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
-   $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter 
%.xcs,$^))
+   $(call gb_XcuModuleTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)),$(filter %.xcs,$^))
 
 $(call gb_XcuModuleTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,3)
@@ -253,7 +253,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-   -i $(3) \
+   -i $(call gb_Helper_symlinked_native,$(3)) \
-o $(1) \
-m $(SDF) \
-l all)
@@ -295,7 +295,7 @@ $(call gb_Helper_abbreviate_dirs,\
 endef
 
 $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
-   $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
+   $(call gb_XcuResTarget__command,$@,$*,$(call 
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
 
 $(call gb_XcuResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,6)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0c0c98f..7b64e2b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -248,6 +248,12 @@ define gb_Helper_make_url
 file:///$(strip $(1))
 endef
 
+# for source files in non-core repositories, the cygwin symlink is not
+# understood by native tools, so find the real path to the file
+define gb_Helper_symlinked_native
+$(shell cygpath -m $(realpath $(1)))
+endef
+
 # YaccTarget class
 
 define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 60ae0c3..39fa02b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -158,6 +158,8 @@ define gb_Helper_make_url
 file://$(strip $(1))
 endef
 
+gb_Helper_symlinked_native = $(1)
+
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
 gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source

2012-08-09 Thread Stephan Bergmann
 connectivity/source/drivers/postgresql/pq_allocator.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4a5c42950822b495e3b72ef513339101220e7304
Author: Michael Stahl 
Date:   Tue Jul 10 22:05:52 2012 +0200

pq_allocator.hxx: work around spurious MSVC warning

Change-Id: I6c516e4bd125c4075c195980a2fcdb58382c38dd
(cherry picked from commit 2c5cff69309937b5b06772cd021d1a6213bf2c2d)

Signed-off-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx 
b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index f454bb6..dadeb8e 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -182,6 +182,9 @@ public:
 void destroy (pointer p)
 {
 p->~T();
+#ifdef _MSC_VER
+(void) p; // spurious warning C4100: 'p': unreferenced formal parameter
+#endif
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values

2012-08-09 Thread Michael Stahl
On 09/08/12 12:50, Michael Meeks wrote:

>   In case things arn't tangled enough - you can release the SolarMutex in
> your current thread and give another thread a chance to get in using
> XToolkit's "reschedule" method. Whether that is likely to make your life
> only yet more tangled is unclear to me ;-)

WTF, there is an API to release SolarMutex? ... /me hides under desk


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


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/source

2012-08-09 Thread Stephan Bergmann
 connectivity/source/drivers/postgresql/pq_allocator.hxx |6 --
 connectivity/source/drivers/postgresql/pq_common.hxx|   41 
 2 files changed, 2 insertions(+), 45 deletions(-)

New commits:
commit 9d38931c3b7c90d19427a45b8d23794792b14ea2
Author: Luboš Luňák 
Date:   Wed Jul 4 21:12:57 2012 +0200

use SAL_UNUSED_PARAMETER instead of local macro
(cherry picked from commit bd493f15a5d9478739368e48f598d2cd7ed4ea30)

Signed-off-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx 
b/connectivity/source/drivers/postgresql/pq_allocator.hxx
index fad9b03..f454bb6 100644
--- a/connectivity/source/drivers/postgresql/pq_allocator.hxx
+++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx
@@ -59,8 +59,6 @@
 #include 
 #include "sal/types.h"
 
-#include "pq_common.hxx"
-
 /** jbu: This source has been copied from sal/inc/internal/allocator.hxx,
  because it is not a public interface. Thx a lot for figuring this
  out.
@@ -153,14 +151,14 @@ public:
are not enabled, e.g. GCC under Linux and it is
in general not desired to compile sal with exceptions
enabled. */
-pointer allocate (size_type n, const void* UNUSED(hint) = 0)
+pointer allocate (size_type n, SAL_UNUSED_PARAMETER const void* = 0)
 {
 return reinterpret_cast(
 rtl_allocateMemory(sal_uInt32(n * sizeof(T;
 }
 
 //-
-void deallocate (pointer p, size_type UNUSED(n))
+void deallocate (pointer p, SAL_UNUSED_PARAMETER size_type)
 {
 rtl_freeMemory(p);
 }
diff --git a/connectivity/source/drivers/postgresql/pq_common.hxx 
b/connectivity/source/drivers/postgresql/pq_common.hxx
deleted file mode 100644
index 68a973a..000
--- a/connectivity/source/drivers/postgresql/pq_common.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2011 Lionel Elie Mamane  (initial 
developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#ifndef _PQ_COMMON_
-#define _PQ_COMMON_
-
-#ifdef UNUSED
-#elif defined(__GNUC__)
-# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
-#elif defined(__LCLINT__)
-# define UNUSED(x) /*@unused@*/ x
-#else
-# define UNUSED(x) x
-#endif
-
-#endif /* _PQ_COMMON_ */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - connectivity/Library_file.mk

2012-08-09 Thread Stephan Bergmann
 connectivity/Library_file.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 1eefb05e3f7d5be0e88aa4e31a03607322764f00
Author: Michael Stahl 
Date:   Tue Jul 10 23:38:20 2012 +0200

warning C4530: C++ exception handler used ... specify /EHsc

Change-Id: Ifb23269c01dc80c328075fefe5e61b378e2d8477
(cherry picked from commit 95d0593986a659475729e4a8b50242d05503116c)

Signed-off-by: Stephan Bergmann 

diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index b1757c1..900a48e 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -56,10 +56,6 @@ $(eval $(call gb_Library_use_libraries,file,\
$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_noexception_objects,file,\
-   connectivity/source/drivers/file/quotedstring \
-))
-
 $(eval $(call gb_Library_add_exception_objects,file,\
connectivity/source/drivers/file/FCatalog \
connectivity/source/drivers/file/FColumns \
@@ -79,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,file,\
connectivity/source/drivers/file/fanalyzer \
connectivity/source/drivers/file/fcode \
connectivity/source/drivers/file/fcomp \
+   connectivity/source/drivers/file/quotedstring \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: README.cross

2012-08-09 Thread Tor Lillqvist
 README.cross |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 97febaa3e2130b92a2eadfc20688b2a37b194f45
Author: Tor Lillqvist 
Date:   Thu Aug 9 14:08:32 2012 +0300

Drop the --with-external-tar to avoid confusion

Change-Id: I8861a007b94b24d2482658ca7d78e200bcf890ea

diff --git a/README.cross b/README.cross
index d23dba5..891b6a5 100644
--- a/README.cross
+++ b/README.cross
@@ -353,7 +353,6 @@ CXX_FOR_BUILD=xcrun clang++ -arch i386
 --with-android-sdk=/Users/tml/android-sdk-macosx
 --with-build-platform-configure-options=--with-macosx-sdk=10.8 
--with-macosx-version-min-required=10.8 --with-macosx-version-max-allowed=10.8
 --with-distro=LibreOfficeAndroid
---with-external-tar=/Users/tml/lo/10.4/src
 --without-doxygen
 --without-helppack-integration
 --without-myspell-dicts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: wizards/com

2012-08-09 Thread Julien Nabet
 wizards/com/sun/star/wizards/agenda/AgendaTemplate.py  |1 -
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py |1 -
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py  |1 -
 wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py |1 -
 wizards/com/sun/star/wizards/agenda/CGAgenda.py|1 -
 wizards/com/sun/star/wizards/agenda/TopicsControl.py   |1 -
 wizards/com/sun/star/wizards/document/OfficeDocument.py|1 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialog.py|1 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py   |1 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py   |1 -
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |1 -
 wizards/com/sun/star/wizards/letter/LocaleCodes.py |1 -
 wizards/com/sun/star/wizards/text/TextDocument.py  |1 -
 wizards/com/sun/star/wizards/text/TextFieldHandler.py  |1 -
 wizards/com/sun/star/wizards/text/TextSectionHandler.py|1 -
 wizards/com/sun/star/wizards/text/ViewHandler.py   |1 -
 wizards/com/sun/star/wizards/ui/ControlScroller.py |1 -
 wizards/com/sun/star/wizards/ui/DocumentPreview.py |1 -
 wizards/com/sun/star/wizards/ui/ImageList.py   |1 -
 wizards/com/sun/star/wizards/ui/PathSelection.py   |1 -
 wizards/com/sun/star/wizards/ui/PeerConfig.py  |1 -
 wizards/com/sun/star/wizards/ui/UIConsts.py|1 -
 wizards/com/sun/star/wizards/ui/UnoDialog.py   |1 -
 wizards/com/sun/star/wizards/ui/WizardDialog.py|1 -
 wizards/com/sun/star/wizards/ui/XPathSelectionListener.py  |1 -
 wizards/com/sun/star/wizards/ui/event/DataAware.py |1 -
 wizards/com/sun/star/wizards/ui/event/ListModelBinder.py   |1 -
 wizards/com/sun/star/wizards/web/StylePreview.py   |1 -
 wizards/com/sun/star/wizards/web/WWD_Events.py |1 -
 wizards/com/sun/star/wizards/web/WebWizardDialogResources.py   |1 -
 wizards/com/sun/star/wizards/web/data/CGArgument.py|1 -
 wizards/com/sun/star/wizards/web/data/CGContent.py |1 -
 wizards/com/sun/star/wizards/web/data/CGDesign.py  |1 -
 wizards/com/sun/star/wizards/web/data/CGDocument.py|1 -
 wizards/com/sun/star/wizards/web/data/CGExporter.py|1 -
 wizards/com/sun/star/wizards/web/data/CGFilter.py  |1 -
 wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py |1 -
 wizards/com/sun/star/wizards/web/data/CGIconSet.py |1 -
 wizards/com/sun/star/wizards/web/data/CGImage.py   |1 -
 wizards/com/sun/star/wizards/web/data/CGLayout.py  |1 -
 wizards/com/sun/star/wizards/web/data/CGPublish.py |1 -
 wizards/com/sun/star/wizards/web/data/CGSession.py |1 -
 wizards/com/sun/star/wizards/web/data/CGSessionName.py |1 -
 wizards/com/sun/star/wizards/web/data/CGSettings.py|1 -
 wizards/com/sun/star/wizards/web/data/CGStyle.py   |1 -
 wizards/com/sun/star/wizards/web/data/TypeDetection.py |1 -
 46 files changed, 46 deletions(-)

New commits:
commit 8b13238c453f05f1d862cf570dff0110295fbe3b
Author: Julien Nabet 
Date:   Thu Aug 9 12:56:40 2012 +0200

Fix last duplicated lines for Python files

Change-Id: I22cbba9c574835c3e47dadb70d3c293b79e57325

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py 
b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
index a95dfc9..56b8523 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
-import uno
 from TemplateConsts import *
 from threading import RLock
 from wizards.text.TextDocument import *
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py 
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
index 2faf846..d97ddf9 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py
@@ -16,7 +16,6 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 from wizards.common.HelpIds import HelpIds
-from wizards.common.HelpIds import HelpIds
 
 TXTTITLE_TEXT_CHANGED = "txtTitleTextChanged"
 TXTDATE_TEXT_CHANGED = "txtDateTextChanged"
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/agenda/AgendaWizardD

[Libreoffice-commits] .: distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf README.cross

2012-08-09 Thread Tor Lillqvist
 README.cross  |1 -
 distro-configs/LibreOfficeAndroid.conf|1 -
 distro-configs/LibreOfficeAndroidX86.conf |1 -
 3 files changed, 3 deletions(-)

New commits:
commit a606fa37da7c3d2daf5b1695fdc5518b4f8bdda7
Author: Tor Lillqvist 
Date:   Thu Aug 9 13:52:40 2012 +0300

No, we don't want any Python stuff for Android

Change-Id: I227c408e03130667760f9672f08b11cc7a9c75a8

diff --git a/README.cross b/README.cross
index 3856c29..d23dba5 100644
--- a/README.cross
+++ b/README.cross
@@ -345,7 +345,6 @@ OS X 10.8 with Xcode 4.4.1:
 CC_FOR_BUILD=xcrun clang -arch i386
 CXX_FOR_BUILD=xcrun clang++ -arch i386
 --build=x86_64-apple-darwin11
---disable-python
 --disable-zenity
 --enable-debug
 --enable-werror
diff --git a/distro-configs/LibreOfficeAndroid.conf 
b/distro-configs/LibreOfficeAndroid.conf
index 1f8b942..7d50098 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -18,7 +18,6 @@
 --disable-systray
 --disable-xmlsec
 --enable-mergelibs
---enable-python=internal
 --without-junit
 --without-ppds
 --without-stlport
diff --git a/distro-configs/LibreOfficeAndroidX86.conf 
b/distro-configs/LibreOfficeAndroidX86.conf
index ef3b73e..24907e4 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -19,7 +19,6 @@
 --disable-systray
 --disable-xmlsec
 --enable-mergelibs
---enable-python=internal
 --without-junit
 --without-ppds
 --without-stlport
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


  1   2   >