[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy
svtools/inc/svtools/ctrlbox.hxx| 33 -
svtools/source/control/ctrlbox.cxx | 24
unusedcode.easy|3 ---
3 files changed, 60 deletions(-)
New commits:
commit 458c80234b701fb1cb9a71239cec532c54b2e9f0
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Mon Jan 23 13:53:54 2012 +0530
Removed Get*EntryLine? and Get*EntryDistance methods.
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 5815719..a4d9eff 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -352,16 +352,10 @@ public:
using ListBox::GetEntryPos;
virtual sal_uInt16 GetEntryPos( sal_uInt16 nStyle = STYLE_SOLID ) const;
-longGetEntryLine1( sal_uInt16 nPos ) const;
-longGetEntryLine2( sal_uInt16 nPos ) const;
-longGetEntryDistance( sal_uInt16 nPos ) const;
sal_uInt16 GetEntryStyle( sal_uInt16 nPos ) const;
voidSelectEntry( const XubString rStr, sal_Bool bSelect =
sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
voidSelectEntry( sal_uInt16 nStyle = STYLE_SOLID, sal_Bool
bSelect = sal_True );
-longGetSelectEntryLine1( sal_uInt16 nSelIndex = 0 ) const;
-longGetSelectEntryLine2( sal_uInt16 nSelIndex = 0 ) const;
-longGetSelectEntryDistance( sal_uInt16 nSelIndex = 0 ) const;
sal_uInt16 GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const;
inline sal_Bool IsEntrySelected( const XubString rStr ) const {
return ListBox::IsEntrySelected( rStr ); }
sal_BoolIsEntrySelected( sal_uInt16 nStyle1 = STYLE_SOLID )
const;
@@ -389,33 +383,6 @@ private:
void* GetEntryData( sal_uInt16 nPos ) const;
};
-inline long LineListBox::GetSelectEntryLine1( sal_uInt16 nSelIndex ) const
-{
-sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return GetEntryLine1( nPos );
-else
-return 0;
-}
-
-inline long LineListBox::GetSelectEntryLine2( sal_uInt16 nSelIndex ) const
-{
-sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return GetEntryLine2( nPos );
-else
-return 0;
-}
-
-inline long LineListBox::GetSelectEntryDistance( sal_uInt16 nSelIndex ) const
-{
-sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return GetEntryDistance( nPos );
-else
-return 0;
-}
-
inline sal_Bool LineListBox::IsEntrySelected( sal_uInt16 nStyle ) const
{
sal_uInt16 nPos = GetEntryPos( nStyle );
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index d4959ec..ce72cdc 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -851,30 +851,6 @@ sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle )
const
// ---
-long LineListBox::GetEntryLine1( sal_uInt16 nPos ) const
-{
-ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetLine1ForWidth( m_nWidth ) : 0;
-}
-
-// ---
-
-long LineListBox::GetEntryLine2( sal_uInt16 nPos ) const
-{
-ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetLine2ForWidth( m_nWidth ) : 0;
-}
-
-// ---
-
-long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
-{
-ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
-return ( pData ) ? pData-GetDistForWidth( m_nWidth ) : 0;
-}
-
-// ---
-
sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
{
ImpLineListData* pData = (nPos pLineList-size()) ? (*pLineList)[ nPos ]
: NULL;
diff --git a/unusedcode.easy b/unusedcode.easy
index 9d44e00..caa31b1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -112,9 +112,6 @@ InsCapOptArr::Remove(InsCaptionOpt* const, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
ItemList::FindAttrib(unsigned short)
KeyboardSettings::CopyData()
-LineListBox::GetEntryDistance(unsigned short) const
-LineListBox::GetEntryLine1(unsigned short) const
-LineListBox::GetEntryLine2(unsigned short) const
LinkStructArr::DeleteAndDestroy(unsigned short, unsigned short)
LngSvcMgr::RemoveLngSvcEvtBroadcaster(com::sun::star::uno::Referencecom::sun::star::linguistic2::XLinguServiceEventBroadcaster
const)
LocaleDataWrapper::getCollatorImplementations() const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: svl/inc svl/source unusedcode.easy
svl/inc/svl/zforlist.hxx|4
svl/source/numbers/zforlist.cxx |8
unusedcode.easy |1 -
3 files changed, 13 deletions(-)
New commits:
commit ac7a8bfe4e53d4615929bcafe9cbdd88d03b6e1d
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Mon Jan 23 13:58:13 2012 +0530
Removed NfCurrencyEntry::ApplyVariableInformation().
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index aa68fc1..ac387d4 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -260,10 +260,6 @@ public:
/// Symbols and language identical
booloperator==( const NfCurrencyEntry r ) const;
-/** Apply format information (nPositiveFormat,
- nNegativeFormat, nDigits, cZeroChar) of another
format. */
-voidApplyVariableInformation( const NfCurrencyEntry );
-
const String GetSymbol() const { return aSymbol; }
const String GetBankSymbol() const { return aBankSymbol; }
LanguageTypeGetLanguage() const { return eLanguage; }
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index eecd743..1f5085d 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3852,14 +3852,6 @@ bool NfCurrencyEntry::operator==( const NfCurrencyEntry
r ) const
;
}
-void NfCurrencyEntry::ApplyVariableInformation( const NfCurrencyEntry r )
-{
-nPositiveFormat = r.nPositiveFormat;
-nNegativeFormat = r.nNegativeFormat;
-cZeroChar = r.cZeroChar;
-}
-
-
void NfCurrencyEntry::BuildSymbolString( String rStr, bool bBank,
bool bWithoutExtension ) const
{
diff --git a/unusedcode.easy b/unusedcode.easy
index caa31b1..e06db0c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -147,7 +147,6 @@ MultiLineEdit::IsFocusSelectionHideEnabled() const
MultiSelection::Append(long)
MultiSelection::PrevSelected()
NativeNumberWrapper::isValidNatNum(com::sun::star::lang::Locale const, short)
const
-NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const)
NfCurrencyEntry::NfCurrencyEntry()
NotificationSettings::CopyData()
NumberFormatCodeWrapper::getDefault(short, short) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/inc tools/source
tools/inc/tools/fsys.hxx|4
tools/source/fsys/comdep.hxx|2 --
tools/source/fsys/dirent.cxx| 22 --
tools/source/fsys/tdir.cxx |2 --
tools/source/fsys/wntmsc.cxx|2 --
tools/source/stream/strmunx.cxx |8
tools/source/stream/strmwnt.cxx |2 --
7 files changed, 42 deletions(-)
New commits:
commit 7735b09b5e10e366ffb3a156790316ea0ccfa0a0
Author: Thomas Collerton tom.col...@gmail.com
Date: Mon Jan 23 14:04:47 2012 +0530
fdo#44988: Remove obsolete BOOTSTRAP defines.
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 3d2dfa8..3ec1799 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -425,9 +425,6 @@ public:
DirEntry operator []( size_t nIndex ) const;
};
-// we don't need this stuff for bootstraping
-#ifndef BOOTSTRAP
-
//
/** FSysRedirector is an abstract base class for a hook to redirect
@@ -464,7 +461,6 @@ public:
static void DoRedirect( String rPath );
};
-#endif // BOOTSTRP
#if defined(DBG_UTIL)
void FSysTest();
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 1728116..193041b 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -76,10 +76,8 @@ struct DirReader_Impl
bReady ( sal_False ),
bInUse( sal_False )
{
-#ifndef BOOTSTRAP
// Redirection
FSysRedirector::DoRedirect( aPath );
-#endif
// nur den String der Memer-Var nehmen!
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index a0d3d8e..38138f8 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -128,8 +128,6 @@ int Sys2SolarError_Impl( int nSysErr )
//
-#ifndef BOOTSTRAP
-
FSysRedirector* FSysRedirector::_pRedirector = 0;
sal_Bool FSysRedirector::_bEnabled = sal_True;
#ifdef UNX
@@ -184,8 +182,6 @@ void FSysRedirector::DoRedirect( String rPath )
return;
}
-#endif // BOOTSTRAP
-
//
class DirEntryStack
@@ -738,11 +734,9 @@ DirEntry::DirEntry( const String rInitName, FSysPathStyle
eStyle )
rtl::OString aTmpName(rtl::OUStringToOString(rInitName,
osl_getThreadTextEncoding()));
if (comphelper::string::matchIgnoreAsciiCaseL(aTmpName,
RTL_CONSTASCII_STRINGPARAM(file:)))
{
-#ifndef BOOTSTRAP
DBG_WARNING( File URLs are not permitted but accepted );
aTmpName = rtl::OUStringToOString(INetURLObject( rInitName
).PathToFileName(), osl_getThreadTextEncoding());
eStyle = FSYS_STYLE_HOST;
-#endif // BOOTSTRAP
}
else
{
@@ -792,11 +786,9 @@ DirEntry::DirEntry( const rtl::OString rInitName,
FSysPathStyle eStyle )
rtl::OString aTmpName( rInitName );
if (comphelper::string::matchIgnoreAsciiCaseL(aTmpName,
RTL_CONSTASCII_STRINGPARAM(file:)))
{
-#ifndef BOOTSTRAP
DBG_WARNING( File URLs are not permitted but accepted );
aTmpName = rtl::OUStringToOString(INetURLObject( rInitName
).PathToFileName(), osl_getThreadTextEncoding());
eStyle = FSYS_STYLE_HOST;
-#endif
}
#ifdef DBG_UTIL
else
@@ -916,10 +908,8 @@ DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent,
sal_Bool bNormalize )
sal_Bool DirEntry::Exists( FSysAccess nAccess ) const
{
-#ifndef BOOTSTRAP
static osl::Mutex aLocalMutex;
osl::MutexGuard aGuard( aLocalMutex );
-#endif
if ( !IsValid() )
return sal_False;
@@ -968,9 +958,7 @@ sal_Bool DirEntry::First()
FSysFailOnErrorImpl();
StringaUniPathName( GetPath().GetFull() );
-#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aUniPathName );
-#endif
rtl::OString aPathName(rtl::OUStringToOString(aUniPathName,
osl_getThreadTextEncoding()));
DIR *pDir = opendir(aPathName.getStr());
@@ -1724,9 +1712,7 @@ DirEntry DirEntry::TempName( DirEntryKind eKind ) const
// Redirect
String aRetVal(ret_val, osl_getThreadTextEncoding());
String aRedirected (aRetVal);
-#ifndef BOOTSTRAP
FSysRedirector::DoRedirect( aRedirected );
-#endif
if ( FSYS_KIND_DIR == eKind )
{
if (0 ==
_mkdir(rtl::OUStringToOString(aRedirected,
osl_getThreadTextEncoding()).getStr()))
@@ -1823,9 +1809,7 @@ sal_Bool DirEntry::MakeDir( sal_Bool bSloppy ) const
{
FSysFailOnErrorImpl();
String aDirName(pNewDir-GetFull());
-#ifndef BOOTSTRAP
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 520b8118f4a2d54e4849929d94091f29a6434346
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Jan 23 10:19:55 2012 +0100
ORowSetCache::fillMatrix(): fix case m_nFetchsize table size
When lowering m_nStartPos, do not duplicate rows above its old value
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 87655f4..4cc1811 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -796,7 +796,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32
_nNewStartPos,sal_Int32 _nNewEndPos
++nPos;
bCheck = m_pCacheSet-absolute(nPos);
-for(;bCheck aIter != aRealEnd;++aIter)
+for(;bCheck nPos = m_nStartPos aIter != aRealEnd; ++aIter)
{
if(!aIter-is())
*aIter = new
ORowSetValueVector(m_xMetaData-getColumnCount());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/qa
android/qa/desktop/Makefile |1 + 1 file changed, 1 insertion(+) New commits: commit 7fddab07f4c8e054a489285097623172b853912f Author: Michael Meeks michael.me...@suse.com Date: Mon Jan 23 09:51:12 2012 + android: re-installs can fail silently, remove tree before install diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 4578657..c6ddf59 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -177,6 +177,7 @@ build-ant: copy-stuff unset JAVA_HOME ant debug install: copy-stuff + adb shell rm -r $(APP_DATA_PATH) unset JAVA_HOME ant debug install @echo @echo 'Run it with make run' ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - android/qa unotest/source
android/qa/sc/jni/Android.mk| 23 +++ android/qa/sc/jni/Application.mk|2 ++ unotest/source/cpp/bootstrapfixturebase.cxx |4 ++-- 3 files changed, 27 insertions(+), 2 deletions(-) New commits: commit 47c6f602f7874f3bbc48f970a29f3780e8927963 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 23 12:03:52 2012 +0200 Use /assets as SRC_ROOT and OUTDIR_FOR_BUILD on Android diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 907535e..d135992 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -58,8 +58,8 @@ test::BootstrapFixtureBase::BootstrapFixtureBase() m_aSolverRootURL += rtl::OUString::createFromAscii( / ); #endif #else -const char* pSrcRoot = /; -const char* pSolverRoot = /; +const char* pSrcRoot = /assets; +const char* pSolverRoot = /assets; #endif m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot ); m_aSrcRootURL += m_aSrcRootPath; commit 77d80f9e5bf2c34bacc9bbdf1cfc3bafe593dd51 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 23 11:57:59 2012 +0200 Possibly need dummy jni/Android.mk and Application.mk for ndk-gdb to work diff --git a/android/qa/sc/jni/Android.mk b/android/qa/sc/jni/Android.mk new file mode 100644 index 000..c5c2ed3 --- /dev/null +++ b/android/qa/sc/jni/Android.mk @@ -0,0 +1,23 @@ +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE:= dummy +LOCAL_SRC_FILES := dummy.c +LOCAL_LDLIBS:= + +include $(BUILD_SHARED_LIBRARY) diff --git a/android/qa/sc/jni/Application.mk b/android/qa/sc/jni/Application.mk new file mode 100644 index 000..a11b28d --- /dev/null +++ b/android/qa/sc/jni/Application.mk @@ -0,0 +1,2 @@ +APP_ABI := armeabi-v7a +APP_PLATFORM := android-14 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - binfilter/bf_sch binfilter/bf_sd binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_sw binfilter/inc
binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx|2
binfilter/bf_sd/source/filter/bin/sd_sdbinfilter.cxx|2
binfilter/bf_starmath/source/starmath_document.cxx |2
binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx | 36 +---
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |2
binfilter/inc/bf_svtools/xbmread.hxx|2
6 files changed, 22 insertions(+), 24 deletions(-)
New commits:
commit 5cd8d9c84af6f1562252b62357c0413abd79dbb2
Author: Caolán McNamara caol...@redhat.com
Date: Sun Jan 22 14:35:24 2012 +
mirror ReadLine changes to binfilter
diff --git a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
index 04ee230..1f8846f 100644
--- a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
@@ -103,13 +103,11 @@ void XBMReader::InitTable()
//
-ByteString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
+rtl::OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
const char* pTok2, const char* pTok3 )
{
-ByteString aRet;
-longnPos1;
-longnPos2;
-longnPos3;
+rtl::OString aRet;
+sal_Int32 nPos1, nPos2, nPos3;
bStatus = FALSE;
@@ -120,7 +118,7 @@ ByteString XBMReader::FindTokenLine( SvStream* pInStm,
const char* pTok1,
if( pTok1 )
{
-if( ( nPos1 = aRet.Search( pTok1 ) ) != STRING_NOTFOUND )
+if( ( nPos1 = aRet.indexOf(pTok1) ) != -1 )
{
bStatus = TRUE;
@@ -128,7 +126,7 @@ ByteString XBMReader::FindTokenLine( SvStream* pInStm,
const char* pTok1,
{
bStatus = FALSE;
-if( ( ( nPos2 = aRet.Search( pTok2 ) ) != STRING_NOTFOUND
)
+if( ( ( nPos2 = aRet.indexOf(pTok2) ) != -1 )
( nPos2 nPos1 ) )
{
bStatus = TRUE;
@@ -137,7 +135,7 @@ ByteString XBMReader::FindTokenLine( SvStream* pInStm,
const char* pTok1,
{
bStatus = FALSE;
-if( ( ( nPos3 = aRet.Search( pTok3 ) ) !=
STRING_NOTFOUND ) ( nPos3 nPos2 ) )
+if( ( ( nPos3 = aRet.indexOf(pTok3) ) != -1 ) (
nPos3 nPos2 ) )
bStatus = TRUE;
}
}
@@ -203,7 +201,7 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString aLastLine,
XBMFormat eFormat )
{
-ByteString aLine;
+rtl::OStringaLine;
longnRow = 0;
longnCol = 0;
longnBits = ( eFormat == XBM10 ) ? 16 : 8;
@@ -216,32 +214,32 @@ BOOL XBMReader::ParseData( SvStream* pInStm, const
ByteString aLastLine, XBMFor
{
if( bFirstLine )
{
-xub_StrLen nPos;
+sal_Int32 nPos;
// einfuehrende geschweifte Klammer loeschen
-if( (nPos = ( aLine = aLastLine ).Search( '{' ) ) !=
STRING_NOTFOUND )
-aLine.Erase( 0, nPos + 1 );
+if( (nPos = ( aLine = aLastLine ).indexOf('{') ) != -1 )
+aLine = aLine.copy(nPos + 1);
bFirstLine = FALSE;
}
else if( !pInStm-ReadLine( aLine ) )
break;
-if( aLine.Len() )
+if( !aLine.isEmpty() )
{
-const USHORT nCount = aLine.GetTokenCount( ',' );
+const sal_Int32 nCount = comphelper::string::getTokenCount(aLine,
',');
-for( USHORT i = 0; ( i nCount ) ( nRow nHeight ); i++ )
+for( sal_Int32 i = 0; ( i nCount ) ( nRow nHeight ); i++ )
{
-const ByteStringaToken(comphelper::string::getToken(aLine,
i, ',') );
-const xub_StrLen nLen = aToken.Len();
+const rtl::OString
aToken(comphelper::string::getToken(aLine,i, ','));
+const sal_Int32 nLen = aToken.getLength();
BOOLbProcessed = FALSE;
nBit = nDigits = nValue = 0;
-for( xub_StrLen n = 0UL; n nLen; n++ )
+for (sal_Int32 n = 0; n nLen; ++n)
{
-const unsigned char cChar = aToken.GetChar( n );
+const unsigned char cChar = aToken[n];
const short nTable = pHexTable[ cChar ];
if( isxdigit( cChar ) || !nTable )
diff --git a/binfilter/inc/bf_svtools/xbmread.hxx
b/binfilter/inc/bf_svtools/xbmread.hxx
index 5a10826..6b281fa 100644
---
[Libreoffice-commits] .: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/source framework/uiconfig officecfg/registry reportdesign/uiconfig sc/uiconfig sd/uiconfig sfx2/inc sfx2/sdi sfx2/
basctl/uiconfig/basicide/menubar/menubar.xml | 3 - chart2/uiconfig/menubar/menubar.xml | 3 - dbaccess/uiconfig/dbapp/menubar/menubar.xml | 3 - dbaccess/uiconfig/dbquery/menubar/menubar.xml | 3 - dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 3 - dbaccess/uiconfig/dbtable/menubar/menubar.xml | 3 - dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 3 - extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml | 3 - framework/uiconfig/startmodule/menubar/menubar.xml| 3 - officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 ++ reportdesign/uiconfig/dbreport/menubar/menubar.xml| 3 - sc/uiconfig/scalc/menubar/menubar.xml | 3 - sd/uiconfig/sdraw/menubar/menubar.xml | 3 - sd/uiconfig/simpress/menubar/menubar.xml | 3 - sfx2/inc/sfx2/sfxsids.hrc | 1 sfx2/sdi/appslots.sdi | 4 + sfx2/sdi/sfx.sdi | 25 ++ sfx2/source/appl/appserv.cxx | 16 ++ starmath/uiconfig/smath/menubar/menubar.xml | 3 - sw/uiconfig/sglobal/menubar/menubar.xml | 3 - sw/uiconfig/sweb/menubar/menubar.xml | 3 - sw/uiconfig/swform/menubar/menubar.xml| 3 - sw/uiconfig/swreport/menubar/menubar.xml | 3 - sw/uiconfig/swriter/menubar/menubar.xml | 3 - sw/uiconfig/swxform/menubar/menubar.xml | 3 - 25 files changed, 91 insertions(+), 20 deletions(-) New commits: commit 924d0bdd47ed895592332714be8ee32afe1acebb Author: Ivan Timofeev timofeev@gmail.com Date: Wed Jan 18 22:47:58 2012 +0400 add the Send Feedback... help menu item diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 15d4fcd..0d7ecd7 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -83,8 +83,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +menu:menuitem menu:id=.uno:ShowLicense/ menu:menuitem menu:id=.uno:ShowCredits/ menu:menuitem menu:id=.uno:About/ /menu:menupopup diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 3c50167..a52dff8 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -147,8 +147,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +menu:menuitem menu:id=.uno:ShowLicense/ menu:menuitem menu:id=.uno:ShowCredits/ menu:menuitem menu:id=.uno:About/ /menu:menupopup diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index a76fda5..0367d7e 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -133,8 +133,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/ menu:menuseparator/ +menu:menuitem menu:id=.uno:ShowLicense/ menu:menuitem menu:id=.uno:ShowCredits/ menu:menuitem menu:id=.uno:About/ /menu:menupopup diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 2d6ec8d..e041079 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -74,8 +74,9 @@ menu:menuitem menu:id=.uno:HelpIndex/ menu:menuitem menu:id=.uno:ExtendedHelp/ menu:menuseparator/ -menu:menuitem menu:id=.uno:ShowLicense/ +menu:menuitem menu:id=.uno:SendFeedback/
[Libreoffice-commits] .: 2 commits - android/qa sal/osl
android/qa/sc/Makefile |7 ++- sal/osl/unx/file.cxx |2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 1921a96c323f5a0dcd846f5d17a6bbb3de208797 Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 23 13:33:06 2012 +0200 Add the filters_test test documents diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index dbf9fb4..0412f33 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -127,6 +127,7 @@ copy-stuff: mkdir -p assets/bin assets/lib assets/xml/ure cp $(OUTDIR)/bin/udkapi.rdb assets/bin cp $(OUTDIR)/bin/types.rdb assets/bin +# # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? # So just hardcode the known APP_DATA_PATH for now... # Ditto for URE_INTERNAL_LIB_DIR @@ -141,16 +142,20 @@ copy-stuff: sed -e 's!uri=./!uri=$(APP_DATA_PATH)/lib/!g' $(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb assets/lib/$$F.rdb; \ done cp -R $(OUTDIR)/xml/registry assets/xml +# # .res files for F in $(OUTDIR)/bin/*.res; do \ cp $$F assets/bin; \ done +# +# Test documents for filters_test + (cd $(SRC_ROOT) tar cf - sc/qa/unit/data) | (cd assets tar xvf -) +# # Then assets that are unpacked at run-time into the app's data directory. mkdir -p assets/unpack/etc/fonts cp fonts.conf assets/unpack/etc/fonts # # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. -# cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST) echo set solib-search-path ./obj/local/armeabi-v7a $(SODEST)/gdb.setup commit 5b715f0dd92aeb4c08c53f914b31ee8fe83e0e5d Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Jan 23 13:28:10 2012 +0200 Don't crash when attempting to open non-existent files under /assets diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 7dd557a..aa6cc26 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -907,6 +907,8 @@ SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_u void *address; size_t size; address = lo_apkentry(cpFilePath, size); +if (address == NULL) +return osl_File_E_NOENT; return osl_openMemoryAsFile(address, size, pHandle); } #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: qadevOOo/testdocs vcl/unx
qadevOOo/testdocs/vertical-testcase.odt |binary
vcl/unx/generic/gdi/salgdi3.cxx | 11 ---
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 8f23e9813daae808aa2a81250b5e414dc57a3394
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 23 12:15:44 2012 +
Resolves: fdo#44856 skew artificial fonts before glyph or layout rotation
diff --git a/qadevOOo/testdocs/vertical-testcase.odt
b/qadevOOo/testdocs/vertical-testcase.odt
index cd279c8..de564f8 100644
Binary files a/qadevOOo/testdocs/vertical-testcase.odt and
b/qadevOOo/testdocs/vertical-testcase.odt differ
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index e27cb43..a444161 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -414,9 +414,6 @@ void X11SalGraphics::DrawServerFontLayout( const
ServerFontLayout rLayout )
cairo_matrix_init_identity(m);
-if (rFont.NeedsArtificialItalic())
-m.xy = -m.xx * 0x6000L / 0x1L;
-
if (rLayout.GetOrientation())
cairo_matrix_rotate(m, toRadian(rLayout.GetOrientation()));
@@ -463,6 +460,14 @@ void X11SalGraphics::DrawServerFontLayout( const
ServerFontLayout rLayout )
cairo_matrix_translate(m, xdiff, ydiff);
}
+if (rFont.NeedsArtificialItalic())
+{
+cairo_matrix_t shear;
+cairo_matrix_init_identity(shear);
+shear.xy = -shear.xx * 0x6000L / 0x1L;
+cairo_matrix_multiply(m, shear, m);
+}
+
cairo_set_font_matrix(cr, m);
cairo_show_glyphs(cr, cairo_glyphs[nStartIndex], nLen);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/file/FResultSet.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 7177eebc6942cc66a20514a409788ef87b1383b5
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 23 13:42:37 2012 +0100
connectivity: fdo#43479: sort order doesn't matter
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index c47e92f..3316e37 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1449,7 +1449,7 @@ sal_Bool OResultSet::OpenImpl()
// order of columns that are not specified in ORDER BY
// clause is undefined, so it doesn't hurt to sort on
// these; pad the vectors to include them.
-for (sal_Int32 i = 1;
+for (sal_Int32 i = 1; // 0: bookmark (see
setBoundedColumns)
static_castsize_t(i) m_aColMapping.size(); ++i)
{
if (::std::find(m_aOrderbyColumnNumber.begin(),
@@ -1457,10 +1457,8 @@ sal_Bool OResultSet::OpenImpl()
== m_aOrderbyColumnNumber.end())
{
m_aOrderbyColumnNumber.push_back(i);
-m_aOrderbyAscending.push_back(
-(m_aOrderbyAscending.empty())
-? SQL_ASC // default for no ORDER BY
-: m_aOrderbyAscending.back());
+// ASC or DESC doesn't matter
+m_aOrderbyAscending.push_back(SQL_ASC);
}
}
bDistinct = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/misc/filechangedchecker.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1bc228f769be2999c10beefe224517804bb0316c
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Mon Jan 23 12:52:55 2012 +
Same expression on both sides of || in if condition
diff --git a/svtools/source/misc/filechangedchecker.cxx
b/svtools/source/misc/filechangedchecker.cxx
index 514841f..50d73da 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -83,7 +83,7 @@ bool FileChangedChecker::hasFileChanged()
// Check if the seconds time stamp has any difference
// If so, then our file has changed meanwhile
if( newTime.Seconds != mLastModTime.Seconds ||
-newTime.Seconds != mLastModTime.Seconds )
+newTime.Nanosec != mLastModTime.Nanosec )
{
// Since the file has changed, set the new status as the file status
and
// return True
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterTimer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e9ca381275f42a445a7c8918230c6263258e53c6
Author: Mariusz Dykierek mariuszdykie...@gmail.com
Date: Mon Jan 23 12:58:10 2012 +
A copy-paste bug detected by cppcheck
diff --git a/sdext/source/presenter/PresenterTimer.cxx
b/sdext/source/presenter/PresenterTimer.cxx
index 6c5f8d9..3757bd0 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -511,7 +511,7 @@ void PresenterClockTimer::CheckCurrentTime (const
TimeValue rCurrentTime)
{
if (aDateTime.Seconds != maDateTime.Seconds
|| aDateTime.Minutes != maDateTime.Minutes
-|| aDateTime.Seconds != maDateTime.Seconds)
+|| aDateTime.Hours != maDateTime.Hours)
{
// The displayed part of the current time has changed.
// Prepare to call the listeners.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 4ad1652522aff11f53edc45bf29531225979935a Author: Miklos Vajna vmik...@frugalware.org Date: Sat Jan 21 00:58:48 2012 +0100 fdo#44983 Fix RTF import of \paperh and \paperw These keywords should not only set the *default* paper height/width but also set the current values. (cherry picked from commit c39e891d4dc963d2cac9843b426494e4dc490278) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 62445de..18643af 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2357,18 +2357,16 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) pIntValue)); } break; -case RTF_PAPERH: +case RTF_PAPERH: // fall through: set the default + current value lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue, true); -break; -case RTF_PAPERW: -lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, -NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue, true); -break; case RTF_PGHSXN: lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_h, pIntValue, true); break; +case RTF_PAPERW: // fall through: set the default + current value +lcl_putNestedAttribute(m_aDefaultState.aSectionSprms, +NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue, true); case RTF_PGWSXN: lcl_putNestedAttribute(m_aStates.top().aSectionSprms, NS_ooxml::LN_EG_SectPrContents_pgSz, NS_ooxml::LN_CT_PageSz_w, pIntValue, true); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc
svx/inc/svx/zoom_def.hxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit a18c8a06073650e12f3c1f9f8990670484ac5cf1 Author: Jan Holesovsky ke...@suse.cz Date: Mon Jan 23 15:27:45 2012 +0100 Let's use 2^(1/4) as the zoom factor, instead of 1.2 (thanks, Tor!) diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index e194493..9f1a8ef 100644 --- a/svx/inc/svx/zoom_def.hxx +++ b/svx/inc/svx/zoom_def.hxx @@ -8,7 +8,8 @@ #endif -// zoom factor for Calc, Writer, Draw and Impress -#define ZOOM_FACTOR1.2 +// Zoom factor for Calc, Writer, Draw and Impress +// We use 2^(1/4) so that 4 steps lead to double / half size +#define ZOOM_FACTOR1.1892071150027210667175 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/kde4/KDEXLib.cxx |4 1 file changed, 4 deletions(-) New commits: commit 5cde352b9622c0e009b52e4848c84584d03e0d5d Author: Thomas Arnhold tho...@arnhold.org Date: Mon Jan 23 15:35:55 2012 +0100 remove duplicate header diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 56150cf..23822b1 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -51,10 +51,6 @@ #include KDESalDisplay.hxx -#if OSL_DEBUG_LEVEL 1 -#include stdio.h -#endif - #include stdio.h #if QT_VERSION = QT_VERSION_CHECK( 4, 9, 0 ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/interpr4.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit a7769e27849b74102e11540d7753576528323114
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 23 15:43:50 2012 +0100
resolved rhbz#783556 crash in ScMatrix::GetDimensons() from ScInterpreter
* Interpreter tried to access a nonexistent matrix for external reference.
* In ScInterpreter::PopExternalDoubleRef(ScMatrixRef rMat) set error for
unexpected conditions. In caller or descendants check for error or
presence
of ScMatrix.
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index cda83d3..b6492dd 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1285,6 +1285,8 @@ ScDBRangeBase* ScInterpreter::PopDBDoubleRef()
pMat = PopMatrix();
else
PopExternalDoubleRef(pMat);
+if (nGlobalError)
+break;
return new ScDBExternalRange(pDok, pMat);
}
default:
@@ -1541,7 +1543,14 @@ void ScInterpreter::PopExternalDoubleRef(ScMatrixRef
rMat)
// references, which means the array should only contain a
// single matrix token.
ScToken* p = static_castScToken*(pArray-First());
-rMat = p-GetMatrix();
+if (!p || p-GetType() != svMatrix)
+SetError( errIllegalParameter);
+else
+{
+rMat = p-GetMatrix();
+if (!rMat)
+SetError( errUnknownVariable);
+}
}
void ScInterpreter::GetExternalDoubleRef(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/file/FResultSet.cxx | 48
1 file changed, 17 insertions(+), 31 deletions(-)
New commits:
commit 48c33e89fe7398c05f2af6c49c75fa2bedf36859
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 19 15:25:07 2012 +0100
connectivity: fdo#43479: fix crash on DISTINCT:
Since commit f89f2b8bf506de0cc547ad596c75cbe1a0cf1ef1,
OResultSet::sortRows() works on the rows after SELECT, not on full rows.
So OResultSet::OpenImpl() has to be adapted to not use the mapping from
selected columns to entries rows in m_aColMapping any more; instead,
use the given ORDER BY clause for sorting.
But first extend the sort order to cover all columns, so it is no longer
necessary to call sortRows twice (this should be legal, because SQL says
the order of rows that are equal in ORDER BY columns is unspecified).
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index 43b7827..3316e37 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1438,26 +1438,29 @@ sal_Bool OResultSet::OpenImpl()
else
{
sal_Bool bDistinct = sal_False;
-sal_Bool bWasSorted = sal_False;
OSQLParseNode *pDistinct = m_pParseTree-getChild(1);
-::std::vectorsal_Int32
aOrderbyColumnNumberSave;
-::std::vectorTAscendingOrder aOrderbyAscendingSave;
+assert(m_aOrderbyColumnNumber.size() ==
+ m_aOrderbyAscending.size());
if (pDistinct pDistinct-getTokenID() == SQL_TOKEN_DISTINCT
)
{
-// Sort on all columns, saving original order for later
-if(IsSorted())
+// To eliminate duplicates we need to sort on all columns.
+// This is not a problem because the SQL spec says that the
+// order of columns that are not specified in ORDER BY
+// clause is undefined, so it doesn't hurt to sort on
+// these; pad the vectors to include them.
+for (sal_Int32 i = 1; // 0: bookmark (see
setBoundedColumns)
+ static_castsize_t(i) m_aColMapping.size(); ++i)
{
-aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;
-m_aOrderbyColumnNumber.clear();
-
aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(),
m_aOrderbyAscending.end());
-bWasSorted = sal_True;
+if (::std::find(m_aOrderbyColumnNumber.begin(),
+m_aOrderbyColumnNumber.end(), i)
+== m_aOrderbyColumnNumber.end())
+{
+m_aOrderbyColumnNumber.push_back(i);
+// ASC or DESC doesn't matter
+m_aOrderbyAscending.push_back(SQL_ASC);
+}
}
-
-// the first column is the bookmark column
-::std::vectorsal_Int32::iterator aColStart =
(m_aColMapping.begin()+1);
-::std::copy(aColStart,
m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
-m_aOrderbyAscending.assign(m_aColMapping.size()-1,
SQL_ASC);
bDistinct = sal_True;
}
@@ -1539,23 +1542,6 @@ sal_Bool OResultSet::OpenImpl()
m_pFileSet-get().erase(::std::remove_if(m_pFileSet-get().begin(),m_pFileSet-get().end(),
::std::bind2nd(::std::equal_tosal_Int32(),0))
,m_pFileSet-get().end());
-
-if (bWasSorted)
-{
-// Re-sort on original requested order
-m_aOrderbyColumnNumber = aOrderbyColumnNumberSave;
-
m_aOrderbyAscending.assign(aOrderbyAscendingSave.begin(),
aOrderbyAscendingSave.end());
-
-TIntVector aEvaluationKeySet(m_pFileSet-get());
-m_pEvaluationKeySet = aEvaluationKeySet;
-sortRows();
-}
-else
-{
-m_aOrderbyColumnNumber.clear();
-m_aOrderbyAscending.clear();
-
::std::sort(m_pFileSet-get().begin(),m_pFileSet-get().end());
-}
}
}
}
___
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/filter/html/htmlexp.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 531b11d98d5fedd575d5e1564a937ac109d6bdf5
Author: Eike Rathke er...@redhat.com
Date: Sun Jan 22 20:13:36 2012 +0100
resolved fdo#45032 Calc export to HTML with graphics failed
Fixed a misconception in transition from List to to ptr_vector of commit
db599f64e63a3141159b7f0e59783197c39b3e02, List::Next() returned NULL when at
end of list, mimic that.
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 1f36f9d..0e8fee9 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -883,11 +883,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
size_t ListSize = aGraphList.size();
for ( size_t i = 0; i ListSize; ++i )
{
-pGraphEntry = aGraphList[ i ];
-if ( pGraphEntry-bInCell pGraphEntry-aRange.In( aPos ) )
+ScHTMLGraphEntry* pE = aGraphList[ i ];
+if ( pE-bInCell pE-aRange.In( aPos ) )
{
-if ( pGraphEntry-aRange.aStart == aPos )
+if ( pE-aRange.aStart == aPos )
+{
+pGraphEntry = pE;
break; // for
+}
else
return ;// ist ein Col/RowSpan, Overlapped
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/locale.dtd | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) New commits: commit b247f7691e0498355afcbcc4b60b5e9fdd28d867 Author: Eike Rathke er...@redhat.com Date: Mon Jan 23 16:59:35 2012 +0100 added description of time edit format diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd index 1d79039..6b88bbe 100644 --- a/i18npool/source/localedata/data/locale.dtd +++ b/i18npool/source/localedata/data/locale.dtd @@ -243,16 +243,18 @@ data. The requirements are the same as for formatindex=21 above. Of usage=TIME: -formatindices 43, 44, 45 are special in the sense that they are -programmatically used to automatically display values that meet certain -criteria: -Formatindex=43 contains the [HH] format code that displays hour -values greater than or equal to 24 (as opposed to a simple HH that -displays modulo 24). -Formatindex=44 uses no hour code but 100th seconds and the -Time100SecSeparator. -Formatindex=45 uses both [HH] hour code and 100th seconds to be able -to edit such time values without loosing information. +* The FormatElement with default=true type=medium is used to edit + times and thus must contain all HH and MM and SS codes, e.g. HH:MM:SS +* Formatindices 43, 44, 45 are special in the sense that they are + programmatically used to automatically display values that meet + certain criteria: + * Formatindex=43 contains the [HH] format code that displays hour +values greater than or equal to 24 (as opposed to a simple HH that +displays modulo 24). + * Formatindex=44 uses no hour code but 100th seconds and the +Time100SecSeparator. + * Formatindex=45 uses both [HH] hour code and 100th seconds to be +able to edit such time values without loosing information. Of usage=CURRENCY: formatindices 12, 13, 14, 15, 17 with [$xxx-yyy] notation must use the ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/filter/html/htmlexp.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 12f883d3601bb695e589ab8b570d81d789c4bf64
Author: Eike Rathke er...@redhat.com
Date: Sun Jan 22 20:13:36 2012 +0100
resolved fdo#45032 Calc export to HTML with graphics failed
Fixed a misconception in transition from List to to ptr_vector of commit
db599f64e63a3141159b7f0e59783197c39b3e02, List::Next() returned NULL when at
end of list, mimic that.
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 772b72b..34e994b 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -829,11 +829,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
size_t ListSize = aGraphList.size();
for ( size_t i = 0; i ListSize; ++i )
{
-pGraphEntry = aGraphList[ i ];
-if ( pGraphEntry-bInCell pGraphEntry-aRange.In( aPos ) )
+ScHTMLGraphEntry* pE = aGraphList[ i ];
+if ( pE-bInCell pE-aRange.In( aPos ) )
{
-if ( pGraphEntry-aRange.aStart == aPos )
+if ( pE-aRange.aStart == aPos )
+{
+pGraphEntry = pE;
break; // for
+}
else
return ; // ist ein Col/RowSpan, Overlapped
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/tool/interpr4.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 2ec3bc43e1d00ae1911397883976c3724f0bfe14
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 23 15:43:50 2012 +0100
resolved rhbz#783556 crash in ScMatrix::GetDimensons() from ScInterpreter
* Interpreter tried to access a nonexistent matrix for external reference.
* In ScInterpreter::PopExternalDoubleRef(ScMatrixRef rMat) set error for
unexpected conditions. In caller or descendants check for error or
presence
of ScMatrix.
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c399205..5a36165 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1286,6 +1286,8 @@ ScDBRangeBase* ScInterpreter::PopDBDoubleRef()
pMat = PopMatrix();
else
PopExternalDoubleRef(pMat);
+if (nGlobalError)
+break;
return new ScDBExternalRange(pDok, pMat);
}
default:
@@ -1542,7 +1544,14 @@ void ScInterpreter::PopExternalDoubleRef(ScMatrixRef
rMat)
// references, which means the array should only contain a
// single matrix token.
ScToken* p = static_castScToken*(pArray-First());
-rMat = p-GetMatrix();
+if (!p || p-GetType() != svMatrix)
+SetError( errIllegalParameter);
+else
+{
+rMat = p-GetMatrix();
+if (!rMat)
+SetError( errUnknownVariable);
+}
}
void ScInterpreter::GetExternalDoubleRef(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/core/tool/interpr4.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 9faf077b85098436ac29b9369bfc7d8a9286fbd3
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 23 15:43:50 2012 +0100
resolved rhbz#783556 crash in ScMatrix::GetDimensons() from ScInterpreter
* Interpreter tried to access a nonexistent matrix for external reference.
* In ScInterpreter::PopExternalDoubleRef(ScMatrixRef rMat) set error for
unexpected conditions. In caller or descendants check for error or
presence
of ScMatrix.
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 07ff54b..424c713 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1285,6 +1285,8 @@ ScDBRangeBase* ScInterpreter::PopDBDoubleRef()
pMat = PopMatrix();
else
PopExternalDoubleRef(pMat);
+if (nGlobalError)
+break;
return new ScDBExternalRange(pDok, pMat);
}
default:
@@ -1535,7 +1537,14 @@ void ScInterpreter::PopExternalDoubleRef(ScMatrixRef
rMat)
// references, which means the array should only contain a
// single matrix token.
ScToken* p = static_castScToken*(pArray-First());
-rMat = p-GetMatrix();
+if (!p || p-GetType() != svMatrix)
+SetError( errIllegalParameter);
+else
+{
+rMat = p-GetMatrix();
+if (!rMat)
+SetError( errUnknownVariable);
+}
}
void ScInterpreter::GetExternalDoubleRef(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/fi_FI.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 49e685663146b9ad59a47cfaf9cf499fc6a6b937 Author: Eike Rathke er...@redhat.com Date: Mon Jan 23 17:43:01 2012 +0100 added [fi-FI] date acceptance pattern D.M. diff --git a/i18npool/source/localedata/data/fi_FI.xml b/i18npool/source/localedata/data/fi_FI.xml index f666ff6..7e4f5dc 100644 --- a/i18npool/source/localedata/data/fi_FI.xml +++ b/i18npool/source/localedata/data/fi_FI.xml @@ -35,6 +35,7 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M./DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeYleinen/FormatCode /FormatElement ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/SwAppletImpl.hxx| 19 +++
sw/source/filter/html/SwAppletImpl.cxx | 80 -
2 files changed, 49 insertions(+), 50 deletions(-)
New commits:
commit 0a7126a7673e60490b5da565d1df14248136fcce
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jan 24 01:45:12 2012 +0900
Replaced String by rtl::OUString
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 3c936b3..b0c9e8a 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -37,7 +37,6 @@
#include com/sun/star/embed/XEmbeddedObject.hpp
-#include tools/string.hxx
#include sfx2/frmhtml.hxx
#include sfx2/frmhtmlw.hxx
#include vcl/wrkwin.hxx
@@ -55,25 +54,25 @@ class SwApplet_Impl
com::sun::star::uno::Reference com::sun::star::embed::XEmbeddedObject
xApplet;
SvCommandList aCommandList;
SfxItemSetaItemSet;
-StringsAlt;
+::rtl::OUString sAlt;
public:
-static sal_uInt16 GetOptionType( const String rName, sal_Bool bApplet );
+static sal_uInt16 GetOptionType( const ::rtl::OUString rName, sal_Bool
bApplet );
SwApplet_Impl( SfxItemPool rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2
);
SwApplet_Impl( SfxItemSet rSet ): aItemSet ( rSet) {}
~SwApplet_Impl();
-void CreateApplet( const String rCode, const String rName,
- sal_Bool bMayScript, const String rCodeBase,
- const String rBaseURL );
+void CreateApplet( const ::rtl::OUString rCode, const ::rtl::OUString
rName,
+ sal_Bool bMayScript, const ::rtl::OUString rCodeBase,
+ const ::rtl::OUString rBaseURL );
#ifdef SOLAR_JAVA
-sal_Bool CreateApplet( const String rBaseURL );
-void AppendParam( const String rName, const String rValue );
+sal_Bool CreateApplet( const ::rtl::OUString rBaseURL );
+void AppendParam( const ::rtl::OUString rName, const ::rtl::OUString
rValue );
#endif
void FinishApplet();
com::sun::star::uno::Reference com::sun::star::embed::XEmbeddedObject
GetApplet() { return xApplet; }
SfxItemSet GetItemSet() { return aItemSet; }
-const String GetAltText() { return sAlt; }
-void SetAltText( const String rAlt ) {sAlt = rAlt;}
+const ::rtl::OUString GetAltText() const { return sAlt; }
+void SetAltText( const ::rtl::OUString rAlt ) {sAlt = rAlt;}
};
#endif
diff --git a/sw/source/filter/html/SwAppletImpl.cxx
b/sw/source/filter/html/SwAppletImpl.cxx
index 520ad8c..23db157 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -47,76 +47,76 @@ static char const sHTML_O_Object[] = OBJECT;
}
-sal_uInt16 SwApplet_Impl::GetOptionType( const String rName, sal_Bool bApplet
)
+sal_uInt16 SwApplet_Impl::GetOptionType( const ::rtl::OUString rName,
sal_Bool bApplet )
{
sal_uInt16 nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG;
-switch( rName.GetChar(0) )
+switch( rName.toChar() )
{
case 'A':
case 'a':
-if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_align ) ||
-rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_alt ) )
+if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_align
) ||
+rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_alt ) )
nType = SWHTML_OPTTYPE_IGNORE;
else if( bApplet
- (rName.EqualsIgnoreCaseAscii( sHTML_O_archive ) ||
- rName.EqualsIgnoreCaseAscii( sHTML_O_Archives )) )
+ (rName.equalsIgnoreAsciiCaseAscii( sHTML_O_archive ) ||
+ rName.equalsIgnoreAsciiCaseAscii( sHTML_O_Archives )) )
nType = SWHTML_OPTTYPE_TAG;
break;
case 'C':
case 'c':
-if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_class ) ||
-(bApplet (rName.EqualsIgnoreCaseAscii(
OOO_STRING_SVTOOLS_HTML_O_code ) ||
- rName.EqualsIgnoreCaseAscii(
OOO_STRING_SVTOOLS_HTML_O_codebase ))) )
+if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_class
) ||
+(bApplet (rName.equalsIgnoreAsciiCaseAscii(
OOO_STRING_SVTOOLS_HTML_O_code ) ||
+ rName.equalsIgnoreAsciiCaseAscii(
OOO_STRING_SVTOOLS_HTML_O_codebase ))) )
nType = SWHTML_OPTTYPE_IGNORE;
break;
case 'H':
case 'h':
-if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_height ) )
+if( rName.equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_O_height
) )
nType = SWHTML_OPTTYPE_SIZE;
-else if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_hspace
) ||
-(!bApplet rName.EqualsIgnoreCaseAscii(
OOO_STRING_SW_HTML_O_Hidden )) )
+else if( rName.equalsIgnoreAsciiCaseAscii(
OOO_STRING_SVTOOLS_HTML_O_hspace ) ||
+(!bApplet
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/tr_TR.xml |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2d8a5940a0369127602fcc6144e9c31aae4917bd Author: Eike Rathke er...@redhat.com Date: Mon Jan 23 17:50:23 2012 +0100 added [tr-TR] date acceptance patterns D.M D/M D-M diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index 945afbe..ca2d1ab 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -35,6 +35,9 @@ MeasurementSystemmetric/MeasurementSystem /LC_CTYPE LC_FORMAT +DateAcceptancePatternD.M/DateAcceptancePattern +DateAcceptancePatternD/M/DateAcceptancePattern +DateAcceptancePatternD-M/DateAcceptancePattern FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeStandard/FormatCode /FormatElement ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in connectivity/prj connectivity/source distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOff
configure.in |
19 --
connectivity/prj/d.lst |
6
connectivity/source/drivers/postgresql/description.xml |
17 --
connectivity/source/drivers/postgresql/description/description_en-US.txt |
1
connectivity/source/drivers/postgresql/makefile.mk |
81 +++---
connectivity/source/drivers/postgresql/manifest.xml |
10 -
connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component|
35
connectivity/source/drivers/postgresql/postgresql-sdbc.component |
35
connectivity/source/drivers/postgresql/postgresql-sdbc.ini |
2
connectivity/source/drivers/postgresql/postgresql-sdbc.uno |
2
connectivity/source/drivers/postgresql/pq_connection.cxx |
15 -
connectivity/source/drivers/postgresql/pq_driver.cxx |
13 -
distro-configs/LibreOfficeLinux.conf |
1
distro-configs/LibreOfficeMacOSX.conf|
1
distro-configs/LibreOfficeWin32.conf |
1
postprocess/packregistry/makefile.mk |
6
scp2/source/base/makefile.mk |
6
scp2/source/base/postgresqlsdbc.scp |
75 +
scp2/source/base/postgresqlsdbc.ulf |
36
scp2/source/extensions/directory_extensions.scp |
11 -
scp2/source/extensions/file_extensions.scp |
13 -
scp2/source/extensions/module_extensions.scp |
15 -
scp2/source/extensions/module_extensions.ulf |
6
scp2/util/makefile.mk|
3
setup_native/source/packinfo/packinfo_extensions.txt |
15 -
setup_native/source/packinfo/packinfo_office.txt |
15 +
26 files changed, 251 insertions(+), 189 deletions(-)
New commits:
commit 3a7ae48b6f610899200ae2800706533f7c4c9f80
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 23 15:08:36 2012 +0100
fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.
Replaced --enable-ext-postgresql-sdbc with --disable-postgresql-sdbc.
Renamed postgresql-sdbc.uno{.ini,rc} to consistent postgresql-sdbc.ini
(which made the code a little easier).
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/configure.in b/configure.in
index b15f76c..109bc7d 100644
--- a/configure.in
+++ b/configure.in
@@ -355,11 +355,6 @@ AC_ARG_ENABLE(ext-pdfimport,
[Disable the PDF Import extension.])
)
-AC_ARG_ENABLE(ext-postgresql-sdbc,
-AS_HELP_STRING([--enable-ext-postgresql-sdbc],
-[Enable the build of the PostgreSQL-SDBC extension.])
-)
-
AC_ARG_ENABLE(ext-presenter-console,
AS_HELP_STRING([--disable-ext-presenter-console],
[Disable the Presenter Console extension.])
@@ -807,6 +802,11 @@ AC_ARG_ENABLE(silent-msi,
[Enable MSI with LIMITUI=1 (silent install).]),
,)
+AC_ARG_ENABLE(postgresql-sdbc,
+AS_HELP_STRING([--disable-postgresql-sdbc],
+[Disable the build of the PostgreSQL-SDBC driver.])
+)
+
dnl ===
dnl Optional Packages (--with/without-)
dnl ===
@@ -1118,7 +1118,7 @@ AC_ARG_WITH(system-mysql-cppconn,
AC_ARG_WITH(system-postgresql,
AS_HELP_STRING([--with-system-postgresql],
[Use PostgreSQL libraries already on system, for building the
PostgreSQL-SDBC
- extension. If pg_config is not in PATH, use PGCONFIG to point to
it.]),,
+ driver. If pg_config is not in PATH, use PGCONFIG to point to it.]),,
[with_system_postgresql=$with_system_libs])
AC_ARG_WITH(libpq-path,
@@ -5388,11 +5388,8 @@ dnl
===
dnl Check for PostgreSQL stuff
dnl ===
-if test x$enable_ext_postgresql_sdbc = xyes; then
-if test x$enable_extension_integration = xyes; then
- SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
-fi
-
+if test x$enable_postgresql_sdbc != xno; then
+SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC
AC_MSG_CHECKING([PostgreSQL C interface])
if test $with_system_postgresql = yes; then
AC_MSG_RESULT([external PostgreSQL])
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 954a89d..b80de85 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -1,7 +1,6 @@
..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
[Libreoffice-commits] .: 4 commits - android/qa cppuhelper/source desktop/source README.Android
README.Android|7 ++-
android/qa/desktop/Makefile | 17 +
android/qa/desktop/jni/Android.mk | 23 +++
android/qa/desktop/jni/Application.mk |2 ++
cppuhelper/source/bootstrap.cxx | 11 +++
desktop/source/app/appinit.cxx|7 +++
6 files changed, 58 insertions(+), 9 deletions(-)
New commits:
commit 4b7b244fe71f5ed589b5e72f81b7b2f79096c68d
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 23 17:09:31 2012 +
android: make desktop/ marginally debuggable
diff --git a/android/qa/desktop/jni/Android.mk
b/android/qa/desktop/jni/Android.mk
new file mode 100644
index 000..c5c2ed3
--- /dev/null
+++ b/android/qa/desktop/jni/Android.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= dummy
+LOCAL_SRC_FILES := dummy.c
+LOCAL_LDLIBS:=
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/android/qa/desktop/jni/Application.mk
b/android/qa/desktop/jni/Application.mk
new file mode 100644
index 000..a11b28d
--- /dev/null
+++ b/android/qa/desktop/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_ABI := armeabi-v7a
+APP_PLATFORM := android-14
commit e74a3585a0b6ffed998800b2be8617c0c095e02e
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 23 17:08:55 2012 +
android: update README and fix a number of silly escaping issues
diff --git a/README.Android b/README.Android
index dd1a639..b5e32c7 100644
--- a/README.Android
+++ b/README.Android
@@ -24,7 +24,7 @@ test output to enjoy. After a while of this loop you'll
probably
find that android has lost a lot of space on your device at
this point:
- adb shell stop ; adb shell start
+ adb shell stop; adb shell setprop log.redirect-stdio true; adb shell
start
and continue onwards upwards.
@@ -44,6 +44,11 @@ attached, so you need to carefully guess where to put:
into the code; and when you see that in logcat, you have time
to run: ndk-gdb and it will attach the process.
+ thread 12 # or perhaps 13
+ backtrace
+
+ may show you the native code trace.
+
* Common Errors / Gotchas
lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c6ddf59..18d 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -37,16 +37,16 @@ buildrcs:
echo [Bootstrap] assets/program/fundamentalrc
echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc # checkme - is this used to find configs ?
- echo BRAND_BASE_DIR=file:///assets/ assets/program/fundamentalrc
- echo CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry
module:${BRAND_BASE_DIR}/share/registry/modules
res:${BRAND_BASE_DIR}/share/registry
bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
xcsxcu:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu
assets/program/fundamentalrc
- echo
URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway
assets/program/fundamentalrc
- echo URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb $${URE_MORE_TYPES}
assets/program/fundamentalrc
- echo URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb
file:///assets/program/services/services.rdb $${URE_MORE_SERVICES}
assets/program/fundamentalrc
+ echo BRAND_BASE_DIR=file:///assets assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
[Libreoffice-commits] .: 2 commits - extensions/source
extensions/source/abpilot/abspilot.cxx |5 +
extensions/source/abpilot/abspilot.hxx |2 ++
extensions/source/abpilot/unodialogabp.hxx |4 ++--
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit c8f15a768dd4d71acfb65c3af4995e2a991b8087
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 23 17:19:17 2012 +
call FreeResource like the other RoadmapWizard users
diff --git a/extensions/source/abpilot/abspilot.cxx
b/extensions/source/abpilot/abspilot.cxx
index 9f08d05..0024596 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -135,6 +135,11 @@ namespace abp
typeSelectionChanged( m_aSettings.eType );
}
+OAddessBookSourcePilot::~OAddessBookSourcePilot()
+{
+FreeResource();
+}
+
//-
String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState )
const
{
diff --git a/extensions/source/abpilot/abspilot.hxx
b/extensions/source/abpilot/abspilot.hxx
index a813670..9c751c5 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -59,6 +59,8 @@ namespace abp
OAddessBookSourcePilot(
Window* _pParent,
const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory _rxORB);
+/// dtor
+~OAddessBookSourcePilot();
/// get the service factory which was used to create the dialog
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory
commit 17d933c97d9b80830b2152906ab0f82b9b21ba1c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 23 17:17:45 2012 +
ctor OModuleResourceClient first so OModuleResourceClient dtor is last
which means that we don't crash in --enable-dbgutil on cancel
of the addressbook dialog
diff --git a/extensions/source/abpilot/unodialogabp.hxx
b/extensions/source/abpilot/unodialogabp.hxx
index aa320b0..3674d95 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -49,10 +49,10 @@ namespace abp
typedef ::comphelper::OPropertyArrayUsageHelper OABSPilotUno
OABSPilotUno_PBase;
/// the UNO wrapper for the address book source pilot
class OABSPilotUno
-:public OABSPilotUno_DBase
+:public OModuleResourceClient
+,public OABSPilotUno_DBase
,public OABSPilotUno_JBase
,public OABSPilotUno_PBase
-,public OModuleResourceClient
{
::rtl::OUString m_sDataSourceName;
OABSPilotUno(const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory _rxORB);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/qa
android/qa/desktop/Makefile |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 9bea733ecf01da09aaf7281868441b8a02fcf5cc
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 23 17:36:14 2012 +
android: add missing component, icon theme, and UI config xml
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 18d..2d55786 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -38,7 +38,7 @@ buildrcs:
echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc # checkme - is this used to find configs ?
echo BRAND_BASE_DIR=file:///assets assets/program/fundamentalrc
- echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
bundledext:$${$${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:$${$${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
xcsxcu:$${$${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry
userext:$${$${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
assets/program/fundamentalrc
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb' assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb
file:///assets/program/services/services.rdb $$ORIGIN/services*'
assets/program/fundamentalrc
@@ -103,6 +103,7 @@ copy-stuff: buildrcs
icuuclo \
jvmaccessgcc3 \
jvmfwk \
+ localebe1.uno \
localedata_en \
localedata_es \
localedata_euro \
@@ -155,12 +156,17 @@ copy-stuff: buildrcs
mkdir -p assets/program/types assets/program/services
mkdir -p assets/program/resource
mkdir -p assets/ure/share/misc assets/share/registry/res
+ mkdir -p assets/share/config/soffice.cfg
+# uno types services
cp $(OUTDIR)/bin/types.rdb assets/program/types/
cp $(OUTDIR)/bin/ure/types.rdb assets/ure/share/misc/
cp $(OUTDIR)/xml/services.rdb assets/program/services
cp $(OUTDIR)/xml/ure/services.rdb assets/ure/share/misc/
+# config
cp -R $(OUTDIR)/xml/*.xcd assets/share/registry/
mv assets/share/registry/fcfg_langpack_en-US.xcd
assets/share/registry/res/
+ cp -R $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg
+ cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config/images.zip
# .res files
cp $(OUTDIR)/bin/*en-US.res assets/program/resource/
# Then assets that are unpacked at run-time into the app's data directory.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/inc/virtmenu.hxx |8 +---
sfx2/source/menu/virtmenu.cxx | 20 +---
2 files changed, 18 insertions(+), 10 deletions(-)
New commits:
commit a0093404ffbca79655a52019d6bf66b976964fe9
Author: Michael Stahl mst...@redhat.com
Date: Mon Jan 23 18:38:45 2012 +0100
SfxVirtualMenu: fix context menu crash:
SfxMenuCtrlArr_Impl used to be a PTRARR_DEL, so use a boost::ptr_vector
to ensure elements are deleted.
(regression from 94d4764a42f8f38b884bb8960791d80ac876b786)
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 998fe66..44bf381 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -25,8 +25,10 @@
* for a copy of the LGPLv3 License.
*
/
-#ifndef _SFXVIRTMENU_HXX
-#define _SFXVIRTMENU_HXX
+#ifndef SFXVIRTMENU_HXX
+#define SFXVIRTMENU_HXX
+
+#include boost/ptr_container/ptr_vector.hpp
#include sfx2/mnuitem.hxx
#include mnucfga.hxx
@@ -35,7 +37,7 @@ class SfxBindings;
class Timer;
class SfxMenuImageControl_Impl;
-typedef std::vectorSfxMenuControl* SfxMenuCtrlArr_Impl;
+typedef ::boost::ptr_vectorSfxMenuControl SfxMenuCtrlArr_Impl;
class SAL_DLLPUBLIC_EXPORT SfxVirtualMenu
{
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index c62dfd5..0098ee5 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -731,11 +731,14 @@ void SfxVirtualMenu::BindControllers()
}
SfxMenuCtrlArr_Impl rCtrlArr = GetAppCtrl_Impl();
-for(SfxMenuCtrlArr_Impl::const_iterator i = rCtrlArr.begin(); i !=
rCtrlArr.end(); ++i)
+for (SfxMenuCtrlArr_Impl::iterator i = rCtrlArr.begin();
+i != rCtrlArr.end(); ++i)
{
-sal_uInt16 nSlotId = (*i)-GetId();
+sal_uInt16 nSlotId = i-GetId();
if ( !pSVMenu-GetItemCommand(nSlotId).Len() )
-(*i)-ReBind();
+{
+i-ReBind();
+}
}
pBindings-LEAVEREGISTRATIONS();
@@ -755,11 +758,14 @@ void SfxVirtualMenu::UnbindControllers()
}
SfxMenuCtrlArr_Impl rCtrlArr = GetAppCtrl_Impl();
-for(SfxMenuCtrlArr_Impl::const_iterator i = rCtrlArr.begin(); i !=
rCtrlArr.end(); ++i)
+for (SfxMenuCtrlArr_Impl::iterator i = rCtrlArr.begin();
+i != rCtrlArr.end(); ++i)
{
-if((*i)-IsBound())
-// UnoController is not binded!
-(*i)-UnBind();
+if (i-IsBound())
+{
+// UnoController is not bound!
+i-UnBind();
+}
}
pBindings-LEAVEREGISTRATIONS();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in connectivity/prj connectivity/source distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf postprocess/p
configure.in |
20 +-
connectivity/prj/d.lst |
6
connectivity/source/drivers/postgresql/description.xml |
17 --
connectivity/source/drivers/postgresql/description/description_en-US.txt |
1
connectivity/source/drivers/postgresql/makefile.mk |
81 +++---
connectivity/source/drivers/postgresql/manifest.xml |
10 -
connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component|
35
connectivity/source/drivers/postgresql/postgresql-sdbc.component |
35
connectivity/source/drivers/postgresql/postgresql-sdbc.ini |
2
connectivity/source/drivers/postgresql/postgresql-sdbc.uno |
2
connectivity/source/drivers/postgresql/pq_connection.cxx |
15 -
connectivity/source/drivers/postgresql/pq_driver.cxx |
13 -
distro-configs/LibreOfficeLinux.conf |
1
distro-configs/LibreOfficeMacOSX.conf|
1
distro-configs/LibreOfficeWin32.conf |
1
postprocess/packregistry/makefile.mk |
6
scp2/source/base/makefile.mk |
6
scp2/source/base/postgresqlsdbc.scp |
75 +
scp2/source/base/postgresqlsdbc.ulf |
36
scp2/source/extensions/directory_extensions.scp |
11 -
scp2/source/extensions/file_extensions.scp |
13 -
scp2/source/extensions/module_extensions.scp |
15 -
scp2/source/extensions/module_extensions.ulf |
6
scp2/util/makefile.mk|
3
setup_native/source/packinfo/packinfo_extensions.txt |
15 -
setup_native/source/packinfo/packinfo_office.txt |
15 +
26 files changed, 252 insertions(+), 189 deletions(-)
New commits:
commit c97d74b5f0608866bad3f7ae943811bdff4f7986
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 23 15:08:36 2012 +0100
fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.
Replaced --enable-ext-postgresql-sdbc with --disable-postgresql-sdbc.
Renamed postgresql-sdbc.uno{.ini,rc} to consistent postgresql-sdbc.ini
(which made the code a little easier).
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
(cherry picked from commit 3a7ae48b6f610899200ae2800706533f7c4c9f80)
Conflicts:
configure.in
connectivity/source/drivers/postgresql/makefile.mk
diff --git a/configure.in b/configure.in
index 84beec3..2f7bd61 100644
--- a/configure.in
+++ b/configure.in
@@ -427,11 +427,6 @@ AC_ARG_ENABLE(ext-pdfimport,
[Disable the PDF Import extension.])
)
-AC_ARG_ENABLE(ext-postgresql-sdbc,
-AS_HELP_STRING([--enable-ext-postgresql-sdbc],
-[Enable the build of the PostgreSQL-SDBC extension.])
-)
-
AC_ARG_ENABLE(ext-presenter-console,
AS_HELP_STRING([--disable-ext-presenter-console],
[Disable the Presenter Console extension.])
@@ -873,6 +868,11 @@ AC_ARG_ENABLE(silent-msi,
[Enable MSI with LIMITUI=1 (silent install).]),
,)
+AC_ARG_ENABLE(postgresql-sdbc,
+AS_HELP_STRING([--disable-postgresql-sdbc],
+[Disable the build of the PostgreSQL-SDBC driver.])
+)
+
dnl ===
dnl Optional Packages (--with/without-)
dnl ===
@@ -1199,7 +1199,7 @@ AC_ARG_WITH(system-mysql-cppconn,
AC_ARG_WITH(system-postgresql,
AS_HELP_STRING([--with-system-postgresql],
[Use PostgreSQL libraries already on system, for building the
PostgreSQL-SDBC
- extension. If pg_config is not in PATH, use PGCONFIG to point to
it.]),,
+ driver. If pg_config is not in PATH, use PGCONFIG to point to it.]),,
[with_system_postgresql=$with_system_libs])
AC_ARG_WITH(libpq-path,
@@ -6118,13 +6118,11 @@ fi
dnl ===
dnl Check for PostgreSQL stuff
dnl ===
-if test x$enable_ext_postgresql_sdbc = xyes; then
-if test x$enable_extension_integration = xyes; then
- SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
-fi
+if test x$enable_postgresql_sdbc != xno; then
+SCPDEFS=$SCPDEFS -DWITH_POSTGRESQL_SDBC
# if/when anything else than PostgreSQL uses Kerberos,
-# move this out of `test x$enable_ext_postgresql_sdbc = xyes'
+# move this out of `test x$enable_postgresql_sdbc != xno'
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 82a061079ae03f841713fd26c809d45621a59836
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 23 21:09:24 2012 +0100
Fix fdo#44040 VIEWING: Crash when page preview after f4 (data sources)
Caolán fixed Iterator management which was buggy. (thank you !)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 4d980a0..6e31141 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1410,24 +1410,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const
EventObject _rSource ) thr
Reference XDispatch xSource(_rSource.Source, UNO_QUERY);
if(xSource.is())
{
-for ( ExternalFeaturesMap::iterator aLoop =
m_aExternalFeatures.begin();
- aLoop != m_aExternalFeatures.end();
- ++aLoop
-)
+ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
+ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end();
+while (aLoop != aEnd)
{
-if ( aLoop-second.xDispatcher.get() == xSource.get() )
+ExternalFeaturesMap::iterator aI = aLoop++;
+if ( aI-second.xDispatcher.get() == xSource.get() )
{
-ExternalFeaturesMap::iterator aPrevious = aLoop;
---aPrevious;
+sal_uInt16 nSlot = aI-first;
// remove it
-m_aExternalFeatures.erase( aLoop );
+m_aExternalFeatures.erase(aI);
// maybe update the UI
-implCheckExternalSlot(aLoop-first);
+implCheckExternalSlot(nSlot);
// continue, the same XDispatch may be resposible for more
than one URL
-aLoop = aPrevious;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/column3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6a28de4944a9c40be901f2356e7c295e184c5c95
Author: Eike Rathke er...@redhat.com
Date: Mon Jan 23 21:16:46 2012 +0100
erase the correct element in ScColumn::Delete(), not the last one
This fixes the dreaded crash in sc_unoapi test.
Thanks to Kohei for pointing in the right direction.
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 687c62d..73c0bbb 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -172,7 +172,7 @@ void ScColumn::Delete( SCROW nRow )
else
{
pNoteCell-Delete();
-maItems.erase(maItems.end() - 1);
+maItems.erase( maItems.begin() + nIndex);
// Soll man hier den Speicher freigeben (delta)? Wird dann
langsamer!
}
pCell-EndListeningTo( pDocument );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 4d60e1a0832dafe05b4eecee7c9607bbd2ce1b07
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 23 21:22:59 2012 +0100
Fix fdo#44040 VIEWING: Crash when page preview after f4 (data sources)
Caolán fixed iterator management which was buggy. (thank you !)
(cherry picked from commit 82a061079ae03f841713fd26c809d45621a59836)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 9ca1392..7567542 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1410,24 +1410,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const
EventObject _rSource ) thr
Reference XDispatch xSource(_rSource.Source, UNO_QUERY);
if(xSource.is())
{
-for ( ExternalFeaturesMap::iterator aLoop =
m_aExternalFeatures.begin();
- aLoop != m_aExternalFeatures.end();
- ++aLoop
-)
+ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
+ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end();
+while (aLoop != aEnd)
{
-if ( aLoop-second.xDispatcher.get() == xSource.get() )
+ExternalFeaturesMap::iterator aI = aLoop++;
+if ( aI-second.xDispatcher.get() == xSource.get() )
{
-ExternalFeaturesMap::iterator aPrevious = aLoop;
---aPrevious;
+sal_uInt16 nSlot = aI-first;
// remove it
-m_aExternalFeatures.erase( aLoop );
+m_aExternalFeatures.erase(aI);
// maybe update the UI
-implCheckExternalSlot(aLoop-first);
+implCheckExternalSlot(nSlot);
// continue, the same XDispatch may be resposible for more
than one URL
-aLoop = aPrevious;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: test/inc test/Library_subsequenttest.mk test/Package_inc.mk test/source
test/Library_subsequenttest.mk |2
test/Package_inc.mk|2
test/inc/test/container/xelementaccess.hxx | 52 +++
test/inc/test/container/xindexaccess.hxx | 53
test/source/container/xelementaccess.cxx | 51 +++
test/source/container/xindexaccess.cxx | 76 +
6 files changed, 236 insertions(+)
New commits:
commit 6c0a26274629ae4f83105aa5f038d21b5c8ca7d0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Jan 23 22:28:27 2012 +0100
add new interface tests for some common data structures
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 649fa1e..d1c383d 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -67,6 +67,8 @@ $(eval $(call gb_Library_use_external,subsequenttest,cppunit))
$(eval $(call gb_Library_add_exception_objects,subsequenttest,\
test/source/unoapi_test \
+test/source/container/xelementaccess \
+test/source/container/xindexaccess \
test/source/container/xnamecontainer \
test/source/sheet/cellproperties \
test/source/sheet/datapilotfield \
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
index aeb82f1..666a52b 100644
--- a/test/Package_inc.mk
+++ b/test/Package_inc.mk
@@ -34,6 +34,8 @@ $(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xcellrangesquery.hxx,t
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xnamedranges.hxx,test/sheet/xnamedranges.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xnamedrange.hxx,test/sheet/xnamedrange.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xdatabaserange.hxx,test/sheet/xdatabaserange.hxx))
+$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xelementaccess.hxx,test/container/xelementaccess.hxx))
+$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xindexaccess.hxx,test/container/xindexaccess.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx,test/container/xnamecontainer.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,test/sheet/xdatapilottable.hxx))
diff --git a/test/inc/test/container/xelementaccess.hxx
b/test/inc/test/container/xelementaccess.hxx
new file mode 100644
index 000..a9b897e
--- /dev/null
+++ b/test/inc/test/container/xelementaccess.hxx
@@ -0,0 +1,52 @@
+/* -*- 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) 2012 Markus Mohrhard markus.mohrh...@googlemail.com
(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.
+ */
+
+#include com/sun/star/uno/Type.hxx
+#include com/sun/star/uno/Reference.hxx
+
+using namespace com::sun::star;
+
+namespace apitest {
+
+class XElementAccess
+{
+public:
+XElementAccess(uno::Type rType): maType(rType) {}
+
+void testGetElementType();
+void testHasElements();
+
+virtual uno::Reference uno::XInterface init() = 0;
+
+private:
+uno::Type maType;
+};
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/inc/test/container/xindexaccess.hxx
b/test/inc/test/container/xindexaccess.hxx
new file mode 100644
index 000..bd09a8f
--- /dev/null
+++ b/test/inc/test/container/xindexaccess.hxx
@@ -0,0 +1,53 @@
+/* -*- 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
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dpobject.hxx |7 ++
sc/source/core/data/dpobject.cxx | 121 +--
2 files changed, 124 insertions(+), 4 deletions(-)
New commits:
commit 561b044d62f4701e51abb4a7c47ce3b07f788f8e
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 23 16:34:15 2012 -0500
Fix refresh problem on pivot tables whose data cache have not been created.
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index a894833..f7126b1 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -328,6 +328,7 @@ public:
ScDocument* mpDoc;
public:
DBCaches(ScDocument* pDoc);
+bool hasCache(sal_Int32 nSdbType, const rtl::OUString rDBName, const
rtl::OUString rCommand) const;
const ScDPCache* getCache(sal_Int32 nSdbType, const ::rtl::OUString
rDBName, const ::rtl::OUString rCommand);
private:
@@ -382,6 +383,12 @@ private:
/** Only to be called from ScDPCache::RemoveReference(). */
void RemoveCache(const ScDPCache* pCache);
+void GetAllTables(const ScRange rSrcRange, std::setScDPObject* rRefs)
const;
+void GetAllTables(const rtl::OUString rSrcName, std::setScDPObject*
rRefs) const;
+void GetAllTables(
+sal_Int32 nSdbType, const ::rtl::OUString rDBName, const
::rtl::OUString rCommand,
+std::setScDPObject* rRefs) const;
+
private:
typedef ::boost::ptr_vectorScDPObject TablesType;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 984d3de..d5ac788 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2680,6 +2680,13 @@ bool ScDPCollection::DBType::less::operator() (const
DBType left, const DBType
ScDPCollection::DBCaches::DBCaches(ScDocument* pDoc) : mpDoc(pDoc) {}
+bool ScDPCollection::DBCaches::hasCache(sal_Int32 nSdbType, const OUString
rDBName, const OUString rCommand) const
+{
+DBType aType(nSdbType, rDBName, rCommand);
+CachesType::const_iterator itr = maCaches.find(aType);
+return itr != maCaches.end();
+}
+
const ScDPCache* ScDPCollection::DBCaches::getCache(sal_Int32 nSdbType, const
OUString rDBName, const OUString rCommand)
{
DBType aType(nSdbType, rDBName, rCommand);
@@ -2872,13 +2879,27 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject*
pDPObj, std::setScDPObject*
{
// cache by named range
ScDPCollection::NameCaches rCaches = GetNameCaches();
-rCaches.updateCache(pDesc-GetRangeName(),
pDesc-GetSourceRange(), rRefs);
+if (rCaches.hasCache(pDesc-GetRangeName()))
+rCaches.updateCache(pDesc-GetRangeName(),
pDesc-GetSourceRange(), rRefs);
+else
+{
+// Not cached yet. Collect all tables that use this named
+// range as data source.
+GetAllTables(pDesc-GetRangeName(), rRefs);
+}
}
else
{
// cache by cell range
ScDPCollection::SheetCaches rCaches = GetSheetCaches();
-rCaches.updateCache(pDesc-GetSourceRange(), rRefs);
+if (rCaches.hasCache(pDesc-GetSourceRange()))
+rCaches.updateCache(pDesc-GetSourceRange(), rRefs);
+else
+{
+// Not cached yet. Collect all tables that use this range as
+// data source.
+GetAllTables(pDesc-GetSourceRange(), rRefs);
+}
}
}
else if (pDPObj-IsImportData())
@@ -2889,8 +2910,15 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject*
pDPObj, std::setScDPObject*
return STR_ERR_DATAPILOTSOURCE;
ScDPCollection::DBCaches rCaches = GetDBCaches();
-rCaches.updateCache(
-pDesc-GetCommandType(), pDesc-aDBName, pDesc-aObject, rRefs);
+if (rCaches.hasCache(pDesc-GetCommandType(), pDesc-aDBName,
pDesc-aObject))
+rCaches.updateCache(
+pDesc-GetCommandType(), pDesc-aDBName, pDesc-aObject,
rRefs);
+else
+{
+// Not cached yet. Collect all tables that use this range as
+// data source.
+GetAllTables(pDesc-GetCommandType(), pDesc-aDBName,
pDesc-aObject, rRefs);
+}
}
return 0;
}
@@ -3116,6 +3144,91 @@ void ScDPCollection::RemoveCache(const ScDPCache* pCache)
return;
}
+void ScDPCollection::GetAllTables(const ScRange rSrcRange,
std::setScDPObject* rRefs) const
+{
+std::setScDPObject* aRefs;
+TablesType::const_iterator it = maTables.begin(), itEnd = maTables.end();
+for (; it != itEnd; ++it)
+{
+const ScDPObject rObj = *it;
+if (!rObj.IsSheetData())
+// Source is not a sheet range.
+continue;
+
+const ScSheetSourceDesc* pDesc = rObj.GetSheetDesc();
+if (!pDesc)
+continue;
+
+if (pDesc-HasRangeName())
+// This table has a range name as its
[Libreoffice-commits] .: 4 commits - android/qa sal/osl vcl/source
android/qa/desktop/Makefile | 20 +++-
sal/osl/unx/pipe.c | 42 +++---
vcl/source/window/msgbox.cxx |8 +++-
3 files changed, 65 insertions(+), 5 deletions(-)
New commits:
commit e384f241554a1157137b6121a064f75308b2ba10
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 23 22:02:43 2012 +
android: get dummy user-install 'presets' setup to please first-run
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 63399d7..eae96e0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -43,7 +43,7 @@ buildrcs:
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway'
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb' assets/program/fundamentalrc
- echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb
file:///assets/program/services/services.rdb $$ORIGIN/services*'
assets/program/fundamentalrc
+ echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb
file:///assets/program/services/services.rdb
$$BRAND_BASE_DIR/program/services*' assets/program/fundamentalrc
# unorc ini ...
echo [Bootstrap] assets/program/unorc
echo URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/unorc
@@ -53,7 +53,7 @@ buildrcs:
echo [Bootstrap] assets/program/bootstraprc
echo InstallMode=installmode assets/program/bootstraprc
echo ProductKey=LibreOffice 3.5 assets/program/bootstraprc
- echo
UserInstallation=file://$(APP_DATA_PATH)=/data/data/$(APP_PACKAGE)/files/.libreoffice
assets/program/bootstraprc
+ echo UserInstallation=file://$(APP_DATA_PATH)/files/.libreoffice
assets/program/bootstraprc
copy-stuff: buildrcs
#
@@ -177,6 +177,16 @@ copy-stuff: buildrcs
cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config/images.zip
# .res files
cp $(OUTDIR)/bin/*en-US.res assets/program/resource/
+# presets - becomes the users home directory
+ mkdir -p assets/presets/autocorr
+ mkdir -p assets/presets/autotext
+ mkdir -p assets/presets/backup
+ mkdir -p assets/presets/basic
+ mkdir -p assets/presets/config
+ mkdir -p assets/presets/gallery
+ mkdir -p assets/presets/psprint
+ mkdir -p assets/presets/template
+ mkdir -p assets/presets/wordbook
# Then assets that are unpacked at run-time into the app's data directory.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
commit 6ce3dc5165cdc1328ae0dd877d183fc688b43299
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 23 21:16:37 2012 +
vcl: early crash = no ucb = no images.zip = unhandled exception, caught.
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 042c629..b42136c 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -573,7 +573,13 @@ ErrorBox::ErrorBox( Window* pParent, const ResId rResId )
:
Image ErrorBox::GetStandardImage()
{
-ImplInitMsgBoxImageList();
+try {
+ImplInitMsgBoxImageList();
+} catch (const ::com::sun::star::uno::Exception e) {
+// During early bootstrap we can have no initialized
+// ucb and hence no ability to get this image, so nop.
+return Image();
+}
return ImplGetSVData()-maWinData.mpMsgBoxImgList-GetImage( 1 );
}
commit d83eb4b9ff792080f3c0012f7e0b59ed3c8639ce
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 23 21:09:48 2012 +
android: get osl_Pipe creation sorted out, before we kill it.
use new OSL_SOCKET_PATH bootstrap variable to customise this.
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 0076b6f..63399d7 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -33,6 +33,8 @@ buildrcs:
echo Logo=1 assets/program/lofficerc
echo NativeProgress=1 assets/program/lofficerc
echo URE_BOOTSTRAP=file:///assets/program/fundamentalrc
assets/program/lofficerc
+ echo RTL_LOGFILE=file:///dev/log/main assets/program/lofficerc
+ echo OSL_SOCKET_PATH=$(APP_DATA_PATH)/files
assets/program/lofficerc
# fundamentalrc ini ...
echo [Bootstrap] assets/program/fundamentalrc
echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/
assets/program/fundamentalrc
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index 6deac99..fd472fa 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -32,6 +32,9 @@
#include osl/diagnose.h
#include osl/thread.h
[Libreoffice-commits] .: 3 commits - basctl/source sfx2/source svtools/source svx/source toolkit/source ucb/source vcl/source xmloff/source
basctl/source/basicide/basobj2.cxx | 18 +-
sfx2/source/dialog/taskpane.cxx |7 ++
svtools/source/contnr/svtreebx.cxx |8 ++
svtools/source/uno/svtxgridcontrol.cxx | 48 +---
svtools/source/uno/unocontroltablemodel.cxx |7 ++
svx/source/form/fmpgeimp.cxx| 18 +-
svx/source/form/fmvwimp.cxx | 13 +++-
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx |7 ++
ucb/source/ucp/ext/ucpext_content.cxx | 21 ++-
ucb/source/ucp/ext/ucpext_datasupplier.cxx |6 +-
vcl/source/control/throbber.cxx |7 ++
xmloff/source/forms/elementexport.cxx |7 +-
xmloff/source/forms/elementimport.cxx | 42 +++---
xmloff/source/forms/property_meta_data.cxx |8 ++
14 files changed, 180 insertions(+), 37 deletions(-)
New commits:
commit 115a684b40deff70e5337444c02861e7c0458840
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jan 23 23:11:56 2012 +0100
Unused #includes.
diff --git a/svtools/source/contnr/svtreebx.cxx
b/svtools/source/contnr/svtreebx.cxx
index 9bcbeb9..f55233d 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -34,7 +34,6 @@ class TabBar;
#include svtools/svlbox.hxx
#include svtools/svlbitm.hxx
#include svtools/svtreebx.hxx
-#include tools/diagnose_ex.h
#include comphelper/string.hxx
#include svimpbox.hxx
#include unotools/accessiblestatesethelper.hxx
diff --git a/xmloff/source/forms/property_meta_data.cxx
b/xmloff/source/forms/property_meta_data.cxx
index 8291d03..a45ddc9 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -32,7 +32,6 @@
#include xmloff/xmltoken.hxx
#include xmloff/xmlnmspe.hxx
-#include tools/diagnose_ex.h
#include tools/debug.hxx
#include boost/unordered_map.hpp
commit 89f0655ebadb1aa9be31d854dfe5476e2b16e64c
Author: Marcel Metz mm...@adrian-broher.net
Date: Sun Jan 15 11:48:11 2012 +0100
Replaced diagnore ENSURE_OR_CONTINUE with regular code.
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d83ad1b..7a85eaa 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -671,7 +671,12 @@ namespace sfx2
{
const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i ) );
const CustomToolPanel* pCustomPanel = dynamic_cast const
CustomToolPanel* ( pPanel.get() );
-ENSURE_OR_CONTINUE( pCustomPanel != NULL,
ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation! );
+if ( !pCustomPanel )
+{
+SAL_WARN( sfx2.dialog, ModuleTaskPane_Impl::GetPanelPos:
illegal panel implementation! );
+continue;
+}
+
if ( pCustomPanel-GetResourceURL() == i_rResourceURL )
{
aPanelPos = i;
diff --git a/svtools/source/uno/svtxgridcontrol.cxx
b/svtools/source/uno/svtxgridcontrol.cxx
index 4cf1a85..0a874af 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -781,7 +781,11 @@ void SVTXGridControl::impl_updateColumnsFromModel_nothrow()
++colRef
)
{
-ENSURE_OR_CONTINUE( colRef-is(), illegal column! );
+if ( !colRef-is() )
+{
+SAL_WARN( svtools.uno, illegal column! );
+continue;
+}
m_pTableModel-appendColumn( *colRef );
}
diff --git a/svtools/source/uno/unocontroltablemodel.cxx
b/svtools/source/uno/unocontroltablemodel.cxx
index 015dd67..f6cd894 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -323,7 +323,12 @@ namespace svt { namespace table
)
{
UnoGridColumnFacade* pColumn = dynamic_cast UnoGridColumnFacade*
( col-get() );
-ENSURE_OR_CONTINUE( pColumn != NULL,
UnoControlTableModel::removeAllColumns: illegal column implementation! );
+if ( !pColumn )
+{
+SAL_WARN( svtools.uno,
UnoControlTableModel::removeAllColumns: illegal column implementation! );
+continue;
+}
+
pColumn-dispose();
}
m_pImpl-aColumns.clear();
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index a037401..33a3082 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -216,15 +216,23 @@ void FmFormPageImpl::initFrom( FmFormPageImpl
i_foreignImpl )
continue;
Reference XControlModel xForeignModel(
pForeignObj-GetUnoControlModel() );
-ENSURE_OR_CONTINUE( xForeignModel.is(),
[Libreoffice-commits] .: sc/qa
sc/qa/extras/scdatapilottableobj.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f8214f0f1d66c6b96b3663dcb3cd71280bcd0d39
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jan 24 00:08:08 2012 +0100
enable ScDataPilotTableObj::testRefresh again
diff --git a/sc/qa/extras/scdatapilottableobj.cxx
b/sc/qa/extras/scdatapilottableobj.cxx
index 6d07b8f..a09eb6e 100644
--- a/sc/qa/extras/scdatapilottableobj.cxx
+++ b/sc/qa/extras/scdatapilottableobj.cxx
@@ -38,7 +38,7 @@
namespace sc_apitest {
-#define NUMBER_OF_TESTS 9
+#define NUMBER_OF_TESTS 10
class ScDataPilotTableObj : public UnoApiTest, apitest::XDataPilotDescriptor,
apitest::XDataPilotTable
{
@@ -48,7 +48,7 @@ public:
virtual uno::Reference uno::XInterface init();
CPPUNIT_TEST_SUITE(ScDataPilotTableObj);
-//CPPUNIT_TEST(testRefresh);
+CPPUNIT_TEST(testRefresh);
//CPPUNIT_TEST(testGetHiddenFields);
CPPUNIT_TEST(testGetOutputRange);
CPPUNIT_TEST(testSourceRange);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpoutput.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2c659e692a17cc10d364a2304bead9403fc6bdde
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Jan 23 22:33:30 2012 -0500
fdo#45067: We need automatic number detection for date/number grouping.
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 990e212..c5bb124 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -795,10 +795,11 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow,
SCTAB nTab,
if ( nFlags sheet::MemberResultFlags::HASMEMBER )
{
-// Avoid unwanted automatic format detection.
+// We need automatic number format detection here. Date and number
+// grouping functionality depend on it.
ScSetStringParam aParam;
-aParam.mbDetectNumberFormat = false;
-aParam.mbSetTextCellFormat = true;
+aParam.mbDetectNumberFormat = true;
+aParam.mbSetTextCellFormat = false;
pDoc-SetString(nCol, nRow, nTab, rData.Caption, aParam);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: test/source
test/source/sheet/xdatabaserange.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 2aedbd241f05692cde01c60c51ba398777e372bb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jan 24 05:06:14 2012 +0100
fix WaE
diff --git a/test/source/sheet/xdatabaserange.cxx
b/test/source/sheet/xdatabaserange.cxx
index d8cf5e4..92423e9 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -87,19 +87,19 @@ void XDatabaseRange::testGetSortDescriptor()
if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsSortColumns)))
{
-sal_Bool bIsSortColumns;
+sal_Bool bIsSortColumns = true;
xProp.Value = bIsSortColumns;
CPPUNIT_ASSERT(bIsSortColumns == false);
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ContainsHeader)))
{
-sal_Bool bContainsHeader;
+sal_Bool bContainsHeader = true;
xProp.Value = bContainsHeader;
CPPUNIT_ASSERT(bContainsHeader == true);
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MaxFieldCount)))
{
-sal_Int32 nMaxFieldCount;
+sal_Int32 nMaxFieldCount = 0;
xProp.Value = nMaxFieldCount;
std::cout Value: nMaxFieldCount std::endl;
@@ -110,13 +110,13 @@ void XDatabaseRange::testGetSortDescriptor()
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(BindFormatsToContent)))
{
-sal_Bool bBindFormatsToContent;
+sal_Bool bBindFormatsToContent = false;
xProp.Value = bBindFormatsToContent;
CPPUNIT_ASSERT(bBindFormatsToContent == true);
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CopyOutputData)))
{
-sal_Bool bCopyOutputData;
+sal_Bool bCopyOutputData = true;
xProp.Value = bCopyOutputData;
CPPUNIT_ASSERT(bCopyOutputData == false);
}
@@ -126,14 +126,14 @@ void XDatabaseRange::testGetSortDescriptor()
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsUserListEnabled)))
{
-sal_Bool bIsUserListEnabled;
+sal_Bool bIsUserListEnabled true;
xProp.Value = bIsUserListEnabled;
CPPUNIT_ASSERT(bIsUserListEnabled == false);
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UserListIndex)))
{
-sal_Int32 nUserListIndex;
+sal_Int32 nUserListIndex = 1;
xProp.Value = nUserListIndex;
CPPUNIT_ASSERT(nUserListIndex == 0);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: test/source
test/source/sheet/xdatabaserange.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3456c03198e57b5a8f49ad79a3bbb2ce2602a07d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jan 24 05:21:24 2012 +0100
typo
diff --git a/test/source/sheet/xdatabaserange.cxx
b/test/source/sheet/xdatabaserange.cxx
index 92423e9..ef68e8e 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -126,7 +126,7 @@ void XDatabaseRange::testGetSortDescriptor()
}
else if (xProp.Name ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsUserListEnabled)))
{
-sal_Bool bIsUserListEnabled true;
+sal_Bool bIsUserListEnabled = true;
xProp.Value = bIsUserListEnabled;
CPPUNIT_ASSERT(bIsUserListEnabled == false);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/source
connectivity/source/drivers/file/FResultSet.cxx | 48
1 file changed, 17 insertions(+), 31 deletions(-)
New commits:
commit 9cd5a1b11f2f5f69d674f0b0e44352d96518013e
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 19 15:25:07 2012 +0100
connectivity: fdo#43479: fix crash on DISTINCT:
Since commit f89f2b8bf506de0cc547ad596c75cbe1a0cf1ef1,
OResultSet::sortRows() works on the rows after SELECT, not on full rows.
So OResultSet::OpenImpl() has to be adapted to not use the mapping from
selected columns to entries rows in m_aColMapping any more; instead,
use the given ORDER BY clause for sorting.
But first extend the sort order to cover all columns, so it is no longer
necessary to call sortRows twice (this should be legal, because SQL says
the order of rows that are equal in ORDER BY columns is unspecified).
Signed-off-by: Lionel Elie Mamane lio...@mamane.lu
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index 71d2f3e..26baffe 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1441,26 +1441,29 @@ sal_Bool OResultSet::OpenImpl()
else
{
sal_Bool bDistinct = sal_False;
-sal_Bool bWasSorted = sal_False;
OSQLParseNode *pDistinct = m_pParseTree-getChild(1);
-::std::vectorsal_Int32
aOrderbyColumnNumberSave;
-::std::vectorTAscendingOrder aOrderbyAscendingSave;
+assert(m_aOrderbyColumnNumber.size() ==
+ m_aOrderbyAscending.size());
if (pDistinct pDistinct-getTokenID() == SQL_TOKEN_DISTINCT
)
{
-// Sort on all columns, saving original order for later
-if(IsSorted())
+// To eliminate duplicates we need to sort on all columns.
+// This is not a problem because the SQL spec says that the
+// order of columns that are not specified in ORDER BY
+// clause is undefined, so it doesn't hurt to sort on
+// these; pad the vectors to include them.
+for (sal_Int32 i = 1; // 0: bookmark (see
setBoundedColumns)
+ static_castsize_t(i) m_aColMapping.size(); ++i)
{
-aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;
-m_aOrderbyColumnNumber.clear();
-
aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(),
m_aOrderbyAscending.end());
-bWasSorted = sal_True;
+if (::std::find(m_aOrderbyColumnNumber.begin(),
+m_aOrderbyColumnNumber.end(), i)
+== m_aOrderbyColumnNumber.end())
+{
+m_aOrderbyColumnNumber.push_back(i);
+// ASC or DESC doesn't matter
+m_aOrderbyAscending.push_back(SQL_ASC);
+}
}
-
-// the first column is the bookmark column
-::std::vectorsal_Int32::iterator aColStart =
(m_aColMapping.begin()+1);
-::std::copy(aColStart,
m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
-m_aOrderbyAscending.assign(m_aColMapping.size()-1,
SQL_ASC);
bDistinct = sal_True;
}
@@ -1542,23 +1545,6 @@ sal_Bool OResultSet::OpenImpl()
m_pFileSet-get().erase(::std::remove_if(m_pFileSet-get().begin(),m_pFileSet-get().end(),
::std::bind2nd(::std::equal_tosal_Int32(),0))
,m_pFileSet-get().end());
-
-if (bWasSorted)
-{
-// Re-sort on original requested order
-m_aOrderbyColumnNumber = aOrderbyColumnNumberSave;
-
m_aOrderbyAscending.assign(aOrderbyAscendingSave.begin(),
aOrderbyAscendingSave.end());
-
-TIntVector aEvaluationKeySet(m_pFileSet-get());
-m_pEvaluationKeySet = aEvaluationKeySet;
-sortRows();
-}
-else
-{
-m_aOrderbyColumnNumber.clear();
-m_aOrderbyAscending.clear();
-
::std::sort(m_pFileSet-get().begin(),m_pFileSet-get().end());
-}
}
[Libreoffice-commits] .: dictionaries/ru_RU
dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties | 30 +++ 1 file changed, 15 insertions(+), 15 deletions(-) New commits: commit 0329fd247e20bd3e9aa7d7943dfd5574fc60544a Author: Andras Timar ati...@suse.com Date: Tue Jan 24 08:03:22 2012 +0100 fix double utf8 encoding diff --git a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties index 20e78c2..d7df847 100644 --- a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties +++ b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties @@ -1,15 +1,15 @@ -abbreviation=\u0420\u0452\u0420\u00b1\u0420\u00b1\u0421\u0402\u0420\u00b5\u0420\u0406\u0420\u0451\u0420\u00b0\u0421\u201a\u0421\u0453\u0421\u0402\u0421\u2039 -grammar=\u0420\u201c\u0421\u0402\u0420\u00b0\u0420\u0458\u0420\u0458\u0420\u00b0\u0421\u201a\u0420\u0451\u0420\u0454\u0420\u00b0 -hyphen=\u0420\u201d\u0420\u00b5\u0421\u201e\u0420\u0451\u0421\u0403 -comma=\u0420\u045f\u0421\u0453\u0420\u0405\u0420\u0454\u0421\u201a\u0421\u0453\u0420\u00b0\u0421\u2020\u0420\u0451\u0421\u040f -common=\u0420\u045b\u0420\u00b1\u0421\u2030\u0420\u0451\u0420\u00b5 \u0420\u0455\u0421\u20ac\u0420\u0451\u0420\u00b1\u0420\u0454\u0420\u0451 -multiword=\u0420\u040e\u0420\u00bb\u0420\u0455\u0420\u0406\u0420\u0455\u0421\u0403\u0420\u0455\u0421\u2021\u0420\u00b5\u0421\u201a\u0420\u00b0\u0420\u0405\u0420\u0451\u0421\u040f -together=\u0420\u040e\u0420\u00bb\u0420\u0451\u0421\u201a\u0420\u0405\u0420\u0455/\u0421\u0402\u0420\u00b0\u0420\u00b7\u0420\u0491\u0420\u00b5\u0420\u00bb\u0421\u040a\u0420\u0405\u0420\u0455 -proofreading=\u0420\u040e\u0421\u201a\u0420\u0451\u0420\u00bb\u0420\u0451\u0421\u0403\u0421\u201a\u0420\u0451\u0420\u0454\u0420\u00b0 -space=\u0420\u045f\u0421\u0402\u0420\u0455\u0420\u00b1\u0420\u00b5\u0420\u00bb -typographica=\u0420\u045e\u0420\u0451\u0420\u0457\u0420\u0455\u0420\u0456\u0421\u0402\u0420\u00b0\u0421\u201e\u0420\u0451\u0420\u0454\u0420\u00b0 -dup=\u0420\u045f\u0420\u0455\u0420\u0406\u0421\u201a\u0420\u0455\u0421\u0402 \u0421\u0403\u0420\u00bb\u0420\u0455\u0420\u0406 \u0420\u0406 \u0421\u0403\u0420\u00bb\u0420\u0455\u0420\u0406\u0420\u0455\u0421\u0403\u0420\u0455\u0421\u2021\u0420\u00b5\u0421\u201a\u0420\u00b0\u0420\u0405\u0420\u0451\u0421\u040f\u0421\u2026 -dup2=\u0420\u045f\u0420\u0455\u0420\u0406\u0421\u201a\u0420\u0455\u0421\u0402 \u0421\u0403\u0420\u00bb\u0420\u0455\u0420\u0406 \u0420\u0406 \u0420\u0457\u0421\u0402\u0420\u00b5\u0420\u0491\u0420\u00bb\u0420\u0455\u0420\u00b6\u0420\u00b5\u0420\u0405\u0420\u0451\u0421\u040f\u0421\u2026 -others=\u0420\u045f\u0421\u0402\u0420\u0455\u0421\u2021\u0420\u00b5\u0420\u00b5 -numsep=\u0420\u00a0\u0420\u00b0\u0420\u00b7\u0420\u0491\u0420\u00b5\u0420\u00bb\u0420\u0451\u0421\u201a\u0420\u00b5\u0420\u00bb\u0420\u0451 \u0420\u0456\u0421\u0402\u0421\u0453\u0420\u0457\u0420\u0457 \u0421\u0402\u0420\u00b0\u0420\u00b7\u0421\u0402\u0421\u040f\u0420\u0491\u0420\u0455\u0420\u0406 (ISO) \u0420\u0491\u0420\u00bb\u0421\u040f \u0421\u2021\u0420\u0451\u0421\u0403\u0420\u00b5\u0420\u00bb -quotation=\u0420\u0459\u0420\u00b0\u0420\u0406\u0421\u2039\u0421\u2021\u0420\u0454\u0420\u0451 +abbreviation=\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u044b +grammar=\u0413\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a\u0430 +hyphen=\u0414\u0435\u0444\u0438\u0441 +comma=\u041f\u0443\u043d\u043a\u0442\u0443\u0430\u0446\u0438\u044f +common=\u041e\u0431\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 +multiword=\u0421\u043b\u043e\u0432\u043e\u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f +together=\u0421\u043b\u0438\u0442\u043d\u043e/\u0440\u0430\u0437\u0434\u0435\u043b\u044c\u043d\u043e +proofreading=\u0421\u0442\u0438\u043b\u0438\u0441\u0442\u0438\u043a\u0430 +space=\u041f\u0440\u043e\u0431\u0435\u043b +typographica=\u0422\u0438\u043f\u043e\u0433\u0440\u0430\u0444\u0438\u043a\u0430 +dup=\u041f\u043e\u0432\u0442\u043e\u0440 \u0441\u043b\u043e\u0432 \u0432 \u0441\u043b\u043e\u0432\u043e\u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f\u0445 +dup2=\u041f\u043e\u0432\u0442\u043e\u0440 \u0441\u043b\u043e\u0432 \u0432 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u0445 +others=\u041f\u0440\u043e\u0447\u0435\u0435 +numsep=\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u0438 \u0433\u0440\u0443\u043f\u043f \u0440\u0430\u0437\u0440\u044f\u0434\u043e\u0432 (ISO) \u0434\u043b\u044f \u0447\u0438\u0441\u0435\u043b +quotation=\u041a\u0430\u0432\u044b\u0447\u043a\u0438 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/inc oox/source
oox/inc/oox/helper/propertymap.hxx |3 +++
oox/source/drawingml/textparagraph.cxx |2 +-
oox/source/drawingml/textparagraphproperties.cxx |2 +-
oox/source/helper/propertymap.cxx|6 ++
4 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 5fb4b78559a44133673a49a028c691fa474aee75
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Jan 24 13:03:11 2012 +0530
n719734: Overridding properties from master/layout.
When there are conflicting properties in masterslide-layout-slide
most recent (i.e. e.g. slide has higher priority than layout)
should be used.
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index bf1e5d5..37b723e 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -86,6 +86,9 @@ public:
inline void assignUsed( const PropertyMap rPropMap )
{ insert( rPropMap.begin(), rPropMap.end() ); }
+/** Inserts all properties contained in the passed property map */
+voidassignAll( const PropertyMap rPropMap );
+
/** Returns a sequence of property values, filled with all contained
properties. */
::com::sun::star::uno::Sequence ::com::sun::star::beans::PropertyValue
makePropertyValueSequence() const;
diff --git a/oox/source/drawingml/textparagraphproperties.cxx
b/oox/source/drawingml/textparagraphproperties.cxx
index eeb8409..ff6e972 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -376,7 +376,7 @@ TextParagraphProperties::~TextParagraphProperties()
void TextParagraphProperties::apply( const TextParagraphProperties
rSourceProps )
{
-maTextParagraphPropertyMap.insert(
rSourceProps.maTextParagraphPropertyMap.begin(),
rSourceProps.maTextParagraphPropertyMap.end() );
+maTextParagraphPropertyMap.assignAll(
rSourceProps.maTextParagraphPropertyMap );
maBulletList.apply( rSourceProps.maBulletList );
maTextCharacterProperties.assignUsed(
rSourceProps.maTextCharacterProperties );
if ( rSourceProps.maParaTopMargin.bHasValue )
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index 2858baf..0bf875c 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -234,6 +234,12 @@ const Any* PropertyMap::getProperty( sal_Int32 nPropId )
const
return (aIt == end()) ? 0 : aIt-second;
}
+void PropertyMap::assignAll( const PropertyMap rPropMap )
+{
+for( PropertyMap::const_iterator it=rPropMap.begin(); it !=
rPropMap.end(); it++ )
+(*this)[it-first] = it-second;
+}
+
Sequence PropertyValue PropertyMap::makePropertyValueSequence() const
{
Sequence PropertyValue aSeq( static_cast sal_Int32 ( size() ) );
commit a21c7f835bd7034614fa8ac606fd60a0cbeef1ec
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Jan 24 13:02:03 2012 +0530
Fix for a probable crash. (code review)
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index 964932f..689ab90 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -113,8 +113,8 @@ void TextParagraph::insertAt(
{
pTextParagraphStyle-pushToPropSet( rFilterBase, xProps,
aioBulletList, NULL, sal_False, fCharacterSize );
fCharacterSize = pTextParagraphStyle-getCharHeightPoints(
fCharacterSize );
+maProperties.pushToPropSet( rFilterBase, xProps, aioBulletList,
pTextParagraphStyle-getBulletList(), sal_True, fCharacterSize );
}
-maProperties.pushToPropSet( rFilterBase, xProps, aioBulletList,
pTextParagraphStyle-getBulletList(), sal_True, fCharacterSize );
// empty paragraphs do not have bullets in ppt
if ( !nParagraphSize )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On 01/22/2012 10:03 PM, Fridrich Strba wrote: Let us see what Stephan answers in the Windows bug. Fridrich, What Windows bug do you mean? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Replace ENSURE_OR_* macros with regular code.
Hello Marcel, Thank you for the nice patch. Before pushing, it would be great to understand the reason behind replacing the macro with regular code. I believe the macro would help in improving code readability (and of course the code size) - in my understanding. Any particular reason, please? Thanks! Muthu Subramanian On 01/22/2012 06:30 PM, Marcel Metz wrote: Hello lo-devs, the attached patches replace some of the ENSURE_OR_* macros, with regular code. I can't see any advantage in these macros aside from save some typing. regards Marcel Metz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On Mon, Jan 23, 2012 at 09:02:16AM +0100, Stephan Bergmann wrote: On 01/22/2012 10:03 PM, Fridrich Strba wrote: Let us see what Stephan answers in the Windows bug. What Windows bug do you mean? https://bugs.freedesktop.org/show_bug.cgi?id=45058 -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On 01/22/2012 11:02 PM, Lionel Elie Mamane wrote: LD_LIBRARY_PATH envvar? With GNU ld, it is the only one I see. MacOS X has @executable_path which is *exactly* what we want in this situation: It is replaced by the path to the directory containing the *main* executable, not the path to the shared library; from reading the manpage, GNU ld-linux has only $ORIGIN, which is the path to the shared library (that is called @loader_path on MacOS X). Note that even Mac OS X's @executable_path is no general solution here (see http://lists.freedesktop.org/archives/libreoffice/2012-January/023463.html). OTOH, even if we find a good way to handle library load path issue, it still does not solve the problem of how the .oxt will work with a LibreOffice compiled with --with-openldap, such as e.g. Debian's one. In the --with-openldap case, postgresql-sdbc-impl.uno.so contained in the postgresql-sdbc oxt links against some other lib than libldap50.so? One more reason to change it from an extension into a proper part of LO, I would say. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Pushed] [PATCH] Removed LineListBox methods listed in unusedcode.easy
Pushed! Thank you for the patch! Looking for more :) On 01/22/2012 05:44 PM, Mariusz Dykierek wrote: Hi, Attached patch removes: - LineListBox::GetEntryLine1 - LineListBox::GetEntryLine2 - LineListBox::GetEntryDistance - LineListBox::GetSelectEntryLine1 - LineListBox::GetSelectEntryLine2 - LineListBox::GetSelectEntryDistance and corresponding entries in unusedcode.easy. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Pushed] [PATCH] Removed unused NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const)
Thanks for the patch! On 01/22/2012 06:01 PM, Mariusz Dykierek wrote: Attached patch removes NfCurrencyEntry::ApplyVariableInformation(NfCurrencyEntry const) as listed in unusedcode.easy. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Pushed] [License Statement] [PATCH] EasyHack: remove obsolete BOOTSTRAP defines
Pushed. Thank you for your patch. Looking for more! :) http://cgit.freedesktop.org/libreoffice/core/commit/?id=7735b09b5e10e366ffb3a156790316ea0ccfa0a0 On 01/22/2012 05:21 PM, Thomas Collerton wrote: Hello, this patch addresses the EasyHack described at https://bugs.freedesktop.org/show_bug.cgi?id=44988. This and all my future contributions are licensed under the LGPLv3 / MPL 1.1 or later versions. Cheers, Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
Hello, On 23/01/12 09:07, Stephan Bergmann wrote: In the --with-openldap case, postgresql-sdbc-impl.uno.so contained in the postgresql-sdbc oxt links against some other lib than libldap50.so? One more reason to change it from an extension into a proper part of LO, I would say. I second Stephan in this one. There are two options we have. Either we lose the universally possible ldap authentication (and we distribute an extension that is build without ldap support, which is also an option), or we distribute the postgresql driver as a component that is part of the stock LO. That should be actually pretty easy change. Cheers Fridrich ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On 01/23/2012 09:07 AM, Stephan Bergmann wrote: One more reason to change it from an extension into a proper part of LO, I would say. Lionel, what do you think about changing the extension into an integral part of LO 3.5? It should make all problems go away (on all platforms; at least so I would think). I could offer you to do the change, or land you a hand if you want to do it yourself. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Win-x86@6-fast tinderbox build help from core branch? was: ooo_custom_images to icon-themes
Hi Korrawit, On 2012-01-20 at 18:25 +0700, Korrawit Pruegsanusak wrote: By the way, I seem to have broken at least one tinderbox which seems to have been building from the libo 3.5 branch of core, but is still using help's master (which is now incompatible). The machine is: Box name: Win-x86@6-fast Machine: CYGWIN_NT-6.1-WOW64 mel 1.7.9(0.237/5/3) 2011-03-29 10:10 i686 Cygwin Could you please give a look at this? Thanks :-) Fixed now, sorry for that. I was on vacation, so I was unable to fix it earlier :-( Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Build error in helpcontent2
Hello, i'm trying to build libreoffice from git but it gives me an error in helpcontent2: Entering /home/rm/src/libo/helpcontent2/source/auxiliary echo aux_langdirs:=en-US ../../unxlngi6.pro/inc/aux_langs.mk echo help_exist:=en-US ../../unxlngi6.pro/inc/help_exist.mk rm -f ../../unxlngi6.pro/bin/helpimg.ilst /usr/bin/perl ../../helpers/create_ilst.pl -dir=/home/rm/src/libo/default_images/res/helpimg ../../unxlngi6.pro/bin/helpimg.ilst.unxlngi6.pro Cannot find /home/rm/src/libo/default_images/res/helpimg. create_ilst.pl -dir=directory [-pre=string] -dir root directory for the help images to be searched (default=current dir) Only *.png will be found. -pre define directory prefix (default=helpimg) dmake: Error code 2, while making '../../unxlngi6.pro/bin/helpimg.ilst' ls -l /home/rm/src/libo/default_images ls: cannot access /home/rm/src/libo/default_images: No such file or directory This is the autogen line: ./autogen.sh --without-junit --without-java --disable-epm --disable-gtk --disable-gtk3 --disable-odk --disable-vba --disable-mozilla --disable-gstreamer --disable-randr --without-ppds --without-afms --disable-cairo-canvas --disable-neon --disable-dbus --disable-systray --disable-mathmldtd --disable-extension-integration --with-system-libs --without-system-libvisio --without-system-libcmis --without-system-libwpd --without-system-cppunit --without-system-libwps --without-system-libwpg --without-system-graphite --without-system-sampleicc --without-system-redland --without-system-hunspell --without-system-mythes --without-system-altlinuxhyph --without-system-lpsolve --without-system-libexttextcat --without-system-poppler --host=i486-linux-gnu thanks in advance, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] .: sal/inc sal/osl
Michael Meeks píše v Pá 20. 01. 2012 v 17:34 +: On Fri, 2012-01-20 at 17:06 +0100, Michael Stahl wrote: +#if defined(__GNUC__) (__GNUC__ 3) +struct ::stat a_stat, b_stat; +#else +struct stat a_stat, b_stat; +#endif do we really need to have ifdefs for GCC 2 in LO? Probably not :-) I just re-used what was there already to avoid causing even more novel problems :-) I suspect we can rid ourselves of gcc2 everywhere (as an easy hack ?) but I'd prefer to have Petr check whatever ultra-old systems we build for ;-) The oldest system, we use, is SLED10 with gcc-4.1.2. Also we use gcc-4.2.4 for the official LO builds for TDF. So, I think that it is perfectly fine to remove support for GCC 2. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build error in helpcontent2
On Mon, Jan 23, 2012 at 10:02:43AM +0100, Riccardo Magliocchetti wrote: Hello, i'm trying to build libreoffice from git but it gives me an error in helpcontent2: Entering /home/rm/src/libo/helpcontent2/source/auxiliary echo aux_langdirs:=en-US ../../unxlngi6.pro/inc/aux_langs.mk echo help_exist:=en-US ../../unxlngi6.pro/inc/help_exist.mk rm -f ../../unxlngi6.pro/bin/helpimg.ilst /usr/bin/perl ../../helpers/create_ilst.pl -dir=/home/rm/src/libo/default_images/res/helpimg ../../unxlngi6.pro/bin/helpimg.ilst.unxlngi6.pro Cannot find /home/rm/src/libo/default_images/res/helpimg. You need to update the help repository. cd clone/help git pull -r D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Build error in helpcontent2
Il 23/01/2012 10:05, David Tardon ha scritto: On Mon, Jan 23, 2012 at 10:02:43AM +0100, Riccardo Magliocchetti wrote: Hello, i'm trying to build libreoffice from git but it gives me an error in helpcontent2: Entering /home/rm/src/libo/helpcontent2/source/auxiliary echo aux_langdirs:=en-US ../../unxlngi6.pro/inc/aux_langs.mk echo help_exist:=en-US ../../unxlngi6.pro/inc/help_exist.mk rm -f ../../unxlngi6.pro/bin/helpimg.ilst /usr/bin/perl ../../helpers/create_ilst.pl -dir=/home/rm/src/libo/default_images/res/helpimg ../../unxlngi6.pro/bin/helpimg.ilst.unxlngi6.pro Cannot find /home/rm/src/libo/default_images/res/helpimg. You need to update the help repository. cd clone/help git pull -r D. Thanks a lot, fixed the issue for me. riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] How to discover a toolbutton callback function?
Given a label of a toolbuton how can I discover which method it trigger? I can't find the Increase Font thing (I'd like to fix this bug https://bugs.freedesktop.org/show_bug.cgi?id=35862 ) Regards, Rodolfo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Compiling question by a complete beginner
On Sat, Jan 21, 2012 at 10:49:10PM +0200, Barış Akkurt wrote: Hi, I'm a complete beginner in LibreOffice development and at the compiling step now. I tried instructions here: http://wiki.documentfoundation.org/Development/Native_Build But compilation failed while building the moz module. I tried instructions here: https://www.libreoffice.org/bugzilla/show_bug.cgi?id=39852 but the result is the same. Then, i found this blog post and restarted compilation from the beginning: http://www.vogella.de/blog/2011/02/10/how-to-compile-libreoffice/ I got an error about helpcontent2. Error message: --- ERROR: error 65280 occurred while making /home/baris/libo/helpcontent2/source/auxiliary it seems that the error is inside 'helpcontent2', please re-run build inside this module to isolate the error and/or test your fix: --- Your help repository is outdated. cd clone/help git pull -r D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] weird shortcut key for repeat action in Writer
On Mon, 2012-01-23 at 06:29 +0100, Jean-Baptiste Faure wrote: Hi all, In LO 3.4.5 and LO 3.5.0 rc1+ we have a weird shortcut key in Writer in the menu Edit Repeat. It is the word Encore. We have that for the UI in French and even for the UI in English. This shortcut key Encore is in Tools Customize too. Do you know what does mean ? Bug or feature ? That one is a bug. The keycode com::sun::star::awt::Key::REPEAT is assigned to that menu entry... and it ends up being translated with the Sun keyboard key (see that file [0]). That brings several questions to me: how comes the translation of the key names is depending on the keyboard model? I have a normal french keyboard with en-US locale and en-US libreoffice build. [0]: http://opengrok.libreoffice.org/xref/core/vcl/unx/generic/app/keysymnames.cxx -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] How to discover a toolbutton callback function?
Hi Rodolfo, On Mon, 2012-01-23 at 07:12 -0200, Rodolfo wrote: Given a label of a toolbuton how can I discover which method it trigger? That's a really good question :-) I can't find the Increase Font thing (I'd like to fix this bug https://bugs.freedesktop.org/show_bug.cgi?id=35862 ) Wow - that'd be great. So - here are the steps. First you need to find the command-name which looks like .uno:Foo: * Finding the command name If you're familiar with the layout of the menus / toolbars you can see the XML config files that define their layout in each component eg. sw/uiconfig/swriter/toolbar/textobjectbar.xml toolbar:toolbaritem xlink:href=.uno:IncrementIndent toolbar:helpid=helpid:10462 / toolbar:toolbaritem xlink:href=.uno:Grow toolbar:helpid=helpid:20403 toolbar:visible=false / toolbar:toolbaritem xlink:href=.uno:Shrink toolbar:helpid=helpid:20404 toolbar:visible=false / toolbar:toolbarseparator/ If you only have the english string for the name, then: cd officecfg/ git grep -5 -i increase font registry/data/org/openoffice/Office/UI/WriterCommands.xcu-node oor:name=.uno:Grow oor:op=replace registry/data/org/openoffice/Office/UI/WriterCommands.xcu-prop oor:name=Label oor:type=xs:string registry/data/org/openoffice/Office/UI/WriterCommands.xcu: value xml:lang=en-USIncrease Font/value registry/data/org/openoffice/Office/UI/WriterCommands.xcu- /prop registry/data/org/openoffice/Office/UI/WriterCommands.xcu-prop oor:name=Properties oor:type=xs:int registry/data/org/openoffice/Office/UI/WriterCommands.xcu- value1/value registry/data/org/openoffice/Office/UI/WriterCommands.xcu- /prop registry/data/org/openoffice/Office/UI/WriterCommands.xcu-/node So this gets you to the command-name: .uno:Grow * Finding the SID for that command-name Each command has an integer associated with it for historical reasons :-) We need to find that so, from the toplevel: git grep '.uno:Grow' svx/inc/svx/svxcommands.h:#define CMD_SID_GROW_FONT_SIZE .uno:Grow sw/inc/swcommands.h:#define CMD_FN_GROW_FONT_SIZE .uno:Grow Which gives us the name of the function: git grep -5 'GROW_FONT_SIZE' sw/inc/cmdid.h:#define FN_GROW_FONT_SIZE (FN_FORMAT + 3 ) And we start to find the hooks for this command around the place :-) * How the string is associated with the id ... Ho hum, I tried to dig out how this is done; it used to be via a structure in sfx2 that had both the integer and the string id, but I can't see it immediately :-) Anyhow - hope that helps, All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] weird shortcut key for repeat action in Writer
On Mon, 2012-01-23 at 10:25 +0100, Cedric Bosdonnat wrote: That one is a bug. The keycode com::sun::star::awt::Key::REPEAT is assigned to that menu entry... and it ends up being translated with the Sun keyboard key (see that file [0]). Ho hum; nasty :-) That brings several questions to me: how comes the translation of the key names is depending on the keyboard model? I have a normal french keyboard with en-US locale and en-US libreoffice build. Well - I guess the -idea- is prolly to try to show the user the key that is written on their keyboard, rather than a generic 'Ctrl' for Control - it can show 'Control' (if that is what is written there) or somesuch. IMHO that leads to excessive ugliness and a ton of code in there that (AFAICS) works well only for obscure unix'es. But, of course, some keyboards really do have oddly named keys that we want to assign shortcuts to so ... I was pondering what to do with the code the other day; if it is not even working for the common cases ;-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Replace ENSURE_OR_* macros with regular code.
Hello Muthu, On 23.01.2012 09:19, Muthu Subramanian K wrote: Before pushing, it would be great to understand the reason behind replacing the macro with regular code. Sure thing. The reason why I replaced the ENSURE_OR_* macros with regular code was the replacement of the OSL_ENSURE macro with SAL_WARN. SAL_WARN needs a location parameter that could be added to the macros parameter list. But the macros lump together debugging code and code that is independent of the debug compilation and part of the regular application execution (even if in some places this is only avoiding some invalid application state). I don't have enough understanding of the code yet to think of a better replacement of macros where this would be applicable (exceptions, rewrite the code in a way that the condition can't occur anymore) so I've decided for now to drop the macros in favor of regular code. I believe the macro would help in improving code readability (and of course the code size) - in my understanding. Any particular reason, please? I oppose to the macros improve readability argument, these macros don't improve readability, they hide some regular execution from the programmer. You would need to know the structure of the macro to completely understand what the code is doing which could be a problem for developers that are not aware of the side effects of the macros. When reading the regular code the keywords that change the execution would stand out while the macros could easily be skipped. The code size shouldn't matter because after the preprocessor run the output is exactly the same and I prefer code clarity over source code size. regards Marcel Metz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Problem with clipboard paste in 3.5
Hello I did some tests, I tried to put some debug printouts to file clone/libs-gui/dtrans/source/generic/clipboardmanager.cxx, but never seen one while running LO. Also I tried to use gdb, but this file is not among the sources gdb loaded, and libdtrans is not in info sharedlibrary printout when I stop LO in the middle. However I could see clone/libs-gui/vcl/unx/generic/dtrans/X11_clipboard.cxx which is according to my understanding responsible for the middle-button paste. What concerns KDE, I have the KDE support disabled in LO build, and I am using KDE3.5, so I don't think it may cause this problem. Also, the clipboard worked in older versions of LO. I use following options for the build: export DEBUG=--enable-debug CC=gcc CXX=g++ CPPFLAGS=$INC CXXFLAGS=-O2 CFLAGS=-O2 LDFLAGS=$LIB -s -Wl,-z,combreloc nice -n 15 ./autogen.sh --prefix=$PREFIX --with-lang=$LANGUAGES --disable-kde --disable-kde4 --disable-mozilla --without-junit --with-system-libxml --with-system-libxslt --with-system-cairo --with-system-db --with-system-curl --with-system-mysql --with-system-mesa-headers --with-system-openssl --with-system-python --with-system-stdlibs --with-system-zlib --with-system-mysql --with-system-jpeg --enable-dbus --with-max-jobs=1 --libdir=$TOPDIR $DEBUG $* So my next question is whether it is possible that LO can run without libdtrans for some reason and what may be the possible cause ? Best Regards Petr Cisar On Thursday 19 January 2012 17:54:04 Kohei Yoshida wrote: On Thu, 2012-01-19 at 16:39 +0100, Petr Cisar wrote: Hello. I managed to build the recent version of Libreoffice 3.5.0 on x86_64 Linux. The only problem I have found so far is that the CTRL-V clipboard paste does not do anything, as if the clipboard is empty. However, the middle mouse button works. So, copy and pasting on Linux can be influenced by several factors. First of all, if you are running KDE, chances are that KDE's clipboard manager thingie (I forget the name) can interfere with LibreOffice's copy and paste. If you are in this situation, try disabling it to see if that makes any difference. Failing that, most of the clipboard handling code for unix platform is located under vcl/generic/dtrans. HTH, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] weird shortcut key for repeat action in Writer
Hi Michael, all Well - I guess the -idea- is prolly to try to show the user the key that is written on their keyboard, rather than a generic 'Ctrl' for Control - it can show 'Control' (if that is what is written there) or somesuch. I think it would make sense for different countries since special keys have different text... That said this would mean having a database of ALL keyboard models for ALL brands for ALL supported Languages, which was fine when there was IBM and HP... Today... well just look at the keyboard section in any supply store :) E.g. I have two Logitech keyboards with Portuguese layout. Model Y-SR34 has an Insert key; in Model K120 the key has been translated (correctly :) ) to the Portuguese word Inserir. If you want to cover all keyboards that is the kind of information that would have to be available :) I was pondering what to do with the code the other day; if it is not even working for the common cases ;-) IMO remove it all. It doesn't make any sense to cater for some old unused models (and introducing unneeded errors) while not supporting the huge amount of newer keyboards. Just my 2 (non-dev) cents :) Regards, Pedro ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] weird shortcut key for repeat action in Writer
Hi all, That brings several questions to me: how comes the translation of the key names is depending on the keyboard model? I have a normal french keyboard with en-US locale and en-US libreoffice build. Well - I guess the -idea- is prolly to try to show the user the key that is written on their keyboard, rather than a generic 'Ctrl' for Control - it can show 'Control' (if that is what is written there) or somesuch. I would like to say that I hate the fact that regardless of the rest of my UI, LibreOffice keyboard shortcuts are always displayed in German [1]. I believe this behaviour is also inconsistent wrt to almost any other software. But, of course, some keyboards really do have oddly named keys that we want to assign shortcuts to so ... All we should need is localised versions of key names like Ctrl, Del, Ins (that are on almost every keyboard [1], but whose names can change) and global versions of key names for alphanumeric/script-specific keys (which might not be on every keyboard, but whose names are the same internationally). So, looking at the code, we'd need to just move the keyboard language specific data to the specific locales. This also seems a lot more scalable than for every localiser having to ask a developer to add their native keys into this code. Astron. [1] I use a German keyboard and an English locale of my OS. [2] I think their names only differ between PC and Mac keyboards. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Use $(GPERF) not gperf
Hi, With the new gmake build work the bug #32195 has been reintroduce in some part: The folloing fixes the one I have found so far: http://people.freebsd.org/~bapt/0001-use-GPERF-instead-of-using-gperf-from-path.patch As ususal, it respect all the license that fits the best libreoffice :) regards, Bapt pgpGZkGw1sLJL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] weird shortcut key for repeat action in Writer
Hi Stefan, all All we should need is localised versions of key names like Ctrl, Del, Ins (that are on almost every keyboard [1], but whose names can change) and global versions of key names for alphanumeric/script-specific keys (which might not be on every keyboard, but whose names are the same internationally). So, looking at the code, we'd need to just move the keyboard language specific data to the specific locales. This also seems a lot more scalable than for every localiser having to ask a developer to add their native keys into this code. That would be too simple. See my example in the previous email. You would need to match the keys for EACH keyboard model, regardless of Locale. This is particularly true for laptops (at least in Portugal...). All laptops sold in Portugal have a Portuguese layout but the Special keys (like Ctrl, Alt, Insert) have the English text. Obviously manufacturers do this to save on producing specific keys. So Locale doesn't solve the problem. Regards, Pedro ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] Use $(GPERF) not gperf
On Mon, Jan 23, 2012 at 11:31:14AM +0100, Baptiste Daroussin b...@freebsd.org wrote: With the new gmake build work the bug #32195 has been reintroduce in some part: The folloing fixes the one I have found so far: http://people.freebsd.org/~bapt/0001-use-GPERF-instead-of-using-gperf-from-path.patch As ususal, it respect all the license that fits the best libreoffice :) Pushed, thanks! pgpTIM5ECl83k.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Use $(GPERF) not gperf
On Mon, Jan 23, 2012 at 11:31:14AM +0100, Baptiste Daroussin wrote: Hi, With the new gmake build work the bug #32195 has been reintroduce in some part: The folloing fixes the one I have found so far: http://people.freebsd.org/~bapt/0001-use-GPERF-instead-of-using-gperf-from-path.patch As ususal, it respect all the license that fits the best libreoffice :) regards, Bapt It would be nice if this could be also pushed to 3.5.0 :) regards, Bapt pgp6QiBB79bga.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] .: sw/source
On 29/12/11 00:39, Miklos Vajna wrote:
sw/source/filter/ww8/rtfattributeoutput.cxx | 297
+---
sw/source/filter/ww8/rtfexport.cxx | 74 +++---
sw/source/filter/ww8/rtfexportfilter.cxx|2
sw/source/filter/ww8/rtfimportfilter.cxx|2
sw/source/filter/ww8/rtfsdrexport.cxx | 30 +-
5 files changed, 202 insertions(+), 203 deletions(-)
New commits:
commit a4ab175d5a05e1172deeb9a06a852e5209a530fc
Author: Miklos Vajna vmik...@frugalware.org
Date: Thu Dec 29 00:38:01 2011 +0100
RTF export: replace OSL_TRACE(...) by SAL_INFO(sw,...)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9ade064..17fff9a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -199,7 +200,7 @@ static OString OutBorderLine(RtfExport rExport, const
SvxBorderLine* pLine,
void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
{
-OSL_TRACE(%s, OSL_THIS_FUNC);
+SAL_INFO(sw, OSL_THIS_FUNC);
/*
You would have thought that
m_rExport.Strm() (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH :
OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficent here ,
hi Miklos,
i've replaced sw with sw.rtf, because sw is big enough that
sub-categories are needed...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] gbuild: variables in user makefiles
hi Stephan, On 21/01/12 22:17, Michael Stahl wrote: commit e2b3be6416df0c8913b2d6bb32c34fe162a0a019 Author: Michael Stahl mst...@redhat.com Date: Sat Jan 21 19:36:01 2012 +0100 officecfg: namespace prefix make variable FILES if you have to define variables in user makefiles (and in officecfg there is a good reason to do that), then please note that they will eventually end up in a single make process for the whose office, so please prevent namespace collisions by prefixing with the module name. diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk index b90102b..2a3b01f 100644 --- a/officecfg/Package_cppheader.mk +++ b/officecfg/Package_cppheader.mk @@ -39,7 +39,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,officecfg/registry, \ $(eval $(call gb_CustomTarget_add_dependencies,officecfg/registry, \ officecfg/registry/cppheader.xsl \ -$(foreach i,$(FILES),officecfg/registry/schema/org/openoffice/$(i).xcs))) +$(foreach i,$(officecfg_FILES),officecfg/registry/schema/org/openoffice/$(i).xcs))) -$(eval $(foreach i,$(FILES),$(call \ +$(eval $(foreach i,$(officecfg_FILES),$(call \ gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx))) diff --git a/officecfg/registry/Makefile b/officecfg/registry/Makefile index edb80b0..50d872c 100644 --- a/officecfg/registry/Makefile +++ b/officecfg/registry/Makefile @@ -33,7 +33,7 @@ include $(WFDIR)/files.mk .DEFAULT_GOAL := all .PHONY: all -all: $(foreach i,$(FILES),$(i).hxx) +all: $(foreach i,$(officecfg_FILES),$(i).hxx) define my_target $(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \ diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index f4c72d7..21a4a15 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -1,4 +1,4 @@ -FILES = \ +officecfg_FILES = \ FirstStartWizard \ Inet \ Interaction \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] .: sal/inc sal/osl
On 23/01/12 10:03, Petr Mladek wrote: Michael Meeks píše v Pá 20. 01. 2012 v 17:34 +: On Fri, 2012-01-20 at 17:06 +0100, Michael Stahl wrote: +#if defined(__GNUC__) (__GNUC__ 3) +struct ::stat a_stat, b_stat; +#else +struct stat a_stat, b_stat; +#endif do we really need to have ifdefs for GCC 2 in LO? Probably not :-) I just re-used what was there already to avoid causing even more novel problems :-) I suspect we can rid ourselves of gcc2 everywhere (as an easy hack ?) but I'd prefer to have Petr check whatever ultra-old systems we build for ;-) The oldest system, we use, is SLED10 with gcc-4.1.2. Also we use gcc-4.2.4 for the official LO builds for TDF. ah, yes, that's about what i expected; also, for MacOSX gcc 4.0.1 is used, which is AFAIK the oldest one. So, I think that it is perfectly fine to remove support for GCC 2. i'd be very, very surprised if anything older than 4.0.1 still builds at all (and even that one is annoying with it's spurious uno::Any warnings), so there's some cleanup potential here. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Libreoffice-qa] weird shortcut key for repeat action in Writer
Hi Pedro, That would be too simple. See my example in the previous email. You would need to match the keys for EACH keyboard model, regardless of Locale. Well, that doesn't scale (at least I can't believe it does), as it would probably make adding keyboard layout stuff a full-time job and add quite a few MB of install size. (But I am biased because I am currently annoyed at the fact that only because I use a German keyboard (with Strg, Einf, Druck printed on the Ctrl, Ins, Prnt keys), I also get these German key names in my English LibO interface. That looks ugly, especially on screenshots.) This is particularly true for laptops (at least in Portugal...). All laptops sold in Portugal have a Portuguese layout but the Special keys (like Ctrl, Alt, Insert) have the English text. Obviously manufacturers do this to save on producing specific keys. So Locale doesn't solve the problem. That's really arrogant on the part of manufacturers (since Portuguese is quite an important language, I believe), but if that really is the case for most Portuguese computers, then it might make sense to translate string [en-US]=Ctrl as string [pt-PT]=Ctrl, etc. But that decision should be left to the localisers. If keys are actually uncommon in a certain locale, like SysRq is becoming (in all locales, though), then we can only avoid using that for default shortcuts. Regards, Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] send-feedback patch (was: Re: minutes of ESC call ...)
let me get to that tomorrow first thing! Sorry for the lag - patch is fine as-is I think, let's add the startcenter icon etc. as/when they arrive. Let's push this to -3-5 after the 3.5.0 branch-off. Cheers, -- Thorsten pgp2HFln1DVu9.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 38177, which changed state. Bug 38177 Summary: Closing parent Base window leaves wizard generated table, query, report or form window in orphaned state https://bugs.freedesktop.org/show_bug.cgi?id=38177 What|Old Value |New Value Resolution||FIXED Status|NEW |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
[Libreoffice] [REVIEW][3-5] artificial italic and vertical/rotated text
I'd like to get http://cgit.freedesktop.org/libreoffice/core/commit/?id=8f23e9813daae808aa2a81250b5e414dc57a3394 into 3-5. Fixes (seems to anyway) the out-of-order glyph rotation and skew-for-artifical-bold, i.e. https://bugs.freedesktop.org/show_bug.cgi?id=44856 Test case of qadevOOo/testdocs/vertical-testcase.odt is updated to demo the effect. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] validation documents for writer
On Sun, 2012-01-22 at 12:28 +0200, Noel Grandin wrote: I thought someone was running a test-bot that downloaded all of the documents from bugzilla and loaded them? This would be ./bin/get-bugzilla-attachments-by-mimetype but its currently tuned for the mime-types I was interested in collecting for low-level filter crash/security checking. I haven't used it to get .odt yet for any tests on those. Maybe the best place is just to attach them to the relevant bug entries in bugzilla? There is a contrib repo for test-docs, i.e. http://cgit.freedesktop.org/libreoffice/contrib/test-files/ I'm not 100% sure what the organizational structure there is C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On Mon, Jan 23, 2012 at 09:07:13AM +0100, Stephan Bergmann wrote:
On 01/22/2012 11:02 PM, Lionel Elie Mamane wrote:
OTOH, even if we find a good way to handle library load path
issue, it still does not solve the problem of how the .oxt will
work with a LibreOffice compiled with --with-openldap, such as
e.g. Debian's one.
In the --with-openldap case, postgresql-sdbc-impl.uno.so contained
in the postgresql-sdbc oxt links against some other lib than
libldap50.so?
Yes, because in that case there is no libldap50.so; the OpenLDAP
library is called something like libldap{,_r}-2.4.so.2 (these are the
names on my system; I guess the _r version is the
thread-safe/reentrant one).
On Mon, Jan 23, 2012 at 09:26:08AM +0100, Stephan Bergmann wrote:
On 01/23/2012 09:07 AM, Stephan Bergmann wrote:
One more reason to change it from an extension into a proper part
of LO, I would say.
Lionel, what do you think about changing the extension into an
integral part of LO 3.5? It should make all problems go away (on
all platforms; at least so I would think). I could offer you to do
the change, or land you a hand if you want to do it yourself.
Users loose the feature to use a newer PostgreSQL-SDBC with an older
LibreOffice. But Fridrich and you agree it fixes all our issues, so
OK, I consent to it. I'm happy to let you and/or Fridrich do the
change.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED] send-feedback patch
Hi Thorsten, 23.01.2012 15:40, Thorsten Behrens пишет: Sorry for the lag - patch is fine as-is I think, let's add the startcenter icon etc. as/when they arrive. Thanks for reviewing/pushing! I was afraid that the hard-coded url is not fine, because I saw another urls in instsetoo_native/util/openoffice.lst - the ones that is used in the startcenter btw. They are accessed through the officecfg/registry/data/org/openoffice/Office/Common.xcu file (I don't know background details, i.e. how this works). So, since it was planned to add an icon to the startcenter, maybe it would be good to follow its style?... (The code in framework/source/services/backingwindow.cxx, IMPL_LINK( BackingWindow, ToolboxHdl ...) ) And (maybe it's not important) I didn't understand why in appslots.sdi there are several 'ExecMethod's - OfaExec_Impl, PropExec_Impl, MiscExec_Impl... I used the latter one. Regards, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED]PATCH] Same expression on both sides of || in if condition at libreoffice@lists.freedesktop.org (cppcheck)
On Sun, 2012-01-22 at 23:21 +0100, Mariusz Dykierek wrote: I guess this is what author intended. Yeah, well with Minutes-Nanosec anyway, looks like the intention. Pushed now, thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED][PATCH] A copy-paste bug detected by cppcheck at sdext/source/presenter/PresenterTimer.cxx:512
On Sun, 2012-01-22 at 22:25 +0100, Mariusz Dykierek wrote: Attached patch fixes a copy-paste error in the condition. Seconds used twice instead of Hours. Ah indeed, good catch, looks good to me. Pushed now, thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED][REVIEW] fdo#44983 Fix RTF import of \paperh and \paperw
On Sun, 2012-01-22 at 21:56 +0100, Miklos Vajna wrote: Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=c39e891d4dc963d2cac9843b426494e4dc490278 Could somebody sign-off and push to -3-5, please? Looks sane to me, pushed to 3-5 now. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [Pushed] Removed LineListBox methods listed in unusedcode.easy
Hi! On 23.01.2012 10:26, Muthu Subramanian K wrote: Pushed! Thank you for the patch! The only problem is that these entries will come back when the call catcher magician Caolán regenerates the unusedcode.easy list next time. -- RN ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED 3-5] Re: Use $(GPERF) not gperf
On 23/01/12 12:15, Baptiste Daroussin wrote: On Mon, Jan 23, 2012 at 11:31:14AM +0100, Baptiste Daroussin wrote: Hi, With the new gmake build work the bug #32195 has been reintroduce in some part: The folloing fixes the one I have found so far: http://people.freebsd.org/~bapt/0001-use-GPERF-instead-of-using-gperf-from-path.patch As ususal, it respect all the license that fits the best libreoffice :) regards, Bapt It would be nice if this could be also pushed to 3.5.0 :) done ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On 01/23/2012 01:45 PM, Lionel Elie Mamane wrote: Users loose the feature to use a newer PostgreSQL-SDBC with an older LibreOffice. But Fridrich and you agree it fixes all our issues, so OK, I consent to it. I'm happy to let you and/or Fridrich do the change. Doing it. Lionel, do you have a recipe for database-dummies how to actually test the postgresql-sdbc functionality? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Removed nonexistent items from unusedcode.easy
On Sun, 2012-01-22 at 11:41 +0100, Mariusz Dykierek wrote:
Hi,
Attached patch removes from unusedcode.easy a number of methods that cannot
be found in the
sources within the core directory.
Can someone more experienced than I am confirm that items:
- CIcc*::*
- boost::gregorian::*
are really supposed to be enumerated in the unusedcode.easy?
If we manually remove them, then they'll just come back the next time
I run make findunusedcode.
The CIcc* stuff is in icc, but unpacked during the build as an external
module. The other ones are in boost, which is a similar situation. Atom*
in libcmis. So those contain stuff which we build but don't call.
Arguably we could tweak the makefiles and or patch them to only build
the stuff we actually use for a faster build and smaller install set.
We don't include the boost libs or icc libs into our install set, so
those don't bloat anything, and its too painful to customize libcmis to
cut out the methods we do use, so I've now added them to the filter in
solenv/gbuild/extensions/postBuiltplTargets.mk to filter those out.
Stuff like LinkStubClickLightHdl and various others are actually there
in the code, except created from DECL_LINK IMPL_LINK macros. Sometimes
they can be converted from LINKs to normal methods as the wrapped
methods *is* called directly while the wrapper is unused. And sometimes
the wrapper and wrappee are both unused.
FWIW, as an example Svx3DWin::LinkStubClickLightHdl is
svx/inc/svx/float3d.hxx as DECL_LINK( ClickLightHdl, PushButton * ); and
svx/source/engine3d/float3d.cxx as IMPL_LINK( Svx3DWin, ClickLightHdl,
PushButton*, pBtn ) but the LINK wrapper is unused, even though there is
a direct call to ClickLightHdl( pBtn ); so this can be changed to
something like...
-IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
+void Svx3DWin::ClickLightHdl(PushButton* pBtn)
{
}
-DECL_LINK( ClickLightHdl, PushButton * );
+void ClickLightHdl(PushButton *);
C.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] sc_unoapi failure
Hi Stephan, On Monday, 2012-01-23 11:44:43 +0100, Stephan Bergmann wrote: On 01/23/2012 11:38 AM, Stephan Bergmann wrote: The Linux-RHEL6-x86_64@14-with-check tinderbox is consistently failing with a crash in sc_unoapi in all the builds since the one whose failure mail is at the end of this mail. I made a valgrind run of sc_unoapi (on a different machine than the tinderbox), and it indeed indicates two problems: Thanks for the pointers, I'm investigating. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp9f48BQD0U7.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [ANN] LibreOffice 3.5.0 RC1 available
Pedro wrote: WARNING for Windows users: The Release Candidate will uninstall your current stable build and replace it. If you do not wish this to happen but still would like to test this Release you should follow the instructions for installing in parallel http://wiki.documentfoundation.org/Installing_in_parallel; Added to my announcement draft, might want to word-smith that a bit, but in general probably not a bad idea - thx for pointing it out! :) (and yeah, had added some extra wording to the release notes in the wiki already) Cheers, -- Thorsten pgpZocu6Qn8yM.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Mozldap switch: --with-openldap to go away?
Hi, On Mon, Jan 23, 2012 at 01:38:45PM +0100, Lionel Elie Mamane wrote: I'm not sure if Debian configures LO with --with-openldap for a Because we didn't want to link with Mozilas libldap509.so (which evben isn't properly SONAMEd) and have a dependency on Mozilla for that. And that OpenLDAP is LDAP reference. Why use Mozilla if we have that? specific reason or if we would be OK with switching to Mozilla LDAP in future versions. If you mean the standalone mozladap: if someone (Mozilla team? I won't) packages it and it has a proper library etc, yes, we could switch to that though I still don't see why OpenLDAP is bad. Do we have positive confirmation that the LDAP features of LO work with OpenLDAP? AFAIR someone tested it with OpenLDAP when I wrote the patch for adding --with-openldap back then. Might also be wrong remembering, though, never tried it myself. Just in case you missed this thread on upstream ML, wanted to give you a heads-up so that you can weigh in before it maybe happens. I noticed, but I managed to ignore so far because I don't even see the sense in there. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Easyhack : updating biblio.odb
On Sat, 2012-01-21 at 12:36 -0800, julien2412 wrote: Hello again, I discussed about it on IRC, there's nothing to do . I updated the completed task page to remove this task. I must have made something wrong with git or else but I don't want to do this task again. These were the two original commits anyway http://cgit.freedesktop.org/libreoffice/core/commit/?id=6dd5212a016a0eeb780e87faceeecfa9d9147b0c http://cgit.freedesktop.org/libreoffice/core/commit/?id=757aa0a8e4a77f8c24faa362f2758c22898a7285 Doesn't seem to be any LibreOffice books in there, but maybe there simply wasn't any at the time. Tweaked (I hope) the easy-hack bits on fdo#45033 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED][REVIEW][3-5] artificial italic and vertical/rotated text
Hi Caolán, On Monday, 2012-01-23 12:33:57 +, Caolán McNamara wrote: I'd like to get http://cgit.freedesktop.org/libreoffice/core/commit/?id=8f23e9813daae808aa2a81250b5e414dc57a3394 into 3-5. Fixes (seems to anyway) the out-of-order glyph rotation and skew-for-artifical-bold, i.e. https://bugs.freedesktop.org/show_bug.cgi?id=44856 Looks plausible, pushed with my sign-off http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=95372ec15484a74c8956cda869c55138dc318daf Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpgBWRnvPW0t.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Flat ODF usage in Git [Was: concept for c++ based subsequenttests]
Only one query; I wonder whether we should be using the flat (fods) file-type for these tests - so we can read meaningful diffs to them in the git history. +1 for this... ... and I also think that all ODF files in git repos should be in Flat ODFormat so that the Git can track them easily. Just my 2 snt's. -- RN ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW][3-5] let postgresql-sdbc find its dependencies
As discussed in the recent thread starting at http://lists.freedesktop.org/archives/libreoffice/2012-January/024255.html rpath / ... for extensions (and the case of PostgreSQL-SDBC), it looks like the two bugs * https://bugs.freedesktop.org/show_bug.cgi?id=45058 postgresql-sdbc doesn't work on LO 3.5RC1 win32 * https://bugs.freedesktop.org/show_bug.cgi?id=45090 PostgreSQL-SDBC fails to load on Unix / official binaries: missing libldap50.so (of which neither is currently attached to https://bugs.freedesktop.org/show_bug.cgi?id=37361 LibreOffice 3.5 most annoying bugs, however) can (only) be solved by changing the postgresql-sdbc functionality from a bundled extension into a proper (optional) part of LO. The attached 0001-Changed-postgresql-sdbc-from-bundled-oxt-to-proper-o.patch (against recent libreoffice-3-5) does just that. It builds fine on Linux and produces installation sets that properly contain the various files for the postgresql-sdbc functionality. Whether the functionality actually works there however is not clear to me, as I have no recipe how to test it. Also, it would need to be checked that it also works on other platforms (esp. Windows, also including whether the functionality is offered there correctly as an optional component during installation). Feel free to review for inclusion in LO 3.5. (I can do the actual push in case enough reviewers approve.) Stephan From f67f580e87a187ea31b09d196029fe646e6f8619 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann sberg...@redhat.com Date: Mon, 23 Jan 2012 15:08:36 +0100 Subject: [PATCH] Changed postgresql-sdbc from bundled oxt to proper optional part. --- configure.in | 91 +--- connectivity/prj/d.lst |6 +- .../source/drivers/postgresql/description.xml | 17 .../postgresql/description/description_en-US.txt |1 - connectivity/source/drivers/postgresql/makefile.mk | 79 + .../source/drivers/postgresql/manifest.xml | 10 -- .../postgresql/postgresql-sdbc-impl.component | 35 .../drivers/postgresql/postgresql-sdbc.component | 35 .../source/drivers/postgresql/postgresql-sdbc.ini |2 + .../source/drivers/postgresql/postgresql-sdbc.uno |2 - .../source/drivers/postgresql/pq_connection.cxx| 15 +--- .../source/drivers/postgresql/pq_driver.cxx| 13 --- distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeMacOSX.conf |1 - distro-configs/LibreOfficeWin32.conf |1 - postprocess/packregistry/makefile.mk |4 + scp2/source/base/makefile.mk |6 +- scp2/source/base/postgresqlsdbc.scp| 71 +++ scp2/source/base/postgresqlsdbc.ulf| 36 scp2/source/extensions/directory_extensions.scp| 11 --- scp2/source/extensions/file_extensions.scp | 13 --- scp2/source/extensions/module_extensions.scp | 15 --- scp2/source/extensions/module_extensions.ulf |6 -- scp2/util/makefile.mk |3 +- set_soenv.in |1 - .../source/packinfo/packinfo_extensions.txt| 15 --- setup_native/source/packinfo/packinfo_office.txt | 15 +++ 27 files changed, 271 insertions(+), 234 deletions(-) delete mode 100644 connectivity/source/drivers/postgresql/description.xml delete mode 100644 connectivity/source/drivers/postgresql/description/description_en-US.txt delete mode 100644 connectivity/source/drivers/postgresql/manifest.xml create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.component create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.ini delete mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.uno create mode 100644 scp2/source/base/postgresqlsdbc.scp create mode 100644 scp2/source/base/postgresqlsdbc.ulf diff --git a/configure.in b/configure.in index b15f76c..6bd4aac 100644 --- a/configure.in +++ b/configure.in @@ -355,11 +355,6 @@ AC_ARG_ENABLE(ext-pdfimport, [Disable the PDF Import extension.]) ) -AC_ARG_ENABLE(ext-postgresql-sdbc, -AS_HELP_STRING([--enable-ext-postgresql-sdbc], -[Enable the build of the PostgreSQL-SDBC extension.]) -) - AC_ARG_ENABLE(ext-presenter-console, AS_HELP_STRING([--disable-ext-presenter-console], [Disable the Presenter Console extension.]) @@ -5388,58 +5383,50 @@ dnl === dnl Check for PostgreSQL stuff dnl === -if test x$enable_ext_postgresql_sdbc = xyes; then -if test x$enable_extension_integration = xyes; then -
Re: [Libreoffice] Found duplicate branches for if and else in dbtree.cxx
On 21/01/12 08:53, julien2412 wrote: Hello, Cppcheck reported this : core/sw/source/ui/dbui/dbtree.cxx 349 duplicateBranch style Found duplicate branches for if and else. if(bTable)--- Found duplicate branches for if and else. InsertEntry(sName, pParent); else InsertEntry(sName, pParent); I took a look at the git history, it's been there since the initial commit on 2000. So either the if(bTable) is useless or something's missing. reading the code above the if, bTable is used for 2 different ways to get the table columns. thus, the if(bTable) looks totally spurious and should be removed. Any idea ? Julien. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC)
On Mon, Jan 23, 2012 at 02:20:31PM +0100, Stephan Bergmann wrote:
On 01/23/2012 01:45 PM, Lionel Elie Mamane wrote:
Users loose the feature to use a newer PostgreSQL-SDBC with an
older LibreOffice. But Fridrich and you agree it fixes all our
issues, so OK, I consent to it. I'm happy to let you and/or
Fridrich do the change.
Doing it. Lionel, do you have a recipe for database-dummies how to
actually test the postgresql-sdbc functionality?
To really test it, you need a PostgreSQL server. However, you can do a
very limited, but still meaningful, test without it:
- Menu: File / New / Database
- Connect to an existing database: PostgreSQL
- Next
- Datasource URL: host=localhost
- Next
- User name: blank
- Test connection - the error message should be along the lines of:
Couldn't establish database connection to 'sdbc:postgresql:host=localhost'
could not connect to server: Connection refused
is the server running on host localhost (::1) and accepting
TCP/IP connections on port 5432?
could not connect to server: Connection refused
is the server running on host localhost (127.0.0.1) and accepting
TCP/IP connections on port 5432?
If you get any other error message (such as no driver registered
for URL), then there is something wrong with PostgreSQL-SDBC or
LibreOffice more generally. I you get the error message only with
127.0.0.1 and not with ::1, that's fine and not a problem.
- OK to click error message away
- next
- no, do not register the database
- uncheck open the database for editing
- finish
- choose a filename to save file to
- save
- close libreoffice
- open libreoffice again, open file you just created
- in the left part of the main screen, click tables
You should get the same error message as above with test
connection. If not, it is a problem.
As to installing a PostgreSQL server, rather easy on Debian GNU/Linux
and probably most other distros. Make sure you get version 8.4 or
later.
aptitude install postgresql
sudo -u postgres createdb -O $USER name_you_choose $USER's test DB
psql --db name_you_choose
CREATE TABLE names ( num serial, name varchar(30) NOT NULL, PRIMARY KEY (num)
);
# It says:
# NOTICE: CREATE TABLE will create implicit sequence names_num_seq for
serial column names.num
# NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index names_pkey
for table names
# CREATE TABLE
INSERT INTO names (name) VALUES ('Alice'), ('Bob'), ('Eve'), ('Mallory');
INSERT INTO names (num, name) VALUES (0, 'Nominem incognitum');
\q
#back to the shell
Now, do as above in LibreOffice, except put:
Datasource URL: host=localhost dbname=name_you_choose
User name: Your UNIX username
Do *not* check needs password.
You'll see in tables the names table. You can double-click on it and
modify data, insert new data, delete row, etc.
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] proposed fix for fdo#44040 (seems iterator issue only)
On Tue, 2012-01-17 at 11:40 -0800, julien2412 wrote: There was an extra semicolon after the while on the patch. Even if i re read several times the code, I just missed it too and needed gdb to see it ! Now it works better :-) *groan*, that was dumb of me. Do you want to commit/push it yourself on master or do you want me to do it Sure, you push it. Would it be ok to cherry-pick it on 3.5 ? IMO yeah, cherry-pick it there too. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
