[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - vcl/generic
vcl/generic/fontmanager/fontcache.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 32e931cd08423bbe74a2532f7eba2b3f6c374233
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 11 19:32:57 2013 +0100
Resolves: fdo#66524 string conversion gone wrong
Change-Id: Ie885514cdfaecc14ac57bb53a2da7c51274d54b0
(cherry picked from commit 019a8f3f74ec778d5fead4d2b4d47e75cf750bf7)
Reviewed-on: https://gerrit.libreoffice.org/4849
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Andras Timar ati...@suse.com
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/vcl/generic/fontmanager/fontcache.cxx
b/vcl/generic/fontmanager/fontcache.cxx
index 0d14d48..0f6c677 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -264,10 +264,10 @@ void FontCache::read()
do
{
aStream.ReadLine( aLine );
-if( aLine == FontCacheDirectory: ||
-aLine == EmptyFontCacheDirectory: )
+if( aLine.startsWith(FontCacheDirectory:) ||
+aLine.startsWith(EmptyFontCacheDirectory:) )
{
-bool bEmpty = (aLine == Empty );
+bool bEmpty = aLine.startsWith(Empty);
sal_Int32 nSearchIndex = bEmpty ? 24 : 19;
OString aDir;
@@ -309,7 +309,7 @@ void FontCache::read()
m_aCache[ nDir ].m_bUserOverrideOnly = bKeepOnlyUserOverridden;
}
}
-else if( pDir aLine == File:)
+else if( pDir aLine.startsWith(File:) )
{
OString aFile( aLine.copy( 5 ) );
aStream.ReadLine( aLine );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/parse/sqliterator.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99f8b0363ab3bddcd9ccffd2803b3ad99e569295 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Jul 11 17:42:31 2013 +0200 sort is ascending by default Change-Id: I38354405acbbdb27b9e7ce1d19e862b7b352c850 Reviewed-on: https://gerrit.libreoffice.org/4839 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 6007eb9..8d0e20f 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1110,7 +1110,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo OSQLParseNode * pOptAscDesc = pColumnRef-getParent()-getChild(1); OSL_ENSURE(pOptAscDesc != NULL,OSQLParseTreeIterator: error in parse tree!); -sal_Bool bAscending = pOptAscDesc SQL_ISTOKEN(pOptAscDesc,ASC); +sal_Bool bAscending = ! (pOptAscDesc SQL_ISTOKEN(pOptAscDesc,DESC)); setOrderByColumnName(sColumnName, aTableRange,bAscending); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/parse/sqliterator.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1572082c1e7300fc20c33d9f87c1a7460a180d7a Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Jul 11 17:42:31 2013 +0200 sort is ascending by default Change-Id: I38354405acbbdb27b9e7ce1d19e862b7b352c850 Reviewed-on: https://gerrit.libreoffice.org/4844 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index cb17652..7967683 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1112,7 +1112,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo OSQLParseNode * pOptAscDesc = pColumnRef-getParent()-getChild(1); OSL_ENSURE(pOptAscDesc != NULL,OSQLParseTreeIterator: error in parse tree!); -sal_Bool bAscending = pOptAscDesc SQL_ISTOKEN(pOptAscDesc,ASC); +sal_Bool bAscending = ! (pOptAscDesc SQL_ISTOKEN(pOptAscDesc,DESC)); setOrderByColumnName(sColumnName, aTableRange,bAscending); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform8.cxx |6 ++--
sc/source/filter/excel/impop.cxx |4 +-
sc/source/filter/excel/xepivot.cxx | 10 +++
sc/source/filter/excel/xestyle.cxx | 16 +--
sc/source/filter/excel/xicontent.cxx | 50 +--
sc/source/filter/excel/xihelper.cxx | 44 --
sc/source/filter/excel/xilink.cxx| 14 -
sc/source/filter/excel/xipivot.cxx |6 ++--
sc/source/filter/inc/xicontent.hxx |2 -
sc/source/filter/inc/xihelper.hxx| 11 ++-
sc/source/filter/inc/xilink.hxx |2 -
sc/source/filter/inc/xipivot.hxx |6 ++--
12 files changed, 79 insertions(+), 92 deletions(-)
New commits:
commit 01ea5d7f6c92055a9a131c124f899968bb7c4023
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Tue Jun 18 16:57:15 2013 -0300
String.AppendAscii() cleanup in sc
Change-Id: I99e8834085573238f0d1d49576f73e945abc44d3
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index 4cd9dce..8efbc1a 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -94,8 +94,8 @@ ExcelToSc8::~ExcelToSc8()
bool ExcelToSc8::GetExternalFileIdFromXti( sal_uInt16 nIxti, sal_uInt16
rFileId ) const
{
-const String* pFileUrl = rLinkMan.GetSupbookUrl(nIxti);
-if (!pFileUrl || pFileUrl-Len() == 0 || !GetDocShell())
+const OUString* pFileUrl = rLinkMan.GetSupbookUrl(nIxti);
+if (!pFileUrl || pFileUrl-isEmpty() || !GetDocShell())
return false;
String aFileUrl = ScGlobal::GetAbsDocName(*pFileUrl, GetDocShell());
@@ -123,7 +123,7 @@ bool ExcelToSc8::Read3DTabReference( sal_uInt16 nIxti,
SCTAB rFirstTab, SCTAB
bool ExcelToSc8::HandleOleLink(sal_uInt16 nXtiIndex, const XclImpExtName
rExtName, ExternalTabInfo rExtInfo)
{
-const String* pUrl = rLinkMan.GetSupbookUrl(nXtiIndex);
+const OUString* pUrl = rLinkMan.GetSupbookUrl(nXtiIndex);
if (!pUrl)
return false;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 1c12861..2cf90d2 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -459,9 +459,9 @@ void ImportExcel::SheetPassword( void )
void ImportExcel::Externsheet( void )
{
-String aUrl, aTabName;
+OUString aUrl, aTabName;
bool bSameWorkBook;
-String aEncodedUrl( aIn.ReadByteString( false ) );
+OUString aEncodedUrl( aIn.ReadByteString( false ) );
XclImpUrlHelper::DecodeUrl( aUrl, aTabName, bSameWorkBook, *pExcRoot-pIR,
aEncodedUrl );
mnLastRefIdx = pExcRoot-pExtSheetBuff-Add( aUrl, aTabName, bSameWorkBook
);
}
diff --git a/sc/source/filter/excel/xepivot.cxx
b/sc/source/filter/excel/xepivot.cxx
index 4653e2d..a3f269b 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -920,9 +920,9 @@ namespace {
//
/** Returns a display string for a data field containing the field name and
aggregation function. */
-String lclGetDataFieldCaption( const String rFieldName, GeneralFunction eFunc
)
+OUString lclGetDataFieldCaption( const OUString rFieldName, GeneralFunction
eFunc )
{
-String aCaption;
+OUString aCaption;
sal_uInt16 nResIdx = 0;
using namespace ::com::sun::star::sheet;
@@ -942,9 +942,9 @@ String lclGetDataFieldCaption( const String rFieldName,
GeneralFunction eFunc )
default:;
}
if( nResIdx )
-aCaption.Assign( ScGlobal::GetRscString( nResIdx ) ).AppendAscii(
RTL_CONSTASCII_STRINGPARAM( - ) );
-aCaption.Append( rFieldName );
-return aCaption;
+aCaption = ScGlobal::GetRscString( nResIdx ) + - ;
+aCaption += rFieldName;
+return( aCaption );
}
//
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 3976927..8158af5 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1308,9 +1308,9 @@ void XclExpNumFmtBuffer::WriteFormatRecord( XclExpStream
rStrm, const XclExpNum
namespace {
-String GetNumberFormatCode(XclRoot rRoot, const sal_uInt16 nScNumFmt,
SvNumberFormatter* xFormatter, NfKeywordTable* pKeywordTable)
+OUString GetNumberFormatCode(XclRoot rRoot, const sal_uInt16 nScNumFmt,
SvNumberFormatter* xFormatter, NfKeywordTable* pKeywordTable)
{
-String aFormatStr;
+OUString aFormatStr;
if( const SvNumberformat* pEntry = rRoot.GetFormatter().GetEntry(
nScNumFmt ) )
{
@@ -1320,9 +1320,9 @@ String GetNumberFormatCode(XclRoot rRoot, const
sal_uInt16 nScNumFmt, SvNumberF
Color* pColor = 0;
OUString aTemp;
const_cast SvNumberformat* ( pEntry )-GetOutputString( 1.0,
aTemp, pColor );
-aFormatStr.Append( '' ).Append( aTemp ).AppendAscii(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - dbaccess/source
dbaccess/source/ui/dlg/directsql.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 50d92e404547917f3829dc25018910960ea0c469 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Jul 11 11:44:03 2013 +0200 delete in destructor checkbox created in constructor Change-Id: Ifceae4c7ffe15bfc62ce34f4463fd4e071403359 fixes: debug build aborts when closing that window Reviewed-on: https://gerrit.libreoffice.org/4841 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com Reviewed-by: Andras Timar ati...@suse.com diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index fe5c972..7df8d15 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -121,6 +121,7 @@ DBG_NAME(DirectSQLDialog) stopAllComponentListening(); } delete m_pSQLHistory; +delete m_pShowOutput; DBG_DTOR(DirectSQLDialog,NULL); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source dbaccess/source include/connectivity
connectivity/source/parse/sqliterator.cxx | 28 +
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 49 ++---
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 20 ++
dbaccess/source/ui/dlg/queryorder.cxx | 25
include/connectivity/sqliterator.hxx |8 ++
5 files changed, 95 insertions(+), 35 deletions(-)
New commits:
commit 311fb8b75053c22ae5d5a5726c760489edaebe8c
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Jul 11 16:53:23 2013 +0200
ORDER BY columns are prioritarily *SELECT* columns
as opposed to *table* columns,
and notwithstanding HSQLDB 1.8 (our embedded database) bugs.
Actually, supporting ORDER BY on non-select (but table) columns is OPTIONAL
for DBMSs
(but quite common)
Conflicts:
connectivity/source/parse/sqliterator.cxx
Change-Id: I6725dfda36b09429a78262bff6f3d3e3dd9032b6
Reviewed-on: https://gerrit.libreoffice.org/4836
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 8d0e20f..7065e66 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1863,7 +1863,9 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const
OUString rColumnName
void OSQLParseTreeIterator::setOrderByColumnName(const OUString rColumnName,
OUString rTableRange, sal_Bool bAscending)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
OSQLParseTreeIterator::setOrderByColumnName );
-ReferenceXPropertySet xColumn = findColumn( rColumnName, rTableRange,
false );
+ReferenceXPropertySet xColumn = findSelectColumn( rColumnName );
+if ( !xColumn.is() )
+xColumn = findColumn ( rColumnName, rTableRange, false );
if ( xColumn.is() )
m_aOrderColumns-get().push_back(new OOrderColumn( xColumn,
rTableRange, isCaseSensitive(), bAscending ) );
else
@@ -2041,6 +2043,30 @@ const OSQLParseNode*
OSQLParseTreeIterator::getSimpleHavingTree() const
}
//
-
+Reference XPropertySet OSQLParseTreeIterator::findSelectColumn( const
OUString rColumnName )
+{
+SAL_INFO( connectivity.parse, parse lio...@mamane.lu
OSQLParseTreeIterator::findSelectColumn );
+for ( OSQLColumns::Vector::const_iterator lookupColumn =
m_aSelectColumns-get().begin();
+ lookupColumn != m_aSelectColumns-get().end();
+ ++lookupColumn )
+{
+Reference XPropertySet xColumn( *lookupColumn );
+try
+{
+OUString sName, sTableName;
+xColumn-getPropertyValue(
OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) = sName;
+if ( sName == rColumnName )
+return xColumn;
+}
+catch( const Exception )
+{
+DBG_UNHANDLED_EXCEPTION();
+}
+}
+return NULL;
+}
+
+//
-
Reference XPropertySet OSQLParseTreeIterator::findColumn( const OUString
rColumnName, OUString rTableRange, bool _bLookInSubTables )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
OSQLParseTreeIterator::findColumn );
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index d7071a2..32035e7 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -457,7 +457,7 @@ void SAL_CALL
OSingleSelectQueryComposer::appendFilterByColumn( const Reference
setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
}
-OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference
XPropertySet column)
+OUString OSingleSelectQueryComposer::impl_getColumnRealName_throw(const
Reference XPropertySet column, bool bGroupBy)
{
::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
@@ -472,17 +472,18 @@ OUString
OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference X
throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,makeAny(aErr)
);
}
-OUString aName,aNewName;
+OUString aName, aNewName;
column-getPropertyValue(PROPERTY_NAME) = aName;
-if ( !m_xMetaData-supportsOrderByUnrelated()
m_aCurrentColumns[SelectColumns]
!m_aCurrentColumns[SelectColumns]-hasByName(aName))
+if ( bGroupBy
+ !m_xMetaData-supportsGroupByUnrelated()
+ m_aCurrentColumns[SelectColumns]
+ !m_aCurrentColumns[SelectColumns]-hasByName(aName) )
{
OUString sError(DBACORE_RESSTRING(RID_STR_COLUMN_MUST_VISIBLE));
throw
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/inc connectivity/source dbaccess/source
connectivity/inc/connectivity/sqliterator.hxx |8 ++
connectivity/source/parse/sqliterator.cxx | 30 -
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 53 +
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 19 +-
dbaccess/source/ui/dlg/queryorder.cxx | 25
5 files changed, 98 insertions(+), 37 deletions(-)
New commits:
commit 6fb427e8d233f7adf416d7ac48c7afb4435518d4
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Jul 11 16:53:23 2013 +0200
ORDER BY columns are prioritarily *SELECT* columns
as opposed to *table* columns,
and notwithstanding HSQLDB 1.8 (our embedded database) bugs.
Actually, supporting ORDER BY on non-select (but table) columns is OPTIONAL
for DBMSs
(but quite common)
Conflicts:
connectivity/source/parse/sqliterator.cxx
Change-Id: I6725dfda36b09429a78262bff6f3d3e3dd9032b6
Reviewed-on: https://gerrit.libreoffice.org/4846
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/connectivity/inc/connectivity/sqliterator.hxx
b/connectivity/inc/connectivity/sqliterator.hxx
index 5da60c2..a18809d 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -112,6 +112,14 @@ namespace connectivity
::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet findColumn(
const ::rtl::OUString rColumnName, ::rtl::OUString
rTableRange, bool _bLookInSubTables );
+/** finds a column with a given name among the select columns
+@param rColumnName
+the column name to look for
+@return
+*/
+::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet findSelectColumn(
+const OUString rColumnName );
+
protected:
void setSelectColumnName(::rtl::ReferenceOSQLColumns
_rColumns,const ::rtl::OUString rColumnName,const ::rtl::OUString
rColumnAlias, const ::rtl::OUString rTableRange,sal_Bool
bFkt=sal_False,sal_Int32 _nType =
com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
void appendColumns(::rtl::ReferenceOSQLColumns _rColumns,const
::rtl::OUString _rTableAlias,const OSQLTable _rTable);
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 7967683..97122d1 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1912,7 +1912,9 @@ void
OSQLParseTreeIterator::setSelectColumnName(::rtl::ReferenceOSQLColumns _
void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString
rColumnName, ::rtl::OUString rTableRange, sal_Bool bAscending)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
OSQLParseTreeIterator::setOrderByColumnName );
-ReferenceXPropertySet xColumn = findColumn( rColumnName, rTableRange,
false );
+ReferenceXPropertySet xColumn = findSelectColumn( rColumnName );
+if ( !xColumn.is() )
+xColumn = findColumn ( rColumnName, rTableRange, false );
if ( xColumn.is() )
m_aOrderColumns-get().push_back(new OOrderColumn( xColumn,
rTableRange, isCaseSensitive(), bAscending ) );
else
@@ -2090,7 +2092,31 @@ const OSQLParseNode*
OSQLParseTreeIterator::getSimpleHavingTree() const
}
//
-
-Reference XPropertySet OSQLParseTreeIterator::findColumn( const
::rtl::OUString rColumnName, ::rtl::OUString rTableRange, bool
_bLookInSubTables )
+Reference XPropertySet OSQLParseTreeIterator::findSelectColumn( const
OUString rColumnName )
+{
+SAL_INFO( connectivity.parse, parse lio...@mamane.lu
OSQLParseTreeIterator::findSelectColumn );
+for ( OSQLColumns::Vector::const_iterator lookupColumn =
m_aSelectColumns-get().begin();
+ lookupColumn != m_aSelectColumns-get().end();
+ ++lookupColumn )
+{
+Reference XPropertySet xColumn( *lookupColumn );
+try
+{
+OUString sName, sTableName;
+xColumn-getPropertyValue(
OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) = sName;
+if ( sName == rColumnName )
+return xColumn;
+}
+catch( const Exception )
+{
+DBG_UNHANDLED_EXCEPTION();
+}
+}
+return NULL;
+}
+
+//
-
+Reference XPropertySet OSQLParseTreeIterator::findColumn( const OUString
rColumnName, OUString rTableRange, bool _bLookInSubTables )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
OSQLParseTreeIterator::findColumn );
Reference XPropertySet xColumn = findColumn( *m_pImpl-m_pTables,
rColumnName, rTableRange );
diff --git
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk|3 sw/UIConfig_swriter.mk |1 sw/inc/swabstdlg.hxx |1 sw/source/ui/chrdlg/paradlg.hrc | 25 --- sw/source/ui/chrdlg/paradlg.src | 128 --- sw/source/ui/chrdlg/pardlg.cxx | 70 ++ sw/source/ui/dialog/swdlgfact.cxx| 21 --- sw/source/ui/dialog/swdlgfact.hxx|1 sw/source/ui/inc/swuipardlg.hxx | 12 + sw/source/ui/shells/annotsh.cxx |2 sw/source/ui/shells/drwtxtex.cxx |2 sw/source/ui/shells/textsh1.cxx |2 sw/uiconfig/swriter/ui/paradialog.ui | 233 +++ 13 files changed, 294 insertions(+), 207 deletions(-) New commits: commit 9992b1aadb114159fe5d78e46aebb209d718d958 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Thu Jul 11 17:10:14 2013 -0300 Convert paragraph properties dialog to .ui format Convert Writer paragraph properties dialog to .ui widgets. Reduced 2 different dialogs into one (bDrawParaDlg) Conflicts: sw/AllLangResTarget_sw.mk Change-Id: I63135dda5416b8b503f9aa9f4986ce3ed08f535c Reviewed-on: https://gerrit.libreoffice.org/4851 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 7f96e8b..c4553fd 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -69,10 +69,9 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/app/mn.src \ sw/source/ui/chrdlg/ccoll.src \ sw/source/ui/chrdlg/chrdlg.src \ -sw/source/ui/chrdlg/paradlg.src \ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ - sw/source/ui/config/optdlg.src \ +sw/source/ui/config/optdlg.src \ sw/source/ui/config/optload.src \ sw/source/ui/dbui/addresslistdialog.src \ sw/source/ui/dbui/createaddresslistdialog.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 43fc6a0..c4a09e5 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -113,6 +113,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/outlinenumberingpage \ sw/uiconfig/swriter/ui/outlinepositionpage \ sw/uiconfig/swriter/ui/queryshowchangesdialog \ + sw/uiconfig/swriter/ui/paradialog \ sw/uiconfig/swriter/ui/previewzoomdialog \ sw/uiconfig/swriter/ui/printoptionspage \ sw/uiconfig/swriter/ui/printeroptions \ diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 1515b78..4f48dad 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -365,7 +365,6 @@ public: SwView rVw, const SfxItemSet rCoreSet, sal_uInt8 nDialogMode, -int nResId, const String *pCollName = 0, sal_Bool bDraw = sal_False, sal_uInt16 nDefPage = 0) = 0; diff --git a/sw/source/ui/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc deleted file mode 100644 index d0f59f9..000 --- a/sw/source/ui/chrdlg/paradlg.hrc +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#define TAB_CONTROL 55 -#define HYPHEN_BOX_AFTER 44 -#define HYPHEN_BOX_BEFORE 22 -#define OK_BTN 50 -#define CANCEL_BTN 51 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src deleted file mode 100644 index 6435a96..000 --- a/sw/source/ui/chrdlg/paradlg.src +++ /dev/null @@ -1,128 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v.
[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/pardlg.cxx | 24 +++-
sw/source/ui/inc/swuipardlg.hxx |2 --
2 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 952bc9feece3ab57014263371dd00d60bf1c75ee
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 09:03:45 2013 +0100
ensure all tabpageids are initialized
Change-Id: I0973daedacf38ed9fbe969063c3f7f17a2fa4758
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 1073d2e..20b4f95 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -50,15 +50,21 @@ SwParaDlg::SwParaDlg(Window *pParent,
sal_uInt8 nDialogMode,
const String *pTitle,
sal_Bool bDraw,
-sal_uInt16 nDefPage):
-SfxTabDialog(pParent,
+sal_uInt16 nDefPage)
+: SfxTabDialog(pParent,
ParagraphPropertiesDialog,
modules/swriter/ui/paradialog.ui,
- rCoreSet, 0 != pTitle),
-rView(rVw),
-nDlgMode(nDialogMode),
-bDrawParaDlg(bDraw)
-
+ rCoreSet, 0 != pTitle)
+, rView(rVw)
+, nDlgMode(nDialogMode)
+, bDrawParaDlg(bDraw)
+, m_nParaStd(0)
+, m_nParaAlign(0)
+, m_nParaExt(0)
+, m_nParaNumPara(0)
+, m_nParaDrpCps(0)
+, m_nParaBckGrnd(0)
+, m_nParaBorder(0)
{
nHtmlMode = ::GetHtmlMode(rVw.GetDocShell());
sal_Bool bHtmlMode = static_cast sal_Bool (nHtmlMode HTMLMODE_ON);
@@ -101,7 +107,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
{
OSL_ENSURE(pFact-GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
GetTabPageCreatorFunc fail!);
OSL_ENSURE(pFact-GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN),
GetTabPageRangesFunc fail!);
-m_nParaAsian = AddTabPage( labelTP_PARA_ASIAN,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
+AddTabPage( labelTP_PARA_ASIAN,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
pFact-GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
}
else
@@ -115,7 +121,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
{
OSL_ENSURE(pFact-GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
GetTabPageCreatorFunc fail!);
OSL_ENSURE(pFact-GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR),
GetTabPageRangesFunc fail!);
-m_nParaTab = AddTabPage( labelTP_TABULATOR,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact-GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
+AddTabPage( labelTP_TABULATOR,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),
pFact-GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
}
// remove unwanted tabs for draw text box paragraph properties
diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/ui/inc/swuipardlg.hxx
index 379863f..75ad561 100644
--- a/sw/source/ui/inc/swuipardlg.hxx
+++ b/sw/source/ui/inc/swuipardlg.hxx
@@ -30,8 +30,6 @@ class SwParaDlg: public SfxTabDialog
sal_uInt16 m_nParaStd;
sal_uInt16 m_nParaAlign;
sal_uInt16 m_nParaExt;
-sal_uInt16 m_nParaAsian;
-sal_uInt16 m_nParaTab;
sal_uInt16 m_nParaNumPara;
sal_uInt16 m_nParaDrpCps;
sal_uInt16 m_nParaBckGrnd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 35a230af3f2e847983174cf65c567e04212791dc
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 12 10:45:14 2013 +0200
prepare to read backsolver's OOo ODFF namespaced function name
Change-Id: Ieff6955c54125483eeac25f87ab334d91e37968f
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6b5a59c..ca10424 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2461,14 +2461,13 @@ bool ScCompiler::IsOpCode( const String rName, bool
bInArray )
OpCode eOp;
};
static const FunctionName aOdffAliases[] = {
-// Renamed old names:
+// Renamed old names, still accept them:
{ B, ocB }, // B - BINOM.DIST.RANGE
{ TDIST, ocTDist }, // TDIST - LEGACY.TDIST
{ EASTERSUNDAY, ocEasterSunday }, // EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
-{ ZGZ,ocZGZ } // ZGZ - RRI
-// Renamed new names:
-// XXX none currently. Example:
-//{ ORG.OPENOFFICE.EASTERSUNDAY, ocEasterSunday }
+{ ZGZ,ocZGZ },// ZGZ - RRI
+// Renamed new names, prepare to read future names:
+{ ORG.OPENOFFICE.GOALSEEK, ocBackSolver } // GOALSEEK -
ORG.OPENOFFICE.GOALSEEK
};
static const size_t nOdffAliases = sizeof(aOdffAliases) /
sizeof(aOdffAliases[0]);
for (size_t i=0; inOdffAliases; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_sdraw.mk
sd/AllLangResTarget_sd.mk|1
sd/UIConfig_sdraw.mk |2
sd/inc/helpids.h |1
sd/source/ui/dlg/paragr.cxx | 99 -
sd/source/ui/dlg/paragr.src | 141
sd/source/ui/func/fuparagr.cxx |2
sd/source/ui/inc/paragr.hrc | 25
sd/source/ui/inc/paragr.hxx |8 +
sd/uiconfig/sdraw/ui/drawparadialog.ui | 176 +++
sd/uiconfig/sdraw/ui/paranumberingtab.ui | 100 +
10 files changed, 334 insertions(+), 221 deletions(-)
New commits:
commit 65adf781e097b658b1b3ba1ee6999b1bbadf6592
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Thu Jul 11 21:52:38 2013 -0300
Convert Draw paragraph dialog to widget .ui
An undocumented feature can be enabled by environment variable
export SD_SHOW_NUMBERING_PAGE=1
so a paragraph numbering tab pages shows up.
Change-Id: I21b0c8f6dffefd09fa783f29d3280c955513ddd6
Reviewed-on: https://gerrit.libreoffice.org/4852
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 6b7b144..473a60d 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/morphdlg.src \
sd/source/ui/dlg/navigatr.src \
sd/source/ui/dlg/PaneDockingWindow.src \
-sd/source/ui/dlg/paragr.src \
sd/source/ui/dlg/prltempl.src \
sd/source/ui/dlg/RemoteDialog.src \
sd/source/ui/dlg/sdpreslt.src \
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 04c4b35..f5a5d1f 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -68,7 +68,9 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
+sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/insertlayer \
+ sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
))
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index bbace93..d0e0b21 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -183,7 +183,6 @@
#define HID_SD_ANNOTATIONS
SD_HID_SD_ANNOTATIONS
#define HID_DLG_INSERT_PAGES_OBJS
SD_HID_DLG_INSERT_PAGES_OBJS
-#define HID_TABPAGE_PARA_NUMBERING
SD_HID_TABPAGE_PARA_NUMBERING
#define HID_VECTORIZE_DLG
SD_HID_VECTORIZE_DLG
#define HID_UNDO_DELETE_WARNING
SD_HID_UNDO_DELETE_WARNING
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index b9ebdf5..b55fcd5 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -41,31 +41,33 @@ public:
~SdParagraphNumTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet rSet );
-static sal_uInt16* GetRanges();
+static sal_uInt16* GetRanges();
-virtual sal_BoolFillItemSet( SfxItemSet rSet );
+virtual sal_BoolFillItemSet( SfxItemSet rSet );
virtual voidReset( const SfxItemSet rSet );
private:
-TriStateBox maNewStartCB;
-TriStateBox maNewStartNumberCB;
-NumericFieldmaNewStartNF;
-boolmbModified;
+TriStateBox* m_pNewStartCB;
+TriStateBox* m_pNewStartNumberCB;
+NumericField*m_pNewStartNF;
+bool mbModified;
DECL_LINK( ImplNewStartHdl, void* );
};
SdParagraphNumTabPage::SdParagraphNumTabPage(Window* pParent, const
SfxItemSet rAttr )
-: SfxTabPage(pParent, SdResId(RID_TABPAGE_PARA_NUMBERING), rAttr)
-, maNewStartCB( this, SdResId( CB_NEW_START ) )
-, maNewStartNumberCB( this, SdResId( CB_NUMBER_NEW_START ) )
-, maNewStartNF( this, SdResId( NF_NEW_START ) )
-, mbModified(false)
+ : SfxTabPage(pParent,
+ DrawParaNumbering,
+ modules/sdraw/ui/paranumberingtab.ui,
+ rAttr),
+mbModified(false)
{
-FreeResource();
+get(m_pNewStartCB,checkbuttonCB_NEW_START);
+get(m_pNewStartNumberCB,checkbuttonCB_NUMBER_NEW_START);
+get(m_pNewStartNF,spinbuttonNF_NEW_START);
-maNewStartCB.SetClickHdl(LINK(this, SdParagraphNumTabPage,
ImplNewStartHdl));
-maNewStartNumberCB.SetClickHdl(LINK(this, SdParagraphNumTabPage,
ImplNewStartHdl));
+m_pNewStartCB-SetClickHdl(LINK(this, SdParagraphNumTabPage,
ImplNewStartHdl));
+m_pNewStartNumberCB-SetClickHdl(LINK(this, SdParagraphNumTabPage,
ImplNewStartHdl));
}
SdParagraphNumTabPage::~SdParagraphNumTabPage()
@@ -90,16
Re: fdo 37341 MAXRECURSION reached in ScFormulaCell::Interpret
Hi, On Thursday, 2013-07-11 23:05:40 -0400, Kohei Yoshida wrote: Actually, I'm just wondering why that code is even in ScInterpreter. The goalseek functionality is not a cell function, and I would expect a code like that to be outside of ScInterpreter. Dating back to prehistoric times it is a cell function, it is just not offered in the UI. Hell, it would even still be saved as GOALSEEK without ODFF namespace prefix, which I just prepared to change with 35a230af3f2e847983174cf65c567e04212791dc But yes, this unnecessarily complicates things. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpj4iJ2ppATD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |4 1 file changed, 4 deletions(-) New commits: commit b6af35b3def2399a8dec491c50f7a946618261d0 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 09:14:58 2013 +0100 remove unused helpids Change-Id: Ia01570619c3b388c1ad0251117d0a86cc3268b35 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 39fae3a..76ed2d9 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3956,7 +3956,6 @@ RID_MATH_TOOLBOX,20050, RID_MN_FORMAT_STYLE,25031, RID_SVX_EXTRUSION_BAR,10986, RID_SVX_FONTWORK_BAR,10987, -RID_TABPAGE_PARA_NUMBERING,20976, RID_UNDO_DELETE_WARNING,20558, SD_IF_SDAPP,200, SD_IF_SDDRAWBEZIEROBJECTBAR,208, @@ -6740,7 +6739,6 @@ sd_MultiLineEdit_DLG_ASS_EDT_PAGE4_ASKINFORMATION,1088490011, sd_MultiLineEdit_DLG_PUBLISHING_PAGE4_MISC,1085852234, sd_NumericField_DLG_VECTORIZE_NM_LAYERS,1084463105, sd_NumericField_FLT_WIN_ANIMATION_NUM_FLD_BITMAP,3231373313, -sd_NumericField_RID_TABPAGE_PARA_NUMBERING_NF_NEW_START,880547843, sd_PushButton_DLG_ASS_BUT_LAST,1088492035, sd_PushButton_DLG_ASS_BUT_NEXT,1088492036, sd_PushButton_DLG_ASS_PB_PAGE1_OPEN,1088492049, @@ -6816,8 +6814,6 @@ sd_TimeField_DLG_ASS_TMF_PAGE3_BREAK,1088495668, sd_TimeField_DLG_ASS_TMF_PAGE3_TIME,1088495666, sd_TimeField_DLG_PUBLISHING_PAGE2_DURATION_TMF,1085857829, sd_TimeField_FLT_WIN_ANIMATION_TIME_FIELD,3231375361, -sd_TriStateBox_RID_TABPAGE_PARA_NUMBERING_CB_NEW_START,880543233, -sd_TriStateBox_RID_TABPAGE_PARA_NUMBERING_CB_NUMBER_NEW_START,880543234, sfx2_CheckBox_DLG_NEW_FILE_BTN_PREVIEW,1107379251, sfx2_CheckBox_DLG_NEW_FILE_CB_FRAME_STYLE,1107379234, sfx2_CheckBox_DLG_NEW_FILE_CB_MERGE_STYLE,1107379237, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 sd/source sd/uiconfig
helpcontent2 |2 +-
sd/source/ui/dlg/paragr.cxx |8
sd/source/ui/func/fuparagr.cxx |1 -
sd/source/ui/inc/paragr.hxx |4
sd/uiconfig/sdraw/ui/paranumberingtab.ui | 16 ++--
5 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 77826a484fc0eaceff4cfeacced0b8792743788c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 09:13:38 2013 +0100
remove unused ids
Change-Id: I6c25699ec598ff6d3191870859eebc83eacc7709
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index b55fcd5..9483210 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -163,19 +163,19 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const
SfxItemSet* pAttr )
SvtCJKOptions aCJKOptions;
if( aCJKOptions.IsAsianTypographyEnabled() )
-m_nParaAsian = AddTabPage( labelTP_PARA_ASIAN,
RID_SVXPAGE_PARA_ASIAN);
+AddTabPage( labelTP_PARA_ASIAN, RID_SVXPAGE_PARA_ASIAN);
else
RemoveTabPage( labelTP_PARA_ASIAN );
-m_nParaAlign = AddTabPage( labelTP_PARA_ALIGN,
RID_SVXPAGE_ALIGN_PARAGRAPH);
+AddTabPage( labelTP_PARA_ALIGN, RID_SVXPAGE_ALIGN_PARAGRAPH);
static const sal_Bool bShowParaNumbering = ( getenv(
SD_SHOW_NUMBERING_PAGE ) != NULL );
if( bShowParaNumbering )
- m_nParaNumPara = AddTabPage( labelNUMBERING,
SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges );
+AddTabPage( labelNUMBERING, SdParagraphNumTabPage::Create,
SdParagraphNumTabPage::GetRanges );
else
RemoveTabPage( labelNUMBERING );
- m_nParaTab = AddTabPage( labelTP_TABULATOR, RID_SVXPAGE_TABULATOR);
+ AddTabPage(labelTP_TABULATOR, RID_SVXPAGE_TABULATOR);
}
void SdParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage rPage )
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 1f33834..e04e832 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -33,7 +33,6 @@
#include ViewShell.hxx
#include drawdoc.hxx
#include sdabstdlg.hxx
-//#include paragr.hrc
#include sdattr.hrc
namespace sd {
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 625d7e0..72d7ec6 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -29,10 +29,6 @@
class SdParagraphDlg : public SfxTabDialog
{
sal_uInt16 m_nParaStd;
-sal_uInt16 m_nParaNumPara;
-sal_uInt16 m_nParaAsian;
-sal_uInt16 m_nParaTab;
-sal_uInt16 m_nParaAlign;
private:
virtual voidPageCreated( sal_uInt16 nId, SfxTabPage rPage );
diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui
b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
index abfb5bc..b7ca96d 100644
--- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui
+++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
@@ -9,8 +9,7 @@
object class=GtkFrame id=DrawParaNumbering
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=margin_left6/property
-property name=margin_top6/property
+property name=border_width6/property
property name=label_xalign0/property
property name=shadow_typenone/property
child
@@ -18,13 +17,11 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=top_padding6/property
-property name=left_padding6/property
+property name=left_padding12/property
child
object class=GtkGrid id=grid1
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=margin_left12/property
-property name=margin_top12/property
property name=row_spacing6/property
property name=column_spacing6/property
child
@@ -41,13 +38,14 @@
packing
property name=left_attach0/property
property name=top_attach0/property
-property name=width1/property
+property name=width2/property
property name=height1/property
/packing
/child
child
object class=GtkSpinButton id=spinbuttonNF_NEW_START
property name=visibleTrue/property
+property name=sensitiveFalse/property
property name=can_focusFalse/property
property name=invisible_charâ¢/property
property name=adjustmentadjustment1/property
@@ -63,10 +61,11 @@
object class=GtkCheckButton
id=checkbuttonCB_NUMBER_NEW_START
property name=label translatable=yesS_tart
with/property
property name=visibleTrue/property
+property name=sensitiveFalse/property
property name=can_focusFalse/property
property
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66524, which changed state. Bug 66524 Summary: LibreOffice 410rc1 start time regression vs. 3.6.6/4.0.4 https://bugs.freedesktop.org/show_bug.cgi?id=66524 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2b.cxx | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 84b18461e5fad248dc9a80f90d1e3296722fda9b
Author: Gergo Mocsi gmocs...@gmail.com
Date: Fri Jul 12 11:18:36 2013 +0200
GSOC work nested reflection fix
Ive fixed the parameter problem: I use the tokens created
by the syntax highlighter (it's struct HighlightPortion),
and put the identiiers to the vector, and reflect them.
Change-Id: I0e4a8bf00fa987a16466f4a5ac03836e5ee7
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index e62bf60..4d15c48 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -524,7 +524,16 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
OUString aLine( pEditEngine-GetText( nLine ) ); // the line being
modified
OUString aStr = aLine.copy( std::max(aLine.lastIndexOf( ),
aLine.lastIndexOf(\t))+1 ); // variable name
OUString sActSub = GetActualSubName( nLine );
-std::vector OUString aVect = Split( aStr, '.' );
+std::vector OUString aVect; //= Split( aStr, '.' );
+
+HighlightPortions aPortions;
+aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
+for ( size_t i = 0; i aPortions.size(); i++ )
+{
+HighlightPortion r = aPortions[i];
+if( r.tokenType == 1 ) // extract the identifers(methods, base
variable)
+aVect.push_back( aLine.copy(r.nBegin, r.nEnd - r.nBegin) );
+}
OUString sBaseName = aVect[0];
for( unsigned int i = 0; i aCodeCompleteCache.size(); ++i)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - 6 commits - connectivity/source
connectivity/source/drivers/firebird/FConnection.cxx | 235 -
connectivity/source/drivers/firebird/FConnection.hxx | 12
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 18
connectivity/source/drivers/firebird/FDatabaseMetaData.hxx |1
4 files changed, 157 insertions(+), 109 deletions(-)
New commits:
commit 699aa1aff95b517d4a749f548526ca62bef912db
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Jul 12 09:45:39 2013 +0100
Remove unnecessary catalog state (unsupported in firebird).
Change-Id: I34a7a245eb87a5b0d626be4008e2584774e82cf3
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx
b/connectivity/source/drivers/firebird/FConnection.cxx
index 89d1967..0735d24 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -71,15 +71,16 @@
using namespace connectivity::firebird;
using namespace connectivity;
-using namespace com::sun::star;
-using namespace com::sun::star::beans;
-using namespace com::sun::star::document;
-using namespace com::sun::star::embed;
-using namespace com::sun::star::frame;
-using namespace com::sun::star::io;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::sdbc;
-using namespace com::sun::star::uno;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::document;
+using namespace ::com::sun::star::embed;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::uno;
const OUString OConnection::sDBLocation( firebird.fdb );
@@ -92,7 +93,6 @@ OConnection::OConnection(FirebirdDriver*_pDriver)
m_sUser(),
m_pDriver(_pDriver),
m_bClosed(sal_False),
- m_bUseCatalog(sal_False),
m_bUseOldDateFormat(sal_False),
m_bAutoCommit(sal_True),
m_bReadOnly(sal_False),
@@ -493,7 +493,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly()
throw(SQLException, RuntimeException
void SAL_CALL OConnection::setCatalog(const OUString catalog)
throw(SQLException,
RuntimeException)
{
-// Unsupported
+::dbtools::throwFeatureNotImplementedException( XConnection::setCatalog,
*this );
(void) catalog;
}
@@ -519,23 +519,21 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation(
) throw(SQLException,
return m_aTransactionIsolation;
}
-//
-Reference ::com::sun::star::container::XNameAccess SAL_CALL
OConnection::getTypeMap( ) throw(SQLException, RuntimeException)
-{
-::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(OConnection_BASE::rBHelper.bDisposed);
-
-// if your driver has special database types you can return it here
-return NULL;
+Reference XNameAccess SAL_CALL OConnection::getTypeMap()
throw(SQLException, RuntimeException)
+{
+::dbtools::throwFeatureNotImplementedException( XConnection::getTypeMap,
*this );
+return 0;
}
-//
-void SAL_CALL OConnection::setTypeMap( const Reference
::com::sun::star::container::XNameAccess typeMap ) throw(SQLException,
RuntimeException)
+
+void SAL_CALL OConnection::setTypeMap(const Reference XNameAccess typeMap)
+throw(SQLException,
RuntimeException)
{
-// the other way around
+::dbtools::throwFeatureNotImplementedException( XConnection::setTypeMap,
*this );
+(void) typeMap;
}
-//
-// XCloseable
+
+//- XCloseable ---
void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException)
{
SAL_INFO(connectivity.firebird, = OConnection::close().);
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx
b/connectivity/source/drivers/firebird/FConnection.hxx
index 0ca035c..e91aef6 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -106,7 +106,6 @@ namespace connectivity
// driver
object
sal_Boolm_bClosed;
-sal_Boolm_bUseCatalog; // should
we use the catalog on filebased databases
sal_Boolm_bUseOldDateFormat;
sal_Boolm_bAutoCommit;
sal_Bool
[Libreoffice-commits] core.git: sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/source/ui/frmdlg/frmpage.cxx | 267 +++
sw/source/ui/frmdlg/frmpage.hrc | 16 -
sw/source/ui/frmdlg/frmpage.src | 158 -
sw/source/ui/inc/frmpage.hxx | 41 +--
sw/uiconfig/swriter/ui/frmaddpage.ui | 403 +++
6 files changed, 556 insertions(+), 330 deletions(-)
New commits:
commit 78f5ef0a36f1484b533197136279821497bc4151
Author: Csikós Tamás csks.t...@gmail.com
Date: Thu Jul 11 18:56:17 2013 +0200
modern .ui widgetlayout for frmpage/frmaddpage
Change-Id: Idbc62b17551398b80711c5a4a4a6c8346580e73e
Reviewed-on: https://gerrit.libreoffice.org/4843
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index c4a09e5..7096808 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footendnotedialog \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
+ sw/uiconfig/swriter/ui/frmaddpage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 274998f..47e98bc 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2741,29 +2741,7 @@ static void lcl_Move(Window rWin, sal_Int32 nDiff)
}
SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet rSet ) :
-SfxTabPage(pParent, SW_RES(TP_FRM_ADD), rSet),
-
-aNamesFL (this, SW_RES(FL_NAME)),
-aNameFT(this, SW_RES(FT_NAME)),
-aNameED(this, SW_RES(ED_NAME)),
-aAltNameFT (this, SW_RES(FT_ALT_NAME)),
-aAltNameED (this, SW_RES(ED_ALT_NAME)),
-aPrevFT(this, SW_RES(FT_PREV)),
-aPrevLB(this, SW_RES(LB_PREV)),
-aNextFT(this, SW_RES(FT_NEXT)),
-aNextLB(this, SW_RES(LB_NEXT)),
-
-aProtectFL (this, SW_RES(FL_PROTECT)),
-aProtectContentCB (this, SW_RES(CB_PROTECT_CONTENT)),
-aProtectFrameCB(this, SW_RES(CB_PROTECT_FRAME)),
-aProtectSizeCB (this, SW_RES(CB_PROTECT_SIZE)),
-aExtFL (this, SW_RES(FL_EXT)),
-
-aEditInReadonlyCB (this, SW_RES(CB_EDIT_IN_READONLY)),
-aPrintFrameCB (this, SW_RES(CB_PRINT_FRAME)),
-aTextFlowFT(this, SW_RES(FT_TEXTFLOW)),
-aTextFlowLB(this, SW_RES(LB_TEXTFLOW)),
-
+SfxTabPage(pParent, FrmAddPage , modules/swriter/ui/frmaddpage.ui,
rSet),
pWrtSh(0),
nDlgType(0),
@@ -2771,7 +2749,26 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const
SfxItemSet rSet ) :
bFormat(sal_False),
bNew(sal_False)
{
-FreeResource();
+get(pNamesFT,);
+get(pNameFT,name_label);
+get(pNameED,name);
+get(pAltNameFT,altname_label);
+get(pAltNameED,altname);
+get(pPrevFT,prev_label);
+get(pPrevLB,prev);
+get(pNextFT,next_label);
+get(pNextLB,next);
+get(pProtectFT,label1);
+
+get(pProtectContentCB,protectcontent);
+get(pProtectFrameCB,protectframe);
+get(pProtectSizeCB,protectsize);
+get(pExtFT,label2);
+
+get(pEditInReadonlyCB,editinreadonly);
+get(pPrintFrameCB,printframe);
+get(pTextFlowFT,textflow_label);
+get(pTextFlowLB,textflow);
}
@@ -2791,24 +2788,24 @@ void SwFrmAddPage::Reset(const SfxItemSet rSet )
bHtmlMode = nHtmlMode HTMLMODE_ON ? sal_True : sal_False;
if(bHtmlMode)
{
-aProtectContentCB .Hide();
-aProtectFrameCB .Hide();
-aProtectSizeCB.Hide();
-aEditInReadonlyCB .Hide();
-aPrintFrameCB .Hide();
-aExtFL.Hide();
-aProtectFL.Hide();
+pProtectContentCB-Hide();
+pProtectFrameCB-Hide();
+pProtectSizeCB-Hide();
+pEditInReadonlyCB-Hide();
+pPrintFrameCB-Hide();
+pExtFT-Hide();
+pProtectFT-Hide();
}
if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType )
{
-aEditInReadonlyCB.Hide();
-aPrintFrameCB.SetPosPixel(aEditInReadonlyCB.GetPosPixel());
+pEditInReadonlyCB-Hide();
+pPrintFrameCB-SetPosPixel(pEditInReadonlyCB-GetPosPixel());
}
if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, sal_False,
pItem))
{
-aAltNameED.SetText(((const SfxStringItem*)pItem)-GetValue());
-aAltNameED.SaveValue();
+pAltNameED-SetText(((const SfxStringItem*)pItem)-GetValue());
+pAltNameED-SaveValue();
}
if(!bFormat)
@@ -2837,50 +2834,50 @@ void SwFrmAddPage::Reset(const SfxItemSet rSet )
break;
}
-aNameED.SetText( aTmpName1 );
-
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/helpid.h |1
sw/source/ui/frmdlg/frmpage.cxx | 81 +++
sw/source/ui/inc/frmpage.hxx | 53 +++---
sw/uiconfig/swriter/ui/frmaddpage.ui | 77 -
4 files changed, 90 insertions(+), 122 deletions(-)
New commits:
commit 1163b54c2973e3e67d1259ad10b2ff81be74055b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 10:36:52 2013 +0100
add back text flow options and some other reorgs
Change-Id: I7139779728907b20d577bf465090674238f80649
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index bc85c42..062ae99 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -153,7 +153,6 @@
#define HID_ENV_FMT
SW_HID_ENV_FMT
#define HID_FRM_URL
SW_HID_FRM_URL
#define HID_COND_COLL
SW_HID_COND_COLL
-#define HID_FRM_ADD
SW_HID_FRM_ADD
#define HID_FLD_DB SW_HID_FLD_DB
#define HID_FLD_DOKINF
SW_HID_FLD_DOKINF
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 47e98bc..210293f 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2733,13 +2733,6 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl)
return 0;
}
-static void lcl_Move(Window rWin, sal_Int32 nDiff)
-{
-Point aPos(rWin.GetPosPixel());
-aPos.Y() -= nDiff;
-rWin.SetPosPixel(aPos);
-}
-
SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet rSet ) :
SfxTabPage(pParent, FrmAddPage , modules/swriter/ui/frmaddpage.ui,
rSet),
pWrtSh(0),
@@ -2749,7 +2742,7 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const
SfxItemSet rSet ) :
bFormat(sal_False),
bNew(sal_False)
{
-get(pNamesFT,);
+get(pNameFrame, nameframe);
get(pNameFT,name_label);
get(pNameED,name);
get(pAltNameFT,altname_label);
@@ -2758,12 +2751,11 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const
SfxItemSet rSet ) :
get(pPrevLB,prev);
get(pNextFT,next_label);
get(pNextLB,next);
-get(pProtectFT,label1);
+get(pProtectFrame,protect);
get(pProtectContentCB,protectcontent);
get(pProtectFrameCB,protectframe);
get(pProtectSizeCB,protectsize);
-get(pExtFT,label2);
get(pEditInReadonlyCB,editinreadonly);
get(pPrintFrameCB,printframe);
@@ -2786,20 +2778,15 @@ void SwFrmAddPage::Reset(const SfxItemSet rSet )
const SfxPoolItem* pItem;
sal_uInt16 nHtmlMode = ::GetHtmlMode((const
SwDocShell*)SfxObjectShell::Current());
bHtmlMode = nHtmlMode HTMLMODE_ON ? sal_True : sal_False;
-if(bHtmlMode)
+if (bHtmlMode)
{
-pProtectContentCB-Hide();
-pProtectFrameCB-Hide();
-pProtectSizeCB-Hide();
+pProtectFrame-Hide();
pEditInReadonlyCB-Hide();
pPrintFrameCB-Hide();
-pExtFT-Hide();
-pProtectFT-Hide();
}
if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType )
{
pEditInReadonlyCB-Hide();
-pPrintFrameCB-SetPosPixel(pEditInReadonlyCB-GetPosPixel());
}
if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, sal_False,
pItem))
@@ -2843,37 +2830,11 @@ void SwFrmAddPage::Reset(const SfxItemSet rSet )
pAltNameED-Enable(sal_False);
pNameFT-Enable( sal_False );
pAltNameFT-Enable(sal_False);
-pNamesFT-Enable(sal_False);
}
if(nDlgType == DLG_FRM_STD pAltNameFT-IsVisible())
{
pAltNameFT-Hide();
pAltNameED-Hide();
-//move all controls one step up
-/*Window* aWindows[] =
-{
-pPrevFT,
-pPrevLB,
-pNextFT,
-pNextLB,
-pNamesFT,
-pProtectContentCB,
-pProtectFrameCB,
-pProtectSizeCB,
-pProtectFT,
-pEditInReadonlyCB,
-pPrintFrameCB,
-pTextFlowFT,
-pTextFlowLB,
-pExtFT,
-0
-};
-sal_Int32 nOffset = pAltNameED-GetPosPixel().Y() -
pNameED-GetPosPixel().Y();
-sal_Int32 nIdx = 0;
-while(aWindows[nIdx])
-{
-lcl_Move(*aWindows[nIdx++], nOffset);
-}*/
}
else
{
@@ -3054,38 +3015,12 @@ IMPL_LINK_NOARG(SwFrmAddPage, EditModifyHdl)
return 0;
}
-voidSwFrmAddPage::SetFormatUsed(sal_Bool bFmt)
+void SwFrmAddPage::SetFormatUsed(sal_Bool bFmt)
{
-bFormat = bFmt;
-if(bFormat)
+bFormat = bFmt;
+if (bFormat)
{
-pNameFT-Show(sal_False);
-pNameED-Show(sal_False);
-pAltNameFT-Show(sal_False);
-pAltNameED-Show(sal_False);
-pPrevFT-Show(sal_False);
-pPrevLB-Show(sal_False);
-pNextFT-Show(sal_False);
-
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst| 11 source/text/swriter/01/05060900.xhp | 46 +--- 2 files changed, 22 insertions(+), 35 deletions(-) New commits: commit de54c17248708f728177be7a3421da1dc0e97504 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 10:44:42 2013 +0100 update help ids for frame options page .ui conversion Change-Id: I2a314f2502addfd6f995aa8118ce898d7c8718ad diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 76ed2d9..e7cf9f8 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1803,7 +1803,6 @@ HID_FORMULA_LB_FUNCTION,64866, HID_FORM_NAVIGATOR,38068, HID_FORM_NAVIGATOR_WIN,38069, HID_FRAME_TOOLBOX,54829, -HID_FRM_ADD,53195, HID_FRM_EXT,53169, HID_FRM_STD,53170, HID_FRM_URL,53189, @@ -7767,11 +7766,6 @@ sw_CheckBox_TP_FLD_DOKINF_CB_DOKINFFIXEDCONTENT,878724117, sw_CheckBox_TP_FLD_DOK_CB_DOKFIXEDCONTENT,878756922, sw_CheckBox_TP_FLD_VAR_CB_VARINVISIBLE,878740520, sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196, -sw_CheckBox_TP_FRM_ADD_CB_EDIT_IN_READONLY,878494843, -sw_CheckBox_TP_FRM_ADD_CB_PRINT_FRAME,878494844, -sw_CheckBox_TP_FRM_ADD_CB_PROTECT_CONTENT,878494839, -sw_CheckBox_TP_FRM_ADD_CB_PROTECT_FRAME,878494840, -sw_CheckBox_TP_FRM_ADD_CB_PROTECT_SIZE,878494841, sw_CheckBox_TP_FRM_STD_CB_AUTOHEIGHT,878167071, sw_CheckBox_TP_FRM_STD_CB_AUTOWIDTH,878167086, sw_CheckBox_TP_FRM_STD_CB_FIXEDRATIO,878167142, @@ -7898,8 +7892,6 @@ sw_Edit_TP_FLD_VAR_ED_VARNAME,878741535, sw_Edit_TP_FLD_VAR_ED_VARSEPARATOR,878741546, sw_Edit_TP_FLD_VAR_ED_VARVALUE,878741537, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, -sw_Edit_TP_FRM_ADD_ED_ALT_NAME,878495857, -sw_Edit_TP_FRM_ADD_ED_NAME,878495855, sw_Edit_TP_FRM_URL_ED_NAME,878348399, sw_Edit_TP_FRM_URL_ED_URL,878348347, sw_Edit_TP_GRF_EXT_ED_CONNECT,878233654, @@ -8024,9 +8016,6 @@ sw_ListBox_TP_FLD_VAR_LB_VARTYPE,878743067, sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631, sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629, sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796, -sw_ListBox_TP_FRM_ADD_LB_NEXT,878497397, -sw_ListBox_TP_FRM_ADD_LB_PREV,878497395, -sw_ListBox_TP_FRM_ADD_LB_TEXTFLOW,878497408, sw_ListBox_TP_FRM_STD_DLB_HORIZONTAL,878169634, sw_ListBox_TP_FRM_STD_DLB_VERTICAL,878169639, sw_ListBox_TP_FRM_STD_LB_HORI_RELATION,878169602, diff --git a/source/text/swriter/01/05060900.xhp b/source/text/swriter/01/05060900.xhp index 15d8dbb..28ccba4 100644 --- a/source/text/swriter/01/05060900.xhp +++ b/source/text/swriter/01/05060900.xhp @@ -31,54 +31,52 @@ /meta body section id=zusaetze -bookmark xml-lang=en-US branch=hid/SW_HID_FRM_ADD id=bm_id3150016 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmaddpage/FrmAddPage id=bm_id3150016 localize=false/ paragraph role=heading id=hd_id3149879 xml-lang=en-US level=1 l10n=U oldref=1link href=text/swriter/01/05060900.xhp name=OptionsOptions/link/paragraph -paragraph role=paragraph id=par_id3149708 xml-lang=en-US l10n=U oldref=2ahelp hid=HID_FRM_ADDSpecifies properties for the selected object, graphic or frame./ahelp/paragraph +paragraph role=paragraph id=par_id3149708 xml-lang=en-US l10n=U oldref=2ahelp hid=modules/swriter/ui/frmaddpage/FrmAddPageSpecifies properties for the selected object, graphic or frame./ahelp/paragraph /section section id=howtoget embed href=text/swriter/00/0405.xhp#grazusaetze/ /section paragraph role=heading id=hd_id3151183 xml-lang=en-US level=2 l10n=U oldref=3Name/paragraph paragraph role=paragraph id=par_id3147568 xml-lang=en-US l10n=U oldref=4Specifies the name of the selected item, and associated links./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_FRM_ADD:ED_NAME id=bm_id3145419 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmaddpage/name id=bm_id3145419 localize=false/ paragraph role=heading id=hd_id3151178 xml-lang=en-US level=3 l10n=U oldref=5Name/paragraph -paragraph role=paragraph id=par_id3147510 xml-lang=en-US l10n=U oldref=6ahelp hid=SW:EDIT:TP_FRM_ADD:ED_NAMEEnter a name for the selected item./ahelp/paragraph +paragraph role=paragraph id=par_id3147510 xml-lang=en-US l10n=U oldref=6ahelp hid=modules/swriter/ui/frmaddpage/nameEnter a name for the selected item./ahelp/paragraph paragraph role=tip id=par_id3154565 xml-lang=en-US l10n=U oldref=7Assign an object, graphic or frame a meaningful name, so that you can quickly locate it afterwards in long documents./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_FRM_ADD:ED_ALT_NAME id=bm_id3150352 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmaddpage/altname id=bm_id3150352 localize=false/ paragraph role=heading id=hd_id3153674 xml-lang=en-US level=3 l10n=U oldref=15Alternative text (floating frames, graphics, and objects only)/paragraph -paragraph role=paragraph id=par_id3150977 xml-lang=en-US l10n=U oldref=21ahelp hid=SW:EDIT:TP_FRM_ADD:ED_ALT_NAMEEnter
[Libreoffice-commits] core.git: sfx2/uiconfig starmath/uiconfig svx/uiconfig sw/uiconfig
sfx2/uiconfig/ui/querysavedialog.ui|1 + starmath/uiconfig/smath/ui/savedefaultsdialog.ui |1 + svx/uiconfig/ui/deletefooterdialog.ui |1 + svx/uiconfig/ui/deleteheaderdialog.ui |1 + sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui|1 + sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui |1 + sw/uiconfig/swriter/ui/queryshowchangesdialog.ui |1 + sw/uiconfig/swriter/ui/saveashtmldialog.ui |1 + 8 files changed, 8 insertions(+) New commits: commit 164c83d0fd06db0d6b4f2458517405ef74a09010 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 10:58:14 2013 +0100 Resolves: fdo#66675 set alerts to non resizable GNOME HIG states that Alert windows are not resizable so consistent with that. Change-Id: I44240f2202fafca2e6a0502e09f22683bbea4c50 diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui index ab3dd3e..64ca5f3 100644 --- a/sfx2/uiconfig/ui/querysavedialog.ui +++ b/sfx2/uiconfig/ui/querysavedialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesSave document?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typewarning/property diff --git a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui index 6c05c7e..da6040d 100644 --- a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui +++ b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesSave defaults?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typequestion/property diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui index 98fb3d5..78fa1d6 100644 --- a/svx/uiconfig/ui/deletefooterdialog.ui +++ b/svx/uiconfig/ui/deletefooterdialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesDelete footer?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typewarning/property diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui index 2fb39b4..bd471d9 100644 --- a/svx/uiconfig/ui/deleteheaderdialog.ui +++ b/svx/uiconfig/ui/deleteheaderdialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesDelete header?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typewarning/property diff --git a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui index 20e19961..67b6b0e 100644 --- a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui +++ b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesCannot add label/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typeerror/property diff --git a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui index a503b6e..c51e46a 100644 --- a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui +++ b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesCreate a new data source?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property property name=message_typequestion/property diff --git a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui index e43ea0d..b7fcd3d 100644 --- a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui +++ b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui @@ -5,6 +5,7 @@ property name=can_focusFalse/property property name=border_width12/property property name=title translatable=yesShow changes?/property +property name=resizableFalse/property property name=type_hintdialog/property property name=skip_taskbar_hintTrue/property
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/button.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9f7eab01a65c39b07afb1fba8819593694a3fef3 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 11:22:39 2013 +0100 Related: fdo#66817 pressing space on a DisclosureButton should toggle it Change-Id: Ib0f03e4389a35f1eb66c3c5951e89a9f70ec7145 diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 515db35..74542e6 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -4172,7 +4172,7 @@ void DisclosureButton::KeyInput( const KeyEvent rKEvt ) Check( aKeyCode.GetCode() == KEY_ADD ); } else -Button::KeyInput( rKEvt ); +CheckBox::KeyInput( rKEvt ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - xmloff/source xmlscript/Library_xmlscript.mk xmlscript/source
xmloff/source/meta/xmlmetae.cxx| 10 +---
xmloff/source/style/xmlnumfe.cxx |7 -
xmlscript/Library_xmlscript.mk |1
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx| 26 -
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 12 ++---
5 files changed, 31 insertions(+), 25 deletions(-)
New commits:
commit 6c88ebe9aaf32b5c7c6e22270ee90091c019f567
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 12 12:29:45 2013 +0200
write bcp47 format-locale if necessary and read both
Change-Id: I82cfdd8652d1c86b701ccb0b913928c860a360d2
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index fa680d1..640b561 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,xmlscript,\
cppuhelper \
sal \
tl \
+ i18nlangtag \
$(gb_UWINAPI) \
))
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 05c724a..8f7c284 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -58,6 +58,7 @@
#include com/sun/star/document/GraphicObjectResolver.hpp
#include comphelper/processfactory.hxx
+#include i18nlangtag/languagetag.hxx
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -485,19 +486,22 @@ void ElementDescriptor::addNumberFormatAttr(
addAttribute(XMLNS_DIALOGS_PREFIX :format-code, sFormat );
// format-locale
-OUStringBuffer buf( 48 );
-buf.append( locale.Language );
-if (!locale.Country.isEmpty())
+LanguageTag aLanguageTag( locale);
+OUString aStr;
+if (aLanguageTag.isIsoLocale())
{
-buf.append( (sal_Unicode)';' );
-buf.append( locale.Country );
-if (!locale.Variant.isEmpty())
-{
-buf.append( (sal_Unicode)';' );
-buf.append( locale.Variant );
-}
+// Old style lll;CC for compatibility, I really don't know what may
+// consume this.
+if (aLanguageTag.getCountry().isEmpty())
+aStr = aLanguageTag.getLanguage();
+else
+aStr = aLanguageTag.getLanguage() + ; +
aLanguageTag.getCountry();
+}
+else
+{
+aStr = aLanguageTag.getBcp47( false);
}
-addAttribute( XMLNS_DIALOGS_PREFIX :format-locale,
buf.makeStringAndClear() );
+addAttribute( XMLNS_DIALOGS_PREFIX :format-locale, aStr );
}
//__
Any ElementDescriptor::readProp( OUString const rPropName )
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index bc8193a..d690206 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -31,6 +31,7 @@
#include com/sun/star/script/vba/XVBACompatibility.hpp
#include comphelper/processfactory.hxx
+#include i18nlangtag/languagetag.hxx
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -539,21 +540,24 @@ void FormattedFieldElement::endElement()
if (!sLocale.isEmpty())
{
// split locale
+// Don't know what may have written what we read here, so parse all
+// old style including the trailing ;Variant if present.
sal_Int32 semi0 = sLocale.indexOf( ';' );
-if (semi0 0) // no semi at all, just try language
+if (semi0 0) // no semi at all, try new BCP47 or just language
{
-locale.Language = sLocale;
+locale = LanguageTag( sLocale).getLocale( false);
}
else
{
sal_Int32 semi1 = sLocale.indexOf( ';', semi0 +1 );
if (semi1 semi0) // language;country;variant
{
+SAL_WARN( xmlscript.xmldlg, format-locale with variant
that is ignored: sLocale);
locale.Language = sLocale.copy( 0, semi0 );
locale.Country = sLocale.copy( semi0 +1, semi1 - semi0 -1
);
-locale.Variant = sLocale.copy( semi1 +1 );
+// Ignore Variant that no one knows what it would be.
}
-else // try language;country
+else // language;country
{
locale.Language = sLocale.copy( 0, semi0 );
locale.Country = sLocale.copy( semi0 +1 );
commit 76d36d5bba2712c1c98548e73ca9fb82e11b0cca
Author: Eike Rathke er...@redhat.com
Date: Fri Jul 12 11:29:43 2013 +0200
write ISO codes for native number transliteration
Change-Id: Idc3bf2aabb7df4e57deb13251a1f6631c579268c
diff --git a/xmloff/source/style/xmlnumfe.cxx
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/layout.hxx |1 +
vcl/source/window/layout.cxx | 19 +++
2 files changed, 20 insertions(+)
New commits:
commit 479bba2cdcda8dbd86861ea62c8c25bfef633148
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 11:40:27 2013 +0100
Related: fdo#66817 ensure VclExpander label is mnemonic for disclosure
button
Change-Id: I11c9a35e3d50a827127e4542a40f6f29580d4e8b
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index ede844e..f72b93a 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -516,6 +516,7 @@ public:
virtual Window *get_child();
virtual const Window *get_child() const;
virtual bool set_property(const OString rKey, const OString rValue);
+virtual void StateChanged(StateChangedType nType);
protected:
virtual Size calculateRequisition() const;
virtual void setAllocation(const Size rAllocation);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 2f1d404..1794671 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1468,6 +1468,25 @@ bool VclExpander::set_property(const OString rKey,
const OString rValue)
return true;
}
+void VclExpander::StateChanged(StateChangedType nType)
+{
+VclBin::StateChanged( nType );
+
+if (nType == STATE_CHANGE_INITSHOW)
+{
+//The label widget is the last (of two) children
+Window *pChild = get_child();
+WindowImpl* pWindowImpl = ImplGetWindowImpl();
+Window *pLabel = pChild != pWindowImpl-mpLastChild ?
pWindowImpl-mpLastChild : NULL;
+if (pLabel pLabel-GetType() == WINDOW_FIXEDTEXT)
+{
+FixedText *pLabelWidget = static_castFixedText*(pLabel);
+if (!pLabelWidget-get_mnemonic_widget())
+pLabelWidget-set_mnemonic_widget(m_aDisclosureButton);
+}
+}
+}
+
IMPL_LINK( VclExpander, ClickHdl, DisclosureButton*, pBtn )
{
Window *pChild = get_child();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - de/97eb1fa4eb67d8b0490249f433a26fa5bd8e6a
de/97eb1fa4eb67d8b0490249f433a26fa5bd8e6a |1 + 1 file changed, 1 insertion(+) New commits: commit d91f5b3ebdd44ae475fd64301625f0989154a17d Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 11:42:02 2013 +0100 Notes added by 'git notes add' diff --git a/de/97eb1fa4eb67d8b0490249f433a26fa5bd8e6a b/de/97eb1fa4eb67d8b0490249f433a26fa5bd8e6a new file mode 100644 index 000..31b5a11 --- /dev/null +++ b/de/97eb1fa4eb67d8b0490249f433a26fa5bd8e6a @@ -0,0 +1 @@ +prefer: 980fe99410477f6a4bd0dc935c9e63fa0aad2b0e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/c7f72febe9d294304f70cc7b9cdeab1c67dc8b
9d/c7f72febe9d294304f70cc7b9cdeab1c67dc8b |1 + 1 file changed, 1 insertion(+) New commits: commit cec5c9acf058a13e072e5a637de7bfba5566e0aa Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 11:43:58 2013 +0100 Notes added by 'git notes add' diff --git a/9d/c7f72febe9d294304f70cc7b9cdeab1c67dc8b b/9d/c7f72febe9d294304f70cc7b9cdeab1c67dc8b new file mode 100644 index 000..f21d7f1 --- /dev/null +++ b/9d/c7f72febe9d294304f70cc7b9cdeab1c67dc8b @@ -0,0 +1 @@ +merged as: 3c57a9b8a41b0b1244e649f0766f45d54012f395 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source
scripting/source/pyprov/pythonscript.py | 24 1 file changed, 16 insertions(+), 8 deletions(-) New commits: commit 3c57a9b8a41b0b1244e649f0766f45d54012f395 Author: Herbert Dürr h...@apache.org Date: Fri Jul 12 08:56:00 2013 + Resolves: #i120083# make python loglevel and log output changeable... through environment vars Set the log level with the environment variable PYSCRIPT_LOG_LEVEL DEBUG (for debugging) ERROR (show errors only) NONE (or anything else) (for production) is the default and the log output type with the enviroment variable PYSCRIPT_LOG_STDOUT 0 (log output to user/Scripts/python/log.txt) 1 (or anything else) (log output to stdout) Patch by: Tsutomu Uchino hanya.r...@gmail.com Review by: Herbert Durr h...@apache.org Note: Commit message edited by ASF infra team to work around a known issue with the ASF svn install (not an issue with svn) and UTF-8 handling. This is a temporary issue that we hope to resolve soon. (cherry picked from commit 9dc7f72febe9d294304f70cc7b9cdeab1c67dc8b) Change-Id: I099c8b3f812559c380078f63b692c83fdc811e33 diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index 789b6a6..d2e90ba 100755 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -31,16 +31,24 @@ except NameError: unicode = str class LogLevel: -NONE = 0 -ERROR = 1 -DEBUG = 2 +NONE = 0 # production level +ERROR = 1 # for script developers +DEBUG = 2 # for script framework developers + +PYSCRIPT_LOG_ENV = PYSCRIPT_LOG_LEVEL +PYSCRIPT_LOG_STDOUT_ENV = PYSCRIPT_LOG_STDOUT # Configuration -LogLevel.use = LogLevel.NONE# production level -#LogLevel.use = LogLevel.ERROR # for script developers -#LogLevel.use = LogLevel.DEBUG # for script framework developers -LOG_STDOUT = True # True, writes to stdout (difficult on windows) -# False, writes to user/Scripts/python/log.txt +LogLevel.use = LogLevel.NONE +if os.environ.get(PYSCRIPT_LOG_ENV) == ERROR: +LogLevel.use = LogLevel.ERROR +elif os.environ.get(PYSCRIPT_LOG_ENV) == DEBUG: +LogLevel.use = LogLevel.DEBUG + +# True, writes to stdout (difficult on windows) +# False, writes to user/Scripts/python/log.txt +LOG_STDOUT = os.environ.get(PYSCRIPT_LOG_STDOUT_ENV, 1) != 0 + ENABLE_EDIT_DIALOG=False# offers a minimal editor for editing. #--- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |6 +-
pyuno/source/module/pyuno_callable.cxx |6 --
pyuno/source/module/pyuno_impl.hxx |2 --
3 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 28a4496c76acdab6cb851387e78366bb611f130f
Author: Herbert Dürr h...@apache.org
Date: Fri Jul 12 09:10:27 2013 +
Resolves: #i120788# remove unused members from PyUNO_callable_Internals
Patch by: Tsutomu Uchino hanya.r...@gmail.com
(cherry picked from commit 5e2c3fd88906494965979bd20ca852391bee3bac)
Conflicts:
pyuno/source/module/pyuno_impl.hxx
Change-Id: If73d5f7b799f04b79b5cc71d2d44c797851b18d0
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 4c6191d..58579eb 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -342,8 +342,6 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name
, PyObject *args )
callable = PyUNO_callable_new (
me-members-xInvocation,
attrName,
-runtime.getImpl()-cargo-xInvocation,
-runtime.getImpl()-cargo-xTypeConverter,
ACCEPT_UNO_ANY);
paras = args;
}
@@ -486,9 +484,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
//Create a callable object to invoke this...
PyRef ret = PyUNO_callable_new (
me-members-xInvocation,
-attrName,
-runtime.getImpl()-cargo-xInvocation,
-runtime.getImpl()-cargo-xTypeConverter);
+attrName);
Py_XINCREF( ret.get() );
return ret.get();
diff --git a/pyuno/source/module/pyuno_callable.cxx
b/pyuno/source/module/pyuno_callable.cxx
index 4175c80..24cae2c 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -38,8 +38,6 @@ namespace pyuno
typedef struct
{
ReferenceXInvocation2 xInvocation;
-ReferenceXSingleServiceFactory xInvocationFactory;
-ReferenceXTypeConverter xTypeConverter;
OUString methodName;
ConversionMode mode;
} PyUNO_callable_Internals;
@@ -240,8 +238,6 @@ static PyTypeObject PyUNO_callable_Type =
PyRef PyUNO_callable_new (
const ReferenceXInvocation2 my_inv,
const OUString methodName,
-const ReferenceXSingleServiceFactory xInvocationFactory,
-const ReferenceXTypeConverter tc,
enum ConversionMode mode )
{
PyUNO_callable* self;
@@ -255,8 +251,6 @@ PyRef PyUNO_callable_new (
self-members = new PyUNO_callable_Internals;
self-members-xInvocation = my_inv;
self-members-methodName = methodName;
-self-members-xInvocationFactory = xInvocationFactory;
-self-members-xTypeConverter = tc;
self-members-mode = mode;
return PyRef( (PyObject*)self, SAL_NO_ACQUIRE );
diff --git a/pyuno/source/module/pyuno_impl.hxx
b/pyuno/source/module/pyuno_impl.hxx
index 9524523..b114b3c 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -227,8 +227,6 @@ com::sun::star::uno::TypeClass StringToTypeClass (char*
string);
PyRef PyUNO_callable_new (
const com::sun::star::uno::Referencecom::sun::star::script::XInvocation2
xInv,
const OUString methodName,
-const
com::sun::star::uno::Referencecom::sun::star::lang::XSingleServiceFactory
ssf,
-const
com::sun::star::uno::Referencecom::sun::star::script::XTypeConverter tc,
ConversionMode mode = REJECT_UNO_ANY );
PyObject* PyUNO_Type_new (const char *typeName ,
com::sun::star::uno::TypeClass t , const Runtime r );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/2c3fd88906494965979bd20ca852391bee3bac
5e/2c3fd88906494965979bd20ca852391bee3bac |1 + 1 file changed, 1 insertion(+) New commits: commit 52fdefc759f7474095e0f0e916170ac2e9ca Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 11:45:41 2013 +0100 Notes added by 'git notes add' diff --git a/5e/2c3fd88906494965979bd20ca852391bee3bac b/5e/2c3fd88906494965979bd20ca852391bee3bac new file mode 100644 index 000..aa6f863 --- /dev/null +++ b/5e/2c3fd88906494965979bd20ca852391bee3bac @@ -0,0 +1 @@ +merged as: 28a4496c76acdab6cb851387e78366bb611f130f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source
sc/inc/datauno.hxx|1
sc/inc/dpresfilter.hxx|4 +-
sc/inc/dptabres.hxx |2 +
sc/inc/dputil.hxx | 11 +--
sc/source/core/data/dpobject.cxx | 10 +-
sc/source/core/data/dptabres.cxx | 45
sc/source/core/data/dptabsrc.cxx |2 -
sc/source/core/data/dputil.cxx| 59 +-
sc/source/filter/xml/xmldrani.cxx |4 +-
sc/source/ui/unoobj/cellsuno.cxx | 55 +--
sc/source/ui/unoobj/datauno.cxx | 37 ++-
11 files changed, 114 insertions(+), 116 deletions(-)
New commits:
commit b4f35c69bfe56c1de0507e151dd8895563983723
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jul 11 22:00:54 2013 -0400
fdo#66655: Get GETPIVOTDATA to work again.
1) Compare data field name as it is displayed in the table output.
2) In the result tree, store field member names as strings as displayed
in the table output, instead of as ScDPItemData.
GETPIVOTDATA operates on displayed cell values and do textural comparison.
There is no use storing ScDPItemData which screws up value lookup in
the result tree.
Change-Id: I31bc03a6800f4fadf2ba1180d1958354d43e8a07
Reviewed-on: https://gerrit.libreoffice.org/4853
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 2acde18..a2562c2 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -68,7 +68,6 @@ typedef boost::ptr_vectorXDBRefreshListenerRef
XDBRefreshListenerArr_Impl;
class ScDataUnoConversion
{
public:
-static ScSubTotalFunc GeneralToSubTotal(
com::sun::star::sheet::GeneralFunction eSummary );
static com::sun::star::sheet::GeneralFunction SubTotalToGeneral(
ScSubTotalFunc eSubTotal );
};
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index bde3c02..be84b8c 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -24,7 +24,7 @@ namespace com { namespace sun { namespace star { namespace
sheet {
struct ScDPResultFilter
{
OUString maDimName;
-ScDPItemData maValue;
+OUString maValue;
bool mbHasValue:1;
bool mbDataLayout:1;
@@ -55,7 +55,7 @@ private:
struct MemberNode;
struct DimensionNode;
-typedef std::mapScDPItemData, MemberNode* MembersType;
+typedef std::mapOUString, MemberNode* MembersType;
typedef std::mapOUString, DimensionNode* DimensionsType;
struct DimensionNode : boost::noncopyable
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index e6289be..e39b1da 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -380,6 +380,8 @@ public:
ScDPInitState rInitState);
void CheckShowEmpty( bool bShow = false );
OUString GetName() const;
+OUString GetDisplayName() const;
+
voidFillItemData( ScDPItemData rData ) const;
bool IsValid() const;
bool IsVisible() const;
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 425d333..294ca97 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -7,11 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DPUTIL_HXX__
-#define __SC_DPUTIL_HXX__
+#ifndef SC_DPUTIL_HXX
+#define SC_DPUTIL_HXX
#include rtl/ustring.hxx
#include scdllapi.h
+#include global.hxx
+
+#include com/sun/star/sheet/GeneralFunction.hpp
class SvNumberFormatter;
struct ScDPNumGroupInfo;
@@ -38,6 +41,10 @@ public:
static sal_Int32 getDatePartValue(
double fValue, const ScDPNumGroupInfo rInfo, sal_Int32 nDatePart,
SvNumberFormatter* pFormatter);
+
+static OUString getDisplayedMeasureName(const OUString rName,
ScSubTotalFunc eFunc);
+
+static ScSubTotalFunc
toSubTotalFunc(com::sun::star::sheet::GeneralFunction eGenFunc);
};
#endif
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index dff56a5..fba73d6 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1289,11 +1289,19 @@ public:
FindByName(const OUString rName) : maName(rName) {}
bool operator() (const ScDPSaveDimension* pDim) const
{
+// Layout name takes precedence.
const OUString* pLayoutName = pDim-GetLayoutName();
if (pLayoutName)
return *pLayoutName == maName;
-return maName == pDim-GetName();
+sheet::GeneralFunction eGenFunc =
static_castsheet::GeneralFunction(pDim-GetFunction());
+ScSubTotalFunc eFunc = ScDPUtil::toSubTotalFunc(eGenFunc);
+OUString aSrcName = ScDPUtil::getSourceDimensionName(pDim-GetName());
+OUString aFuncName = ScDPUtil::getDisplayedMeasureName(aSrcName,
eFunc);
+if (maName == aFuncName)
+return true;
+
+return maName == aSrcName;
}
};
diff
[Libreoffice-commits] core.git: smoketest/CppunitTest_smoketest.mk
smoketest/CppunitTest_smoketest.mk |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit e352abc2e60abd21e383ebf971e545ca510ac4ed
Author: David Tardon dtar...@redhat.com
Date: Fri Jul 12 12:50:49 2013 +0200
allow to run smoketest in arbitrary installation
Just set OOO_TEST_SOFFICE=path:/path/to/installation/program/soffice .
Change-Id: Ic772a56328253f608a62a21923a74198fa29a136
diff --git a/smoketest/CppunitTest_smoketest.mk
b/smoketest/CppunitTest_smoketest.mk
index 3915df5..bd4becb 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -30,16 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
unotest \
))
-ifeq ($(OS),MACOSX)
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/MacOS/soffice
-else
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/program/soffice
-endif
-
$(eval $(call gb_CppunitTest_use_ure,smoketest))
$(eval $(call gb_CppunitTest_add_arguments,smoketest,\
- -env:arg-soffice=$(smoketest_SOFFICE) \
+ -env:arg-soffice=$(gb_JunitTest_SOFFICEARG) \
-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR){$(gb_Helper_LIBRARY_PATH_VAR)+=$(gb_Helper_LIBRARY_PATH_VAR)}
\
-env:arg-testarg.smoketest.doc=$(WORKDIR)/Zip/smoketestdoc.sxw \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76789dd61c750b5655fc4dcd7629b12e1ff5d17b Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:09:26 2013 +0100 tab traversal order wrong Change-Id: If3b46a1f41cfdde7e6ae04c2aba48fc49d6f2230 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index d7d384a..c6134c4 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1799,7 +1799,7 @@ void VclBuilder::reorderWithinParent(std::vectorWindow* rChilds, bool bIsButt reorderWithinParent(*rChilds[i], i); if (!bIsButtonBox) -break; +continue; //The first member of the group for legacy code needs WB_GROUP set and the //others not ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update help ids for frame url page .ui conversion
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4861 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/61/4861/1 update help ids for frame url page .ui conversion Change-Id: I1d4ec32bebd5815e071d6c2756fcc3323341de02 --- M helpers/help_hid.lst M source/text/swriter/01/05060800.xhp 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e7cf9f8..ec9092a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1805,7 +1805,6 @@ HID_FRAME_TOOLBOX,54829, HID_FRM_EXT,53169, HID_FRM_STD,53170, -HID_FRM_URL,53189, HID_FTP,41040, HID_FTP_BTN_PATH,41046, HID_FTP_CANCEL,41048, @@ -7773,8 +7772,6 @@ sw_CheckBox_TP_FRM_STD_CB_MIRROR,878167077, sw_CheckBox_TP_FRM_STD_CB_REL_HEIGHT,878167141, sw_CheckBox_TP_FRM_STD_CB_REL_WIDTH,878167140, -sw_CheckBox_TP_FRM_URL_CB_CLIENT,878347363, -sw_CheckBox_TP_FRM_URL_CB_SERVER,878347362, sw_CheckBox_TP_FRM_WRAP_CB_ANCHOR_ONLY,878461960, sw_CheckBox_TP_FRM_WRAP_CB_ONLYOUTSIDE,878461977, sw_CheckBox_TP_FRM_WRAP_CB_OUTLINE,878461975, @@ -7841,7 +7838,6 @@ sw_CheckBox_TP_TOX_SELECT_CB_USE_DASH,879133729, sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087, sw_ComboBox_DLG_SAVE_LABEL_CB_MAKE,1446645763, -sw_ComboBox_TP_FRM_URL_CB_FRAME,878350432, sw_ComboBox_TP_INSERT_SECTION_ED_RNAME,879054868, sw_ComboBox_TP_INSERT_SECTION_LB_SUBREG,879054886, sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, @@ -7892,8 +7888,6 @@ sw_Edit_TP_FLD_VAR_ED_VARSEPARATOR,878741546, sw_Edit_TP_FLD_VAR_ED_VARVALUE,878741537, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, -sw_Edit_TP_FRM_URL_ED_NAME,878348399, -sw_Edit_TP_FRM_URL_ED_URL,878348347, sw_Edit_TP_GRF_EXT_ED_CONNECT,878233654, sw_Edit_TP_INSERT_SECTION_ED_CONDITION,879052813, sw_Edit_TP_INSERT_SECTION_ED_FILE,879052816, @@ -8221,7 +8215,6 @@ sw_PushButton_TP_FLD_FUNC_PB_LISTREMOVE,878776917, sw_PushButton_TP_FLD_FUNC_PB_LISTUP,878776918, sw_PushButton_TP_FRM_STD_BT_REALSIZE,878170668, -sw_PushButton_TP_FRM_URL_PB_SEARCH,878350951, sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213, sw_PushButton_TP_INSERT_SECTION_PB_FILE,879055400, sw_PushButton_TP_INSERT_SECTION_PB_PASSWD,879055411, diff --git a/source/text/swriter/01/05060800.xhp b/source/text/swriter/01/05060800.xhp index 30d2c86..3c20519 100644 --- a/source/text/swriter/01/05060800.xhp +++ b/source/text/swriter/01/05060800.xhp @@ -33,39 +33,39 @@ bookmark_valuepictures; defining hyperlinks/bookmark_value bookmark_valuehyperlinks; for objects/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/SW_HID_FRM_URL id=bm_id3153671 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmurlpage/ id=bm_id3153671 localize=false/ paragraph xml-lang=en-US id=hd_id3150980 role=heading level=1 l10n=U oldref=1link href=text/swriter/01/05060800.xhp name=HyperlinkHyperlink/link/paragraph - paragraph xml-lang=en-US id=par_id3154188 role=paragraph l10n=U oldref=2ahelp hid=HID_FRM_URLSpecify the properties of the hyperlink for the selected graphic, frame or OLE object./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3154188 role=paragraph l10n=U oldref=2ahelp hid=modules/swriter/ui/frmurlpage/Specify the properties of the hyperlink for the selected graphic, frame or OLE object./ahelp/paragraph /section section id=howtoget embed href=text/swriter/00/0405.xhp#grahyper/ /section paragraph xml-lang=en-US id=hd_id3155180 role=heading level=2 l10n=U oldref=3Link to/paragraph paragraph xml-lang=en-US id=par_id3143275 role=paragraph l10n=U oldref=4Set the link properties./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_FRM_URL:ED_URL id=bm_id3154825 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmurlpage/url id=bm_id3154825 localize=false/ paragraph xml-lang=en-US id=hd_id3149485 role=heading level=2 l10n=U oldref=5URL/paragraph - paragraph xml-lang=en-US id=par_id3154831 role=paragraph l10n=CHG oldref=6ahelp hid=SW:EDIT:TP_FRM_URL:ED_URLEnter the complete path to the file that you want to open./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:PushButton:TP_FRM_URL:PB_SEARCH id=bm_id3149103 localize=false/ + paragraph xml-lang=en-US id=par_id3154831 role=paragraph l10n=CHG oldref=6ahelp hid=modules/swriter/ui/frmurlpage/urlEnter the complete path to the file that you want to open./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmurlpage/search id=bm_id3149103 localize=false/ paragraph xml-lang=en-US id=hd_id3151260 role=heading level=2 l10n=U oldref=17Browse/paragraph - paragraph xml-lang=en-US id=par_id3149109 role=paragraph l10n=U oldref=18ahelp hid=SW:PUSHBUTTON:TP_FRM_URL:PB_SEARCHLocate the file that you want the hyperlink to open, and then click emphOpen/emph./ahelp The target file can be on your machine
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/window/builder.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a109cf6ab5d208ff6bfc6de180ed0aaa776815c7 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:09:26 2013 +0100 tab traversal order wrong Change-Id: If3b46a1f41cfdde7e6ae04c2aba48fc49d6f2230 (cherry picked from commit 76789dd61c750b5655fc4dcd7629b12e1ff5d17b) Reviewed-on: https://gerrit.libreoffice.org/4860 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index d652578..9793b86 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1656,7 +1656,7 @@ void VclBuilder::reorderWithinParent(std::vectorWindow* rChilds, bool bIsButt reorderWithinParent(*rChilds[i], i); if (!bIsButtonBox) -break; +continue; //The first member of the group for legacy code needs WB_GROUP set and the //others not ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 06ac689a8d3887519d98a616f9a1727fcc7d0bf6 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:34:18 2013 +0100 initial unexpanded child was actually zero size, not hidden Change-Id: I8b65b4986bf316e352131e737ebf736d91173d16 diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 1794671..462eba1f 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1484,6 +1484,9 @@ void VclExpander::StateChanged(StateChangedType nType) if (!pLabelWidget-get_mnemonic_widget()) pLabelWidget-set_mnemonic_widget(m_aDisclosureButton); } + +if (pChild) +pChild-Show(m_aDisclosureButton.IsChecked()); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/source solenv/gbuild
scp2/source/gnome/module_gnome.scp |2 +- scp2/source/graphicfilter/module_graphicfilter.scp |2 +- scp2/source/kde/module_kde.scp |3 +-- scp2/source/ooo/module_hidden_ooo.scp |2 +- scp2/source/ooo/ure.scp|2 +- scp2/source/tde/module_tde.scp |3 +-- scp2/source/writer/module_writer.scp |2 +- solenv/gbuild/AutoInstallLibs.mk | 13 + 8 files changed, 16 insertions(+), 13 deletions(-) New commits: commit 6baa3e1d835e3dd84071038e1e190300300d3408 Author: David Tardon dtar...@redhat.com Date: Thu Jul 11 12:23:39 2013 +0200 fdo#66072 do not end auto_*_ALL by a comma Reviewed-on: https://gerrit.libreoffice.org/4829 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org (cherry picked from commit bd3aa6983796f9dedf85c446a0ce5e5505583809) Signed-off-by: David Tardon dtar...@redhat.com Conflicts: scp2/source/base/module_base.scp scp2/source/calc/module_calc.scp scp2/source/gnome/module_gnome.scp scp2/source/graphicfilter/module_graphicfilter.scp scp2/source/impress/module_impress.scp scp2/source/kde/module_kde.scp scp2/source/math/module_math.scp scp2/source/onlineupdate/module_onlineupdate.scp scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/ure.scp scp2/source/tde/module_tde.scp scp2/source/writer/module_writer.scp solenv/gbuild/AutoInstall.mk Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939 Reviewed-on: https://gerrit.libreoffice.org/4831 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index f66178d..e8a22bf 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome #ifdef ENABLE_GNOMEVFS XpdCheckSolaris = SUNWgnome-vfs; #endif -Files = (auto_Gnome_Lib_ALL +Files = (auto_Gnome_Lib_ALL, #if (defined ENABLE_GNOMEVFS defined ENABLE_LOCKDOWN) || defined ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 556161e..dd2de5f 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt Sortkey = 600; ParentID = gid_Module_Optional; Default = YES; -Files = (auto_Graphicfilter_Lib_ALL +Files = (auto_Graphicfilter_Lib_ALL, gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 8e8012f..e61fb41 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -26,6 +26,5 @@ Module gid_Module_Optional_Kde PackageInfo = packinfo_office.txt; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); -Files = (auto_Kde_Lib_ALL -); +Files = (auto_Kde_Lib_ALL); End diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 71a6d0f..f75f131 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -143,7 +143,7 @@ Module gid_Module_Root_Files_4 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, - auto_File_Lib_ALL + auto_File_Lib_ALL, gid_File_Lib_Bib, gid_File_Lib_J, gid_File_Lib_Oox, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 6c775b9..55b3091 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -685,7 +685,7 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Store, gid_Unixlink_File_Dl_Jvmaccess, gid_Unixlink_File_Dl_Jvmfwk, -auto_Ure_Private_Lib_ALL +auto_Ure_Private_Lib_ALL, gid_File_Dl_JrepropertiesClass, gid_File_Dl_Profile_Jvmfwk3rc, gid_File_Dl_Jpipe, diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 89f2462..85e349e 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -19,7 +19,6 @@ Module gid_Module_Optional_Tde PackageInfo = packinfo_office.txt; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); -Files = (auto_Tde_Lib_ALL -); +Files = (auto_Tde_Lib_ALL); End diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 6628e86..82cc763 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -37,7 +37,7 @@ Module gid_Module_Prg_Wrt_Bin Styles =
[Libreoffice-commits] core.git: extras/source
extras/source/autotext/lang/en-AU/acor/DocumentList.xml |1 + extras/source/autotext/lang/en-GB/acor/DocumentList.xml |1 + extras/source/autotext/lang/en-US/acor/DocumentList.xml |1 + extras/source/autotext/lang/en-ZA/acor/DocumentList.xml |1 + 4 files changed, 4 insertions(+) New commits: commit cad6d7e516e5cc1e0f66d7e400ce949707c94cc7 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:43:25 2013 +0100 add auto correct for uknown - unknown Change-Id: I1f67da89f7e9b4a31018fc2ab0a95f7368468d6f diff --git a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml index 762a618..33312da 100644 --- a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml +++ b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml @@ -755,6 +755,7 @@ block-list:block block-list:abbreviated-name=tyhat block-list:name=that/ block-list:block block-list:abbreviated-name=tyhe block-list:name=the/ block-list:block block-list:abbreviated-name=udnerstand block-list:name=understand/ + block-list:block block-list:abbreviated-name=uknown block-list:name=unknown/ block-list:block block-list:abbreviated-name=understnad block-list:name=understand/ block-list:block block-list:abbreviated-name=undert he block-list:name=under the/ block-list:block block-list:abbreviated-name=UnitedStates block-list:name=United States/ diff --git a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml index 9ce314d..d46b7ea 100644 --- a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml +++ b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml @@ -754,6 +754,7 @@ block-list:block block-list:abbreviated-name=tyhat block-list:name=that/ block-list:block block-list:abbreviated-name=tyhe block-list:name=the/ block-list:block block-list:abbreviated-name=udnerstand block-list:name=understand/ + block-list:block block-list:abbreviated-name=uknown block-list:name=unknown/ block-list:block block-list:abbreviated-name=understnad block-list:name=understand/ block-list:block block-list:abbreviated-name=undert he block-list:name=under the/ block-list:block block-list:abbreviated-name=UnitedStates block-list:name=United States/ diff --git a/extras/source/autotext/lang/en-US/acor/DocumentList.xml b/extras/source/autotext/lang/en-US/acor/DocumentList.xml index 9a98f6a..26abc6f 100644 --- a/extras/source/autotext/lang/en-US/acor/DocumentList.xml +++ b/extras/source/autotext/lang/en-US/acor/DocumentList.xml @@ -754,6 +754,7 @@ block-list:block block-list:abbreviated-name=tyhat block-list:name=that/ block-list:block block-list:abbreviated-name=tyhe block-list:name=the/ block-list:block block-list:abbreviated-name=udnerstand block-list:name=understand/ + block-list:block block-list:abbreviated-name=uknown block-list:name=unknown/ block-list:block block-list:abbreviated-name=understnad block-list:name=understand/ block-list:block block-list:abbreviated-name=undert he block-list:name=under the/ block-list:block block-list:abbreviated-name=UnitedStates block-list:name=United States/ diff --git a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml index f5f891e..febfe61 100644 --- a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml +++ b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml @@ -744,6 +744,7 @@ block-list:block block-list:abbreviated-name=tyhat block-list:name=that/ block-list:block block-list:abbreviated-name=tyhe block-list:name=the/ block-list:block block-list:abbreviated-name=udnerstand block-list:name=understand/ + block-list:block block-list:abbreviated-name=uknown block-list:name=unknown/ block-list:block block-list:abbreviated-name=understnad block-list:name=understand/ block-list:block block-list:abbreviated-name=undert he block-list:name=under the/ block-list:block block-list:abbreviated-name=UnitedStates block-list:name=United States/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 87f9df77e6d12e711e977e23d758476dfdd2b844
Author: Michael Meeks michael.me...@suse.com
Date: Fri Jul 12 12:45:42 2013 +0100
add SC_SOFTWARE tweak to force sw group interpret.
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 0135c51..5f343d9 100755
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -392,6 +392,11 @@ bool
FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const ScAdd
namespace opencl {
sc::FormulaGroupInterpreter *createFormulaGroupInterpreter()
{
+if (getenv(SC_SOFTWARE))
+{
+fprintf(stderr, Create S/W interp\n);
+return new sc::FormulaGroupInterpreterSoftware();
+}
if (getenv(SC_GROUNDWATER))
return new sc::FormulaGroupInterpreterGroundwater();
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - connectivity/source
connectivity/source/parse/sqliterator.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 89318f13381142942944670d94d209e21526115c Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Jul 11 17:42:31 2013 +0200 sort is ascending by default Change-Id: I38354405acbbdb27b9e7ce1d19e862b7b352c850 Reviewed-on: https://gerrit.libreoffice.org/4840 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com Reviewed-by: Andras Timar ati...@suse.com Reviewed-by: Petr Mladek pmla...@suse.cz diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 6007eb9..8d0e20f 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1110,7 +1110,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo OSQLParseNode * pOptAscDesc = pColumnRef-getParent()-getChild(1); OSL_ENSURE(pOptAscDesc != NULL,OSQLParseTreeIterator: error in parse tree!); -sal_Bool bAscending = pOptAscDesc SQL_ISTOKEN(pOptAscDesc,ASC); +sal_Bool bAscending = ! (pOptAscDesc SQL_ISTOKEN(pOptAscDesc,DESC)); setOrderByColumnName(sColumnName, aTableRange,bAscending); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - smoketest/CppunitTest_smoketest.mk
smoketest/CppunitTest_smoketest.mk |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit f38c8417c8e095aebd5994c01a97169149c27522
Author: David Tardon dtar...@redhat.com
Date: Fri Jul 12 12:50:49 2013 +0200
allow to run smoketest in arbitrary installation
Just set OOO_TEST_SOFFICE=path:/path/to/installation/program/soffice .
Change-Id: Ic772a56328253f608a62a21923a74198fa29a136
(cherry picked from commit e352abc2e60abd21e383ebf971e545ca510ac4ed)
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4863
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/smoketest/CppunitTest_smoketest.mk
b/smoketest/CppunitTest_smoketest.mk
index 0fad801..702c612 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -30,16 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
unotest \
))
-ifeq ($(OS),MACOSX)
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/MacOS/soffice
-else
-smoketest_SOFFICE := path:$(gb_DEVINSTALLROOT)/program/soffice
-endif
-
$(eval $(call gb_CppunitTest_use_ure,smoketest))
$(eval $(call gb_CppunitTest_add_arguments,smoketest,\
- -env:arg-soffice=$(smoketest_SOFFICE) \
+ -env:arg-soffice=$(gb_JunitTest_SOFFICEARG) \
-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR){$(gb_Helper_LIBRARY_PATH_VAR)+=$(gb_Helper_LIBRARY_PATH_VAR)}
\
-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/205034afa2abe9ab73b2f5d0c76f295a7889c9
94/205034afa2abe9ab73b2f5d0c76f295a7889c9 |1 + 1 file changed, 1 insertion(+) New commits: commit 5bb5244cef6a498b1e9f4ec7baec25c6115272b7 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:55:55 2013 +0100 Notes added by 'git notes add' diff --git a/94/205034afa2abe9ab73b2f5d0c76f295a7889c9 b/94/205034afa2abe9ab73b2f5d0c76f295a7889c9 new file mode 100644 index 000..e766c25 --- /dev/null +++ b/94/205034afa2abe9ab73b2f5d0c76f295a7889c9 @@ -0,0 +1 @@ +merged as: 04d937c1ec36c2d9fa8c90604c81a37d30e97da6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/gradient.cxx | 17 --
vcl/source/gdi/outdev4.cxx | 347
2 files changed, 166 insertions(+), 198 deletions(-)
New commits:
commit 04d937c1ec36c2d9fa8c90604c81a37d30e97da6
Author: Armin Le Grand a...@apache.org
Date: Sat Jun 8 14:27:01 2013 +0100
Resolves: #i120957# Added Reginas corrections for gradient colors for...
linear gradients in VCL renderers
Patch by: Regina
Review by: alg
(cherry picked from commit 94205034afa2abe9ab73b2f5d0c76f295a7889c9)
Conflicts:
vcl/source/gdi/outdev4.cxx
Change-Id: I8b66bb1b9155253e138c7ebb4fc3e0686bae7913
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index b4099b5..c1058b2 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -194,20 +194,15 @@ void Gradient::GetBoundRect( const Rectangle rRect,
Rectangle rBoundRect, Poin
if( GetStyle() == GradientStyle_LINEAR || GetStyle() ==
GradientStyle_AXIAL )
{
-aRect.Left()--;
-aRect.Top()--;
-aRect.Right()++;
-aRect.Bottom()++;
-
const doublefAngle = nAngle * F_PI1800;
const doublefWidth = aRect.GetWidth();
const doublefHeight = aRect.GetHeight();
-double fDX = fWidth * fabs( cos( fAngle ) ) + fHeight *
fabs( sin( fAngle ) );
-double fDY = fHeight * fabs( cos( fAngle ) ) + fWidth *
fabs( sin( fAngle ) );
-
-fDX = ( fDX - fWidth ) * 0.5 + 0.5;
-fDY = ( fDY - fHeight ) * 0.5 + 0.5;
-
+double fDX = fWidth * fabs( cos( fAngle ) ) +
+ fHeight * fabs( sin( fAngle ) );
+double fDY = fHeight * fabs( cos( fAngle ) ) +
+ fWidth * fabs( sin( fAngle ) );
+fDX = (fDX - fWidth) * 0.5 + 0.5;
+fDY = (fDY - fHeight) * 0.5 + 0.5;
aRect.Left() -= (long) fDX;
aRect.Right() += (long) fDX;
aRect.Top()-= (long) fDY;
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 4dd70e6..1be80e9 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -146,236 +146,210 @@ void OutputDevice::ImplDrawLinearGradient( const
Rectangle rRect,
const Gradient rGradient,
sal_Bool bMtf, const PolyPolygon*
pClipPolyPoly )
{
-// rotiertes BoundRect ausrechnen
+// get BoundRect of rotated rectangle
Rectangle aRect;
Point aCenter;
sal_uInt16nAngle = rGradient.GetAngle() % 3600;
rGradient.GetBoundRect( rRect, aRect, aCenter );
-// Rand berechnen und Rechteck neu setzen
-Rectangle aFullRect = aRect;
-longnBorder = (long)rGradient.GetBorder() * aRect.GetHeight() /
100;
-
-// Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf
bool bLinear = (rGradient.GetStyle() == GradientStyle_LINEAR);
-if ( bLinear )
+double fBorder = rGradient.GetBorder() * aRect.GetHeight() / 100.0;
+if ( !bLinear )
{
-aRect.Top() += nBorder;
+fBorder /= 2.0;
}
-// Rand berechnen und Rechteck neu setzen fuer axiale Farbverlauf
-else
+Rectangle aMirrorRect = aRect; // used in style axial
+aMirrorRect.Top() = ( aRect.Top() + aRect.Bottom() ) / 2;
+if ( !bLinear )
{
-nBorder = 1;
-
-aRect.Top()+= nBorder;
-aRect.Bottom() -= nBorder;
+aRect.Bottom() = aMirrorRect.Top();
}
-// Top darf nicht groesser als Bottom sein
-aRect.Top() = std::min( aRect.Top(), (long)(aRect.Bottom() - 1) );
-
-long nMinRect = aRect.GetHeight();
+// Intensitaeten von Start- und Endfarbe ggf. aendern
+longnFactor;
+Color aStartCol = rGradient.GetStartColor();
+Color aEndCol = rGradient.GetEndColor();
+longnStartRed = aStartCol.GetRed();
+longnStartGreen = aStartCol.GetGreen();
+longnStartBlue = aStartCol.GetBlue();
+longnEndRed = aEndCol.GetRed();
+longnEndGreen = aEndCol.GetGreen();
+longnEndBlue= aEndCol.GetBlue();
+nFactor = rGradient.GetStartIntensity();
+nStartRed = (nStartRed * nFactor) / 100;
+nStartGreen = (nStartGreen * nFactor) / 100;
+nStartBlue = (nStartBlue * nFactor) / 100;
+nFactor = rGradient.GetEndIntensity();
+nEndRed = (nEndRed * nFactor) / 100;
+nEndGreen = (nEndGreen * nFactor) / 100;
+nEndBlue= (nEndBlue * nFactor) / 100;
+
+// gradient style axial has exchanged start and end colors
+if ( !bLinear)
+{
+long nTempColor = nStartRed;
+nStartRed = nEndRed;
+nEndRed = nTempColor;
+nTempColor = nStartGreen;
+nStartGreen = nEndGreen;
+nEndGreen = nTempColor;
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/7fc9b96d3ae9b78b5b2359d349960be5e59531
37/7fc9b96d3ae9b78b5b2359d349960be5e59531 |1 + 1 file changed, 1 insertion(+) New commits: commit 7dd1305fb788fba2e86df7ca1de300ee7fe55272 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:58:24 2013 +0100 Notes added by 'git notes add' diff --git a/37/7fc9b96d3ae9b78b5b2359d349960be5e59531 b/37/7fc9b96d3ae9b78b5b2359d349960be5e59531 new file mode 100644 index 000..c70caa5 --- /dev/null +++ b/37/7fc9b96d3ae9b78b5b2359d349960be5e59531 @@ -0,0 +1 @@ +prefer: e717d1dcce7f8906311c5ccdbb2326b61a702630 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - connectivity/source dbaccess/source include/connectivity
connectivity/source/parse/sqliterator.cxx | 28 +
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 49 ++---
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 20 ++
dbaccess/source/ui/dlg/queryorder.cxx | 25
include/connectivity/sqliterator.hxx |8 ++
5 files changed, 95 insertions(+), 35 deletions(-)
New commits:
commit a1ff9d9a1cb79a52da0ee07e34a80c7debb225d1
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Jul 11 16:53:23 2013 +0200
ORDER BY columns are prioritarily *SELECT* columns
as opposed to *table* columns,
and notwithstanding HSQLDB 1.8 (our embedded database) bugs.
Actually, supporting ORDER BY on non-select (but table) columns is OPTIONAL
for DBMSs
(but quite common)
Conflicts:
connectivity/source/parse/sqliterator.cxx
Change-Id: I6725dfda36b09429a78262bff6f3d3e3dd9032b6
Reviewed-on: https://gerrit.libreoffice.org/4842
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: Andras Timar ati...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 8d0e20f..7065e66 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1863,7 +1863,9 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const
OUString rColumnName
void OSQLParseTreeIterator::setOrderByColumnName(const OUString rColumnName,
OUString rTableRange, sal_Bool bAscending)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
OSQLParseTreeIterator::setOrderByColumnName );
-ReferenceXPropertySet xColumn = findColumn( rColumnName, rTableRange,
false );
+ReferenceXPropertySet xColumn = findSelectColumn( rColumnName );
+if ( !xColumn.is() )
+xColumn = findColumn ( rColumnName, rTableRange, false );
if ( xColumn.is() )
m_aOrderColumns-get().push_back(new OOrderColumn( xColumn,
rTableRange, isCaseSensitive(), bAscending ) );
else
@@ -2041,6 +2043,30 @@ const OSQLParseNode*
OSQLParseTreeIterator::getSimpleHavingTree() const
}
//
-
+Reference XPropertySet OSQLParseTreeIterator::findSelectColumn( const
OUString rColumnName )
+{
+SAL_INFO( connectivity.parse, parse lio...@mamane.lu
OSQLParseTreeIterator::findSelectColumn );
+for ( OSQLColumns::Vector::const_iterator lookupColumn =
m_aSelectColumns-get().begin();
+ lookupColumn != m_aSelectColumns-get().end();
+ ++lookupColumn )
+{
+Reference XPropertySet xColumn( *lookupColumn );
+try
+{
+OUString sName, sTableName;
+xColumn-getPropertyValue(
OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) = sName;
+if ( sName == rColumnName )
+return xColumn;
+}
+catch( const Exception )
+{
+DBG_UNHANDLED_EXCEPTION();
+}
+}
+return NULL;
+}
+
+//
-
Reference XPropertySet OSQLParseTreeIterator::findColumn( const OUString
rColumnName, OUString rTableRange, bool _bLookInSubTables )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
OSQLParseTreeIterator::findColumn );
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index d7071a2..32035e7 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -457,7 +457,7 @@ void SAL_CALL
OSingleSelectQueryComposer::appendFilterByColumn( const Reference
setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
}
-OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference
XPropertySet column)
+OUString OSingleSelectQueryComposer::impl_getColumnRealName_throw(const
Reference XPropertySet column, bool bGroupBy)
{
::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
@@ -472,17 +472,18 @@ OUString
OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference X
throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,makeAny(aErr)
);
}
-OUString aName,aNewName;
+OUString aName, aNewName;
column-getPropertyValue(PROPERTY_NAME) = aName;
-if ( !m_xMetaData-supportsOrderByUnrelated()
m_aCurrentColumns[SelectColumns]
!m_aCurrentColumns[SelectColumns]-hasByName(aName))
+if ( bGroupBy
+ !m_xMetaData-supportsGroupByUnrelated()
+ m_aCurrentColumns[SelectColumns]
+
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 33484, which changed state. Bug 33484 Summary: Printing multiple files from Windows Explorer at once makes LibreOffice unusable https://bugs.freedesktop.org/show_bug.cgi?id=33484 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - vcl/source
vcl/source/window/builder.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 770099306bdefa83c8b071e09ca040a355a400af Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 12:09:26 2013 +0100 tab traversal order wrong Change-Id: If3b46a1f41cfdde7e6ae04c2aba48fc49d6f2230 (cherry picked from commit 76789dd61c750b5655fc4dcd7629b12e1ff5d17b) Reviewed-on: https://gerrit.libreoffice.org/4860 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com (cherry picked from commit a109cf6ab5d208ff6bfc6de180ed0aaa776815c7) Reviewed-on: https://gerrit.libreoffice.org/4864 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 3824497..3e52ab6 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1656,7 +1656,7 @@ void VclBuilder::reorderWithinParent(std::vectorWindow* rChilds, bool bIsButt reorderWithinParent(*rChilds[i], i); if (!bIsButtonBox) -break; +continue; //The first member of the group for legacy code needs WB_GROUP set and the //others not ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: feature/cmis now using the future libcmis 0.4.0
On Fri, Jul 12, 2013 at 10:51 AM, Cedric Bosdonnat cbosdon...@suse.comwrote: Hello Cuong, On Fri, 2013-07-12 at 10:08 +0200, Cedric Bosdonnat wrote: When I run make install of libcmis, there is an error of docbook as following: /usr/bin/docbook-to-man doc/cmis-client.xml /usr/bin/nsgmls:/usr/share/xml/docbook/schema/dtd/4.3/docbookx.dtd:112:17:E: X20AC is not a function name /usr/bin/nsgmls:/usr/share/xml/entities/xml-iso-entities-8879.1986/ISOamsa.ent:40:19:E: X21B6 is not a function name My docbook-to-man version is 1:2.0.0-31. Does this happen to you? No it doesn't happen here. the docbook2x package here on openSuse Factory is 0.8.8-119.2 and works fine. The errors you are reporting really seem to come from the docbook2x package you installed. Found and fixed the problem: on some distros, docbook-to-man only eats SGML. I fixed libcmis configure.ac to prefer docbook2x. Tell me if it works better now. Actually it's docbook2x-man ;) -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Turn basebmp::Format into a proper enum
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4856 to look at the new patch set (#2). Change subject: Turn basebmp::Format into a proper enum .. Turn basebmp::Format into a proper enum Change-Id: I4067c5039c7b5c74a1c144721dd7260de54dd2bf --- M basebmp/source/bitmapdevice.cxx M basebmp/source/debug.cxx M basebmp/test/basictest.cxx M basebmp/test/bmpdemo.cxx M basebmp/test/bmpmasktest.cxx M basebmp/test/bmptest.cxx M basebmp/test/cliptest.cxx M basebmp/test/filltest.cxx M basebmp/test/linetest.cxx M basebmp/test/masktest.cxx M basebmp/test/polytest.cxx M include/basebmp/bitmapdevice.hxx M include/basebmp/scanlineformats.hxx M vcl/android/androidinst.cxx M vcl/coretext/salgdi2.cxx M vcl/headless/svpbmp.cxx M vcl/headless/svpframe.cxx M vcl/headless/svpgdi.cxx M vcl/headless/svptext.cxx M vcl/headless/svpvd.cxx M vcl/inc/headless/svpbmp.hxx M vcl/inc/headless/svpframe.hxx M vcl/inc/headless/svpgdi.hxx M vcl/ios/iosinst.cxx M vcl/unx/gtk/window/gtksalframe.cxx 25 files changed, 252 insertions(+), 244 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/4856/2 -- To view, visit https://gerrit.libreoffice.org/4856 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4067c5039c7b5c74a1c144721dd7260de54dd2bf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Turn basebmp::Format into a proper enum
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4856 -- To view, visit https://gerrit.libreoffice.org/4856 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4067c5039c7b5c74a1c144721dd7260de54dd2bf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/UIConfig_swriter.mk |1
sw/inc/helpid.h |1
sw/source/ui/frmdlg/frmpage.cxx | 67
sw/source/ui/frmdlg/frmpage.hrc | 10 -
sw/source/ui/frmdlg/frmpage.src | 88 ---
sw/source/ui/inc/frmpage.hxx | 17 --
sw/uiconfig/swriter/ui/frmurlpage.ui | 266 +++
7 files changed, 304 insertions(+), 146 deletions(-)
New commits:
commit efc09e121ceffb0d2c1b841b809277bd6484f1a7
Author: Csikós Tamás csks.t...@gmail.com
Date: Fri Jul 12 11:16:44 2013 +0200
modern .ui widgetlayout for frmpage/frmurlpage
Change-Id: Ia308fa393baffc7f456ba613cb216b427c450ca6
Reviewed-on: https://gerrit.libreoffice.org/4854
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 7096808..4cd89ab 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/footnoteareapage \
sw/uiconfig/swriter/ui/frmaddpage \
+ sw/uiconfig/swriter/ui/frmurlpage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/insertbookmark \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 062ae99..c82e46e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -151,7 +151,6 @@
#define HID_LAB_FMT
SW_HID_LAB_FMT
#define HID_ENV_ENV
SW_HID_ENV_ENV
#define HID_ENV_FMT
SW_HID_ENV_FMT
-#define HID_FRM_URL
SW_HID_FRM_URL
#define HID_COND_COLL
SW_HID_COND_COLL
#define HID_FLD_DB SW_HID_FLD_DB
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 210293f..4240747 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2599,22 +2599,17 @@ void BmpWindow::SetGraphic(const Graphic rGrf)
Description:set URL and ImageMap at frames
***/
SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet rSet ) :
-SfxTabPage(pParent, SW_RES(TP_FRM_URL), rSet),
-aHyperLinkFL(this, SW_RES( FL_HYPERLINK )),
-aURLFT (this, SW_RES( FT_URL)),
-aURLED (this, SW_RES( ED_URL)),
-aSearchPB (this, SW_RES( PB_SEARCH )),
-aNameFT (this, SW_RES( FT_NAME )),
-aNameED (this, SW_RES( ED_NAME )),
-aFrameFT(this, SW_RES( FT_FRAME )),
-aFrameCB(this, SW_RES( CB_FRAME )),
-
-aImageFL(this, SW_RES( FL_IMAGE )),
-aServerCB (this, SW_RES( CB_SERVER )),
-aClientCB (this, SW_RES( CB_CLIENT ))
+SfxTabPage(pParent, FrmURLPage , modules/swriter/ui/frmurlpage.ui,
rSet)
{
-FreeResource();
-aSearchPB.SetClickHdl(LINK(this, SwFrmURLPage, InsertFileHdl));
+get(pURLED,url);
+get(pSearchPB,search);
+get(pNameED,name);
+get(pFrameCB,frame);
+
+get(pServerCB,server);
+get(pClientCB,client);
+
+pSearchPB-SetClickHdl(LINK(this, SwFrmURLPage, InsertFileHdl));
}
SwFrmURLPage::~SwFrmURLPage()
@@ -2633,7 +2628,7 @@ void SwFrmURLPage::Reset( const SfxItemSet rSet )
size_t nCount = pList-size();
for ( size_t i = 0; i nCount; i++ )
{
-aFrameCB.InsertEntry( *pList-at( i ) );
+pFrameCB-InsertEntry( *pList-at( i ) );
}
for ( size_t i = nCount; i; )
{
@@ -2646,24 +2641,24 @@ void SwFrmURLPage::Reset( const SfxItemSet rSet )
if ( SFX_ITEM_SET == rSet.GetItemState( RES_URL, sal_True, pItem ) )
{
const SwFmtURL* pFmtURL = (const SwFmtURL*)pItem;
-aURLED.SetText( INetURLObject::decode( pFmtURL-GetURL(),
+pURLED-SetText( INetURLObject::decode( pFmtURL-GetURL(),
INET_HEX_ESCAPE,
INetURLObject::DECODE_UNAMBIGUOUS,
RTL_TEXTENCODING_UTF8 ));
-aNameED.SetText( pFmtURL-GetName());
+pNameED-SetText( pFmtURL-GetName());
-aClientCB.Enable( pFmtURL-GetMap() != 0 );
-aClientCB.Check ( pFmtURL-GetMap() != 0 );
-aServerCB.Check ( pFmtURL-IsServerMap() );
+pClientCB-Enable( pFmtURL-GetMap() != 0 );
+pClientCB-Check ( pFmtURL-GetMap() != 0 );
+pServerCB-Check ( pFmtURL-IsServerMap() );
-aFrameCB.SetText(pFmtURL-GetTargetFrameName());
-aFrameCB.SaveValue();
+
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|7 --- source/text/swriter/01/05060800.xhp | 28 ++-- 2 files changed, 14 insertions(+), 21 deletions(-) New commits: commit 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 Author: Csikós Tamás csks.t...@gmail.com Date: Fri Jul 12 12:55:04 2013 +0200 update help ids for frame url page .ui conversion Change-Id: I1d4ec32bebd5815e071d6c2756fcc3323341de02 Reviewed-on: https://gerrit.libreoffice.org/4861 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e7cf9f8..ec9092a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1805,7 +1805,6 @@ HID_FORM_NAVIGATOR_WIN,38069, HID_FRAME_TOOLBOX,54829, HID_FRM_EXT,53169, HID_FRM_STD,53170, -HID_FRM_URL,53189, HID_FTP,41040, HID_FTP_BTN_PATH,41046, HID_FTP_CANCEL,41048, @@ -7773,8 +7772,6 @@ sw_CheckBox_TP_FRM_STD_CB_FOLLOWTEXTFLOW,878167169, sw_CheckBox_TP_FRM_STD_CB_MIRROR,878167077, sw_CheckBox_TP_FRM_STD_CB_REL_HEIGHT,878167141, sw_CheckBox_TP_FRM_STD_CB_REL_WIDTH,878167140, -sw_CheckBox_TP_FRM_URL_CB_CLIENT,878347363, -sw_CheckBox_TP_FRM_URL_CB_SERVER,878347362, sw_CheckBox_TP_FRM_WRAP_CB_ANCHOR_ONLY,878461960, sw_CheckBox_TP_FRM_WRAP_CB_ONLYOUTSIDE,878461977, sw_CheckBox_TP_FRM_WRAP_CB_OUTLINE,878461975, @@ -7841,7 +7838,6 @@ sw_CheckBox_TP_TOX_SELECT_CB_USEFF,879133720, sw_CheckBox_TP_TOX_SELECT_CB_USE_DASH,879133729, sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087, sw_ComboBox_DLG_SAVE_LABEL_CB_MAKE,1446645763, -sw_ComboBox_TP_FRM_URL_CB_FRAME,878350432, sw_ComboBox_TP_INSERT_SECTION_ED_RNAME,879054868, sw_ComboBox_TP_INSERT_SECTION_LB_SUBREG,879054886, sw_ComboBox_TP_OPTCAPTION_PAGE_BOX_CATEGORY,878940174, @@ -7892,8 +7888,6 @@ sw_Edit_TP_FLD_VAR_ED_VARNAME,878741535, sw_Edit_TP_FLD_VAR_ED_VARSEPARATOR,878741546, sw_Edit_TP_FLD_VAR_ED_VARVALUE,878741537, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, -sw_Edit_TP_FRM_URL_ED_NAME,878348399, -sw_Edit_TP_FRM_URL_ED_URL,878348347, sw_Edit_TP_GRF_EXT_ED_CONNECT,878233654, sw_Edit_TP_INSERT_SECTION_ED_CONDITION,879052813, sw_Edit_TP_INSERT_SECTION_ED_FILE,879052816, @@ -8221,7 +8215,6 @@ sw_PushButton_TP_FLD_FUNC_PB_LISTDOWN,878776919, sw_PushButton_TP_FLD_FUNC_PB_LISTREMOVE,878776917, sw_PushButton_TP_FLD_FUNC_PB_LISTUP,878776918, sw_PushButton_TP_FRM_STD_BT_REALSIZE,878170668, -sw_PushButton_TP_FRM_URL_PB_SEARCH,878350951, sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213, sw_PushButton_TP_INSERT_SECTION_PB_FILE,879055400, sw_PushButton_TP_INSERT_SECTION_PB_PASSWD,879055411, diff --git a/source/text/swriter/01/05060800.xhp b/source/text/swriter/01/05060800.xhp index 30d2c86..fc71994 100644 --- a/source/text/swriter/01/05060800.xhp +++ b/source/text/swriter/01/05060800.xhp @@ -33,39 +33,39 @@ bookmark_valuepictures; defining hyperlinks/bookmark_value bookmark_valuehyperlinks; for objects/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/SW_HID_FRM_URL id=bm_id3153671 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmurlpage/FrmURLPage id=bm_id3153671 localize=false/ paragraph xml-lang=en-US id=hd_id3150980 role=heading level=1 l10n=U oldref=1link href=text/swriter/01/05060800.xhp name=HyperlinkHyperlink/link/paragraph - paragraph xml-lang=en-US id=par_id3154188 role=paragraph l10n=U oldref=2ahelp hid=HID_FRM_URLSpecify the properties of the hyperlink for the selected graphic, frame or OLE object./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3154188 role=paragraph l10n=U oldref=2ahelp hid=modules/swriter/ui/frmurlpage/FrmURLPageSpecify the properties of the hyperlink for the selected graphic, frame or OLE object./ahelp/paragraph /section section id=howtoget embed href=text/swriter/00/0405.xhp#grahyper/ /section paragraph xml-lang=en-US id=hd_id3155180 role=heading level=2 l10n=U oldref=3Link to/paragraph paragraph xml-lang=en-US id=par_id3143275 role=paragraph l10n=U oldref=4Set the link properties./paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_FRM_URL:ED_URL id=bm_id3154825 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/frmurlpage/url id=bm_id3154825 localize=false/ paragraph xml-lang=en-US id=hd_id3149485 role=heading level=2 l10n=U oldref=5URL/paragraph - paragraph xml-lang=en-US id=par_id3154831 role=paragraph l10n=CHG oldref=6ahelp hid=SW:EDIT:TP_FRM_URL:ED_URLEnter the complete path to the file that you want to open./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/sw:PushButton:TP_FRM_URL:PB_SEARCH id=bm_id3149103 localize=false/ + paragraph xml-lang=en-US id=par_id3154831 role=paragraph l10n=CHG oldref=6ahelp hid=modules/swriter/ui/frmurlpage/urlEnter the complete path to the file that you want to open./ahelp/paragraph +bookmark xml-lang=en-US
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 146e3927f06cf5d1f1782a3dd6b04fc68945bad6 Author: Csikós Tamás csks.t...@gmail.com Date: Fri Jul 12 12:55:04 2013 +0200 Updated core Project: help 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 update help ids for frame url page .ui conversion Change-Id: I1d4ec32bebd5815e071d6c2756fcc3323341de02 Reviewed-on: https://gerrit.libreoffice.org/4861 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index de54c17..38c2d6d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit de54c17248708f728177be7a3421da1dc0e97504 +Subproject commit 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] update help ids for frame url page .ui conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4861 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4861 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d4ec32bebd5815e071d6c2756fcc3323341de02 Gerrit-PatchSet: 3 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós csks.t...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - offapi/com offapi/UnoApi_offapi.mk svtools/source
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl | 38 --
svtools/source/uno/treecontrolpeer.cxx|8 ---
3 files changed, 47 deletions(-)
New commits:
commit 3d64d67763038f4c7070f9bdbfdedf63360e6439
Author: Noel Power noel.po...@suse.com
Date: Fri Jul 12 14:15:12 2013 +0100
remove create of com.sun.star.awt.tree.DefaultTreeDataModel, it doesn't
exist
Change-Id: I029286d9c25f0b7ee562e87cc7e205aa398e594b
diff --git a/svtools/source/uno/treecontrolpeer.cxx
b/svtools/source/uno/treecontrolpeer.cxx
index e4976a6..7130ffc 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1226,16 +1226,6 @@ void TreeControlPeer::onChangeDataModel(
UnoTreeListBoxImpl rTree, const Refere
if( mxDataModel.is() )
mxDataModel-removeTreeDataModelListener( xListener );
-if( !xDataModel.is() )
-{
-static const OUString aSN( RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.awt.tree.DefaultTreeDataModel ) );
-Reference XMultiServiceFactory xORB(
::comphelper::getProcessServiceFactory() );
-if( xORB.is() )
-{
-mxDataModel.query( xORB-createInstance( aSN ) );
-}
-}
-
mxDataModel = xDataModel;
fillTree( rTree, mxDataModel );
commit df9f26c22a59ae2309201d2709ea5f8a0ecbf247
Author: Noel Power noel.po...@suse.com
Date: Fri Jul 12 14:06:08 2013 +0100
fix fdo#66586 Revert fdo#46808, create IDL fortree::DefaultTreeDataModel
This reverts commit fcd01fba69db6de6cfc983fae65b6ba6764de0d6.
Service DefaultTreeDataModel actually doens't exist ( and we can't find
when/where it used to :-( ) The treecontrolpeer.cxx change to
use the new service also had the undesired effect of throwing an exception
when the UnoTreeControl model is inserted ( previously this failed silently
)
The net effect is the dialog control is malformed and not initialised
correctly
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 495eea6..5a7f329 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -72,7 +72,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\
UnoControlTabPageModel \
))
$(eval $(call
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\
- DefaultTreeDataModel \
MutableTreeDataModel \
MutableTreeNode \
TreeControl \
diff --git a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
b/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
deleted file mode 100644
index c709a0b..000
--- a/offapi/com/sun/star/awt/tree/DefaultTreeDataModel.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_awt_tree_DefaultTreeDataModel_idl__
-#define __com_sun_star_awt_tree_DefaultTreeDataModel_idl__
-
-#include com/sun/star/awt/tree/XTreeDataModel.idl
-
-
-module com { module sun { module star { module awt { module tree {
-
-
-/**
-@since LibreOffice 4.1
- */
-service DefaultTreeDataModel : XTreeDataModel;
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/treecontrolpeer.cxx
b/svtools/source/uno/treecontrolpeer.cxx
index a403e31..e4976a6 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -22,8 +22,6 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/lang/DisposedException.hpp
#include com/sun/star/view/SelectionType.hpp
-#include com/sun/star/awt/tree/DefaultTreeDataModel.hpp
-
#include toolkit/helper/property.hxx
#include toolkit/helper/vclunohelper.hxx
@@ -1230,8 +1228,12 @@ void TreeControlPeer::onChangeDataModel(
UnoTreeListBoxImpl rTree, const Refere
if( !xDataModel.is() )
{
-Reference XComponentContext xORB(
::comphelper::getProcessComponentContext() );
-mxDataModel.query( DefaultTreeDataModel::create(xORB));
+static const OUString aSN(
[Libreoffice-commits] core.git: sw/source
sw/source/ui/uiview/formatclipboard.cxx | 10 --
1 file changed, 10 deletions(-)
New commits:
commit f6972d337d0990a5b9c6ddbe1fef1216b6efc714
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 12 15:30:21 2013 +0200
SwFormatClipboard: unused includes
Change-Id: I41a6ad6e3af76ddcfad7c33b434601dcc8a2de95
diff --git a/sw/source/ui/uiview/formatclipboard.cxx
b/sw/source/ui/uiview/formatclipboard.cxx
index 8cf76e7..914aa69 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -21,22 +21,17 @@
#include formatclipboard.hxx
-#include hintids.hxx
#include svx/svxids.hrc
#include cmdid.h
-#include format.hxx
#include charfmt.hxx
-#include fmtcol.hxx
#include frmfmt.hxx
#include docstyle.hxx
#include fchrfmt.hxx
-#include pam.hxx
// header for class SdrView
#include svx/svdview.hxx
//SvxBrushItem
#include editeng/brushitem.hxx
#include editeng/shaditem.hxx
-#include frmatr.hxx
// header for class SvxBoxInfoItem
#include editeng/boxitem.hxx
// header for class SvxFmtBreakItem
@@ -47,13 +42,8 @@
#include editeng/keepitem.hxx
// header for class SvxFrameDirectionItem
#include editeng/frmdiritem.hxx
-#include paratr.hxx
#include fmtpdsc.hxx
#include fmtrowsplt.hxx
-#include swundo.hxx // for the UndoIds
-#include boost/shared_ptr.hpp
-
-
namespace
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/helper/debughelper.hxx |1
sc/qa/unit/ucalc.hxx |3
sc/qa/unit/ucalc_pivottable.cxx | 161 ++
3 files changed, 165 insertions(+)
New commits:
commit 20cbceac4d6ed100a3978d3d7ef3b55735c942ec
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 09:42:05 2013 -0400
Add unit test for GETPIVOTDATA.
This is just an initial version. Will add more test cases as needed.
Change-Id: I40b00bedafc585acd21e804cf041ce4538274ff9
diff --git a/sc/qa/unit/helper/debughelper.hxx
b/sc/qa/unit/helper/debughelper.hxx
index 11dfc51..6f458c9 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -11,6 +11,7 @@
#define SC_DEBUG_HELPER_HXX
#include rtl/strbuf.hxx
+#include rtl/ustrbuf.hxx
#include rtl/ustring.hxx
#ifdef WNT
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 55e3f7c..8c4edcf 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -94,6 +94,8 @@ public:
void testFuncDATEDIF();
void testFuncINDIRECT();
void testFuncIFERROR();
+void testFuncGETPIVOTDATA();
+
void testCopyToDocument();
/**
* Make sure the SHEETS function gets properly updated during sheet
@@ -280,6 +282,7 @@ public:
CPPUNIT_TEST(testFuncDATEDIF);
CPPUNIT_TEST(testFuncINDIRECT);
CPPUNIT_TEST(testFuncIFERROR);
+CPPUNIT_TEST(testFuncGETPIVOTDATA);
CPPUNIT_TEST(testCopyToDocument);
CPPUNIT_TEST(testSheetsFunc);
CPPUNIT_TEST(testVolatileFunc);
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 94d8979..28d0e92 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -2076,4 +2076,165 @@ void Test::testPivotTableDocFunc()
m_pDoc-DeleteTab(0);
}
+void Test::testFuncGETPIVOTDATA()
+{
+m_pDoc-InsertTab(0, Data);
+m_pDoc-InsertTab(1, Table);
+
+// Raw data
+const char* aData[][2] = {
+{ Name, Value },
+{ A, 1 },
+{ A, 2 },
+{ A, 3 },
+{ B, 4 },
+{ B, 5 },
+{ B, 6 },
+};
+
+ScAddress aPos(1,1,0);
+ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE(failed to insert range data at correct position,
aDataRange.aStart == aPos);
+
+ScDPObject* pDPObj = NULL;
+
+{
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Value, sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+};
+
+pDPObj = createDPFromRange(m_pDoc, aDataRange, aFields,
SAL_N_ELEMENTS(aFields), false);
+}
+
+ScDPCollection* pDPs = m_pDoc-GetDPCollection();
+bool bSuccess = pDPs-InsertNewTable(pDPObj);
+
+CPPUNIT_ASSERT_MESSAGE(failed to insert a new pivot table object into
document., bSuccess);
+CPPUNIT_ASSERT_MESSAGE(there should be only one data pilot table.,
+ pDPs-GetCount() == 1);
+pDPObj-SetName(pDPs-CreateNewName());
+
+ScRange aOutRange = refresh(pDPObj);
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ Name, 0 },
+{ A, 6 },
+{ B, 15 },
+{ Total Result, 21 },
+};
+
+bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck,
Pivot table created for GETPIVOTDATA);
+CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess);
+}
+
+aPos = aOutRange.aEnd;
+aPos.IncRow(2); // Move 2 rows down from the table outout.
+
+OUString aPivotPosStr;
+aOutRange.aStart.Format(aPivotPosStr, SCA_ABS);
+
+sc::AutoCalcSwitch aSwitch(*m_pDoc, true); // turn autocalc on.
+
+// First, get the grand total.
+OUString aFormula(=GETPIVOTDATA(\Value\;);
+aFormula += aPivotPosStr;
+aFormula += );
+m_pDoc-SetString(aPos, aFormula);
+double fVal = m_pDoc-GetValue(aPos);
+CPPUNIT_ASSERT_EQUAL(21.0, fVal);
+
+// Get the subtotal for 'A'.
+aFormula = =GETPIVOTDATA(\Value\; + aPivotPosStr + ;\Name\;\A\);
+m_pDoc-SetString(aPos, aFormula);
+fVal = m_pDoc-GetValue(aPos);
+CPPUNIT_ASSERT_EQUAL(6.0, fVal);
+
+// Get the subtotal for 'B'.
+aFormula = =GETPIVOTDATA(\Value\; + aPivotPosStr + ;\Name\;\B\);
+m_pDoc-SetString(aPos, aFormula);
+fVal = m_pDoc-GetValue(aPos);
+CPPUNIT_ASSERT_EQUAL(15.0, fVal);
+
+clearRange(m_pDoc, aPos); // Delete the formula.
+
+pDPs-FreeTable(pDPObj);
+
+{
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Value, sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+{ Value, sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_COUNT },
+};
+
+pDPObj = createDPFromRange(m_pDoc,
[Libreoffice-commits] core.git: 3 commits - include/svl svl/source
include/svl/languageoptions.hxx |7
svl/source/config/cjkoptions.cxx | 36 ++--
svl/source/config/ctloptions.cxx | 51 +-
svl/source/config/languageoptions.cxx | 49 +++-
4 files changed, 119 insertions(+), 24 deletions(-)
New commits:
commit fc0a23e52df27cebb156bc6a128e8b0ce272cfd8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 14:52:10 2013 +0100
constify these methods
Change-Id: I72173ef6cbea28afe9f349aa57a94cbfd537a851
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index c9700e6..08a28e5 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -98,7 +98,7 @@ class SVL_DLLPUBLIC SvtSystemLanguageOptions : public
utl::ConfigItem
private:
OUString m_sWin16SystemLocale;
-bool isKeyboardLayoutTypeInstalled(sal_Int16 scriptType);
+bool isKeyboardLayoutTypeInstalled(sal_Int16 scriptType) const;
public:
SvtSystemLanguageOptions();
@@ -107,10 +107,10 @@ public:
virtual voidCommit();
virtual voidNotify( const com::sun::star::uno::Sequence OUString
rPropertyNames );
-LanguageType GetWin16SystemLanguage();
+LanguageType GetWin16SystemLanguage() const;
-bool isCTLKeyboardLayoutInstalled();
-bool isCJKKeyboardLayoutInstalled();
+bool isCTLKeyboardLayoutInstalled() const;
+bool isCJKKeyboardLayoutInstalled() const;
};
#endif // _SVTOOLS_LANGUAGEOPTIONS_HXX
diff --git a/svl/source/config/languageoptions.cxx
b/svl/source/config/languageoptions.cxx
index 2124b8f..a095ac5 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -200,16 +200,14 @@ voidSvtSystemLanguageOptions::Notify( const
com::sun::star::uno::Sequence O
// no listeners supported yet
}
-
-LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage()
+LanguageType SvtSystemLanguageOptions::GetWin16SystemLanguage() const
{
if( m_sWin16SystemLocale.isEmpty() )
return LANGUAGE_NONE;
return LanguageTag( m_sWin16SystemLocale ).getLanguageType();
}
-
-bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16
scriptType)
+bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16
scriptType) const
{
bool isInstalled = false;
#ifdef WNT
@@ -241,13 +239,13 @@ bool
SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 scriptTyp
}
-bool SvtSystemLanguageOptions::isCTLKeyboardLayoutInstalled()
+bool SvtSystemLanguageOptions::isCTLKeyboardLayoutInstalled() const
{
return
isKeyboardLayoutTypeInstalled(::com::sun::star::i18n::ScriptType::COMPLEX);
}
-bool SvtSystemLanguageOptions::isCJKKeyboardLayoutInstalled()
+bool SvtSystemLanguageOptions::isCJKKeyboardLayoutInstalled() const
{
return
isKeyboardLayoutTypeInstalled(::com::sun::star::i18n::ScriptType::ASIAN);
}
commit d75dd80abb28cdb126a12840597d0384dd43897e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 14:49:02 2013 +0100
Resolves: fdo#54493 autoenable CJK/CTL ui based on installed keyboards
Change-Id: I66d3c57c88ff64fc3e3a7fa50fb5a173e709e3bf
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index ed152c1..d69880a 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -197,15 +197,35 @@ void SvtCJKOptions_Impl::Load()
}
}
-SvtSystemLanguageOptions aSystemLocaleSettings;
-LanguageType eSystemLanguage =
aSystemLocaleSettings.GetWin16SystemLanguage();
-sal_uInt16 nWinScript = SvtLanguageOptions::GetScriptTypeOfLanguage(
eSystemLanguage );
-
-sal_uInt16 nScriptType =
SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM);
-if ( !bCJKFont (( nScriptType SCRIPTTYPE_ASIAN )||
- ((eSystemLanguage != LANGUAGE_SYSTEM) ( nWinScript
SCRIPTTYPE_ASIAN
+if (!bCJKFont)
{
-SetAll(sal_True);
+bool bAutoEnableCJK = false;
+
+sal_uInt16 nScriptType =
SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM);
+//system locale is CJK
+bAutoEnableCJK = (nScriptType SCRIPTTYPE_ASIAN);
+
+if (!bAutoEnableCJK)
+{
+SvtSystemLanguageOptions aSystemLocaleSettings;
+
+//windows secondary system locale is CJK
+LanguageType eSystemLanguage =
aSystemLocaleSettings.GetWin16SystemLanguage();
+if (eSystemLanguage != LANGUAGE_SYSTEM)
+{
+sal_uInt16 nWinScript =
SvtLanguageOptions::GetScriptTypeOfLanguage( eSystemLanguage );
+bAutoEnableCJK = (nWinScript SCRIPTTYPE_ASIAN);
+}
+
+//CJK keyboard is installed
+if (!bAutoEnableCJK)
+bAutoEnableCJK =
aSystemLocaleSettings.isCJKKeyboardLayoutInstalled();
+}
+
+if (bAutoEnableCJK)
+{
+
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - 3 commits - configure.ac connectivity/source dbaccess/source firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk
configure.ac | 17
connectivity/source/drivers/firebird/FConnection.cxx | 17
connectivity/source/drivers/firebird/FConnection.hxx |6
connectivity/source/drivers/firebird/FDatabaseMetaData.cxx | 232 ++---
dbaccess/source/core/misc/dsntypes.cxx |5
firebird/ExternalPackage_firebird.mk | 28 -
firebird/ExternalProject_firebird.mk |5
firebird/Module_firebird.mk|1
8 files changed, 132 insertions(+), 179 deletions(-)
New commits:
commit 7cc42f51e9ab152feb3c959fb2e412bc23440cf9
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Jul 12 15:09:22 2013 +0100
Implement first part of FDatabaseMetaData.
Change-Id: I6dae1f2ecf265333c121f419c0041dd7525efa9e
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx
b/connectivity/source/drivers/firebird/FConnection.cxx
index 0735d24..d506d29 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/FConnection.cxx
@@ -89,7 +89,8 @@ OConnection::OConnection(FirebirdDriver*_pDriver)
OSubComponentOConnection,
OConnection_BASE((::cppu::OWeakObject*)_pDriver, this),
m_xMetaData(NULL),
m_bIsEmbedded(sal_False),
- m_aURL(),
+ m_sConnectionURL(),
+ m_sURL(),
m_sUser(),
m_pDriver(_pDriver),
m_bClosed(sal_False),
@@ -147,6 +148,8 @@ void OConnection::construct(const ::rtl::OUString url,
const Sequence Property
osl_atomic_increment( m_refCount );
+m_sConnectionURL = url;
+
bool bIsNewDatabase = false;
OUString aStorageURL;
if (url.equals(sdbc:embedded:firebird))
@@ -176,10 +179,10 @@ void OConnection::construct(const ::rtl::OUString url,
const Sequence Property
bIsNewDatabase = !m_xEmbeddedStorage-hasElements();
-m_aURL = utl::TempFile::CreateTempName() + .fdb;
+m_sURL = utl::TempFile::CreateTempName() + .fdb;
SAL_INFO(connectivity.firebird, Temporary .fdb location:
- OUStringToOString(m_aURL,RTL_TEXTENCODING_UTF8
).getStr());
+ OUStringToOString(m_sURL,RTL_TEXTENCODING_UTF8
).getStr());
if (!bIsNewDatabase)
{
SAL_INFO(connectivity.firebird, Extracting .fdb from .odb );
@@ -204,7 +207,7 @@ void OConnection::construct(const ::rtl::OUString url,
const Sequence Property
::dbtools::throwGenericSQLException(sMessage ,*this);
}
try {
-xFileAccess-writeFile(m_aURL,xDBStream-getInputStream());
+xFileAccess-writeFile(m_sURL,xDBStream-getInputStream());
}
catch (...)
{
@@ -224,7 +227,7 @@ void OConnection::construct(const ::rtl::OUString url,
const Sequence Property
if (bIsNewDatabase)
{
-if (isc_create_database(status, m_aURL.getLength(),
OUStringToOString(m_aURL, RTL_TEXTENCODING_UTF8).getStr(),
+if (isc_create_database(status, m_sURL.getLength(),
OUStringToOString(m_sURL, RTL_TEXTENCODING_UTF8).getStr(),
m_DBHandler, 0,
NULL, 0))
{
if(pr_error(status, create new database))
@@ -233,7 +236,7 @@ void OConnection::construct(const ::rtl::OUString url,
const Sequence Property
}
else
{
-if (isc_attach_database(status, m_aURL.getLength(),
OUStringToOString(m_aURL, RTL_TEXTENCODING_UTF8).getStr(),
+if (isc_attach_database(status, m_sURL.getLength(),
OUStringToOString(m_sURL, RTL_TEXTENCODING_UTF8).getStr(),
m_DBHandler, 0, NULL))
if (pr_error(status, attach database))
return;
@@ -577,7 +580,7 @@ void SAL_CALL OConnection::documentEventOccured( const
DocumentEvent _Event )
Reference XInputStream xInputStream;
if (xContext.is())
xInputStream =
-OStorageHelper::GetInputStreamFromURL(m_aURL,
xContext);
+OStorageHelper::GetInputStreamFromURL(m_sURL,
xContext);
if (xInputStream.is())
OStorageHelper::CopyInputToOutput( xInputStream,
xDBStream-getOutputStream());
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx
b/connectivity/source/drivers/firebird/FConnection.hxx
index e91aef6..1e5168f 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/FConnection.hxx
@@ -99,7 +99,8 @@ namespace connectivity
::com::sun::star::sdbc::SQLWarning m_aLastWarning; //
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - scp2/source solenv/gbuild
scp2/source/gnome/module_gnome.scp |2 +- scp2/source/graphicfilter/module_graphicfilter.scp |2 +- scp2/source/kde/module_kde.scp |3 +-- scp2/source/ooo/module_hidden_ooo.scp |2 +- scp2/source/ooo/ure.scp|2 +- scp2/source/tde/module_tde.scp |3 +-- scp2/source/writer/module_writer.scp |2 +- solenv/gbuild/AutoInstallLibs.mk | 13 + 8 files changed, 16 insertions(+), 13 deletions(-) New commits: commit b28d846c0f33c93b71c8f6118c8e1f8de78d8e11 Author: David Tardon dtar...@redhat.com Date: Thu Jul 11 12:23:39 2013 +0200 fdo#66072 do not end auto_*_ALL by a comma Reviewed-on: https://gerrit.libreoffice.org/4829 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org (cherry picked from commit bd3aa6983796f9dedf85c446a0ce5e5505583809) Signed-off-by: David Tardon dtar...@redhat.com Conflicts: scp2/source/base/module_base.scp scp2/source/calc/module_calc.scp scp2/source/gnome/module_gnome.scp scp2/source/graphicfilter/module_graphicfilter.scp scp2/source/impress/module_impress.scp scp2/source/kde/module_kde.scp scp2/source/math/module_math.scp scp2/source/onlineupdate/module_onlineupdate.scp scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/ure.scp scp2/source/tde/module_tde.scp scp2/source/writer/module_writer.scp solenv/gbuild/AutoInstall.mk Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939 (cherry picked from commit 2f40865f544edd18ca6832ad94f22aa3be373245) Signed-off-by: David Tardon dtar...@redhat.com Reviewed-on: https://gerrit.libreoffice.org/4832 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Reviewed-by: Andras Timar ati...@suse.com diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index f66178d..e8a22bf 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome #ifdef ENABLE_GNOMEVFS XpdCheckSolaris = SUNWgnome-vfs; #endif -Files = (auto_Gnome_Lib_ALL +Files = (auto_Gnome_Lib_ALL, #if (defined ENABLE_GNOMEVFS defined ENABLE_LOCKDOWN) || defined ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index 556161e..dd2de5f 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt Sortkey = 600; ParentID = gid_Module_Optional; Default = YES; -Files = (auto_Graphicfilter_Lib_ALL +Files = (auto_Graphicfilter_Lib_ALL, gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp index 8e8012f..e61fb41 100644 --- a/scp2/source/kde/module_kde.scp +++ b/scp2/source/kde/module_kde.scp @@ -26,6 +26,5 @@ Module gid_Module_Optional_Kde PackageInfo = packinfo_office.txt; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); -Files = (auto_Kde_Lib_ALL -); +Files = (auto_Kde_Lib_ALL); End diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 71a6d0f..f75f131 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -143,7 +143,7 @@ Module gid_Module_Root_Files_4 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, - auto_File_Lib_ALL + auto_File_Lib_ALL, gid_File_Lib_Bib, gid_File_Lib_J, gid_File_Lib_Oox, diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 6c775b9..55b3091 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -685,7 +685,7 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Store, gid_Unixlink_File_Dl_Jvmaccess, gid_Unixlink_File_Dl_Jvmfwk, -auto_Ure_Private_Lib_ALL +auto_Ure_Private_Lib_ALL, gid_File_Dl_JrepropertiesClass, gid_File_Dl_Profile_Jvmfwk3rc, gid_File_Dl_Jpipe, diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp index 89f2462..85e349e 100644 --- a/scp2/source/tde/module_tde.scp +++ b/scp2/source/tde/module_tde.scp @@ -19,7 +19,6 @@ Module gid_Module_Optional_Tde PackageInfo = packinfo_office.txt; MOD_NAME_DESC(MODULE_OPTIONAL_TDE); Styles = (); -Files = (auto_Tde_Lib_ALL -); +Files = (auto_Tde_Lib_ALL); End diff --git
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.pbxproj
| 24 --
ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
|binary
ios/iosremote/iosremote.xcodeproj/xcuserdata/siqi.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
| 25 --
ios/iosremote/iosremote/AppDelegate.h
|2
ios/iosremote/iosremote/AppDelegate.m
| 18 ++
ios/iosremote/iosremote/en.lproj/iPhone_autolayout.storyboard
| 88 +-
ios/iosremote/iosremote/iosremote-Info.plist
|2
ios/iosremote/iosremote/slideShowPreviewTable_vc.m
|8
ios/iosremote/iosremote/slideShowSwipeInList.m
| 25 ++
9 files changed, 105 insertions(+), 87 deletions(-)
New commits:
commit 135cb84e76e58c64e1b9953f16e3544f1b2db3a2
Author: siqi m...@siqi.fr
Date: Fri Jul 12 16:21:42 2013 +0200
iOS5 backward compatible
Change-Id: Ia540e68d953069e5f690a36303823f59e1129b46
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 7b8bdde..32c9b87 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -36,7 +36,6 @@
57C6E405175E06E800E8BC5F /* Default.png in Resources */ = {isa
= PBXBuildFile; fileRef = 57C6E404175E06E800E8BC5F /* Default.png */; };
57C6E407175E06E800E8BC5F /* defa...@2x.png in Resources */ =
{isa = PBXBuildFile; fileRef = 57C6E406175E06E800E8BC5F /* defa...@2x.png */; };
57C6E409175E06E800E8BC5F /* default-5...@2x.png in Resources */
= {isa = PBXBuildFile; fileRef = 57C6E408175E06E800E8BC5F /*
default-5...@2x.png */; };
- 57C6E40C175E06E800E8BC5F /* iPhone_autolayout.storyboard in
Resources */ = {isa = PBXBuildFile; fileRef = 57C6E40A175E06E800E8BC5F /*
iPhone_autolayout.storyboard */; };
57C6E42E175E076900E8BC5F /* Client.m in Sources */ = {isa =
PBXBuildFile; fileRef = 57C6E427175E076900E8BC5F /* Client.m */; };
57C6E42F175E076900E8BC5F /* CommunicationManager.m in Sources
*/ = {isa = PBXBuildFile; fileRef = 57C6E429175E076900E8BC5F /*
CommunicationManager.m */; };
57C6E430175E076900E8BC5F /* CommandInterpreter.m in Sources */
= {isa = PBXBuildFile; fileRef = 57C6E42B175E076900E8BC5F /*
CommandInterpreter.m */; };
@@ -49,7 +48,7 @@
57DC7007178D84490050FC58 /* CoreMotion.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 57DC7006178D84490050FC58 /*
CoreMotion.framework */; };
57DC700F178E03330050FC58 /* touchPointer_vc.m in Sources */ =
{isa = PBXBuildFile; fileRef = 57DC700E178E03330050FC58 /* touchPointer_vc.m
*/; };
57DC7012178E16A40050FC58 /* setRecursiveUserInteraction.m in
Sources */ = {isa = PBXBuildFile; fileRef = 57DC7011178E16A40050FC58 /*
setRecursiveUserInteraction.m */; };
- 57DF0A85178FFFAB008B2D3D /* iPhone_springstrut.storyboard in
Resources */ = {isa = PBXBuildFile; fileRef = 57DF0A83178FFFAB008B2D3D /*
iPhone_springstrut.storyboard */; };
+ 57DF0A85178FFFAB008B2D3D /* iPhone_autosize.storyboard in
Resources */ = {isa = PBXBuildFile; fileRef = 57DF0A83178FFFAB008B2D3D /*
iPhone_autosize.storyboard */; };
57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */ =
{isa = PBXBuildFile; fileRef = 57FE71E21785C61400B50125 /* pinValidation_vc.m
*/; };
57FE71E61785D7FE00B50125 /* slideShowPreview_vc.m in Sources */
= {isa = PBXBuildFile; fileRef = 57FE71E51785D7FE00B50125 /*
slideShowPreview_vc.m */; };
57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in
Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E817861A9000B50125 /*
slideShowPreviewTable_vc.m */; };
@@ -99,7 +98,6 @@
57C6E404175E06E800E8BC5F /* Default.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree
= group; };
57C6E406175E06E800E8BC5F /* defa...@2x.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = defa...@2x.png;
sourceTree = group; };
57C6E408175E06E800E8BC5F /* default-5...@2x.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; path = default-5...@2x.png;
sourceTree = group; };
- 57C6E40B175E06E800E8BC5F /* en */ = {isa = PBXFileReference;
lastKnownFileType = file.storyboard; name = en; path =
en.lproj/iPhone_autolayout.storyboard; sourceTree = group; };
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
|binary
ios/iosremote/iosremote/slideShow_vc.m
| 110 +-
2 files changed, 57 insertions(+), 53 deletions(-)
New commits:
commit 08225e92133bd056bd18d404da5655df14831b36
Author: siqi m...@siqi.fr
Date: Fri Jul 12 16:25:57 2013 +0200
disable pointer when enlarged image is hidden
Change-Id: I6c637a4d8d8e0e3ffdeeb29ea98ca184d198355e
diff --git
a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
index ea2ca0d..baead88 100644
Binary files
a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
and
b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate
differ
diff --git a/ios/iosremote/iosremote/slideShow_vc.m
b/ios/iosremote/iosremote/slideShow_vc.m
index db979a3..eca3531 100644
--- a/ios/iosremote/iosremote/slideShow_vc.m
+++ b/ios/iosremote/iosremote/slideShow_vc.m
@@ -65,9 +65,9 @@
- (void)startMotionDetect
{
-//__block float stepMoveFactorX = 5;
-//__block float stepMoveFactorY = 5;
-//__block double refX, refY;
+//__block float stepMoveFactorX = 5;
+//__block float stepMoveFactorY = 5;
+//__block double refX, refY;
[self.motionManager
startAccelerometerUpdatesToQueue:[[NSOperationQueue alloc] init]
@@ -76,38 +76,38 @@
dispatch_async(dispatch_get_main_queue(),
^{
-CGRect rect = self.movingPointer.frame;
-NSLog(@x:%f y:%f z:%f, data.acceleration.x,
data.acceleration.y, data.acceleration.z);
-// Used to calibrate pointer based on initial
position
-//if
(self.pointerCalibrationOn){
-//refX =
data.acceleration.x;
-//refY =
data.acceleration.y;
-//
self.pointerCalibrationOn = NO;
-//}
-//float movetoX = rect.origin.x +
((data.acceleration.x - refX) * stepMoveFactorX);
-
-float movetoX =
self.touchPointerImage.frame.origin.x + self.touchPointerImage.frame.size.width
* ABS(data.acceleration.x - self.refLeftUpperGravity.x) /
ABS(self.refRightUpperGravity.x - self.refLeftUpperGravity.x);
-float maxX =
self.touchPointerImage.frame.origin.x + self.touchPointerImage.frame.size.width
- rect.size.width;
-
-//float movetoY = (rect.origin.y) +
((data.acceleration.y - refY) * stepMoveFactorY);
-float movetoY =
self.touchPointerImage.frame.origin.y +
self.touchPointerImage.frame.size.height * ABS(data.acceleration.y -
self.refRightUpperGravity.y) / ABS(self.refRightLowerGravity.y -
self.refRightUpperGravity.y);
-float maxY =
self.touchPointerImage.frame.origin.y +
self.touchPointerImage.frame.size.height;
-
-if ( movetoX
self.touchPointerImage.frame.origin.x movetoX maxX ) {
-rect.origin.x = movetoX;
-};
-
-if ( movetoY
self.touchPointerImage.frame.origin.y movetoY maxY ) {
-rect.origin.y = movetoY;
-};
-
-[UIView animateWithDuration:0 delay:0
-
options:UIViewAnimationOptionCurveEaseIn
- animations:^{
- self.movingPointer.frame = rect;
- }
- completion:nil
- ];
+CGRect rect = self.movingPointer.frame;
+NSLog(@x:%f y:%f z:%f, data.acceleration.x,
data.acceleration.y, data.acceleration.z);
+// Used to calibrate pointer based on initial
position
+//if
(self.pointerCalibrationOn){
+//refX =
data.acceleration.x;
+//refY =
data.acceleration.y;
+//
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 66655, which changed state. Bug 66655 Summary: EDITING: GETPIVOTDATA() gives #REF! https://bugs.freedesktop.org/show_bug.cgi?id=66655 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/inc/areasdlg.hxx| 36 +--
sc/source/ui/pagedlg/areasdlg.cxx| 205 +-
sc/source/ui/pagedlg/pagedlg.hrc | 22 -
sc/source/ui/pagedlg/pagedlg.src | 132 ---
sc/uiconfig/scalc/ui/printareasdialog.ui | 348 +++
6 files changed, 471 insertions(+), 273 deletions(-)
New commits:
commit 9f0644d62f5d54a8d2788f358c850df2fcb1516b
Author: Csikós Tamás csks.t...@gmail.com
Date: Fri Jul 12 15:50:41 2013 +0200
modern .ui widgetlayout for areasdlg/printareasdlg
Change-Id: I91ae85f6ca896bdc91d43654213a079480e627e0
Reviewed-on: https://gerrit.libreoffice.org/4866
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 72e7547..ddf13e8 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optdlg \
sc/uiconfig/scalc/ui/optformula \
sc/uiconfig/scalc/ui/optsortlists \
+ sc/uiconfig/scalc/ui/printareasdialog \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/rightfooterdialog \
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 64c33ce..9f0a03e 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -48,24 +48,24 @@ public:
virtual sal_BoolClose();
private:
-FixedLine aFlPrintArea;
-ListBox aLbPrintArea;
-formula::RefEditaEdPrintArea;
-formula::RefButton aRbPrintArea;
-
-FixedLine aFlRepeatRow;
-ListBox aLbRepeatRow;
-formula::RefEditaEdRepeatRow;
-formula::RefButton aRbRepeatRow;
-
-FixedLine aFlRepeatCol;
-ListBox aLbRepeatCol;
-formula::RefEditaEdRepeatCol;
-formula::RefButton aRbRepeatCol;
-
-OKButtonaBtnOk;
-CancelButtonaBtnCancel;
-HelpButton aBtnHelp;
+FixedLine* pFlPrintArea;
+ListBox* pLbPrintArea;
+formula::RefEdit*pEdPrintArea;
+formula::RefButton* pRbPrintArea;
+
+FixedLine* pFlRepeatRow;
+ListBox* pLbRepeatRow;
+formula::RefEdit*pEdRepeatRow;
+formula::RefButton* pRbRepeatRow;
+
+FixedLine* pFlRepeatCol;
+ListBox* pLbRepeatCol;
+formula::RefEdit*pEdRepeatCol;
+formula::RefButton* pRbRepeatCol;
+
+OKButton*pBtnOk;
+CancelButton*pBtnCancel;
+HelpButton* pBtnHelp;
sal_BoolbDlgLostFocus;
formula::RefEdit* pRefInputEdit;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index 1235314..97b8a16 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -105,33 +105,38 @@ static void printAddressFlags(sal_uInt16 nFlag)
//
ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent )
-: ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS),
-//
-aFlPrintArea( this, ScResId( FL_PRINTAREA ) ),
-aLbPrintArea( this, ScResId( LB_PRINTAREA ) ),
-aEdPrintArea( this, this, aFlPrintArea, ScResId( ED_PRINTAREA ) ),
-aRbPrintArea( this, ScResId( RB_PRINTAREA ), aEdPrintArea, this ),
-//
-aFlRepeatRow( this, ScResId( FL_REPEATROW ) ),
-aLbRepeatRow( this, ScResId( LB_REPEATROW ) ),
-aEdRepeatRow( this, this, aFlRepeatRow, ScResId( ED_REPEATROW ) ),
-aRbRepeatRow( this, ScResId( RB_REPEATROW ), aEdRepeatRow, this ),
-//
-aFlRepeatCol( this, ScResId( FL_REPEATCOL ) ),
-aLbRepeatCol( this, ScResId( LB_REPEATCOL ) ),
-aEdRepeatCol( this, this, aFlRepeatCol, ScResId( ED_REPEATCOL ) ),
-aRbRepeatCol( this, ScResId( RB_REPEATCOL ), aEdRepeatCol, this ),
-//
-aBtnOk ( this, ScResId( BTN_OK ) ),
-aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-aBtnHelp( this, ScResId( BTN_HELP ) ),
+: ScAnyRefDlg ( pB, pCW, pParent, PrintAreasDialog,
modules/scalc/ui/printareasdialog.ui),
//
bDlgLostFocus ( false ),
-pRefInputEdit ( aEdPrintArea ),
pDoc( NULL ),
pViewData ( NULL ),
nCurTab ( 0 )
{
+get(pFlPrintArea,label1);
+get(pLbPrintArea,lbprintarea);
+get(pEdPrintArea,edprintarea);
+pEdPrintArea-SetReferences(this, pFlPrintArea);
+pRefInputEdit = pEdPrintArea;
+get(pRbPrintArea,rbprintarea);
+
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig
sc/inc/helpids.h |1
sc/source/ui/inc/areasdlg.hxx|3
sc/source/ui/pagedlg/areasdlg.cxx| 28 +++-
sc/uiconfig/scalc/ui/printareasdialog.ui | 97 ---
4 files changed, 64 insertions(+), 65 deletions(-)
New commits:
commit 7908692490120350f2ad45241f7b19ba52dc0489
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 15:33:55 2013 +0100
GtkComboBox-GtkComboBoxText to use the items, etc
Change-Id: I6ece0c471fbe21fc832c4c65a02bfbc9cf991a5a
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index bb7e205..eae705d 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -60,7 +60,6 @@
#define HID_SC_PIVOTSUBT
SC_HID_SC_PIVOTSUBT
#define HID_SCPAGE_SUBT_OPTIONS
SC_HID_SCPAGE_SUBT_OPTIONS
#define HID_SCPAGE_SUBT_GROUP
SC_HID_SCPAGE_SUBT_GROUP
-#define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
#define HID_SCPAGE_SUBT_GROUP1
SC_HID_SCPAGE_SUBT_GROUP1
#define HID_SCPAGE_SUBT_GROUP2
SC_HID_SCPAGE_SUBT_GROUP2
#define HID_SCPAGE_SUBT_GROUP3
SC_HID_SCPAGE_SUBT_GROUP3
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 9f0a03e..3ed 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -48,17 +48,14 @@ public:
virtual sal_BoolClose();
private:
-FixedLine* pFlPrintArea;
ListBox* pLbPrintArea;
formula::RefEdit*pEdPrintArea;
formula::RefButton* pRbPrintArea;
-FixedLine* pFlRepeatRow;
ListBox* pLbRepeatRow;
formula::RefEdit*pEdRepeatRow;
formula::RefButton* pRbRepeatRow;
-FixedLine* pFlRepeatCol;
ListBox* pLbRepeatCol;
formula::RefEdit*pEdRepeatCol;
formula::RefButton* pRbRepeatCol;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index 97b8a16..e421b0b 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -105,32 +105,28 @@ static void printAddressFlags(sal_uInt16 nFlag)
//
ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent )
-: ScAnyRefDlg ( pB, pCW, pParent, PrintAreasDialog,
modules/scalc/ui/printareasdialog.ui),
-//
-bDlgLostFocus ( false ),
-pDoc( NULL ),
-pViewData ( NULL ),
-nCurTab ( 0 )
+: ScAnyRefDlg(pB, pCW, pParent, PrintAreasDialog,
modules/scalc/ui/printareasdialog.ui)
+, bDlgLostFocus(false)
+, pDoc(NULL)
+, pViewData(NULL)
+, nCurTab(0)
{
-get(pFlPrintArea,label1);
get(pLbPrintArea,lbprintarea);
get(pEdPrintArea,edprintarea);
-pEdPrintArea-SetReferences(this, pFlPrintArea);
+pEdPrintArea-SetReferences(this,
getVclFrame(printframe)-get_label_widget());
pRefInputEdit = pEdPrintArea;
get(pRbPrintArea,rbprintarea);
pRbPrintArea-SetReferences(this, pEdPrintArea);
-get(pFlRepeatRow,label2);
get(pLbRepeatRow,lbrepeatrow);
get(pEdRepeatRow,edrepeatrow);
-pEdRepeatRow-SetReferences(this, pFlRepeatRow);
+pEdRepeatRow-SetReferences(this,
getVclFrame(rowframe)-get_label_widget());
get(pRbRepeatRow,rbrepeatrow);
pRbRepeatRow-SetReferences(this, pEdRepeatRow);
-get(pFlRepeatCol,label3);
get(pLbRepeatCol,lbrepeatcol);
get(pEdRepeatCol,edrepeatcol);
-pEdRepeatCol-SetReferences(this, pFlRepeatCol);
+pEdRepeatCol-SetReferences(this,
getVclFrame(colframe)-get_label_widget());
get(pRbRepeatCol,rbrepeatcol);
pRbRepeatCol-SetReferences(this, pEdRepeatCol);
@@ -162,13 +158,13 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB,
SfxChildWindow* pCW, Window*
ScPrintAreasDlg::~ScPrintAreasDlg()
{
// Extra-Data an ListBox-Entries abraeumen
-ListBox* pLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
+ListBox* aLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
-for ( sal_uInt16 i=0; i3; i++ )
+for (sal_uInt16 i = 0; i SAL_N_ELEMENTS(aLb); ++i)
{
-sal_uInt16 nCount = pLb[i]-GetEntryCount();
+sal_uInt16 nCount = aLb[i]-GetEntryCount();
for ( sal_uInt16 j=0; jnCount; j++ )
-delete (String*)pLb[i]-GetEntryData(j);
+delete (String*)aLb[i]-GetEntryData(j);
}
}
diff --git a/sc/uiconfig/scalc/ui/printareasdialog.ui
b/sc/uiconfig/scalc/ui/printareasdialog.ui
index 6e119d4..d52ef6d 100644
--- a/sc/uiconfig/scalc/ui/printareasdialog.ui
+++ b/sc/uiconfig/scalc/ui/printareasdialog.ui
@@ -1,9 +1,11 @@
?xml version=1.0 encoding=UTF-8?
interface
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 16/235b6d5c6222fe6fdb49f30e885ba701050fdb
16/235b6d5c6222fe6fdb49f30e885ba701050fdb |1 + 1 file changed, 1 insertion(+) New commits: commit bbbff75d586f86b5364f70a53cdd7f9f708ca035 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 15:38:23 2013 +0100 Notes added by 'git notes add' diff --git a/16/235b6d5c6222fe6fdb49f30e885ba701050fdb b/16/235b6d5c6222fe6fdb49f30e885ba701050fdb new file mode 100644 index 000..1fd5c32 --- /dev/null +++ b/16/235b6d5c6222fe6fdb49f30e885ba701050fdb @@ -0,0 +1 @@ +reject: works for me ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/iosremote
ios/iosremote/ic_launcher.png |binary ios/iosremote/ic_launc...@2x.png |binary ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate |binary 3 files changed New commits: commit cd9a9c8fe95acc35ee0b44b887b825d06358e5b6 Author: siqi m...@siqi.fr Date: Fri Jul 12 16:40:06 2013 +0200 new icon Change-Id: I525bd9ffb539f0a64fa02c6a4f10021b298a2eee diff --git a/ios/iosremote/ic_launcher.png b/ios/iosremote/ic_launcher.png index 3de2dcc..f81bf7a 100644 Binary files a/ios/iosremote/ic_launcher.png and b/ios/iosremote/ic_launcher.png differ diff --git a/ios/iosremote/ic_launc...@2x.png b/ios/iosremote/ic_launc...@2x.png index e336ce0..308 100644 Binary files a/ios/iosremote/ic_launc...@2x.png and b/ios/iosremote/ic_launc...@2x.png differ diff --git a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate index baead88..fce5f43 100644 Binary files a/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcuserdata/siqi.xcuserdatad/UserInterfaceState.xcuserstate differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update help ids for print areas dialog .ui conversion
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4867 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/67/4867/1 update help ids for print areas dialog .ui conversion Change-Id: Icc747e1cb2387aacf806b38aa8a599bf1fec75bd --- M helpers/help_hid.lst M source/text/scalc/01/05080300.xhp M source/text/shared/00/0001.xhp 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ec9092a..72fab47 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6372,9 +6372,6 @@ sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_END,1495440898, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897, -sc_Edit_RID_SCDLG_AREAS_ED_PRINTAREA,2568275979, -sc_Edit_RID_SCDLG_AREAS_ED_REPEATCOL,2568275999, -sc_Edit_RID_SCDLG_AREAS_ED_REPEATROW,2568275989, sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575, sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_AREA,2568783885, sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_DATA,2568783889, @@ -6418,9 +6415,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481, -sc_ImageButton_RID_SCDLG_AREAS_RB_PRINTAREA,2568285708, -sc_ImageButton_RID_SCDLG_AREAS_RB_REPEATCOL,2568285728, -sc_ImageButton_RID_SCDLG_AREAS_RB_REPEATROW,2568285718, sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304, sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_AREA,2568793614, sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_DATA,2568793618, @@ -6446,9 +6440,6 @@ sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291, sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290, -sc_ListBox_RID_SCDLG_AREAS_LB_PRINTAREA,2568277517, -sc_ListBox_RID_SCDLG_AREAS_LB_REPEATCOL,2568277537, -sc_ListBox_RID_SCDLG_AREAS_LB_REPEATROW,2568277527, sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257, sc_ListBox_RID_SCDLG_COLROWNAMERANGES_LB_RANGE,2568785419, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_1,2568523266, diff --git a/source/text/scalc/01/05080300.xhp b/source/text/scalc/01/05080300.xhp index 1278395..f417b6a 100644 --- a/source/text/scalc/01/05080300.xhp +++ b/source/text/scalc/01/05080300.xhp @@ -39,23 +39,23 @@ paragraph role=paragraph id=par_idN105AE xml-lang=en-US l10n=NEW embedvar href=text/scalc/guide/printranges.xhp#printranges/ /paragraph -bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA id=bm_id3154910 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA id=bm_id3150447 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/lbprintarea id=bm_id3154910 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/edprintarea id=bm_id3150447 localize=false/ paragraph role=heading id=hd_id3156281 xml-lang=en-US level=2 l10n=U oldref=3Print range/paragraph -paragraph role=paragraph id=par_id3147228 xml-lang=en-US l10n=U oldref=4ahelp hid=SC:EDIT:RID_SCDLG_AREAS:ED_PRINTAREAAllows you to modify a defined print range./ahelp/paragraph +paragraph role=paragraph id=par_id3147228 xml-lang=en-US l10n=U oldref=4ahelp hid=modules/scalc/ui/printareasdialog/edprintareaAllows you to modify a defined print range./ahelp/paragraph paragraph role=paragraph id=par_id3145174 xml-lang=en-US l10n=CHG oldref=5Select emph-none-/emph to remove a print range definition for the current spreadsheet. Select emph-entire sheet-/emph to set the current sheet as a print range. Select emph-selection-/emph to define the selected area of a spreadsheet as the print range. By selecting emph-user-defined-/emph, you can define a print range that you have already defined using the emphFormat - Print Ranges - Define/emph command. If you have given a name to a range using the emphInsert - Names - Define/emph command, this name will be displayed and can be selected from the list box./paragraph paragraph role=paragraph id=par_id3145272 xml-lang=en-US l10n=U oldref=6In the right-hand text box, you can enter a print range by reference or by name. If the cursor is in the emphPrint range/emph text box, you can also select the print range in the spreadsheet with your mouse./paragraph embed href=text/shared/00/0001.xhp#eingabesymbol/ -bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW id=bm_id3147435 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW id=bm_id3153190 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/lbrepeatrow id=bm_id3147435 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/edrepeatrow id=bm_id3153190 localize=false/ paragraph role=heading id=hd_id3149260 xml-lang=en-US level=2 l10n=U oldref=7Rows to repeat/paragraph -paragraph role=paragraph id=par_id3147426
[Libreoffice-commits] core.git: sw/source
sw/source/ui/uiview/formatclipboard.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 12 16:02:43 2013 +0200
bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes
Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.
Regression from 357fac9713875302d30185feabaf5c165e040ca4.
Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
diff --git a/sw/source/ui/uiview/formatclipboard.cxx
b/sw/source/ui/uiview/formatclipboard.cxx
index 914aa69..3cc007d 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -528,19 +528,8 @@ void SwFormatClipboard::Paste( SwWrtShell rWrtShell,
SfxStyleSheetBasePool* pPo
// remove attribute that were applied by named text and paragraph
formatting
lcl_RemoveEqualItems( *pTemplateItemSet, aItemVector );
-// it can't be a multiple selection
-SwPaM* pCrsr = rWrtShell.GetCrsr();
-
// apply the paragraph automatic attributes to all the nodes in
the selection
-for (SwNodeIndex pNodeIndexIterator = pCrsr-Start()-nNode,
- pNodeIndexEnd = pCrsr-End()-nNode;
-pNodeIndexIterator != pNodeIndexEnd;
-++pNodeIndexIterator )
-{
-pNodeIndexIterator.GetNode().GetCntntNode()-SetAttr(
*pTemplateItemSet );
-}
-// same as pCrsr-End()-nNode.GetNode().GetCntntNode()-SetAttr
-pCrsr-GetCntntNode()-SetAttr( *pTemplateItemSet );
+rWrtShell.SetAttr(*pTemplateItemSet);
// store the attributes in aItemVector in order not to apply them
as
// text automatic formating attributes later in the code
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/uiview/formatclipboard.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit 5156749cde88c5274b36a22dab7b561d59b93cf1
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 12 16:02:43 2013 +0200
bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes
Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.
Regression from 357fac9713875302d30185feabaf5c165e040ca4.
(cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)
Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
Reviewed-on: https://gerrit.libreoffice.org/4868
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/ui/uiview/formatclipboard.cxx
b/sw/source/ui/uiview/formatclipboard.cxx
index 5dd7ef2..f7e41a6 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -538,19 +538,8 @@ void SwFormatClipboard::Paste( SwWrtShell rWrtShell,
SfxStyleSheetBasePool* pPo
// remove attribute that were applied by named text and paragraph
formatting
lcl_RemoveEqualItems( *pTemplateItemSet, aItemVector );
-// it can't be a multiple selection
-SwPaM* pCrsr = rWrtShell.GetCrsr();
-
// apply the paragraph automatic attributes to all the nodes in
the selection
-for (SwNodeIndex pNodeIndexIterator = pCrsr-Start()-nNode,
- pNodeIndexEnd = pCrsr-End()-nNode;
-pNodeIndexIterator != pNodeIndexEnd;
-++pNodeIndexIterator )
-{
-pNodeIndexIterator.GetNode().GetCntntNode()-SetAttr(
*pTemplateItemSet );
-}
-// same as pCrsr-End()-nNode.GetNode().GetCntntNode()-SetAttr
-pCrsr-GetCntntNode()-SetAttr( *pTemplateItemSet );
+rWrtShell.SetAttr(*pTemplateItemSet);
// store the attributes in aItemVector in order not to apply them
as
// text automatic formating attributes later in the code
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/uiview/formatclipboard.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit a179db327c739f3580cf11201b1f6c8520bc2dcb
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 12 16:02:43 2013 +0200
bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes
Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.
Regression from 357fac9713875302d30185feabaf5c165e040ca4.
(cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)
Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
Reviewed-on: https://gerrit.libreoffice.org/4870
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/ui/uiview/formatclipboard.cxx
b/sw/source/ui/uiview/formatclipboard.cxx
index 59ac47c..7ee8a63 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -538,19 +538,8 @@ void SwFormatClipboard::Paste( SwWrtShell rWrtShell,
SfxStyleSheetBasePool* pPo
// remove attribute that were applied by named text and paragraph
formatting
lcl_RemoveEqualItems( *pTemplateItemSet, aItemVector );
-// it can't be a multiple selection
-SwPaM* pCrsr = rWrtShell.GetCrsr();
-
// apply the paragraph automatic attributes to all the nodes in
the selection
-for (SwNodeIndex pNodeIndexIterator = pCrsr-Start()-nNode,
- pNodeIndexEnd = pCrsr-End()-nNode;
-pNodeIndexIterator != pNodeIndexEnd;
-++pNodeIndexIterator )
-{
-pNodeIndexIterator.GetNode().GetCntntNode()-SetAttr(
*pTemplateItemSet );
-}
-// same as pCrsr-End()-nNode.GetNode().GetCntntNode()-SetAttr
-pCrsr-GetCntntNode()-SetAttr( *pTemplateItemSet );
+rWrtShell.SetAttr(*pTemplateItemSet);
// store the attributes in aItemVector in order not to apply them
as
// text automatic formating attributes later in the code
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sw/source
sw/source/ui/uiview/formatclipboard.cxx | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
New commits:
commit 8f65fa122a379daedd747cef511f9ce307d43ef2
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jul 12 16:02:43 2013 +0200
bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes
Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.
Regression from 357fac9713875302d30185feabaf5c165e040ca4.
Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
(cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)
diff --git a/sw/source/ui/uiview/formatclipboard.cxx
b/sw/source/ui/uiview/formatclipboard.cxx
index 59ac47c..7ee8a63 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -538,19 +538,8 @@ void SwFormatClipboard::Paste( SwWrtShell rWrtShell,
SfxStyleSheetBasePool* pPo
// remove attribute that were applied by named text and paragraph
formatting
lcl_RemoveEqualItems( *pTemplateItemSet, aItemVector );
-// it can't be a multiple selection
-SwPaM* pCrsr = rWrtShell.GetCrsr();
-
// apply the paragraph automatic attributes to all the nodes in
the selection
-for (SwNodeIndex pNodeIndexIterator = pCrsr-Start()-nNode,
- pNodeIndexEnd = pCrsr-End()-nNode;
-pNodeIndexIterator != pNodeIndexEnd;
-++pNodeIndexIterator )
-{
-pNodeIndexIterator.GetNode().GetCntntNode()-SetAttr(
*pTemplateItemSet );
-}
-// same as pCrsr-End()-nNode.GetNode().GetCntntNode()-SetAttr
-pCrsr-GetCntntNode()-SetAttr( *pTemplateItemSet );
+rWrtShell.SetAttr(*pTemplateItemSet);
// store the attributes in aItemVector in order not to apply them
as
// text automatic formating attributes later in the code
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 2 commits - sc/source
sc/source/core/tool/formulagroup.cxx | 37 +--
1 file changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 6c320856290e17cdad6c3fb75c63ec63bb247b33
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 11:40:54 2013 -0400
Cache select converted tokens to avoid unnecessary token duplication.
Change-Id: I3a63d5cbbc1cdc37d681ffd41ec22ff65e56cc0d
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 6573d15..4ac4b6b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -19,6 +19,7 @@
#include formula/vectortoken.hxx
#include vector
+#include boost/unordered_map.hpp
#define USE_DUMMY_INTERPRETER 1
@@ -37,6 +38,8 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
const ScFormulaCellGroupRef
xGroup,
ScTokenArray rCode)
{
+typedef boost::unordered_mapconst formula::FormulaToken*,
formula::FormulaTokenRef CachedTokensType;
+
// Decompose the group into individual cells and calculate them
individually.
// The caller must ensure that the top position is the start position of
@@ -45,11 +48,21 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
ScAddress aTmpPos = rTopPos;
std::vectordouble aResults;
aResults.reserve(xGroup-mnLength);
+CachedTokensType aCachedTokens;
+
for (SCROW i = 0; i xGroup-mnLength; ++i, aTmpPos.IncRow())
{
ScTokenArray aCode2;
for (const formula::FormulaToken* p = rCode.First(); p; p =
rCode.Next())
{
+CachedTokensType::iterator it = aCachedTokens.find(p);
+if (it != aCachedTokens.end())
+{
+// This token is cached. Use the cached one.
+aCode2.AddToken(*it-second);
+continue;
+}
+
switch (p-GetType())
{
case formula::svSingleVectorRef:
@@ -77,8 +90,18 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
pMat-PutDouble(pArray, nRowSize, nCol, 0);
}
-ScMatrixToken aTok(pMat);
-aCode2.AddToken(aTok);
+if (p2-IsStartFixed() p2-IsEndFixed())
+{
+// Cached the converted token for absolute range
referene.
+formula::FormulaTokenRef xTok(new ScMatrixToken(pMat));
+aCachedTokens.insert(CachedTokensType::value_type(p,
xTok));
+aCode2.AddToken(*xTok);
+}
+else
+{
+ScMatrixToken aTok(pMat);
+aCode2.AddToken(aTok);
+}
}
break;
default:
commit 644fdbdc7ece20fb5d2b8f64195ab6faed2d4230
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 11:09:38 2013 -0400
Set an array of doubles in one step, rather than individually in loops.
The latter is massively slow, apparently.
Change-Id: I689643330e1b04eff7d9665de5d6e423906517e1
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 5a23511..6573d15 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -73,14 +73,8 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
for (size_t nCol = 0; nCol nColSize; ++nCol)
{
const double* pArray = rArrays[nCol];
-for (size_t nRow = 0; nRow nRowSize; ++nRow)
-{
-if (nRowStart + nRow p2-GetArrayLength())
-{
-double fVal = pArray[nRowStart+nRow];
-pMat-PutDouble(fVal, nCol, nRow);
-}
-}
+pArray += nRowStart;
+pMat-PutDouble(pArray, nRowSize, nCol, 0);
}
ScMatrixToken aTok(pMat);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/firebird-sdbc3'
New branch 'feature/firebird-sdbc3' available with the following commits: commit b6f103f21d7f96e51191627f9b8fcae950c578c3 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 15:09:22 2013 +0100 Implement first part of FDatabaseMetaData. Change-Id: I6dae1f2ecf265333c121f419c0041dd7525efa9e commit bd5302552f4f671556ca74f522b06fba6168c7df Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 12:53:15 2013 +0100 Cleanup firebird build files. Change-Id: I347734cfcc5970d68a1deaef8b06e15a43d80639 commit 13cf328aee78867d4cd927a24efc9efcd40c72e4 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 12:52:17 2013 +0100 Enable firebird by default, disable as default embedded driver. Change-Id: I4907b8b7a3b9ab767132d35b5c3539d52d122660 commit af76bc78ef6abe5afa74d4edbcc0973923db734d Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 09:45:39 2013 +0100 Remove unnecessary catalog state (unsupported in firebird). Change-Id: I34a7a245eb87a5b0d626be4008e2584774e82cf3 commit 6f93afa5835af33ede29cf376512ae83253ade87 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 09:27:49 2013 +0100 Clean up and remove warnings for unsupported methods. Change-Id: Id1a6c3c438c88791654ca9f301dbc7763caebeab commit aa535d3ed8ea64a547ab33259dfdce53c6ff2fa9 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 09:11:52 2013 +0100 Implement transaction isolation in firebird-sdbc. Change-Id: Id18c26cbd62b2cf9573ffafcd3da0041c2d8e9c5 commit bb8802d72ce628aa977342520ea70f063613403b Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 08:34:34 2013 +0100 Make db location a static member variable. Change-Id: I138c18839f2816baae24ef84eb08dbb71cce2948 commit 4e0a1205fb2bdd214f991e60b0945e9dad8d1107 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 08:17:20 2013 +0100 Implement readonly support in firebird-sdbc. Change-Id: Ifdb235a3772b92b7064d059700084f75d468d146 commit 1d342ab2ebb443a806d0f036e321d708d8b605fa Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 07:39:15 2013 +0100 Add auto-commit support to firebird-sdbc, enabled by default. Change-Id: I0303cc8df281c70973ee10dd67d23757cc7bd97a commit b43dc831a8a38e8da2e98d7a117285ddc8449a7c Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 20:15:41 2013 +0100 Cleanup warnings in FConnection. Unused parameter warnings remain as these methods are still to be implemented. Change-Id: I38ec0a895112766ecae322fdf9c07dea11e60c59 commit 822bc27d8eaf2b959663330d6701bf92a48fb807 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 19:44:50 2013 +0100 Do not ask for user/password in embedded firebird. Change-Id: I0237106e4012c9116248a97eda0ddf899b435f64 commit 65d3418ee39d30b10989d34bdc73fc8c56de74d8 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 17:04:50 2013 +0100 Write embedded .fdb into Storage for OnSave OnSaveAs. Change-Id: I2534378c48253584904d11bf049d5d4a05c300dd commit 8f6e969c71d8693aece01ad4b769c9ba6ec6dd6e Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 15:26:48 2013 +0100 Implement DocumentEventListener in firebird_sdbc driver. Change-Id: I7e0c9abcb9822e673ba1e93c1d8bf4d177baae0f commit 3391121cccbf92587443420daab8c25f80531ad8 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 11:09:42 2013 +0100 Fix firebird lib installation location. Change-Id: Ia7f649abbfe0793dd9389a415845fc1307206798 commit d965bae3f182febed36c2a7d8ce30fa9ef172b5c Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 10:14:58 2013 +0100 Create new fdb and/or extract from .odb as appropriate. Change-Id: I99dd3300c2a7e903bc924b15c4fea2fd3ad4abb8 commit 71c28936999ba082493806a022fb664331e00772 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Thu Jul 11 06:48:30 2013 +0100 Rename firebird-sdbc to firebird_sdbc to compile with latest master. Change-Id: I56e3180095c8a1fa660e1e27588320bdce972952 commit 05a9c8a18e6ad767f29cdb2fcc1c1d028d05c908 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Mon Jul 8 09:39:55 2013 +0100 Add embedded firebird loading code, set as default db. Change-Id: I993d7d7bacec710bb57d9e8f91d3cd01b0fbf616 commit 109d59a297e54d83f5ba8072427ad8c7db529293 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Sun Jul 7 10:51:55 2013 +0100 Fix firebird installation (windows) + driver compilation fixes. Change-Id: I253a2770c951a984bd50c906b0e84feeb8d105d9 commit 3eab10f6173f0e65b4c6ba979fd86086ae7cd3a8 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 5 14:30:45 2013 +0100 Patch Firebird to build on cygwin/msvc. Change-Id: I56669eb98cdd3c6fab756898664751c349e8988e commit adf22731b8d7f65bd38eb3429f495cc226583220 Author: Andrzej J.R. Hunt
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/areasdlg.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 46846b7c48c0d408d66ffecea1dbd9ba8e77ff9e Author: Tor Lillqvist t...@iki.fi Date: Fri Jul 12 18:41:55 2013 +0300 WaE: private field 'pBtnHelp' is not used Change-Id: I72f8440691192b7c05ef1c7df85c76e84f7f54ee diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 3ed..22c8a21 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -62,7 +62,6 @@ private: OKButton*pBtnOk; CancelButton*pBtnCancel; -HelpButton* pBtnHelp; sal_BoolbDlgLostFocus; formula::RefEdit* pRefInputEdit; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools include/vcl svtools/source vcl/source
include/svtools/ctrlbox.hxx | 49 +-
include/svtools/svtabbx.hxx |4 +-
include/svtools/svxbox.hxx| 10 --
include/svtools/treelistbox.hxx |4 +-
include/vcl/lstbox.hxx|2 -
svtools/source/contnr/svtabbx.cxx | 14 -
svtools/source/contnr/treelistbox.cxx |6 ++--
vcl/source/control/lstbox.cxx |2 -
8 files changed, 47 insertions(+), 44 deletions(-)
New commits:
commit 8ad3d846a46a2780e1759f58334b04ce2286ff00
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 15:42:47 2013 +0100
XubString-OUString
Change-Id: I07f4db038114174a65ed453096d566d699e8fce8
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index c83a94e..bbef331 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -199,10 +199,19 @@ public:
XubString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const
{ return ListBox::GetSelectEntry( nSelIndex ); }
Color GetSelectEntryColor( sal_uInt16 nSelIndex = 0 ) const;
-sal_BoolIsEntrySelected( const XubString rStr ) const
-{ return ListBox::IsEntrySelected( rStr ); }
-
-sal_BoolIsEntrySelected( const Color rColor ) const;
+boolIsEntrySelected(const OUString rStr ) const
+{
+return ListBox::IsEntrySelected(rStr);
+}
+
+boolIsEntrySelected(const Color rColor) const
+{
+sal_uInt16 nPos = GetEntryPos( rColor );
+if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+return IsEntryPosSelected( nPos );
+else
+return sal_False;
+}
private:
// declared as private because some compilers would generate the default
functions
@@ -220,15 +229,6 @@ inline void ColorListBox::SelectEntry( const Color
rColor, sal_Bool bSelect )
ListBox::SelectEntryPos( nPos, bSelect );
}
-inline sal_Bool ColorListBox::IsEntrySelected( const Color rColor ) const
-{
-sal_uInt16 nPos = GetEntryPos( rColor );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return IsEntryPosSelected( nPos );
-else
-return sal_False;
-}
-
inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const
{
sal_uInt16 nPos = GetSelectEntryPos( nSelIndex );
@@ -348,8 +348,18 @@ public:
voidSelectEntry( const XubString rStr, sal_Bool bSelect =
sal_True ) { ListBox::SelectEntry( rStr, bSelect ); }
voidSelectEntry( sal_uInt16 nStyle = STYLE_SOLID, sal_Bool
bSelect = sal_True );
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;
+boolIsEntrySelected(const OUString rStr) const
+{
+return ListBox::IsEntrySelected(rStr);
+}
+boolIsEntrySelected(sal_uInt16 nStyle = STYLE_SOLID) const
+{
+sal_uInt16 nPos = GetEntryPos( nStyle );
+if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+return IsEntryPosSelected( nPos );
+else
+return sal_False;
+}
inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
inline FieldUnitGetUnit() const { return eUnit; }
@@ -374,15 +384,6 @@ private:
void* GetEntryData( sal_uInt16 nPos ) const;
};
-inline sal_Bool LineListBox::IsEntrySelected( sal_uInt16 nStyle ) const
-{
-sal_uInt16 nPos = GetEntryPos( nStyle );
-if ( nPos != LISTBOX_ENTRY_NOTFOUND )
-return IsEntryPosSelected( nPos );
-else
-return sal_False;
-}
-
inline void LineListBox::SetColor( const Color rColor )
{
aColor = rColor;
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 4a722fa..c88b418 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -98,8 +98,8 @@ public:
String GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const;
String GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0x )
const;
using SvTreeListBox::SetEntryText;
-voidSetEntryText( const XubString, sal_uLong, sal_uInt16
nCol=0x );
-voidSetEntryText(const XubString,SvTreeListEntry*,sal_uInt16
nCol=0x);
+voidSetEntryText(const OUString, sal_uLong, sal_uInt16
nCol=0x);
+voidSetEntryText(const OUString, SvTreeListEntry*, sal_uInt16
nCol=0x);
String GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const;
sal_uLong GetEntryPos( const XubString, sal_uInt16 nCol =
0x );
sal_uLong GetEntryPos( const SvTreeListEntry* pEntry ) const;
diff --git a/include/svtools/svxbox.hxx b/include/svtools/svxbox.hxx
index 4ccc566..c86f790
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/source
sc/source/core/tool/formulagroup.cxx | 37 +--
1 file changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 04b8fbe686cd4cb34c24ec0d33614a59908dc323
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 11:40:54 2013 -0400
Cache select converted tokens to avoid unnecessary token duplication.
Change-Id: I3a63d5cbbc1cdc37d681ffd41ec22ff65e56cc0d
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 6573d15..4ac4b6b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -19,6 +19,7 @@
#include formula/vectortoken.hxx
#include vector
+#include boost/unordered_map.hpp
#define USE_DUMMY_INTERPRETER 1
@@ -37,6 +38,8 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
const ScFormulaCellGroupRef
xGroup,
ScTokenArray rCode)
{
+typedef boost::unordered_mapconst formula::FormulaToken*,
formula::FormulaTokenRef CachedTokensType;
+
// Decompose the group into individual cells and calculate them
individually.
// The caller must ensure that the top position is the start position of
@@ -45,11 +48,21 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
ScAddress aTmpPos = rTopPos;
std::vectordouble aResults;
aResults.reserve(xGroup-mnLength);
+CachedTokensType aCachedTokens;
+
for (SCROW i = 0; i xGroup-mnLength; ++i, aTmpPos.IncRow())
{
ScTokenArray aCode2;
for (const formula::FormulaToken* p = rCode.First(); p; p =
rCode.Next())
{
+CachedTokensType::iterator it = aCachedTokens.find(p);
+if (it != aCachedTokens.end())
+{
+// This token is cached. Use the cached one.
+aCode2.AddToken(*it-second);
+continue;
+}
+
switch (p-GetType())
{
case formula::svSingleVectorRef:
@@ -77,8 +90,18 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
pMat-PutDouble(pArray, nRowSize, nCol, 0);
}
-ScMatrixToken aTok(pMat);
-aCode2.AddToken(aTok);
+if (p2-IsStartFixed() p2-IsEndFixed())
+{
+// Cached the converted token for absolute range
referene.
+formula::FormulaTokenRef xTok(new ScMatrixToken(pMat));
+aCachedTokens.insert(CachedTokensType::value_type(p,
xTok));
+aCode2.AddToken(*xTok);
+}
+else
+{
+ScMatrixToken aTok(pMat);
+aCode2.AddToken(aTok);
+}
}
break;
default:
commit 2e5fbad1ce8c97f0c9201cdfb4eba49ef72da66f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 11:09:38 2013 -0400
Set an array of doubles in one step, rather than individually in loops.
The latter is massively slow, apparently.
Change-Id: I689643330e1b04eff7d9665de5d6e423906517e1
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 5a23511..6573d15 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -73,14 +73,8 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
for (size_t nCol = 0; nCol nColSize; ++nCol)
{
const double* pArray = rArrays[nCol];
-for (size_t nRow = 0; nRow nRowSize; ++nRow)
-{
-if (nRowStart + nRow p2-GetArrayLength())
-{
-double fVal = pArray[nRowStart+nRow];
-pMat-PutDouble(fVal, nCol, nRow);
-}
-}
+pArray += nRowStart;
+pMat-PutDouble(pArray, nRowSize, nCol, 0);
}
ScMatrixToken aTok(pMat);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 43/7add44fdb1ad58673356859fbaa55dc4559845 45/2d3dfb0eea34aee17d9613e5566fea3be178f1
43/7add44fdb1ad58673356859fbaa55dc4559845 |1 + 45/2d3dfb0eea34aee17d9613e5566fea3be178f1 |1 + 2 files changed, 2 insertions(+) New commits: commit 8a1deeae03918c2aed7e8db2f8880c9c0eebe305 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:16:25 2013 +0100 Notes added by 'git notes add' diff --git a/43/7add44fdb1ad58673356859fbaa55dc4559845 b/43/7add44fdb1ad58673356859fbaa55dc4559845 new file mode 100644 index 000..862bcb2 --- /dev/null +++ b/43/7add44fdb1ad58673356859fbaa55dc4559845 @@ -0,0 +1 @@ +ignore: de-extension-ize Presentation Minimizer commit e818f1155e42098f451cb3de0e8a3be0de5d29eb Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:16:18 2013 +0100 Notes added by 'git notes add' diff --git a/45/2d3dfb0eea34aee17d9613e5566fea3be178f1 b/45/2d3dfb0eea34aee17d9613e5566fea3be178f1 new file mode 100644 index 000..862bcb2 --- /dev/null +++ b/45/2d3dfb0eea34aee17d9613e5566fea3be178f1 @@ -0,0 +1 @@ +ignore: de-extension-ize Presentation Minimizer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a2/36c27366480e4b4e5d76de300a8cc2644298e0
a2/36c27366480e4b4e5d76de300a8cc2644298e0 |1 + 1 file changed, 1 insertion(+) New commits: commit 39f18db194fca42d969703a26c477fbaea93e0ab Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:16:38 2013 +0100 Notes added by 'git notes add' diff --git a/a2/36c27366480e4b4e5d76de300a8cc2644298e0 b/a2/36c27366480e4b4e5d76de300a8cc2644298e0 new file mode 100644 index 000..862bcb2 --- /dev/null +++ b/a2/36c27366480e4b4e5d76de300a8cc2644298e0 @@ -0,0 +1 @@ +ignore: de-extension-ize Presentation Minimizer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 1b/3f31a807d008f378487aa717daaed3ea49f3a6 1e/b66b9730e16f1dd1be426c7d0901b41c300b34 f9/271166c2afcf9cad455aac13846bf460e03f3f
1b/3f31a807d008f378487aa717daaed3ea49f3a6 |1 + 1e/b66b9730e16f1dd1be426c7d0901b41c300b34 |1 + f9/271166c2afcf9cad455aac13846bf460e03f3f |1 + 3 files changed, 3 insertions(+) New commits: commit e98badcfc972c0a5cc438d8c4680f66ce8cccdb6 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:16:11 2013 +0100 Notes added by 'git notes add' diff --git a/1e/b66b9730e16f1dd1be426c7d0901b41c300b34 b/1e/b66b9730e16f1dd1be426c7d0901b41c300b34 new file mode 100644 index 000..862bcb2 --- /dev/null +++ b/1e/b66b9730e16f1dd1be426c7d0901b41c300b34 @@ -0,0 +1 @@ +ignore: de-extension-ize Presentation Minimizer commit dbe6e2a48b9630ff74cbd152f16f131bfa0ec8e9 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:16:04 2013 +0100 Notes added by 'git notes add' diff --git a/1b/3f31a807d008f378487aa717daaed3ea49f3a6 b/1b/3f31a807d008f378487aa717daaed3ea49f3a6 new file mode 100644 index 000..862bcb2 --- /dev/null +++ b/1b/3f31a807d008f378487aa717daaed3ea49f3a6 @@ -0,0 +1 @@ +ignore: de-extension-ize Presentation Minimizer commit af7a6c520a41cc38c634e8232d4e2e4a5869eb51 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:15:57 2013 +0100 Notes added by 'git notes add' diff --git a/f9/271166c2afcf9cad455aac13846bf460e03f3f b/f9/271166c2afcf9cad455aac13846bf460e03f3f new file mode 100644 index 000..862bcb2 --- /dev/null +++ b/f9/271166c2afcf9cad455aac13846bf460e03f3f @@ -0,0 +1 @@ +ignore: de-extension-ize Presentation Minimizer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/e08bdc4b036535b4e7ca1f944153f09d314053
5e/e08bdc4b036535b4e7ca1f944153f09d314053 |1 + 1 file changed, 1 insertion(+) New commits: commit fbd056550d97a367b76949b53ff8e50f44045143 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:26:19 2013 +0100 Notes added by 'git notes add' diff --git a/5e/e08bdc4b036535b4e7ca1f944153f09d314053 b/5e/e08bdc4b036535b4e7ca1f944153f09d314053 new file mode 100644 index 000..777087e --- /dev/null +++ b/5e/e08bdc4b036535b4e7ca1f944153f09d314053 @@ -0,0 +1 @@ +prefer: 6d9be05a6fb251ed0cbcbcefd55ed174b1e8e39d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 66/deeda7b2b72300be6b82aaaffb56c6b4b7fd92
66/deeda7b2b72300be6b82aaaffb56c6b4b7fd92 |1 + 1 file changed, 1 insertion(+) New commits: commit 0fe00fb944828ad5575d8c56a10c6741067c1e70 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 17:27:21 2013 +0100 Notes added by 'git notes add' diff --git a/66/deeda7b2b72300be6b82aaaffb56c6b4b7fd92 b/66/deeda7b2b72300be6b82aaaffb56c6b4b7fd92 new file mode 100644 index 000..71da32b --- /dev/null +++ b/66/deeda7b2b72300be6b82aaaffb56c6b4b7fd92 @@ -0,0 +1 @@ +prefer: 60c8198fd98ebbcabcfd316203886d3e0b7317c7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc
vcl/generic/glyphs/gcach_ftyp.cxx | 21 +++--
vcl/generic/glyphs/gcach_rbmp.cxx | 25 -
vcl/generic/glyphs/glyphcache.cxx |6 ++---
vcl/headless/svptext.cxx | 45 +-
vcl/inc/generic/glyphcache.hxx| 27 +-
5 files changed, 55 insertions(+), 69 deletions(-)
New commits:
commit dd547e4a8c1895aa89e699810323c933d9ac415b
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jul 12 18:51:26 2013 +0200
Fix headless mode glyph cache memory handling
...the original code was riddled with errors. It leaked memory, which if it
didn't it would have deleted multiple times.
Change-Id: Ic70b425fac02ef894e35b3dc15039d217f8870f5
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 29c8820..979be11 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -650,7 +650,6 @@ ImplFontEntry* ImplFTSFontData::CreateFontInstance(
FontSelectPattern rFSD ) co
ServerFont::ServerFont( const FontSelectPattern rFSD, FtFontInfo* pFI )
: maGlyphList( 0),
maFontSelData(rFSD),
-mnExtInfo(0),
mnRefCount(1),
mnBytesUsed( sizeof(ServerFont) ),
mpPrevGCFont( NULL ),
@@ -1420,20 +1419,19 @@ bool ServerFont::GetGlyphBitmap1( int nGlyphIndex,
RawBitmap rRawBitmap ) const
if( rRawBitmap.mnAllocated nNeededSize )
{
-delete[] rRawBitmap.mpBits;
rRawBitmap.mnAllocated = 2*nNeededSize;
-rRawBitmap.mpBits = new unsigned char[ rRawBitmap.mnAllocated ];
+rRawBitmap.mpBits.reset(new unsigned char[ rRawBitmap.mnAllocated ]);
}
if( !mbArtBold || pFTEmbolden )
{
-memcpy( rRawBitmap.mpBits, rBitmapFT.buffer, nNeededSize );
+memcpy( rRawBitmap.mpBits.get(), rBitmapFT.buffer, nNeededSize );
}
else
{
-memset( rRawBitmap.mpBits, 0, nNeededSize );
+memset( rRawBitmap.mpBits.get(), 0, nNeededSize );
const unsigned char* pSrcLine = rBitmapFT.buffer;
-unsigned char* pDstLine = rRawBitmap.mpBits;
+unsigned char* pDstLine = rRawBitmap.mpBits.get();
for( int h = rRawBitmap.mnHeight; --h = 0; )
{
memcpy( pDstLine, pSrcLine, rBitmapFT.pitch );
@@ -1441,7 +1439,7 @@ bool ServerFont::GetGlyphBitmap1( int nGlyphIndex,
RawBitmap rRawBitmap ) const
pSrcLine += rBitmapFT.pitch;
}
-unsigned char* p = rRawBitmap.mpBits;
+unsigned char* p = rRawBitmap.mpBits.get();
for( sal_uLong y=0; y rRawBitmap.mnHeight; y++ )
{
unsigned char nLastByte = 0;
@@ -1549,13 +1547,12 @@ bool ServerFont::GetGlyphBitmap8( int nGlyphIndex,
RawBitmap rRawBitmap ) const
const sal_uLong nNeededSize = rRawBitmap.mnScanlineSize *
rRawBitmap.mnHeight;
if( rRawBitmap.mnAllocated nNeededSize )
{
-delete[] rRawBitmap.mpBits;
rRawBitmap.mnAllocated = 2*nNeededSize;
-rRawBitmap.mpBits = new unsigned char[ rRawBitmap.mnAllocated ];
+rRawBitmap.mpBits.reset(new unsigned char[ rRawBitmap.mnAllocated ]);
}
const unsigned char* pSrc = rBitmapFT.buffer;
-unsigned char* pDest = rRawBitmap.mpBits;
+unsigned char* pDest = rRawBitmap.mpBits.get();
if( !bEmbedded )
{
for( int y = rRawBitmap.mnHeight, x; --y = 0 ; )
@@ -1585,7 +1582,7 @@ bool ServerFont::GetGlyphBitmap8( int nGlyphIndex,
RawBitmap rRawBitmap ) const
if( mbArtBold !pFTEmbolden )
{
// overlay with glyph image shifted by one left pixel
-unsigned char* p = rRawBitmap.mpBits;
+unsigned char* p = rRawBitmap.mpBits.get();
for( sal_uLong y=0; y rRawBitmap.mnHeight; y++ )
{
unsigned char nLastByte = 0;
@@ -1601,7 +1598,7 @@ bool ServerFont::GetGlyphBitmap8( int nGlyphIndex,
RawBitmap rRawBitmap ) const
if( !bEmbedded mbUseGamma )
{
-unsigned char* p = rRawBitmap.mpBits;
+unsigned char* p = rRawBitmap.mpBits.get();
for( sal_uLong y=0; y rRawBitmap.mnHeight; y++ )
{
for( sal_uLong x=0; x rRawBitmap.mnWidth; x++ )
diff --git a/vcl/generic/glyphs/gcach_rbmp.cxx
b/vcl/generic/glyphs/gcach_rbmp.cxx
index 684f886..0efe54c 100644
--- a/vcl/generic/glyphs/gcach_rbmp.cxx
+++ b/vcl/generic/glyphs/gcach_rbmp.cxx
@@ -23,16 +23,12 @@
RawBitmap::RawBitmap()
-: mpBits(0), mnAllocated(0)
+: mnAllocated(0)
{}
RawBitmap::~RawBitmap()
-{
-delete[] mpBits;
-mpBits = 0;
-mnAllocated = 0;
-}
+{}
// used by 90 and 270 degree rotations on 8 bit deep bitmaps
@@ -171,7 +167,7 @@ bool RawBitmap::Rotate( int nAngle )
mnYOffset = -(mnYOffset + mnHeight);
if( mnBitCount == 8 )
{
-ImplRotate8_180( mpBits, mnWidth, mnHeight,
mnScanlineSize-mnWidth );
+ImplRotate8_180( mpBits.get(), mnWidth, mnHeight,
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 20
drawinglayer/source/processor2d/vclpixelprocessor2d.hxx |5
2 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 420aa16af0bbab4bdef80ceeb8d44cabe65840e0
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 12 19:04:21 2013 +0200
fdo#66745: drawinglayer: properly restore anti-aliasing mode
VclPixelProcessor2D: the constructor changes the anti-aliasing mode of
the given output device, and the destructor restores a hard-coded mode
instead of what was there before.
Due to this commit 5913506b2193e93ca2767ab7365ab2e76ed7848f turned off
anti-aliasing for FontWork objects simply by creating a
temporary VclPixelProcessor2D.
Change-Id: I7f7fcbf86b0dd425f599cd8e62fce3c69a2744bb
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 1376a03..a805bd2 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -62,8 +62,18 @@ namespace drawinglayer
{
namespace processor2d
{
+struct VclPixelProcessor2D::Impl
+{
+sal_uInt16 m_nOrigAntiAliasing;
+
+explicit Impl(OutputDevice const rOutDev)
+: m_nOrigAntiAliasing(rOutDev.GetAntialiasing())
+{ }
+};
+
VclPixelProcessor2D::VclPixelProcessor2D(const
geometry::ViewInformation2D rViewInformation, OutputDevice rOutDev)
-: VclProcessor2D(rViewInformation, rOutDev)
+: VclProcessor2D(rViewInformation, rOutDev)
+, m_pImpl(new Impl(rOutDev))
{
// prepare maCurrentTransformation matrix with viewTransformation
to target directly to pixels
maCurrentTransformation =
rViewInformation.getObjectToViewTransformation();
@@ -75,11 +85,13 @@ namespace drawinglayer
// react on AntiAliasing settings
if(getOptionsDrawinglayer().IsAntiAliasing())
{
-
mpOutputDevice-SetAntialiasing(mpOutputDevice-GetAntialiasing() |
ANTIALIASING_ENABLE_B2DDRAW);
+mpOutputDevice-SetAntialiasing(
+ m_pImpl-m_nOrigAntiAliasing | ANTIALIASING_ENABLE_B2DDRAW);
}
else
{
-
mpOutputDevice-SetAntialiasing(mpOutputDevice-GetAntialiasing()
~ANTIALIASING_ENABLE_B2DDRAW);
+mpOutputDevice-SetAntialiasing(
+ m_pImpl-m_nOrigAntiAliasing
~ANTIALIASING_ENABLE_B2DDRAW);
}
}
@@ -89,7 +101,7 @@ namespace drawinglayer
mpOutputDevice-Pop();
// restore AntiAliasing
-mpOutputDevice-SetAntialiasing(mpOutputDevice-GetAntialiasing()
~ANTIALIASING_ENABLE_B2DDRAW);
+mpOutputDevice-SetAntialiasing(m_pImpl-m_nOrigAntiAliasing);
}
bool
VclPixelProcessor2D::tryDrawPolyPolygonColorPrimitive2DDirect(const
drawinglayer::primitive2d::PolyPolygonColorPrimitive2D rSource, double
fTransparency)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
index 2b41289..a55962d 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
@@ -25,6 +25,8 @@
#include vclprocessor2d.hxx
#include vcl/outdev.hxx
+#include boost/scoped_ptr.hpp
+
//
// predefines
@@ -49,6 +51,9 @@ namespace drawinglayer
class VclPixelProcessor2D : public VclProcessor2D
{
private:
+struct Impl;
+boost::scoped_ptrImpl m_pImpl;
+
protected:
/* the local processor for BasePrinitive2D-Implementation based
primitives,
called from the common process()-implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) New commits: commit 5e28f6e9d3021171b12a7827cd5c93cfda1fcd90 Author: Michael Meeks michael.me...@suse.com Date: Fri Jul 12 19:11:21 2013 +0100 Disable openCL by default on Mac (for now). Change-Id: Iaf54a64a9e910eaffe1526f3471df8f98854343d diff --git a/configure.ac b/configure.ac index 3f9dbdd..6f5fe8dd 100644 --- a/configure.ac +++ b/configure.ac @@ -9811,14 +9811,15 @@ OPENCL_LIBS= OPENCL_CFLAGS= ENABLE_OPENCL= AC_MSG_CHECKING([OpenCL]) -if test \( -z $with_opencl_sdk -o $with_opencl_sdk = yes \) -a $_os = Darwin; then -# OS X -AC_MSG_RESULT([yes, always on OS X]) -ENABLE_OPENCL=TRUE -OPENCL_CFLAGS= -OPENCL_LIBS=-framework OpenCL -AC_DEFINE(HAVE_FEATURE_OPENCL) -elif test -z $with_opencl_sdk -o $with_opencl_sdk = no; then +dnl if test \( -z $with_opencl_sdk -o $with_opencl_sdk = yes \) -a $_os = Darwin; then +dnl# OS X +dnlAC_MSG_RESULT([yes, always on OS X]) +dnlENABLE_OPENCL=TRUE +dnlOPENCL_CFLAGS= +dnlOPENCL_LIBS=-framework OpenCL +dnlAC_DEFINE(HAVE_FEATURE_OPENCL) +dnl +if test -z $with_opencl_sdk -o $with_opencl_sdk = no; then AC_MSG_RESULT([no]) else if test -d $with_opencl_sdk/include; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc3' - firebird/firebird-cygwin-msvc.patch.1
firebird/firebird-cygwin-msvc.patch.1 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e05fe52638f60320381f0734e46e907abe16ed0 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Fri Jul 12 19:17:08 2013 +0100 Fix libicuin naming in firebird cygwin patch. Change-Id: Ia58e2b3f55b2cbccb35cdcb6da04bd7d67ad4d5c diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1 index f723dda..91a0ede 100644 --- a/firebird/firebird-cygwin-msvc.patch.1 +++ b/firebird/firebird-cygwin-msvc.patch.1 @@ -30,7 +30,7 @@ diff -u firebird/builds/posix/make.defaults firebird/builds/posix/make.defaults LINK_LIBS = @LIBS@ +ifeq ($(PLATFORM),win32) -+ICU_LIBS = -licuuc -licudt -licui ++ICU_LIBS = -licuuc -licudt -licuin +else ICU_LIBS = -licuuc -licudata -licui18n +endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 2 commits - sc/source
sc/source/core/data/column2.cxx |1 +
sc/source/core/data/formulacell.cxx |5 -
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit a1016af0d106ac831c75c6fb2c779a4e0de26f17
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 15:11:19 2013 -0400
Don't forget to shift to the right start element within the block!
Else it would always start from element one of the block regardless of
the requested start row position.
Change-Id: I3843eab2a88b8361250346e3f9696be5086039ea
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 58abd53..14d6828 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2247,6 +2247,7 @@ const double* ScColumn::FetchDoubleArray(
sc::FormulaGroupContext rCxt, SCROW n
rArray.reserve(nLenRequested);
sc::formula_block::const_iterator it =
sc::formula_block::begin(*aPos.first-data);
+std::advance(it, aPos.second);
sc::formula_block::const_iterator itEnd;
if (nLenRequested = nLen)
{
commit e2c3f0be3b2d3097a2b897788e3e01334b89637f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 15:11:04 2013 -0400
This comment is no longer correct.
Change-Id: I815016551ea979d27e1f402dc2badda0d856a229
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index b693502..6277b9d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3020,11 +3020,6 @@ public:
// returned array equals or greater than the requested
// length.
-// TODO: For now, it returns an array pointer only when
-// the entire array is in contiguous memory space.
Once
-// we finish cell storage rework, we'll support
temporary
-// generation of a double array which is a combination
of
-// multiple cell array segments.
const double* pArray = mrDoc.FetchDoubleArray(mrCxt,
aRefPos, mrCell.GetCellGroup()-mnLength);
if (!pArray)
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Send Feedback...and BSA ideas
2013/7/12 Joel Madero jmadero@gmail.com Hi All, After a long discussion with Robinson we came up with a quasi workable plan for what we hope to be the new setup for send feedback... - I think currently there are a couple problems with the send feedback button within LibreOffice: a) Send Feedback... implies more than just bug reporting but currently it's only linked to BSA b) It is assumed that the increase of user support questions being submitted as bug reports is coming from send feedback... c) BSA requires additional logins - so if a user wants to submit feedback they have to get an account So here was the idea(s): Landing page similar to Mozilla's (smiley face/frowny face) with perhaps 2 or 3 options - user support, bug report, maybe get involved or some such thing If they click bug report it would go to BSA but to address Bjoern's concern about the number of steps required to report a bug (ie. mandatory to get an account, sign in, etc...) we would allow users to report without an account but give the option to get an account and explain how it's helpful to have one. The idea is that if the user chooses to submit without an account, the bug will be reported under a default account (possibly b...@tdfplanet.org), they will be forced to enter an email address and do a captcha - then their email address would go into the bug report as a CC'ed user. So this would affect BSA as a whole - the negative(s): 1. Reporters won't be as accurate any more - but honestly I'm not sure if we care about this 2. Reporters will need an account if they are going to comment on their bug in the future, may result in NEEDINFO's going stagnant butthis is the case anyways probably not going to result in a huge increase. Currently Mozilla (which we discussed during ESC) doesn't force a user account so, if we can emulate this and get to a landing page which avoids having to sign up for accounts - might be a good thing. Before we move forward looking for feedback, Robinson feel free to expand on anything that I missed. Warm Regards, Joel Sounds good to me, Joel, particularly than part about not requiring a user account Henri ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/unx
vcl/inc/svids.hrc| 37 +++---
vcl/source/src/fpicker.src |9 +--
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 38 +++
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 15 ++--
vcl/unx/gtk/fpicker/resourceprovider.cxx |3 +-
5 files changed, 70 insertions(+), 32 deletions(-)
New commits:
commit 466545933a70716cb1ca132f7e61cc12c60acbb1
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jul 12 20:34:27 2013 +0100
set primary and secondary text on the gtk overwrite querybox
Change-Id: Ie671ddaba0e749dd0714de589fbaa45d914ba5c9
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index abe1a14..d1fb135 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -177,24 +177,25 @@
#define SV_MAC_SCREENNNAME 10216
#define SV_STDTEXT_ALLFILETYPES 10217
-#define STR_FPICKER_AUTO_EXTENSION10300
-#define STR_FPICKER_PASSWORD 10301
-#define STR_FPICKER_FILTER_OPTIONS10302
-#define STR_FPICKER_READONLY 10303
-#define STR_FPICKER_INSERT_AS_LINK10304
-#define STR_FPICKER_SHOW_PREVIEW 10305
-#define STR_FPICKER_PLAY 10306
-#define STR_FPICKER_VERSION 10307
-#define STR_FPICKER_TEMPLATES 10308
-#define STR_FPICKER_IMAGE_TEMPLATE10309
-#define STR_FPICKER_SELECTION 10310
-#define STR_FPICKER_FOLDER_DEFAULT_TITLE 10311
-#define STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION10312
-#define STR_FPICKER_ALREADYEXISTOVERWRITE 10313
-#define STR_FPICKER_ALLFORMATS10314
-#define STR_FPICKER_OPEN 10315
-#define STR_FPICKER_SAVE 10316
-#define STR_FPICKER_TYPE 10317
+#define STR_FPICKER_AUTO_EXTENSION 10300
+#define STR_FPICKER_PASSWORD10301
+#define STR_FPICKER_FILTER_OPTIONS 10302
+#define STR_FPICKER_READONLY10303
+#define STR_FPICKER_INSERT_AS_LINK 10304
+#define STR_FPICKER_SHOW_PREVIEW10305
+#define STR_FPICKER_PLAY10306
+#define STR_FPICKER_VERSION 10307
+#define STR_FPICKER_TEMPLATES 10308
+#define STR_FPICKER_IMAGE_TEMPLATE 10309
+#define STR_FPICKER_SELECTION 10310
+#define STR_FPICKER_FOLDER_DEFAULT_TITLE10311
+#define STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION 10312
+#define STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY 10313
+#define STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY 10314
+#define STR_FPICKER_ALLFORMATS 10315
+#define STR_FPICKER_OPEN10316
+#define STR_FPICKER_SAVE10317
+#define STR_FPICKER_TYPE10318
#define SV_ACCESSERROR_WRONG_VERSION10500
#define SV_ACCESSERROR_BRIDGE_MSG 10501
diff --git a/vcl/source/src/fpicker.src b/vcl/source/src/fpicker.src
index 324cffb..1196a31 100644
--- a/vcl/source/src/fpicker.src
+++ b/vcl/source/src/fpicker.src
@@ -84,9 +84,14 @@ String STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION
Text [ en-US ] = Please select a folder.;
};
-String STR_FPICKER_ALREADYEXISTOVERWRITE
+String STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY
{
-Text [ en-US ] = A file named \$filename$\ already exists.\n\nDo you
want to replace it? ;
+Text [ en-US ] = A file named \$filename$\ already exists. Do you want
to replace it? ;
+};
+
+String STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY
+{
+Text [ en-US ] = The file already exists in \$dirname$\. Replacing it
will overwrite its contents. ;
};
String STR_FPICKER_ALLFORMATS
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index d237b86..2f35174 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1011,7 +1011,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw(
uno::RuntimeException )
gchar *gFileName = g_filename_from_uri (
sFileName.getStr(), NULL, NULL );
if( g_file_test( gFileName, G_FILE_TEST_IS_REGULAR ) )
{
-GtkWidget *dlg;
INetURLObject aFileObj( sFileName );
OString baseName(
@@ -1026,11 +1025,11 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw(
uno::RuntimeException )
);
OString aMsg(
OUStringToOString(
-getResString( FILE_PICKER_OVERWRITE ),
+getResString(
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c8109193f0d435977c64c1eeec6c734d3d49bc8 Author: Csikós Tamás csks.t...@gmail.com Date: Fri Jul 12 16:45:28 2013 +0200 Updated core Project: help 4096747c2cfa974b1e5b544c36ceff2d85667fc0 update help ids for print areas dialog .ui conversion Change-Id: Icc747e1cb2387aacf806b38aa8a599bf1fec75bd Reviewed-on: https://gerrit.libreoffice.org/4867 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 38c2d6d..4096747 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 38c2d6deb0e64f9f5a7bbc29f313185984d0aea5 +Subproject commit 4096747c2cfa974b1e5b544c36ceff2d85667fc0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8443c7c1cccba55a43b81cc8bfc034f7c5122f58 Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 20:38:32 2013 +0100 Updated core Project: help b344257a8edb47b721e283c9eb50eef9e8a381db diff --git a/helpcontent2 b/helpcontent2 index 4096747..b344257 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4096747c2cfa974b1e5b544c36ceff2d85667fc0 +Subproject commit b344257a8edb47b721e283c9eb50eef9e8a381db ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/scalc/01/05080300.xhp | 18 +- source/text/shared/00/0001.xhp |6 +++--- 3 files changed, 12 insertions(+), 21 deletions(-) New commits: commit 4096747c2cfa974b1e5b544c36ceff2d85667fc0 Author: Csikós Tamás csks.t...@gmail.com Date: Fri Jul 12 16:45:28 2013 +0200 update help ids for print areas dialog .ui conversion Change-Id: Icc747e1cb2387aacf806b38aa8a599bf1fec75bd Reviewed-on: https://gerrit.libreoffice.org/4867 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ec9092a..72fab47 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6372,9 +6372,6 @@ sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL2,1493749793, sc_ComboBox_RID_SCDLG_PIVOTFILTER_ED_VAL3,1493749794, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_END,1495440898, sc_DateField_RID_SCDLG_DPDATEGROUP_ED_START,1495440897, -sc_Edit_RID_SCDLG_AREAS_ED_PRINTAREA,2568275979, -sc_Edit_RID_SCDLG_AREAS_ED_REPEATCOL,2568275999, -sc_Edit_RID_SCDLG_AREAS_ED_REPEATROW,2568275989, sc_Edit_RID_SCDLG_CHANGES_ED_ASSIGN,2568898575, sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_AREA,2568783885, sc_Edit_RID_SCDLG_COLROWNAMERANGES_ED_DATA,2568783889, @@ -6418,9 +6415,6 @@ sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233, sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, sc_ImageButton_FID_FUNCTION_BOX_IMB_INSERT,3651284481, -sc_ImageButton_RID_SCDLG_AREAS_RB_PRINTAREA,2568285708, -sc_ImageButton_RID_SCDLG_AREAS_RB_REPEATCOL,2568285728, -sc_ImageButton_RID_SCDLG_AREAS_RB_REPEATROW,2568285718, sc_ImageButton_RID_SCDLG_CHANGES_RB_ASSIGN,2568908304, sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_AREA,2568793614, sc_ImageButton_RID_SCDLG_COLROWNAMERANGES_RB_DATA,2568793618, @@ -6446,9 +6440,6 @@ sc_ImageButton_RID_SCDLG_TABOP_RB_ROWCELL,2567908866, sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289, sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291, sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290, -sc_ListBox_RID_SCDLG_AREAS_LB_PRINTAREA,2568277517, -sc_ListBox_RID_SCDLG_AREAS_LB_REPEATCOL,2568277537, -sc_ListBox_RID_SCDLG_AREAS_LB_REPEATROW,2568277527, sc_ListBox_RID_SCDLG_AUTOFORMAT_LB_FORMAT,1493536257, sc_ListBox_RID_SCDLG_COLROWNAMERANGES_LB_RANGE,2568785419, sc_ListBox_RID_SCDLG_CONDFORMAT_LB_COND1_1,2568523266, diff --git a/source/text/scalc/01/05080300.xhp b/source/text/scalc/01/05080300.xhp index 1278395..f417b6a 100644 --- a/source/text/scalc/01/05080300.xhp +++ b/source/text/scalc/01/05080300.xhp @@ -39,23 +39,23 @@ paragraph role=paragraph id=par_idN105AE xml-lang=en-US l10n=NEW embedvar href=text/scalc/guide/printranges.xhp#printranges/ /paragraph -bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA id=bm_id3154910 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA id=bm_id3150447 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/lbprintarea id=bm_id3154910 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/edprintarea id=bm_id3150447 localize=false/ paragraph role=heading id=hd_id3156281 xml-lang=en-US level=2 l10n=U oldref=3Print range/paragraph -paragraph role=paragraph id=par_id3147228 xml-lang=en-US l10n=U oldref=4ahelp hid=SC:EDIT:RID_SCDLG_AREAS:ED_PRINTAREAAllows you to modify a defined print range./ahelp/paragraph +paragraph role=paragraph id=par_id3147228 xml-lang=en-US l10n=U oldref=4ahelp hid=modules/scalc/ui/printareasdialog/edprintareaAllows you to modify a defined print range./ahelp/paragraph paragraph role=paragraph id=par_id3145174 xml-lang=en-US l10n=CHG oldref=5Select emph-none-/emph to remove a print range definition for the current spreadsheet. Select emph-entire sheet-/emph to set the current sheet as a print range. Select emph-selection-/emph to define the selected area of a spreadsheet as the print range. By selecting emph-user-defined-/emph, you can define a print range that you have already defined using the emphFormat - Print Ranges - Define/emph command. If you have given a name to a range using the emphInsert - Names - Define/emph command, this name will be displayed and can be selected from the list box./paragraph paragraph role=paragraph id=par_id3145272 xml-lang=en-US l10n=U oldref=6In the right-hand text box, you can enter a print range by reference or by name. If the cursor is in the emphPrint range/emph text box, you can also select the print range in the spreadsheet with your mouse./paragraph embed href=text/shared/00/0001.xhp#eingabesymbol/ -bookmark xml-lang=en-US branch=hid/sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW id=bm_id3147435 localize=false/ -bookmark xml-lang=en-US branch=hid/sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW id=bm_id3153190 localize=false/ +bookmark xml-lang=en-US
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/05080300.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b344257a8edb47b721e283c9eb50eef9e8a381db Author: Caolán McNamara caol...@redhat.com Date: Fri Jul 12 20:38:32 2013 +0100 reuse one of the redundant .uno:EditPrintArea bookmarks for overall .ui dialog Change-Id: I05d1bdb6dae5a71a177940d339d3a4d58a2060aa diff --git a/source/text/scalc/01/05080300.xhp b/source/text/scalc/01/05080300.xhp index f417b6a..c2016da 100644 --- a/source/text/scalc/01/05080300.xhp +++ b/source/text/scalc/01/05080300.xhp @@ -28,7 +28,7 @@ /meta body bookmark xml-lang=en-US branch=hid/.uno:EditPrintArea id=bm_id2248794 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:EditPrintArea id=bm_id3145673 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/printareasdialog/PrintAreasDialog id=bm_id3145673 localize=false/ paragraph role=heading id=hd_id3153088 xml-lang=en-US level=1 l10n=U oldref=1Edit Print Ranges/paragraph paragraph role=paragraph id=par_id3159488 xml-lang=en-US l10n=U oldref=2variable id=druckbereichetextahelp hid=.uno:EditPrintAreaOpens a dialog where you can specify the print range./ahelp /variable You can also set the rows or columns which are to be repeated in every page./paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] update help ids for print areas dialog .ui conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4867 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4867 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc747e1cb2387aacf806b38aa8a599bf1fec75bd Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós csks.t...@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Tamás Csikós csks.t...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/inc
svtools/inc/pch/precompiled_svt.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit d7d37d2101ce468e6ae2e1fd711cd7df321a5378 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Jul 12 22:13:57 2013 +0200 remove use of recently removed header file Change-Id: If4248c728f44bfda089fdba9f27a33868daf8663 diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 129c56e..e6b7d39 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -95,7 +95,6 @@ #include com/sun/star/awt/grid/XGridColumn.hpp #include com/sun/star/awt/grid/XGridColumnListener.hpp #include com/sun/star/awt/grid/XSortableGridData.hpp -#include com/sun/star/awt/tree/DefaultTreeDataModel.hpp #include com/sun/star/awt/tree/XMutableTreeNode.hpp #include com/sun/star/beans/NamedValue.hpp #include com/sun/star/beans/Property.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/win
vcl/inc/win/saldata.hxx|2 +-
vcl/win/source/app/saldata.cxx |5 +++--
vcl/win/source/gdi/salprn.cxx |2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 82f742f65d35896c69be38fa3b1c78a6f71c
Author: Michael Stahl mst...@redhat.com
Date: Fri Jul 12 23:13:10 2013 +0200
fdo#66811: vcl: fix broken OUString with length STRING_LEN
ImplSalGetUniString was wrongly converted and constructs OUString with
invalid length in WinSalGraphics::CreateFontSubset; this is then
implicitly converted to an empty UniString so the font names are
missing in the PDF files generated on Windows.
(regression from 9e310cc32923ceb4b18d97ce68d54a339b935f01)
Change-Id: I1603e62cf18f353f3d7de322b9111a173dc6b225
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 4361448..fdf2faf 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -196,7 +196,7 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT
nDispatchResult );
void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW rLogFont, Font rFont );
rtl_TextEncoding ImplSalGetSystemEncoding();
-OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen =
STRING_LEN );
+OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 nLen = -1);
int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
#define SAL_FRAME_WNDEXTRA sizeof( DWORD )
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 2a3ea09..fc99674 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -44,9 +44,10 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
// ---
-OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
+OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen)
{
-return OUString( pStr, nLen, ImplSalGetSystemEncoding(),
+return OUString( pStr, (-1 == nLen) ? strlen(pStr) : nLen,
+ ImplSalGetSystemEncoding(),
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 385a15e..bc90743 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -266,7 +266,7 @@ OUString WinSalInstance::GetDefaultPrinter()
char* pTmp = pBuf;
while ( *pTmp (*pTmp != ',') )
pTmp++;
-return ImplSalGetUniString( pBuf, (xub_StrLen)(pTmp-pBuf) );
+return ImplSalGetUniString( pBuf, static_castsal_Int32(pTmp-pBuf) );
}
else
return OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source
sc/source/ui/unoobj/scdetect.cxx |5 ++--- sd/source/ui/unoidl/sddetect.cxx |4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) New commits: commit d1fc3fce16172d7d619b6826de44528030ab36f8 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Jul 12 18:02:23 2013 -0400 fdo#64448: Don't get type name from incorrect filter. This causes wrong format type to get detected when testing for a completely different file format type. Change-Id: I230759e2be432beeae2db24c12369ccb4585f334 diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index c843159..d99cb03 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -794,10 +794,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequencebeans::PropertyValue l lDescriptor[nIndexOfFilterName].Value = OUString(pFilter-GetName()); } -if ( pFilter ) -aTypeName = pFilter-GetTypeName(); -else +if (!pFilter) aTypeName.Erase(); + return aTypeName; } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index ac1f7d9..db4d732 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -496,9 +496,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence beans::PropertyValue lDes lDescriptor[nIndexOfDocumentTitle].Value = aDocumentTitle; } -if ( pFilter ) -aTypeName = pFilter-GetTypeName(); -else +if (!pFilter) aTypeName = OUString(); return aTypeName; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Send Feedback...and BSA ideas
I'll wait to respond to the whole email from Bjoern but just two quick points (I'm in heavy moving mode and wife is waiting on me right now ;) ) a) good point about ccindeed an issue that is unresolvable. b) Robinson's main point about ask site is that they don't have the man power to be QA's screeners - I think that summarizes his stance in the nicest way possible :) Basically what we are doing is asking the Ask admins to be QA screeners or for QA to get involved with Ask which - if we do that, they might as well just report on FDO and QA can avoid getting used to the dealings over in the Ask world. If we just send people to ask, they report what is a bug but that has to first wait for Ask site admins to clear it as a bug, then either send them over to FDO or if Robinson made a button that just said this looks like a bug but doesn't actually do the confirmation so it just jumps over to FDO as an UNCONFIRMED bug waiting for QA to tackle itthis seems very time consuming. I'm not sure if other Ask admins have an opinion but I think they (whoever you are) should be involved with this conversation if we're asking them to do more work. Another option (maybe?) is to automatically setup an account for people when they report via BSA - not requiring them to do it but instead when they put in an email address it creates the BSA/FDO account with a random password and instructions on how they can change it. Just thinking out loud. Best, Joel On Fri, Jul 12, 2013 at 3:42 PM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hi, On Fri, Jul 12, 2013 at 12:06:00PM -0700, Joel Madero wrote: The idea is that if the user chooses to submit without an account, the bug will be reported under a default account (possibly b...@tdfplanet.org), they will be forced to enter an email address and do a captcha - then their email address would go into the bug report as a CC'ed user. Hmm. Two questions: a/ how do you cc an email address that has no bugzilla account? AFAIK, that doesnt work? b/ using unverified emails for such things is icky. How do we know people dont abuse it? (actually a/ is a result of b/) Currently Mozilla (which we discussed during ESC) doesn't force a user account so, if we can emulate this and get to a landing page which avoids having to sign up for accounts - might be a good thing. Before we move forward looking for feedback, Robinson feel free to expand on anything that I missed. I would still let the feedback go to askbot with a easily queriable tag. We could ask people for an OpenID or an email. In the first case we are luring people in (and askbots gamification with badges might do its magic from there on) and for the pure email solution, we would need cronjob polling the generated question on askbot and send updates to the reporter. These updates might lure the reporter back (and _then_ do a OpenID login to keep involved). There are a bazillion problems with the emailing still: - How to unsubscribe (e.g. if the question gets huge activity)? - How to avoid abuse, false and unverified emails etc.? The important part on the mozilla feedback page is not the layout (dont get me wrong: showing a smiley to someone angry at us is a Good Thing for mitigating the pain), but the relevant part is IMHO what to do with the feedback, not some small bandaid for someone who got hurt. So what to do after the happy/sad intro? IMHO it could be something like this: Did LibreOffice made you happy or sad? - LibreOffice made me happy! - Was it something cool, that you might want to share as a tip with others so they can do it too? = askbot, self-answered question (aka knowledgebase entry) - Was it a generic LibreOffice feature you experienced? Describe it below, and click the button, to post this on your twitter/g+/facebook page. - LibreOffice made me sad! - Was LibreOffice doing something unexpected or can we help you solving a specific problem? = askbot, unanswered question - No, I have a different/generic complaint. = these are tricky. Reply to email Thanks for your feedback and then send to some private mailing list, for some poor sob to parse through? Im still uneasy about this without a clearer definition of some poor sob and a good story how to motivate that work. Best, Bjoern -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source sd/source
sc/source/ui/unoobj/scdetect.cxx |5 ++--- sd/source/ui/unoidl/sddetect.cxx |4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) New commits: commit fa965d8b1743d786ea07d887f883ab9af9b6652e Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Fri Jul 12 18:02:23 2013 -0400 fdo#64448: Don't get type name from incorrect filter. This causes wrong format type to get detected when testing for a completely different file format type. Change-Id: I230759e2be432beeae2db24c12369ccb4585f334 Reviewed-on: https://gerrit.libreoffice.org/4876 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6d8a7dc..fd81a8c 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -794,10 +794,9 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequencebeans::PropertyValue l lDescriptor[nIndexOfFilterName].Value = OUString(pFilter-GetName()); } -if ( pFilter ) -aTypeName = pFilter-GetTypeName(); -else +if (!pFilter) aTypeName.Erase(); + return aTypeName; } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index b598093..9e98a7b 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -496,9 +496,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence beans::PropertyValue lDes lDescriptor[nIndexOfDocumentTitle].Value = aDocumentTitle; } -if ( pFilter ) -aTypeName = pFilter-GetTypeName(); -else +if (!pFilter) aTypeName = OUString(); return aTypeName; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/source
sc/source/core/data/column2.cxx |1
sc/source/core/data/formulacell.cxx |5
sc/source/core/tool/formulagroup.cxx | 37 +--
3 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit 15cf5afea05f0539035a1393b3150121489eb561
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 15:11:19 2013 -0400
Don't forget to shift to the right start element within the block!
Else it would always start from element one of the block regardless of
the requested start row position.
Change-Id: I3843eab2a88b8361250346e3f9696be5086039ea
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 7b38918..8695581 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2244,6 +2244,7 @@ const double* ScColumn::FetchDoubleArray(
sc::FormulaGroupContext rCxt, SCROW n
rArray.reserve(nLenRequested);
sc::formula_block::const_iterator it =
sc::formula_block::begin(*aPos.first-data);
+std::advance(it, aPos.second);
sc::formula_block::const_iterator itEnd;
if (nLenRequested = nLen)
{
commit 2e614e9d01a5e00506b14ecf0588e01d4d5716e3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 15:11:04 2013 -0400
This comment is no longer correct.
Change-Id: I815016551ea979d27e1f402dc2badda0d856a229
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 55f5010..570b55c 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3093,11 +3093,6 @@ public:
// returned array equals or greater than the requested
// length.
-// TODO: For now, it returns an array pointer only when
-// the entire array is in contiguous memory space.
Once
-// we finish cell storage rework, we'll support
temporary
-// generation of a double array which is a combination
of
-// multiple cell array segments.
const double* pArray = mrDoc.FetchDoubleArray(mrCxt,
aRefPos, mrCell.GetCellGroup()-mnLength);
if (!pArray)
return false;
commit cffba76a3487628f0557b423cefe150932308ede
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jul 12 11:40:54 2013 -0400
Cache select converted tokens to avoid unnecessary token duplication.
Change-Id: I3a63d5cbbc1cdc37d681ffd41ec22ff65e56cc0d
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 6573d15..4ac4b6b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -19,6 +19,7 @@
#include formula/vectortoken.hxx
#include vector
+#include boost/unordered_map.hpp
#define USE_DUMMY_INTERPRETER 1
@@ -37,6 +38,8 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
const ScFormulaCellGroupRef
xGroup,
ScTokenArray rCode)
{
+typedef boost::unordered_mapconst formula::FormulaToken*,
formula::FormulaTokenRef CachedTokensType;
+
// Decompose the group into individual cells and calculate them
individually.
// The caller must ensure that the top position is the start position of
@@ -45,11 +48,21 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
ScAddress aTmpPos = rTopPos;
std::vectordouble aResults;
aResults.reserve(xGroup-mnLength);
+CachedTokensType aCachedTokens;
+
for (SCROW i = 0; i xGroup-mnLength; ++i, aTmpPos.IncRow())
{
ScTokenArray aCode2;
for (const formula::FormulaToken* p = rCode.First(); p; p =
rCode.Next())
{
+CachedTokensType::iterator it = aCachedTokens.find(p);
+if (it != aCachedTokens.end())
+{
+// This token is cached. Use the cached one.
+aCode2.AddToken(*it-second);
+continue;
+}
+
switch (p-GetType())
{
case formula::svSingleVectorRef:
@@ -77,8 +90,18 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument
rDoc, const ScAddres
pMat-PutDouble(pArray, nRowSize, nCol, 0);
}
-ScMatrixToken aTok(pMat);
-aCode2.AddToken(aTok);
+if (p2-IsStartFixed() p2-IsEndFixed())
+{
+// Cached the converted token for absolute range
referene.
+formula::FormulaTokenRef xTok(new ScMatrixToken(pMat));
+aCachedTokens.insert(CachedTokensType::value_type(p,
xTok));
+
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDContentCollector.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c00eda63adaf09678fe3fd70bb2e38c48b6abd9e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sat Jul 13 07:55:20 2013 +0200
Fix some runtime problems with msvc-built libvisio
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 09fc553..da345bf 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -655,7 +655,8 @@ void libvisio::VSDContentCollector::_flushText()
{
// Insert duplicate
std::vectorVSDCharStyle::iterator charIt = m_charFormats.begin() +
charIndex;
-m_charFormats.insert(charIt, m_charFormats[charIndex]);
+VSDCharStyle tmpCharFormat = m_charFormats[charIndex];
+m_charFormats.insert(charIt, tmpCharFormat);
m_charFormats[charIndex].charCount = paraCharCount;
m_charFormats[charIndex+1].charCount -= paraCharCount;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
