[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx |2 +-
connectivity/source/drivers/macab/MacabPreparedStatement.cxx |2 +-
connectivity/source/drivers/macab/MacabStatement.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6bceec845fe0053026fb248d4c0de72d3a97300f
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 09:01:58 2014 +0100
connectivity (Mac): loplugin:cstylecast
Change-Id: Icb680130bf5123029fa3880c8f9865a2b71facfd
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 636bcc1..499626a 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -769,7 +769,7 @@ sal_Bool SAL_CALL
MacabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLExcep
Reference XConnection SAL_CALL MacabDatabaseMetaData::getConnection( )
throw(SQLException, RuntimeException)
{
-return (Reference XConnection ) m_xConnection.get();
+return m_xConnection.get();
}
Reference XResultSet SAL_CALL MacabDatabaseMetaData::getTableTypes( )
throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index cdcb8f1..edeec20 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -177,7 +177,7 @@ Reference XConnection SAL_CALL
MacabPreparedStatement::getConnection() throw(
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
-return (Reference XConnection ) m_pConnection;
+return m_pConnection;
}
Reference XResultSet SAL_CALL MacabPreparedStatement::executeQuery()
throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx
b/connectivity/source/drivers/macab/MacabStatement.cxx
index daa5d07..f807b5b 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -472,7 +472,7 @@ Reference XConnection SAL_CALL
MacabCommonStatement::getConnection( ) throw(
checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
// just return our connection here
-return (Reference XConnection ) m_pConnection;
+return m_pConnection;
}
sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString )
throw(SQLException, RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TableData.hxx| 28 +--
writerfilter/source/dmapper/TableManager.cxx | 18 -
writerfilter/source/dmapper/TableManager.hxx |2 -
3 files changed, 20 insertions(+), 28 deletions(-)
New commits:
commit ee633ec61fd56f83dd217ebe66dd9e12ff0089c9
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Dec 4 09:05:16 2014 +0100
TableData is only used with PropertiesPointer=TablePropertyMapPtr
Change-Id: I613addb6cd8b57fce90659209503f633ee438a58
diff --git a/writerfilter/source/dmapper/TableData.hxx
b/writerfilter/source/dmapper/TableData.hxx
index 7f8b406..69c9f5c 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -264,19 +264,19 @@ public:
}
};
-template typename T, typename PropertiesPointer
+template typename T
/**
Class that holds the data of a table.
*/
class TableData
{
-typedef typename RowDataT, PropertiesPointer::Pointer_t RowPointer_t;
+typedef typename RowDataT, TablePropertyMapPtr::Pointer_t RowPointer_t;
typedef ::std::vectorRowPointer_t Rows;
/**
the table properties
*/
-PropertiesPointer mpTableProps;
+TablePropertyMapPtr mpTableProps;
/**
the data of the rows of the table
@@ -296,10 +296,10 @@ class TableData
/**
initialize mpRow
*/
-void newRow() { mpRow = RowPointer_t(new RowDataT, PropertiesPointer());
}
+void newRow() { mpRow = RowPointer_t(new RowDataT,
TablePropertyMapPtr()); }
public:
-typedef boost::shared_ptrTableData T, PropertiesPointer Pointer_t;
+typedef boost::shared_ptrTableData T Pointer_t;
TableData(unsigned int nDepth) : mnDepth(nDepth) { newRow(); }
~TableData() {}
@@ -312,7 +312,7 @@ public:
@param pPropertiesproperties of the row to be ended
*/
-void endRow(PropertiesPointer pProperties)
+void endRow(TablePropertyMapPtr pProperties)
{
mpRow-insertProperties(pProperties);
mRows.push_back(mpRow);
@@ -326,7 +326,7 @@ public:
@param end end handle of the cell
@param pProps properties of the cell
*/
-void addCell(const T start, PropertiesPointer pProps)
+void addCell(const T start, TablePropertyMapPtr pProps)
{
mpRow-addCell(start, pProps);
}
@@ -354,7 +354,7 @@ public:
@param pProps the properties to add
*/
-void insertCellProperties(PropertiesPointer pProps)
+void insertCellProperties(TablePropertyMapPtr pProps)
{
mpRow-insertCellProperties(pProps);
}
@@ -365,23 +365,15 @@ public:
@param i index of the cell
@param pProps properties to add
*/
-void insertCellProperties(unsigned int i, PropertiesPointer pProps)
+void insertCellProperties(unsigned int i, TablePropertyMapPtr pProps)
{
mpRow-insertCellProperties(i, pProps);
}
-void insertTableProperties( PropertiesPointer pProps )
-{
-if ( mpTableProps.get( ) )
-mpTableProps-insert( pProps );
-else
-mpTableProps = pProps;
-}
-
/**
Return the table properties.
*/
-PropertiesPointer getTableProperties( )
+TablePropertyMapPtr getTableProperties( )
{
return mpTableProps;
}
diff --git a/writerfilter/source/dmapper/TableManager.cxx
b/writerfilter/source/dmapper/TableManager.cxx
index a2de7ce..7c2b558 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -38,7 +38,7 @@ void TableManager::openCell(const
css::uno::Referencecss::text::XTextRange rH
if (mTableDataStack.size() 0)
{
-TableDatacss::uno::Referencecss::text::XTextRange,
TablePropertyMapPtr::Pointer_t pTableData = mTableDataStack.top();
+TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
pTableData-addCell(rHandle, pProps);
}
@@ -211,7 +211,7 @@ void TableManager::closeCell(const
css::uno::Referencecss::text::XTextRange r
if (mTableDataStack.size() 0)
{
-TableDatacss::uno::Referencecss::text::XTextRange,
TablePropertyMapPtr::Pointer_t pTableData = mTableDataStack.top();
+TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
pTableData-endCell(rHandle);
}
@@ -225,7 +225,7 @@ void TableManager::ensureOpenCell(TablePropertyMapPtr
pProps)
if (mTableDataStack.size() 0)
{
-TableDatacss::uno::Referencecss::text::XTextRange,
TablePropertyMapPtr::Pointer_t pTableData = mTableDataStack.top();
+TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
if (pTableData.get() != nullptr)
{
@@ -264,7 +264,7 @@ void TableManager::endParagraphGroup()
if (mnTableDepth 0)
{
-
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/saldata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7dc20c2bd638e9405f761e4b3ada64caa5a51698
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 09:06:39 2014 +0100
Older Mac apparently need a reinterpret_cast here
Change-Id: I7de7fa410d0d88ca786bda481ca06456d84de86d
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index a2a8b85..762bc67 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -230,7 +230,7 @@ NSCursor* SalData::getCursor( PointerStyle i_eStyle )
CFURLRef hURL = CFBundleCopyResourceURL( hMain, pCursorName,
CFSTR(png), CFSTR(cursors) );
if( hURL )
{
-pCurs = [[NSCursor alloc] initWithImage: [[NSImage alloc]
initWithContentsOfURL: const_castNSURL*(static_castNSURL const *(hURL))]
hotSpot: aHotSpot];
+pCurs = [[NSCursor alloc] initWithImage: [[NSImage alloc]
initWithContentsOfURL: const_castNSURL*(reinterpret_castNSURL const
*(hURL))] hotSpot: aHotSpot];
CFRelease( hURL );
}
CFRelease( pCursorName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/docx-frame-export' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/NSURL_OOoAdditions.mm |2 +-
fpicker/source/aqua/SalAquaPicker.mm |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8783158817bb0ea4a135c1a581fb39180f84092c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 09:14:27 2014 +0100
fpicker (Mac): loplugin:cstylecast
Change-Id: I52687481a3d1203e72224c172edefd4a0a280688
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm
b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index 858eb27..44a9768 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -98,7 +98,7 @@ NSString* resolveAlias( NSString* i_pSystemPath )
}
else
{
-pResolvedPath = (NSString*)CFURLCopyFileSystemPath(
rResolvedUrl, kCFURLPOSIXPathStyle );
+pResolvedPath = const_castNSString*(static_castNSString
const *(CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle )));
CFRelease( rResolvedUrl );
}
}
diff --git a/fpicker/source/aqua/SalAquaPicker.mm
b/fpicker/source/aqua/SalAquaPicker.mm
index 125c34f..6fd4023 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -183,7 +183,7 @@ int SalAquaPicker::run()
break;
case NAVIGATIONSERVICES_SAVE:
[m_pDialog setDirectoryURL:startDirectory];
-[m_pDialog setNameFieldStringValue:[NSString
stringWithOUString:((SalAquaFilePicker*)this)-getSaveFileName()]];
+[m_pDialog setNameFieldStringValue:[NSString
stringWithOUString:static_castSalAquaFilePicker*(this)-getSaveFileName()]];
retVal = [m_pDialog runModal];
break;
// [m_pDialog beginSheetForDirectory:startDirectory file:[m_pDialog
saveFilename] modalForWindow:[NSApp keyWindow]
modalDelegate:((SalAquaFilePicker*)this)-getDelegate()
didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:)
contextInfo:nil];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_databasemetadata.cxx |2 -
mysqlc/source/mysqlc_preparedstatement.cxx | 40 ++---
mysqlc/source/mysqlc_statement.cxx |2 -
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 6bca90dd62fd10068ad59302f5d918384d8749d7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 09:36:32 2014 +0100
mysqlc: loplugin:cstylecast
Change-Id: I293f6fc392f6d081d08d2f53886f534409e38bd5
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx
b/mysqlc/source/mysqlc_databasemetadata.cxx
index 4388b61..5fc49b0 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -1054,7 +1054,7 @@ Reference XConnection SAL_CALL
ODatabaseMetaData::getConnection()
throw(SQLException, RuntimeException, std::exception)
{
OSL_TRACE(ODatabaseMetaData::getConnection);
-return (Reference XConnection )m_rConnection;
+return m_rConnection;
}
/*
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx
b/mysqlc/source/mysqlc_preparedstatement.cxx
index 5795f20..6806ac9 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -85,7 +85,7 @@ OPreparedStatement::OPreparedStatement(OConnection*
_pConnection, sql::PreparedS
m_pConnection-acquire();
try {
-m_paramCount = ((sql::PreparedStatement
*)cppStatement)-getParameterMetaData()-getParameterCount();
+m_paramCount = static_castsql::PreparedStatement
*(cppStatement)-getParameterMetaData()-getParameterCount();
} catch (const sql::SQLException e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this,
m_pConnection-getConnectionEncoding());
}
@@ -138,7 +138,7 @@ Reference XResultSetMetaData SAL_CALL
OPreparedStatement::getMetaData()
try {
if (!m_xMetaData.is()) {
m_xMetaData = new OResultSetMetaData(
-((sql::PreparedStatement
*)cppStatement)-getMetaData(),
+static_castsql::PreparedStatement
*(cppStatement)-getMetaData(),
getOwnConnection()-getConnectionEncoding()
);
}
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
bool success = false;
try {
-success = ((sql::PreparedStatement *)cppStatement)-execute()?
sal_True:sal_False;
+success = static_castsql::PreparedStatement
*(cppStatement)-execute()? sal_True:sal_False;
} catch (const sql::SQLException e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this,
m_pConnection-getConnectionEncoding());
}
@@ -195,7 +195,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
sal_Int32 affectedRows = 0;
try {
-affectedRows = ((sql::PreparedStatement
*)cppStatement)-executeUpdate();
+affectedRows = static_castsql::PreparedStatement
*(cppStatement)-executeUpdate();
} catch (const sql::SQLException e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this,
m_pConnection-getConnectionEncoding());
}
@@ -212,7 +212,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32
parameter, const OUString
try {
std::string stringie(OUStringToOString(x,
m_pConnection-getConnectionEncoding()).getStr());
-((sql::PreparedStatement *)cppStatement)-setString(parameter,
stringie);
+static_castsql::PreparedStatement
*(cppStatement)-setString(parameter, stringie);
} catch (const sql::MethodNotImplementedException ) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(OPreparedStatement::clearParameters,
*this);
} catch (const sql::SQLException e) {
@@ -227,7 +227,7 @@ Reference XConnection SAL_CALL
OPreparedStatement::getConnection()
MutexGuard aGuard(m_aMutex);
checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-return (Reference XConnection )m_pConnection;
+return m_pConnection;
}
Reference XResultSet SAL_CALL OPreparedStatement::executeQuery(const
OUString sql)
@@ -257,7 +257,7 @@ Reference XResultSet SAL_CALL
OPreparedStatement::executeQuery()
Reference XResultSet xResultSet;
try {
-sql::ResultSet * res = ((sql::PreparedStatement
*)cppStatement)-executeQuery();
+sql::ResultSet * res = static_castsql::PreparedStatement
*(cppStatement)-executeQuery();
xResultSet = new OResultSet(this, res,
getOwnConnection()-getConnectionEncoding());
} catch (const sql::SQLException e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this,
m_pConnection-getConnectionEncoding());
@@ -274,7 +274,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32
parameter, sal_Bool x)
checkParameterIndex(parameter);
try {
-((sql::PreparedStatement *)cppStatement)-setBoolean(parameter, x);
+static_castsql::PreparedStatement
*(cppStatement)-setBoolean(parameter, x);
} catch
[Libreoffice-commits] core.git: Changes to 'private/moggi/track-win-dc'
New branch 'private/moggi/track-win-dc' available with the following commits: commit 34c9eb6017e5709ee7addf4a1ef08fd614ad8c12 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Dec 4 09:36:09 2014 +0100 DEBUG Patch: track DC deletion ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-20'
Tag 'cp-4.2-20' created by Andras Timar andras.ti...@collabora.com at 2014-12-04 08:46 -0800 cp-4.2-20 Changes since libreoffice-4-2-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-20'
Tag 'cp-4.2-20' created by Andras Timar andras.ti...@collabora.com at 2014-12-04 08:46 -0800 cp-4.2-20 Changes since cp-4.2-19-35: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-20'
Tag 'cp-4.2-20' created by Andras Timar andras.ti...@collabora.com at 2014-12-04 08:46 -0800 cp-4.2-20 Changes since cp-4.2-9: Olivier R (1): French dictionary update: v5.2 --- fr_FR/README_fr.txt | 13 fr_FR/description.xml |2 fr_FR/fr.aff |14658 +++--- fr_FR/fr.dic |15695 ++ 4 files changed, 15644 insertions(+), 14724 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.2-20'
Tag 'cp-4.2-20' created by Andras Timar andras.ti...@collabora.com at 2014-12-04 08:46 -0800 cp-4.2-20 Changes since cp-4.2-19: Christian Lohmaier (1): update translations for 4.2.8 rc1 --- source/ar/sw/uiconfig/swriter/ui.po| 13 source/as/padmin/source.po |8 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/da/cui/uiconfig/ui.po |6 source/da/filter/source/config/fragments/filters.po| 12 source/da/helpcontent2/source/text/sbasic/shared.po| 14 source/da/helpcontent2/source/text/scalc/01.po | 12 source/da/helpcontent2/source/text/schart/01.po| 10 source/da/helpcontent2/source/text/shared/00.po| 10 source/da/helpcontent2/source/text/shared/01.po| 14 source/da/helpcontent2/source/text/shared/autopi.po| 10 source/da/helpcontent2/source/text/shared/explorer/database.po | 14 source/da/helpcontent2/source/text/simpress/01.po | 14 source/da/helpcontent2/source/text/simpress/guide.po | 16 source/da/helpcontent2/source/text/smath/01.po | 10 source/da/helpcontent2/source/text/smath/guide.po | 10 source/da/helpcontent2/source/text/swriter/01.po |8 source/da/helpcontent2/source/text/swriter/guide.po| 12 source/da/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/da/scp2/source/writer.po| 10 source/da/sd/source/ui/app.po | 10 source/da/sw/uiconfig/swriter/ui.po| 10 source/de/helpcontent2/source/text/shared/guide.po | 14 source/de/sw/uiconfig/swriter/ui.po| 10 source/gl/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/gl/sc/source/ui/src.po | 10 source/gl/sd/source/ui/view.po | 12 source/gl/sw/uiconfig/swriter/ui.po| 12 source/nl/cui/uiconfig/ui.po | 12 source/nl/instsetoo_native/inc_openoffice/windows/msi_languages.po | 10 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/nl/sc/source/ui/src.po |8 source/nl/svtools/uiconfig/ui.po | 12 source/nl/svx/source/dialog.po | 10 source/nl/sw/uiconfig/swriter/ui.po| 10 source/nl/vcl/source/src.po| 10 source/ru/cui/uiconfig/ui.po | 12 source/ru/helpcontent2/source/text/shared/optionen.po | 10 source/sv/sc/source/ui/src.po |6 source/th/basic/source/classes.po |6 source/th/connectivity/source/resource.po | 25 - source/th/cui/source/customize.po |6 source/th/cui/uiconfig/ui.po | 33 - source/th/dbaccess/source/ui/dlg.po|6 source/th/dbaccess/source/ui/querydesign.po|6 source/th/desktop/source/app.po|6 source/th/desktop/source/deployment/gui.po |6 source/th/extensions/source/scanner.po | 14 source/th/filter/uiconfig/ui.po|6 source/th/formula/source/ui/dlg.po | 14 source/th/instsetoo_native/inc_openoffice/windows/msi_languages.po |8 source/th/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/th/readlicense_oo/docs.po |6 source/th/sc/source/ui/src.po | 209 -- source/th/sc/uiconfig/scalc/ui.po | 14 source/th/scp2/source/accessories.po | 18 source/th/scp2/source/ooo.po | 14 source/th/sd/source/ui/app.po |7 source/th/sd/uiconfig/sdraw/ui.po |8 source/th/sd/uiconfig/simpress/ui.po |6 source/th/sfx2/uiconfig/ui.po |7 source/th/svl/source/misc.po |7 source/th/svx/uiconfig/ui.po |
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/generic/gendata.hxx |8
vcl/unx/kde/UnxFilePicker.cxx |2 +-
vcl/unx/kde4/KDE4FilePicker.cxx |2 +-
vcl/unx/kde4/KDEXLib.cxx|2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d7e5ee16069106df4e8f11d7dac598fff33425b8
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 10:00:12 2014 +0100
vcl (Linux): loplugin:cstylecast
Change-Id: I7ad80af29d094348f07c9a6b69e160ae5b0b8916
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 334193d..6cd17b2 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -11,12 +11,12 @@
#define INCLUDED_VCL_INC_GENERIC_GENDATA_HXX
#include osl/socket.hxx
-#include saldatabasic.hxx
-class SalGenericDisplay;
+#include generic/gendisp.hxx
+#include saldatabasic.hxx
+#include unx/saldisp.hxx
// Not the prettiest - but helpful for migrating old code ...
-class SalDisplay;
class GtkSalDisplay;
enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4,
@@ -64,7 +64,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
inline SalDisplay *GetSalDisplay() const
{
OSL_ASSERT( m_eType != SAL_DATA_GTK3 );
-return (SalDisplay *)GetDisplay();
+return static_castSalDisplay *(GetDisplay());
}
inline GtkSalDisplay *GetGtkDisplay() const
{
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 4acd5f5..a82252e 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -711,7 +711,7 @@ void UnxFilePicker::initFilePicker()
vcl::Window *pParentWin = Application::GetDefDialogParent();
if ( pParentWin )
{
-const SystemEnvData* pSysData = ((SystemWindow
*)pParentWin)-GetSystemData();
+const SystemEnvData* pSysData = static_castSystemWindow
*(pParentWin)-GetSystemData();
if ( pSysData )
{
snprintf( pWinId, nIdLen, %ld, pSysData-aWindow ); // unx
only
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index af3e3ee..df236c2 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -243,7 +243,7 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
vcl::Window *pParentWin = Application::GetDefDialogParent();
if ( pParentWin )
{
-const SystemEnvData* pSysData = ((SystemWindow
*)pParentWin)-GetSystemData();
+const SystemEnvData* pSysData = static_castSystemWindow
*(pParentWin)-GetSystemData();
if ( pSysData )
{
KWindowSystem::setMainWindow( _dialog, pSysData-aWindow); // unx
only
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index a915fd4..dc357dd 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -359,7 +359,7 @@ void KDEXLib::timeoutActivated()
while( SalKDEDisplay::self()-HasUserEvents() )
SalKDEDisplay::self()-DispatchInternalEvent();
-X11SalData *pData = (X11SalData*)ImplGetSVData()-mpSalData;
+X11SalData *pData = static_castX11SalData*(ImplGetSVData()-mpSalData);
pData-Timeout();
// QTimer is not single shot, so will be restarted immediatelly
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/inc vcl/quartz
vcl/inc/quartz/salvd.h |3 +++
vcl/quartz/salvd.cxx | 12
2 files changed, 15 insertions(+)
New commits:
commit 46d892bfb7c406a8125514735ef700d7765ba452
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Nov 30 18:48:33 2014 +0100
implement virtual methods for OSX vcl backend
Change-Id: Ifd7e06529cbf2e20bdd1560586420cda39c5a50c
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index e1d1d51..e3c68ab 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -61,6 +61,9 @@ public:
virtual SalGraphics*AcquireGraphics() SAL_OVERRIDE;
virtual voidReleaseGraphics( SalGraphics* pGraphics )
SAL_OVERRIDE;
virtual boolSetSize( long nNewDX, long nNewDY )
SAL_OVERRIDE;
+
+virtual long GetWidth() const SAL_OVERRIDE;
+virtual long GetHeight() const SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index a524c1e..ceb7e9b 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -277,4 +277,16 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
return (mxLayer != NULL);
}
+long AquaSalVirtualDevice::GetWidth() const
+{
+const CGSize aSize = CGLayerGetSize( mxLayer );
+return aSize.width;
+}
+
+long AquaSalVirtualDevice::GetHeight() const
+{
+const CGSize aSize = CGLayerGetSize( mxLayer );
+return aSize.height;
+}
+
/* 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: connectivity/source
connectivity/source/drivers/evoab2/NResultSet.cxx | 14 +-
connectivity/source/drivers/evoab2/NResultSet.hxx |2 +-
connectivity/source/drivers/kab/KDatabaseMetaData.cxx |2 +-
connectivity/source/drivers/kab/KPreparedStatement.cxx |2 +-
connectivity/source/drivers/kab/KStatement.cxx |2 +-
5 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit d48668ecdb5e7523ee25a09afb76ca46b22a4fea
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 10:13:10 2014 +0100
connectivity (Linux): loplugin:cstylecast
Change-Id: If2a3306360ea3db4476b09774e4f93c2c0dc4027
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx
b/connectivity/source/drivers/evoab2/NResultSet.cxx
index bbf643c..4cacbb1 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -614,7 +614,6 @@ OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt,
OEvoabConnection *pCo
,::comphelper::OPropertyContainer( OResultSet_BASE::rBHelper )
,m_pStatement(pStmt)
,m_pConnection(pConnection)
-,m_xMetaData(NULL)
,m_bWasNull(true)
,m_nFetchSize(0)
,m_nResultSetType(ResultSetType::SCROLL_INSENSITIVE)
@@ -702,10 +701,9 @@ void OEvoabResultSet::construct( const QueryData _rData )
m_nIndex = -1;
// create our meta data (need the EBookQuery for this)
-OEvoabResultSetMetaData* pMeta = new OEvoabResultSetMetaData(
_rData.sTable );
-m_xMetaData = pMeta;
+m_xMetaData = new OEvoabResultSetMetaData( _rData.sTable );
-pMeta-setEvoabFields( _rData.xSelectColumns );
+m_xMetaData-setEvoabFields( _rData.xSelectColumns );
}
@@ -753,8 +751,7 @@ OUString SAL_CALL OEvoabResultSet::getString( sal_Int32
nColumnNum ) throw(SQLEx
OUString aResult;
if ( m_xMetaData.is())
{
-OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *)
m_xMetaData.get();
-sal_Int32 nFieldNumber = pMeta-fieldAtColumn(nColumnNum);
+sal_Int32 nFieldNumber = m_xMetaData-fieldAtColumn(nColumnNum);
GValue aValue = { 0, { { 0 } } };
if ( getValue( getCur(), nFieldNumber, G_TYPE_STRING, aValue,
m_bWasNull ) )
aResult = valueToOUString( aValue );
@@ -770,8 +767,7 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32
nColumnNum ) throw(SQLE
if ( m_xMetaData.is())
{
-OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *)
m_xMetaData.get();
-sal_Int32 nFieldNumber = pMeta-fieldAtColumn(nColumnNum);
+sal_Int32 nFieldNumber = m_xMetaData-fieldAtColumn(nColumnNum);
GValue aValue = { 0, { { 0 } } };
if ( getValue( getCur(), nFieldNumber, G_TYPE_BOOLEAN, aValue,
m_bWasNull ) )
bResult = valueToBool( aValue );
@@ -891,7 +887,7 @@ Reference XResultSetMetaData SAL_CALL
OEvoabResultSet::getMetaData( ) throw(
// the meta data should have been created at construction time
ENSURE_OR_THROW( m_xMetaData.is(), internal error: no meta data );
-return m_xMetaData;
+return m_xMetaData.get();
}
// XResultSetMetaDataSupplier Interface Ends
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx
b/connectivity/source/drivers/evoab2/NResultSet.hxx
index e1bf253..760f9d7 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -87,7 +87,7 @@ namespace connectivity
OCommonStatement*
m_pStatement;
OEvoabConnection*
m_pConnection;
::com::sun::star::uno::WeakReferenceHelper
m_aStatement;
-::com::sun::star::uno::Reference
::com::sun::star::sdbc::XResultSetMetaData m_xMetaData;
+rtl::ReferenceOEvoabResultSetMetaData m_xMetaData;
::dbtools::WarningsContainer
m_aWarnings;
boolm_bWasNull;
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index c8bda37..47df22c 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -770,7 +770,7 @@ sal_Bool SAL_CALL
KabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLExcepti
Reference XConnection SAL_CALL KabDatabaseMetaData::getConnection( )
throw(SQLException, RuntimeException, std::exception)
{
-return (Reference XConnection ) m_xConnection.get();
+return m_xConnection.get();
}
Reference XResultSet SAL_CALL KabDatabaseMetaData::getTableTypes( )
throw(SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/NSURL_OOoAdditions.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1c1c515e01c93c478a00e7a840b733380406a366
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 10:14:45 2014 +0100
Older Mac apparently need a reinterpret_cast here
Change-Id: I58ff0ae2e2410ff50f0faffabab5cdc0e4471433
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm
b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index 44a9768..232b752 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -98,7 +98,7 @@ NSString* resolveAlias( NSString* i_pSystemPath )
}
else
{
-pResolvedPath = const_castNSString*(static_castNSString
const *(CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle )));
+pResolvedPath =
const_castNSString*(reinterpret_castNSString const
*(CFURLCopyFileSystemPath( rResolvedUrl, kCFURLPOSIXPathStyle )));
CFRelease( rResolvedUrl );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/uwriter.cxx |2
sw/qa/extras/uiwriter/uiwriter.cxx |2
sw/source/ui/dbui/dbinsdlg.cxx |6 -
sw/source/ui/dbui/mmoutputpage.cxx |8 -
sw/source/ui/frmdlg/column.cxx | 52 -
sw/source/ui/frmdlg/cption.cxx | 20 +--
sw/source/ui/frmdlg/frmdlg.cxx |4
sw/source/ui/frmdlg/frmpage.cxx| 100 +-
sw/source/ui/frmdlg/wrap.cxx | 36 +++---
sw/source/ui/index/cnttab.cxx | 200 ++---
sw/source/ui/index/swuiidxmrk.cxx | 24 ++--
sw/source/ui/misc/glossary.cxx |8 -
sw/source/ui/misc/insfnote.cxx |6 -
sw/source/ui/misc/linenum.cxx |4
sw/source/ui/misc/num.cxx |2
sw/source/ui/misc/pggrid.cxx | 18 +--
sw/source/ui/misc/titlepage.cxx|2
sw/source/ui/table/tabledlg.cxx| 16 +-
sw/source/ui/vba/vbawindow.cxx |4
19 files changed, 257 insertions(+), 257 deletions(-)
New commits:
commit 64a70d8cf56b4a9c1b6bdf920f71cc49c3a2240e
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 4 09:07:52 2014 +0200
loplugin: cstylecast
Change-Id: Id61218433add142e109bfc858549b8d2d8d1c28f
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index bad84c9..078bf2e 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -699,7 +699,7 @@ void SwDocTest::testSwScanner()
DateTime aDate(DateTime::SYSTEM);
SwPostItField aPostIt(
-
(SwPostItFieldType*)m_pDoc-getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD),
OUString(An Author),
+
static_castSwPostItFieldType*(m_pDoc-getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)),
OUString(An Author),
OUString(Some Text), OUString(Initials), OUString(Name),
aDate );
m_pDoc-getIDocumentContentOperations().InsertPoolItem(aPaM,
SwFmtFld(aPostIt), 0);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8496e30..6fe83c2 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -293,7 +293,7 @@ void SwUiWriterTest::testFdo74981()
// create a document with an input field
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
-SwInputField aField((SwInputFieldType*)pWrtShell-GetFldType(0,
RES_INPUTFLD), OUString(foo), OUString(bar), 0, 0);
+SwInputField
aField(static_castSwInputFieldType*(pWrtShell-GetFldType(0, RES_INPUTFLD)),
OUString(foo), OUString(bar), 0, 0);
pWrtShell-Insert(aField);
// expect hints
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 04cc190..e565f8a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -913,7 +913,7 @@ bool SwInsertDBColAutoPilot::SplitTextToColArr( const
OUString rTxt,
SwDBFieldType aFldType( rSh.GetDoc(), aSrch.sColumn,
aDBData );
pNew = new _DB_Column( rFndCol, *new SwDBField(
-(SwDBFieldType*)rSh.InsertFldType( aFldType ),
+static_castSwDBFieldType*(rSh.InsertFldType(
aFldType )),
nFormat ) );
if( nSubType )
pNew-DB_ColumnData.pField-SetSubType( nSubType );
@@ -1226,8 +1226,8 @@ void SwInsertDBColAutoPilot::DataToDoc( const
SequenceAny rSelection,
}
}
aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang()
).getLocale();
-SwDBNextSetField aNxtDBFld( (SwDBNextSetFieldType*)rSh.
-GetFldType( 0, RES_DBNEXTSETFLD ),
+SwDBNextSetField aNxtDBFld( static_castSwDBNextSetFieldType*(rSh.
+GetFldType( 0, RES_DBNEXTSETFLD )),
1, , aDBData );
bool bSetCrsr = true;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx
b/sw/source/ui/dbui/mmoutputpage.cxx
index 51c5af6..01a4d1f 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -445,7 +445,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl,
RadioButton*, pButton)
OUString sAttach( m_sDefaultAttachmentST );
sAttach += .;
sAttach += lcl_GetExtensionForDocType(
-
(sal_uLong)m_pSendAsLB-GetEntryData(m_pSendAsLB-GetSelectEntryPos()));
+
reinterpret_castsal_uLong(m_pSendAsLB-GetEntryData(m_pSendAsLB-GetSelectEntryPos(;
m_pAttachmentED-SetText( sAttach );
}
@@ -890,7 +890,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl,
PushButton*, pButton)
IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
{
-sal_uLong nDocType =
(sal_uLong)pBox-GetEntryData(pBox-GetSelectEntryPos());
+
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/store/cstylecast.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 14c94c97ffcb4b51974a8177a8017d620b4d9293
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 4 11:19:19 2014 +0200
cstylecast plugin - exclude some more files
Change-Id: I4dc6cc7f461fa11d12bf6fd9700befe4bbdac62c
diff --git a/compilerplugins/clang/store/cstylecast.cxx
b/compilerplugins/clang/store/cstylecast.cxx
index b8f7325..b036e1b 100644
--- a/compilerplugins/clang/store/cstylecast.cxx
+++ b/compilerplugins/clang/store/cstylecast.cxx
@@ -73,11 +73,18 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr *
expr) {
if ( filename.endswith(.h) ) {
return true;
}
-if ( compat::isInMainFile(compiler.getSourceManager(), spellingLocation)
-? (filename.startswith(SRCDIR /sal) // sal has tons of weird stuff
going on that I don't understand enough to fix
- || filename.startswith(SRCDIR /bridges)) // I'm not messing with
this code - far too dangerous
-: (filename.startswith(SRCDIR /include/tools/solar.h)) ) {
-return true;
+if ( compat::isInMainFile(compiler.getSourceManager(), spellingLocation) )
{
+if (filename.startswith(SRCDIR /sal) // sal has tons of weird stuff
going on that I don't understand enough to fix
+ || filename.startswith(SRCDIR /bridges)) { // I'm not messing
with this code - far too dangerous
+return true;
+}
+} else {
+if (filename.startswith(SRCDIR /include/tools/solar.h)
+ // the GetSalDisplay/GetGtkDisplay methods are problematic
+ || filename.startswith(SRCDIR /vcl/inc/generic/gendata.hxx)
+ || filename.startswith(SRCDIR /include/cppuhelper/)) {
+return true;
+}
}
report(
DiagnosticsEngine::Warning,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - svx/inc svx/source
svx/inc/sdr/contact/objectcontactofpageview.hxx |2 +-
svx/source/inc/eventhandler.hxx |4 ++--
svx/source/sdr/contact/objectcontactofpageview.cxx|2 +-
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |4 ++--
svx/source/sdr/event/eventhandler.cxx |4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit d9c9153d2b3a13d128be7550d27549619bd390c1
Author: Tobias Madl tobias.madl@gmail.com
Date: Thu Dec 4 09:31:30 2014 +
changed inherited timer to idle
Change-Id: I9da6d08964c32e4aafbc9cebc7840eb517f9c33a
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx
b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index d8ea21f..90706b9 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -34,7 +34,7 @@ namespace sdr
{
namespace contact
{
-class ObjectContactOfPageView : public ObjectContact, public Timer
+class ObjectContactOfPageView : public ObjectContact, public Idle
{
protected:
// the owner of this ObjectContactOfPageView. Set from constructor
and not
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index 3c7670c..f3a31de 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -92,10 +92,10 @@ namespace sdr
{
namespace event
{
-class TimerEventHandler : public EventHandler, public Timer
+class TimerEventHandler : public EventHandler, public Idle
{
public:
-TimerEventHandler(sal_uInt32 nTimeout = 1L);
+TimerEventHandler(IdlePriority ePriority = VCL_IDLE_PRIORITY_HIGH);
virtual ~TimerEventHandler();
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx
b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 1d2c154..ddf1a72 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -59,7 +59,7 @@ namespace sdr
setPreviewRenderer(((SdrPaintView)rPageWindow.GetPageView().GetView()).IsPreviewRenderer());
// init timer
-SetTimeout(1);
+SetPriority(VCL_IDLE_PRIORITY_HIGH);
Stop();
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 8e65fb0..007dc7d 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star;
namespace sdr { namespace contact {
-class PagePrimitiveExtractor : public ObjectContactOfPagePainter, public Timer
+class PagePrimitiveExtractor : public ObjectContactOfPagePainter, public Idle
{
private:
// the ViewObjectContactOfPageObj using this painter
@@ -83,7 +83,7 @@ PagePrimitiveExtractor::PagePrimitiveExtractor(
setPreviewRenderer(true);
// init timer
-SetTimeout(1);
+SetPriority(VCL_IDLE_PRIORITY_HIGH);
Stop();
}
diff --git a/svx/source/sdr/event/eventhandler.cxx
b/svx/source/sdr/event/eventhandler.cxx
index cf9b2f5..14156c42 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -121,9 +121,9 @@ namespace sdr
{
namespace event
{
-TimerEventHandler::TimerEventHandler(sal_uInt32 nTimeout)
+TimerEventHandler::TimerEventHandler(IdlePriority ePriority)
{
-SetTimeout(nTimeout);
+SetPriority(ePriority);
Stop();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CustomTarget_generated.mk sw/Library_sw.mk sw/Module_sw.mk sw/source
sw/CustomTarget_generated.mk| 34 ++ sw/Library_sw.mk|1 sw/Module_sw.mk |1 sw/source/core/inc/SwXMLBlockImport.hxx | 76 +- sw/source/core/swg/BlockListTokens.txt |7 sw/source/core/swg/SwXMLBlockImport.cxx | 392 +++- sw/source/core/swg/SwXMLTextBlocks1.cxx | 93 ++- sw/source/core/swg/TextBlockTokens.txt |5 8 files changed, 384 insertions(+), 225 deletions(-) New commits: commit c1e90457d2ecc6e1171b7a296ab8bd05821e39e6 Author: Daniel Sikeler d.sikele...@gmail.com Date: Mon Nov 10 12:23:12 2014 + fdo#80403: Writer specific AutoCorr use FastParser Contextclasses implement XFastContextHandler Importclasses implement XFastDocumentHandler Tokens for BlockList.xml are defined in BlockListTokens.txt Tokens for content.xml are defined in TextBlockTokens.txt A perfect hash table is generated with gperf and used by the tokenhandlers Change-Id: Iff8ad5f1a4df0b808ee6fdf13f75a821596e9ee9 Reviewed-on: https://gerrit.libreoffice.org/12386 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk new file mode 100644 index 000..2752799 --- /dev/null +++ b/sw/CustomTarget_generated.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,sw/generated)) + +sw_SRC := $(SRCDIR)/sw/source/core/swg +sw_PL := $(SRCDIR)/solenv/bin/gentoken.pl +sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated) + +$(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PL) + mkdir -p $(sw_INC) + $(PERL) $(sw_PL) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf + +$(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PL) + mkdir -p $(sw_INC) + $(PERL) $(sw_PL) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf + +$(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens.gperf + $(GPERF) --compare-strncmp --readonly-tables --output-file=$(sw_INC)/tokens.cxx \ + --class-name=TextBlockTokens --word-array-name=textBlockList --enum $(sw_INC)/TextBlockTokens.gperf + $(GPERF) --compare-strncmp --readonly-tables -T $(sw_INC)/BlockListTokens.gperf \ + --class-name=BlockListTokens --word-array-name=blockListList $(sw_INC)/tokens.cxx + sed -i -e s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g $(sw_INC)/tokens.cxx + sed -i -e /^#line/d $(sw_INC)/tokens.cxx + +$(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx + +# vim: set noet sw=4 ts=4: diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index c475315..2816b05 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_set_include,sw,\ $(eval $(call gb_Library_use_custom_headers,sw,\ officecfg/registry \ + sw/generated \ )) $(eval $(call gb_Library_use_sdk_api,sw)) diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index a7a31ef..bf110be 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ $(call gb_Helper_optional,DESKTOP,Executable_tiledrendering) \ +CustomTarget_generated \ Library_msword \ Library_sw \ Library_swd \ diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx index ac166fd..e64b86b 100644 --- a/sw/source/core/inc/SwXMLBlockImport.hxx +++ b/sw/source/core/inc/SwXMLBlockImport.hxx @@ -21,6 +21,14 @@ #define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX #include xmloff/xmlimp.hxx +#include xmloff/nmspmap.hxx +#include xmloff/xmlnmspe.hxx +#include com/sun/star/xml/sax/XFastTokenHandler.hpp +#include com/sun/star/xml/sax/FastToken.hpp +#include sax/fastattribs.hxx + +using namespace css::xml::sax; +using namespace xmloff::token; class SwXMLTextBlocks; class SwXMLBlockListImport : public SvXMLImport @@ -31,10 +39,8 @@ private: protected: // This method is called after the namespace map has been updated, but // before a context for the current element has been pushed. -virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, - const OUString rLocalName, - const ::com::sun::star::uno::Reference -::com::sun::star::xml::sax::XAttributeList xAttrList ) SAL_OVERRIDE; +virtual SvXMLImportContext* CreateFastContext( sal_Int32 Element, +const css::uno::Reference
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/salbmp.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9eee7b8d030917a2b658033aa6c598cffb401765 Author: László Németh nem...@collabora.com Date: Thu Dec 4 10:48:37 2014 +0100 Fix Windows build Change-Id: I91fac95e447b8ea479928b17c45a2b579de87056 diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 9760bc6..16c47e7 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_INC_SALBMP_HXX #include tools/gen.hxx +#include tools/solar.h #include vcl/dllapi.h #include com/sun/star/rendering/XBitmapCanvas.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/inc
vcl/inc/salbmp.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 67bc4c4062b0aeb1135b658d25a23fcd90a82333 Author: László Németh nem...@collabora.com Date: Thu Dec 4 10:48:37 2014 +0100 Fix Windows build Change-Id: I91fac95e447b8ea479928b17c45a2b579de87056 diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index 9760bc6..16c47e7 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_INC_SALBMP_HXX #include tools/gen.hxx +#include tools/solar.h #include vcl/dllapi.h #include com/sun/star/rendering/XBitmapCanvas.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/docfnote.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 50d3ed0a1d47e40c6bf0e50b57751dbe4644b393
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 10:57:28 2014 +0100
sw: loplugin:cstylecast
Change-Id: I0b9f72b24b797bee244f95083b8f0ab10b1c6a02
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index b938a07..15cfb94 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -379,7 +379,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
}
else
{
-SwFtnInfo *pI = (SwFtnInfo*)pInf.get();
+SwFtnInfo *pI = static_castSwFtnInfo*(pInf.get());
pI-ePos = m_pPosPageBox-IsChecked() ? FTNPOS_PAGE : FTNPOS_CHAPTER;
pI-eNum = (SwFtnNum)GetNumbering();
pI-aQuoVadis = m_pContEdit-GetText();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/SwXMLBlockImport.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c940d4d30673dc02ea34b5e60a4a8140648a0dba
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 11:06:33 2014 +0100
loplugin:saloverride
Change-Id: Iabe90321d97b346f8f440ab729eaaec670bf2ce8
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx
b/sw/source/core/inc/SwXMLBlockImport.hxx
index e64b86b..9c4e77c 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -98,7 +98,7 @@ class SwXMLTextBlockTokenHandler : public
{
public:
SwXMLTextBlockTokenHandler();
-~SwXMLTextBlockTokenHandler();
+virtual ~SwXMLTextBlockTokenHandler();
//XFastTokenHandler
sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence sal_Int8
Identifier )
@@ -127,7 +127,7 @@ class SwXMLBlockListTokenHandler : public
{
public:
SwXMLBlockListTokenHandler();
-~SwXMLBlockListTokenHandler();
+virtual ~SwXMLBlockListTokenHandler();
//XFastTokenHandler
sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence sal_Int8
Identifier )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac xmlhelp/source
configure.ac |4 ++--
xmlhelp/source/cxxhelp/provider/databases.cxx | 15 +++
2 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 3de1e67e06a2ca43badf55e9d4b7aa3a21ef4edc
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Dec 4 10:13:36 2014 +0100
images: Remove 'Crystal' from the default image sets.
Change-Id: I90f10ea437fba65aced8a53f7b81d450a6ebd447
diff --git a/configure.ac b/configure.ac
index 17d0de4..b6ae6db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1474,7 +1474,7 @@ AC_ARG_WITH(galleries,
AC_ARG_WITH(theme,
AS_HELP_STRING([--with-theme=theme1 theme2...],
[Choose which themes to include. By default those themes with an '*'
are included.
- Possible choices: *breeze, *crystal, *galaxy, *hicontrast, human,
industrial, *oxygen, *sifr, *tango, *tango_testing.]),
+ Possible choices: *breeze, crystal, *galaxy, *hicontrast, human,
industrial, *oxygen, *sifr, *tango, *tango_testing.]),
,)
AC_ARG_WITH(helppack-integration,
@@ -11375,7 +11375,7 @@ dnl
===
AC_MSG_CHECKING([which themes to include])
# if none given use default subset of available themes
if test x$with_theme = x -o x$with_theme = xyes; then
-with_theme=breeze crystal galaxy hicontrast oxygen sifr tango
+with_theme=breeze galaxy hicontrast oxygen sifr tango
test -z $ENABLE_RELEASE_BUILD with_theme=$with_theme tango_testing
fi
commit 8c2e25b3768013a19ef2371e5d7867a86226df0d
Author: Jan Holesovsky ke...@collabora.com
Date: Thu Dec 4 10:13:14 2014 +0100
images: Tango is the most complete theme.
Change-Id: I211d21b09223dfacac18e879993b0f0943b94741
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index b7c2014..a6c8d3e 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -276,14 +276,13 @@ OString Databases::getImagesZipFileURL()
{
if ( aSymbolsStyleName.equalsAscii(auto) )
{
-OUString const env =
Application::GetDesktopEnvironment();
-if ( env.equalsIgnoreAsciiCase(tde) ||
- env.equalsIgnoreAsciiCase(kde) )
-aSymbolsStyleName = crystal;
-else if ( env.equalsIgnoreAsciiCase(kde4) )
-aSymbolsStyleName = oxygen;
-else
-aSymbolsStyleName = tango;
+// with the layered images*.zip, tango is the most
+// complete theme, so show that one
+// FIXME instead of using a general vnd.sun.star.zip://
+// for imgrepos, we should have some vnd.sun.star.image://
+// so that we don't have to re-open the stream for every
+// image in the help
+aSymbolsStyleName = tango;
}
OUString aZipName = images_ + aSymbolsStyleName + .zip;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/Bugzilla.pm scripts/esc-bug-stats.pl
scripts/Bugzilla.pm |7 +++ scripts/esc-bug-stats.pl |3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) New commits: commit 68d2dda2a02405c02118da4e5bf66b4775a7d7fe Author: Michael Meeks michael.me...@collabora.com Date: Thu Dec 4 10:19:53 2014 + Add 4.5 bits, expand blacklist etc. diff --git a/scripts/Bugzilla.pm b/scripts/Bugzilla.pm index 175721c..853398e 100644 --- a/scripts/Bugzilla.pm +++ b/scripts/Bugzilla.pm @@ -64,6 +64,13 @@ my %sadly_non_libreoffice = ( 'Jani Nikula' = 1, 'Guo Jinxian' = 1, 'Pekka Paalanen' = 1, +'Rodrigo Vivi' = 1, +'Stef Walter' = 1, +'Paulo Zanoni' = 1, +'Adrian Johnson' = 1, +'Kaveh' = 1, +'Marc-Andre Lureau' = 1, +'Aleksander Morgado' = 1, ); sub get_url($) diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl index 3b299b0..3758cab 100755 --- a/scripts/esc-bug-stats.pl +++ b/scripts/esc-bug-stats.pl @@ -29,12 +29,13 @@ sub build_overall_bugstats() } my %bug_to_ver = ( +'4.5' = '86696', '4.4' = '79641', '4.3' = '75025', '4.2' = '65675', '4.1' = '60270', '4.0' = '54157', -'3.6' = '6' +'3.6' = '6', ); my %ver_open; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/swg/SwXMLBlockImport.cxx | 12 1 file changed, 12 insertions(+) New commits: commit 5f0f3d4e91e9eb1d1f60b0cd073e7bbd8ea38c29 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 4 11:23:01 2014 +0100 Work around -Werror,-Wdeprecated-register Change-Id: I501bda18e33939c0becc13dcdf27cd96e33d7331 diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index 5491aa2..dcc6909 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -22,7 +22,19 @@ #include xmloff/xmlictxt.hxx #include unotools/charclass.hxx #include swtypes.hxx + +#if defined __clang__ +#if __has_warning(-Wdeprecated-register) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored -Wdeprecated-register +#endif +#endif #include tokens.cxx +#if defined __clang__ +#if __has_warning(-Wdeprecated-register) +#pragma GCC diagnostic pop +#endif +#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/effectextent-margin.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 +
sw/source/filter/ww8/docxsdrexport.cxx | 114 -
writerfilter/source/dmapper/GraphicImport.cxx |4
4 files changed, 72 insertions(+), 56 deletions(-)
New commits:
commit a5a836d8c43dc9cebbbf8af39bf0142de603a7c6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Dec 4 10:42:40 2014 +0100
DOCX filter: effect extent should be part of the margin
OOXML has an object size (extent) a size including effects like shadow
(effect
extent) and the margin (top/bottom/left/right distance). Our doc model
doesn't
have an explicit effect extent, but to have the intended layout, we at
least
need the spacing of the effect around flys (even if a number of effects are
not
rendered). Fix this by adding the effect extent to the margin; if we still
have
the effect extent grab-bag around, then this can be undone during export.
Change-Id: I9609ce347c54588395e09ad91a84c872b9007f85
diff --git a/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx
b/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx
new file mode 100644
index 000..22db162
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2c4f608..dc5333a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -16,6 +16,7 @@
#include com/sun/star/text/HoriOrientation.hpp
#include com/sun/star/text/XTextRangeCompare.hpp
#include com/sun/star/text/WritingMode2.hpp
+#include oox/drawingml/drawingmltypes.hxx
#include string
@@ -619,6 +620,15 @@ DECLARE_OOXMLEXPORT_TEST(testTextboxRightEdge,
textbox-right-edge.docx)
// inside the draw shape.
CPPUNIT_ASSERT(nShapeLeft + nShapeWidth = nTextboxLeft + nTextboxWidth);
}
+
+DECLARE_OOXMLEXPORT_TEST(testEffectExtentMargin, effectextent-margin.docx)
+{
+// This was 318, i.e. oox::drawingml::convertEmuToHmm(114300), effectExtent
+// wasn't part of the margin, leading to the fly not taking enough space
+// around itself.
+CPPUNIT_ASSERT_EQUAL(oox::drawingml::convertEmuToHmm(114300+95250),
getPropertysal_Int32(getShape(1), LeftMargin));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 4b122e0..3e86967 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -319,6 +319,56 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size rS
{
isAnchor = pFrmFmt-GetAnchor().GetAnchorId() != FLY_AS_CHAR;
}
+
+// Count effectExtent values, their value is needed before dist{T,B,L,R}
is written.
+SvxShadowItem aShadowItem = pFrmFmt-GetShadow();
+sal_Int32 nLeftExt = 0, nRightExt = 0, nTopExt = 0, nBottomExt = 0;
+if (aShadowItem.GetLocation() != SVX_SHADOW_NONE)
+{
+sal_Int32 nShadowWidth(TwipsToEMU(aShadowItem.GetWidth()));
+switch (aShadowItem.GetLocation())
+{
+case SVX_SHADOW_TOPLEFT:
+nTopExt = nLeftExt = nShadowWidth;
+break;
+case SVX_SHADOW_TOPRIGHT:
+nTopExt = nRightExt = nShadowWidth;
+break;
+case SVX_SHADOW_BOTTOMLEFT:
+nBottomExt = nLeftExt = nShadowWidth;
+break;
+case SVX_SHADOW_BOTTOMRIGHT:
+nBottomExt = nRightExt = nShadowWidth;
+break;
+case SVX_SHADOW_NONE:
+case SVX_SHADOW_END:
+break;
+}
+}
+else if (const SdrObject* pObject = pFrmFmt-FindRealSdrObject())
+{
+// No shadow, but we have an idea what was the original effectExtent.
+uno::Any aAny;
+pObject-GetGrabBagItem(aAny);
+comphelper::SequenceAsHashMap aGrabBag(aAny);
+comphelper::SequenceAsHashMap::iterator it =
aGrabBag.find(CT_EffectExtent);
+if (it != aGrabBag.end())
+{
+comphelper::SequenceAsHashMap aEffectExtent(it-second);
+for (std::pairconst OUString, uno::Any rDirection :
aEffectExtent)
+{
+if (rDirection.first == l
rDirection.second.hassal_Int32())
+nLeftExt = rDirection.second.getsal_Int32();
+else if (rDirection.first == t
rDirection.second.hassal_Int32())
+nTopExt = rDirection.second.getsal_Int32();
+else if (rDirection.first == r
rDirection.second.hassal_Int32())
+nRightExt = rDirection.second.getsal_Int32();
+else if (rDirection.first == b
rDirection.second.hassal_Int32())
+nBottomExt = rDirection.second.getsal_Int32();
+
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/Sidebar.hrc |1 +
sfx2/source/sidebar/Sidebar.src |4
sfx2/source/sidebar/SidebarController.cxx | 11 +++
3 files changed, 16 insertions(+)
New commits:
commit 5131750da6df95643e89127349b95df33be2feb4
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Thu Dec 4 11:31:43 2014 +0100
fdo#85937 Add 'Close Sidebar' command to Sidebar menu
Change-Id: I83248398a9a8f2a8abb4e10d7ef9f1c203dddbf5
diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
index 06d1e04..a351c1e 100644
--- a/sfx2/source/sidebar/Sidebar.hrc
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -52,6 +52,7 @@
#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL 132
#define STRING_CUSTOMIZATION200
#define STRING_RESTORE 201
+#define STRING_HIDE_SIDEBAR 202
#define SFX_STR_SIDEBAR_MORE_OPTIONS(RID_SFX_SIDEBAR_START +
1)
#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START +
2)
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index 548fa02..eaa55c0 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -154,6 +154,10 @@ Resource RID_SIDEBAR_RESOURCE
{
Text [en-US] = Restore Default;
};
+String STRING_HIDE_SIDEBAR
+{
+Text [en-US] = Close Sidebar;
+};
};
String SFX_STR_SIDEBAR_MORE_OPTIONS
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 4787587..7f950a2 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -63,6 +63,7 @@ using ::rtl::OUString;
namespace
{
const static char gsReadOnlyCommandName[] = .uno:EditDoc;
+const static char gsHideSidebarCommandName[] = .uno:Sidebar;
const static sal_Int32 gnMaximumSidebarWidth (400);
const static sal_Int32 gnWidthCloseThreshold (70);
const static sal_Int32 gnWidthOpenThreshold (40);
@@ -77,6 +78,7 @@ namespace {
{
MID_UNLOCK_TASK_PANEL = 1,
MID_LOCK_TASK_PANEL,
+MID_HIDE_SIDEBAR,
MID_CUSTOMIZATION,
MID_RESTORE_DEFAULT,
MID_FIRST_PANEL,
@@ -889,6 +891,7 @@ void SidebarController::ShowPopupMenu (
else
pMenu-InsertItem(MID_UNLOCK_TASK_PANEL, SFX2_RESSTR(STR_SFX_UNDOCK));
+pMenu-InsertItem(MID_HIDE_SIDEBAR, SFX2_RESSTR(STRING_HIDE_SIDEBAR));
pCustomizationMenu-InsertSeparator();
pCustomizationMenu-InsertItem(MID_RESTORE_DEFAULT,
SFX2_RESSTR(STRING_RESTORE));
@@ -924,6 +927,14 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*,
pMenu)
mpTabBar-RestoreHideFlags();
break;
+case MID_HIDE_SIDEBAR:
+{
+const util::URL aURL (Tools::GetURL(gsHideSidebarCommandName));
+Referenceframe::XDispatch mxDispatch
(Tools::GetDispatch(mxFrame, aURL));
+if (mxDispatch.is())
+mxDispatch-dispatch(aURL,
Sequencebeans::PropertyValue());
+break;
+}
default:
{
try
___
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/pdfwriter_impl.cxx | 42 +++---
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit bfa01d8a8248f7e44675de5ed1f85a1d17105022
Author: Tor Lillqvist t...@collabora.com
Date: Thu Dec 4 12:39:38 2014 +0200
Use the vcl.pdfwriter logging tag instead of vcl.gdi
Change-Id: Idf000a8faee444e65c5f2fa20edde3eb70ddb371
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index f018615..565d290 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6027,11 +6027,11 @@ bool PDFWriterImpl::finalizeSignature()
if (!cert)
{
-SAL_WARN(vcl.gdi, PDF Signing: Error occurred, certificate cannot
be reconstructed.);
+SAL_WARN(vcl.pdfwriter, PDF Signing: Error occurred, certificate
cannot be reconstructed.);
return false;
}
-SAL_WARN(vcl.gdi, PDF Signing: Certificate Subject:
cert-subjectName \n\tCertificate Issuer: cert-issuerName);
+SAL_WARN(vcl.pdfwriter, PDF Signing: Certificate Subject:
cert-subjectName \n\tCertificate Issuer: cert-issuerName);
// Prepare buffer and calculate PDF file digest
CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
@@ -6039,7 +6039,7 @@ bool PDFWriterImpl::finalizeSignature()
HashContextScope hc(HASH_Create(HASH_AlgSHA1));
if (!hc.get())
{
-SAL_WARN(vcl.gdi, PDF Signing: SHA1 HASH_Create failed!);
+SAL_WARN(vcl.pdfwriter, PDF Signing: SHA1 HASH_Create failed!);
return false;
}
@@ -6051,7 +6051,7 @@ bool PDFWriterImpl::finalizeSignature()
//FIXME: Check if SHA1 is calculated from the correct byterange
CHECK_RETURN( (osl::File::E_None == m_aFile.read(buffer.get(),
m_nSignatureContentOffset - 1 , bytesRead)) );
if (bytesRead != (sal_uInt64)m_nSignatureContentOffset - 1)
-SAL_WARN(vcl.gdi, PDF Signing: First buffer read failed!);
+SAL_WARN(vcl.pdfwriter, PDF Signing: First buffer read failed!);
HASH_Update(hc.get(), reinterpret_castconst unsigned
char*(buffer.get()), bytesRead);
@@ -6059,7 +6059,7 @@ bool PDFWriterImpl::finalizeSignature()
buffer.reset(new char[nLastByteRangeNo + 1]);
CHECK_RETURN( (osl::File::E_None == m_aFile.read(buffer.get(),
nLastByteRangeNo, bytesRead)) );
if (bytesRead != (sal_uInt64) nLastByteRangeNo)
-SAL_WARN(vcl.gdi, PDF Signing: Second buffer read failed!);
+SAL_WARN(vcl.pdfwriter, PDF Signing: Second buffer read failed!);
HASH_Update(hc.get(), reinterpret_castconst unsigned
char*(buffer.get()), bytesRead);
@@ -6074,21 +6074,21 @@ bool PDFWriterImpl::finalizeSignature()
NSSCMSMessage *cms_msg = NSS_CMSMessage_Create(NULL);
if (!cms_msg)
{
-SAL_WARN(vcl.gdi, PDF signing: can't create new CMS message.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't create new CMS
message.);
return false;
}
NSSCMSSignedData *cms_sd = NSS_CMSSignedData_Create(cms_msg);
if (!cms_sd)
{
-SAL_WARN(vcl.gdi, PDF signing: can't create CMS SignedData.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't create CMS SignedData.);
return false;
}
NSSCMSContentInfo *cms_cinfo = NSS_CMSMessage_GetContentInfo(cms_msg);
if (NSS_CMSContentInfo_SetContent_SignedData(cms_msg, cms_cinfo, cms_sd)
!= SECSuccess)
{
-SAL_WARN(vcl.gdi, PDF signing: Can't set CMS content signed data.);
+SAL_WARN(vcl.pdfwriter, PDF signing: Can't set CMS content signed
data.);
return false;
}
@@ -6096,48 +6096,48 @@ bool PDFWriterImpl::finalizeSignature()
//attach NULL data as detached data
if (NSS_CMSContentInfo_SetContent_Data(cms_msg, cms_cinfo, NULL, PR_TRUE)
!= SECSuccess)
{
-SAL_WARN(vcl.gdi, PDF signing: Can't set CMS content data.);
+SAL_WARN(vcl.pdfwriter, PDF signing: Can't set CMS content data.);
return false;
}
NSSCMSSignerInfo *cms_signer = NSS_CMSSignerInfo_Create(cms_msg, cert,
SEC_OID_SHA1);
if (!cms_signer)
{
-SAL_WARN(vcl.gdi, PDF signing: can't create CMS SignerInfo.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't create CMS SignerInfo.);
return false;
}
if (NSS_CMSSignerInfo_IncludeCerts(cms_signer, NSSCMSCM_CertChain,
certUsageEmailSigner) != SECSuccess)
{
-SAL_WARN(vcl.gdi, PDF signing: can't include cert chain.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't include cert chain.);
return false;
}
if (NSS_CMSSignerInfo_AddSigningTime(cms_signer, PR_Now()) != SECSuccess)
{
-SAL_WARN(vcl.gdi, PDF signing: can't add signing time.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't add signing time.);
return false;
}
if (NSS_CMSSignedData_AddCertificate(cms_sd, cert) != SECSuccess)
{
-SAL_WARN(vcl.gdi, PDF signing: can't
[Libreoffice-commits] core.git: include/sfx2 include/svl include/svtools include/vcl jvmfwk/source sfx2/source svl/source svtools/source svx/source unusedcode.easy vcl/source vcl/unx vcl/win
include/sfx2/sidebar/EnumContext.hxx |3
include/svl/currencytable.hxx|2
include/svl/zforlist.hxx | 13 --
include/svtools/valueset.hxx |2
include/vcl/settings.hxx |6 -
jvmfwk/source/elements.cxx | 28
jvmfwk/source/elements.hxx |7 -
jvmfwk/source/framework.cxx | 10 -
jvmfwk/source/framework.hxx |1
jvmfwk/source/fwkutil.cxx| 79 -
jvmfwk/source/fwkutil.hxx| 17 --
jvmfwk/source/libxmlutil.cxx |5
jvmfwk/source/libxmlutil.hxx |3
sfx2/source/sidebar/EnumContext.cxx | 19 ---
svl/source/numbers/currencytable.cxx | 10 -
svl/source/numbers/zforlist.cxx | 17 --
svtools/source/control/valueset.cxx |9 -
svx/source/sidebar/ColorPanel.cxx| 204 ---
unusedcode.easy | 12 +-
vcl/source/app/settings.cxx | 34 -
vcl/unx/kde/salnativewidgets-kde.cxx |8 -
vcl/unx/kde4/KDESalFrame.cxx |3
vcl/win/source/window/salframe.cxx |1
23 files changed, 11 insertions(+), 482 deletions(-)
New commits:
commit f4d03933dc764139dc1e40fe6985a3cac090216e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 4 09:27:12 2014 +
callcatcher: update unused code
Change-Id: Ia25b857738bb7b6c3baf18c68ef0d1bc0b3e142e
diff --git a/include/sfx2/sidebar/EnumContext.hxx
b/include/sfx2/sidebar/EnumContext.hxx
index 4cd58bd..2918537 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -119,11 +119,8 @@ public:
*/
sal_Int32 GetCombinedContext_DI(void) const;
-const ::rtl::OUString GetApplicationName (void) const;
Application GetApplication_DI (void) const;
-const ::rtl::OUString GetContextName (void) const;
-
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx
index 940a584..ed2e5f4 100644
--- a/include/svl/currencytable.hxx
+++ b/include/svl/currencytable.hxx
@@ -23,9 +23,7 @@ public:
typedef DataType::const_iterator const_iterator;
iterator begin();
-iterator end();
const_iterator begin() const;
-const_iterator end() const;
NfCurrencyEntry operator[] ( size_t i );
const NfCurrencyEntry operator[] ( size_t i ) const;
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 7ada1b5..8d5b9fc 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -255,8 +255,6 @@ public:
sal_Unicode cZero );
~NfCurrencyEntry() {}
-NfCurrencyEntry* Clone() const;
-
/// Symbols and language identical
booloperator==( const NfCurrencyEntry r ) const;
@@ -304,11 +302,6 @@ public:
static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
};
-inline NfCurrencyEntry* new_clone( const NfCurrencyEntry r )
-{
-return r.Clone();
-}
-
typedef std::vector OUString NfWSStringsDtor;
class SvNumberFormatterRegistry_Impl;
@@ -642,8 +635,6 @@ public:
/// DEPRECATED: Return first character of the decimal separator of the
current language/country
sal_Unicode GetDecSep() const;
-/// Return the decimal separator of the current language/country
-OUString GetDecimalSep() const;
/// Return the decimal separator matching the locale of the given format
OUString GetFormatDecimalSep( sal_uInt32 nFormat ) const;
@@ -921,10 +912,6 @@ public:
// return corresponding Transliteration wrapper
const ::utl::TransliterationWrapper* GetTransliteration() const;
-// return corresponding Transliteration wrapper with loadModuleByImplName()
-const ::utl::TransliterationWrapper* GetTransliterationForModule(
-const OUString rModule, LanguageType eLang ) const;
-
// return the corresponding CharacterClassification wrapper
const CharClass* GetCharClass() const;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 4ddc64d..10db4d5 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -308,8 +308,6 @@ public:
voidInsertItem( sal_uInt16 nItemId, const Image rImage,
size_t nPos = VALUESET_APPEND );
-voidInsertItem( sal_uInt16 nItemId, const Color rColor,
-size_t nPos = VALUESET_APPEND );
voidInsertItem( sal_uInt16 nItemId,
const Image rImage, const OUString rStr,
size_t nPos = VALUESET_APPEND );
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 9650828..5873c8e3 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -278,9 +278,6 @@ public:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sfx2/source
sfx2/source/sidebar/Sidebar.hrc |1 +
sfx2/source/sidebar/Sidebar.src |4
sfx2/source/sidebar/SidebarController.cxx | 11 +++
3 files changed, 16 insertions(+)
New commits:
commit f0b969179d8583a98849b0b8df1e1f5f130b3fbf
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Thu Dec 4 11:31:43 2014 +0100
fdo#85937 Add 'Close Sidebar' command to Sidebar menu
Change-Id: I83248398a9a8f2a8abb4e10d7ef9f1c203dddbf5
Reviewed-on: https://gerrit.libreoffice.org/13297
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc
index 06d1e04..a351c1e 100644
--- a/sfx2/source/sidebar/Sidebar.hrc
+++ b/sfx2/source/sidebar/Sidebar.hrc
@@ -52,6 +52,7 @@
#define IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL 132
#define STRING_CUSTOMIZATION200
#define STRING_RESTORE 201
+#define STRING_HIDE_SIDEBAR 202
#define SFX_STR_SIDEBAR_MORE_OPTIONS(RID_SFX_SIDEBAR_START +
1)
#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START +
2)
diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src
index 548fa02..eaa55c0 100644
--- a/sfx2/source/sidebar/Sidebar.src
+++ b/sfx2/source/sidebar/Sidebar.src
@@ -154,6 +154,10 @@ Resource RID_SIDEBAR_RESOURCE
{
Text [en-US] = Restore Default;
};
+String STRING_HIDE_SIDEBAR
+{
+Text [en-US] = Close Sidebar;
+};
};
String SFX_STR_SIDEBAR_MORE_OPTIONS
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index db09eea..a0e05fc 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -66,6 +66,7 @@ using ::rtl::OUString;
namespace
{
const static char gsReadOnlyCommandName[] = .uno:EditDoc;
+const static char gsHideSidebarCommandName[] = .uno:Sidebar;
const static sal_Int32 gnMaximumSidebarWidth (400);
const static sal_Int32 gnWidthCloseThreshold (70);
const static sal_Int32 gnWidthOpenThreshold (40);
@@ -81,6 +82,7 @@ namespace {
{
MID_UNLOCK_TASK_PANEL = 1,
MID_LOCK_TASK_PANEL,
+MID_HIDE_SIDEBAR,
MID_CUSTOMIZATION,
MID_RESTORE_DEFAULT,
MID_FIRST_PANEL,
@@ -927,6 +929,7 @@ void SidebarController::ShowPopupMenu (
else
pMenu-InsertItem(MID_UNLOCK_TASK_PANEL, SFX2_RESSTR(STR_SFX_UNDOCK));
+pMenu-InsertItem(MID_HIDE_SIDEBAR, SFX2_RESSTR(STRING_HIDE_SIDEBAR));
pCustomizationMenu-InsertSeparator();
pCustomizationMenu-InsertItem(MID_RESTORE_DEFAULT,
SFX2_RESSTR(STRING_RESTORE));
@@ -965,6 +968,14 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*,
pMenu)
mpTabBar-RestoreHideFlags();
break;
+case MID_HIDE_SIDEBAR:
+{
+const util::URL aURL (Tools::GetURL(gsHideSidebarCommandName));
+Referenceframe::XDispatch mxDispatch
(Tools::GetDispatch(mxFrame, aURL));
+if (mxDispatch.is())
+mxDispatch-dispatch(aURL,
Sequencebeans::PropertyValue());
+break;
+}
default:
{
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: lcov-report/lcov-report.sh
lcov-report/lcov-report.sh |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 47f20415c056ed56108dbf5a1894be3a119e8c5d
Author: Maarten Hoes hoes.maar...@gmail.com
Date: Tue Dec 2 22:40:06 2014 +0100
Allow for relative pathnames, by translating relative to absolutei ones.
Change-Id: Ifee8c9d744cbed16090f35b437069b3ee4c84110
Reviewed-on: https://gerrit.libreoffice.org/13281
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/lcov-report/lcov-report.sh b/lcov-report/lcov-report.sh
index d4d17fd..8a20a46 100755
--- a/lcov-report/lcov-report.sh
+++ b/lcov-report/lcov-report.sh
@@ -219,19 +219,19 @@ fi
while getopts :s:t:w:C:d:abc opt ; do
case $opt in
s)
-SRC_DIR=$OPTARG
+SRC_DIR=$(readlink -f ${OPTARG?})
;;
t)
-TRACEFILE_DIR=$OPTARG
+TRACEFILE_DIR=$(readlink -f ${OPTARG?})
;;
w)
-HTML_DIR=$OPTARG
+HTML_DIR=$(readlink -f ${OPTARG?})
;;
c)
SOURCE_COMPILE=TRUE
;;
C)
-BUILD_DIR=$OPTARG
+BUILD_DIR=$(readlink -f ${OPTARG?})
;;
b)
BEFORE=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/store/cstylecast.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit a0db0648f6c4971f73c32eb8164934d24aa7503c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 11:56:14 2014 +0100
Problematic casts in gendata.hxx are already under control
Change-Id: If3b0f667b379b7973364c93be4b88347e5768223
diff --git a/compilerplugins/clang/store/cstylecast.cxx
b/compilerplugins/clang/store/cstylecast.cxx
index b036e1b..132686f 100644
--- a/compilerplugins/clang/store/cstylecast.cxx
+++ b/compilerplugins/clang/store/cstylecast.cxx
@@ -80,8 +80,6 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr *
expr) {
}
} else {
if (filename.startswith(SRCDIR /include/tools/solar.h)
- // the GetSalDisplay/GetGtkDisplay methods are problematic
- || filename.startswith(SRCDIR /vcl/inc/generic/gendata.hxx)
|| filename.startswith(SRCDIR /include/cppuhelper/)) {
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/gdimtf.hxx | 80 - 1 file changed, 40 insertions(+), 40 deletions(-) New commits: commit 68a859f3e672435e623351c8bd5f0b667f6d89c2 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Wed Dec 3 18:58:22 2014 +1100 vcl: cleanup gdimtf.hxx Change-Id: Id6bea5dba1e2c4741d27b0eaf9d52722e2b0df61 diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 5a80213..65bf763 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -87,39 +87,40 @@ private: boolbUseCanvas; -SAL_DLLPRIVATE static ColorImplColAdjustFnc( const Color rColor, const void* pColParam ); -SAL_DLLPRIVATE static BitmapEx ImplBmpAdjustFnc( const BitmapEx rBmpEx, const void* pBmpParam ); +SAL_DLLPRIVATE static Color ImplColAdjustFnc( const Color rColor, const void* pColParam ); +SAL_DLLPRIVATE static BitmapEx ImplBmpAdjustFnc( const BitmapEx rBmpEx, const void* pBmpParam ); -SAL_DLLPRIVATE static ColorImplColConvertFnc( const Color rColor, const void* pColParam ); -SAL_DLLPRIVATE static BitmapEx ImplBmpConvertFnc( const BitmapEx rBmpEx, const void* pBmpParam ); +SAL_DLLPRIVATE static Color ImplColConvertFnc( const Color rColor, const void* pColParam ); +SAL_DLLPRIVATE static BitmapEx ImplBmpConvertFnc( const BitmapEx rBmpEx, const void* pBmpParam ); -SAL_DLLPRIVATE static ColorImplColMonoFnc( const Color rColor, const void* pColParam ); -SAL_DLLPRIVATE static BitmapEx ImplBmpMonoFnc( const BitmapEx rBmpEx, const void* pBmpParam ); +SAL_DLLPRIVATE static Color ImplColMonoFnc( const Color rColor, const void* pColParam ); +SAL_DLLPRIVATE static BitmapEx ImplBmpMonoFnc( const BitmapEx rBmpEx, const void* pBmpParam ); -SAL_DLLPRIVATE static ColorImplColReplaceFnc( const Color rColor, const void* pColParam ); -SAL_DLLPRIVATE static BitmapEx ImplBmpReplaceFnc( const BitmapEx rBmpEx, const void* pBmpParam ); +SAL_DLLPRIVATE static Color ImplColReplaceFnc( const Color rColor, const void* pColParam ); +SAL_DLLPRIVATE static BitmapEx ImplBmpReplaceFnc( const BitmapEx rBmpEx, const void* pBmpParam ); -SAL_DLLPRIVATE voidImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, - BmpExchangeFnc pFncBmp, const void* pBmpParam ); +SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, +BmpExchangeFnc pFncBmp, const void* pBmpParam ); -SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point rPt, const Point rRotatePt, -const Size rOffset, double fSin, double fCos ); -SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon rPoly, const Point rRotatePt, - const Size rOffset, double fSin, double fCos ); -SAL_DLLPRIVATE tools::PolyPolygon ImplGetRotatedPolyPolygon( const tools::PolyPolygon rPoly, const Point rRotatePt, - const Size rOffset, double fSin, double fCos ); -SAL_DLLPRIVATE voidImplAddGradientEx( GDIMetaFile rMtf, - const OutputDevice rMapDev, - const tools::PolyPolygonrPolyPoly, - const Gradient rGrad ); -SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut, const Point rPos, Size rLogicDestSize ); -SAL_DLLPRIVATE void ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut ); +SAL_DLLPRIVATE PointImplGetRotatedPoint( const Point rPt, const Point rRotatePt, + const Size rOffset, double fSin, double fCos ); +SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon rPoly, const Point rRotatePt, + const Size rOffset, double fSin, double fCos ); +SAL_DLLPRIVATE tools::PolyPolygon ImplGetRotatedPolyPolygon( const tools::PolyPolygon rPoly, const Point rRotatePt, + const Size rOffset, double fSin, double fCos ); +SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile rMtf, + const OutputDevice rMapDev, + const tools::PolyPolygon rPolyPoly, + const Gradient rGrad ); + +SAL_DLLPRIVATE bool
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - sc/source
sc/source/core/data/column3.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1e6abaa8b97f537ee76c5e3e7501ccddb88c50ce
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 28 10:09:23 2014 +
test rows for validity
Change-Id: I501c1c18df96b5b2ad628e86cfb724a541d5c4b6
Reviewed-on: https://gerrit.libreoffice.org/13170
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index aa84d8d..924c9e3 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -101,6 +101,9 @@ struct DirtyCellInterpreter
void ScColumn::InterpretDirtyCells( SCROW nRow1, SCROW nRow2 )
{
+if (!ValidRow(nRow1) || !ValidRow(nRow2) || nRow1 nRow2)
+return;
+
DirtyCellInterpreter aFunc;
sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 23 commits - android/Bootstrap desktop/Library_sofficeapp.mk desktop/source libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Executable_lokcon
UnoControls/Makefile | 14 -
android/Bootstrap/Makefile.shared |2
android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java |8 -
desktop/Library_sofficeapp.mk |8 +
desktop/source/app/cmdlineargs.cxx| 12 +
desktop/source/app/officeipcthread.cxx| 29 ++-
desktop/source/app/officeipcthread.hxx|4
desktop/source/lib/init.cxx | 79 +-
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |3
libreofficekit/Executable_lokconf_init.mk | 42 +
libreofficekit/Module_libreofficekit.mk |4
libreofficekit/qa/lokconf_init/lokconf_init.cxx | 42 +
libreofficekit/qa/unit/tiledrendering.cxx |3
sd/source/ui/remotecontrol/Server.cxx | 15 +
solenv/gbuild/CppunitTest.mk |8 +
svx/source/sdr/contact/objectcontactofpageview.cxx|2
vcl/source/window/window.cxx |2
17 files changed, 245 insertions(+), 32 deletions(-)
New commits:
commit 12491e11f05b56130e33ab6ed637cf1fe01ca9fc
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Thu Dec 4 11:25:43 2014 +0100
android: force create directory assets/gz.unpack/program
It can happen that this directory doesn't exist and the copy
script fails (especially on a clean install). The script has been
modified to force create this directory before trying to copy
stuff into it.
Change-Id: Iedf3caef07e6896405750aea9e8f211b1e80dc3a
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index c798fd6..2429dea 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -122,7 +122,7 @@ copy-stuff:
# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
# extent).
#
- mkdir -p assets/lib assets/program/services
assets/ComponentTarget/i18npool/util
+ mkdir -p assets/lib assets/program/services
assets/ComponentTarget/i18npool/util assets/gz.unpack/program
gzip -9 $(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb
assets/gz.unpack/program/offapi.rdb
gzip -9 $(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb
assets/gz.unpack/program/oovbaapi.rdb
gzip -9 $(INSTDIR)/$(LIBO_URE_MISC_FOLDER)/types.rdb
assets/gz.unpack/program/udkapi.rdb
commit 7915b3fcafd0fea249d924f053f0a775206a22f4
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Fri Sep 26 09:12:56 2014 +0100
Add more lok debug output.
This should allow as at least to see if soffice_main thread
initialisation gets stuck (which we'd otherwise have a hard time
determining if we are trying to debug e.g. on Android).
Change-Id: I0baa211c015318c4e0fcf78a4e86a0ba8b895d5f
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 598bfdc..8040f54 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -695,9 +695,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
// to LOK in an external program).
if (!osl_areCommandArgsSet())
{
+SAL_INFO(lok, commandArgs not previously set);
osl_setCommandArgs(2, pArgs);
}
+SAL_INFO(lok, attempting to initalize UNO);
initialize_uno(aAppURL);
+SAL_INFO(lok, uno successfully initalized);
force_c_locale();
// Force headless -- this is only for bitmap rendering.
@@ -719,9 +722,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
// the Thread from wherever (it's done again in Desktop::Main), and can
// then use it to wait until we're definitely ready to continue.
+SAL_INFO(lok, enabling OfficeIPCThread);
OfficeIPCThread::EnableOfficeIPCThread();
+SAL_INFO(lok, starting soffice_main);
pthread_create((pLib-maThread), 0, lo_startmain, NULL);
+SAL_INFO(lok, waiting for OfficeIPCThread);
OfficeIPCThread::WaitForReady();
+SAL_INFO(lok, OfficeIPCThread ready -- continuing);
// If the Thread has been disabled again that indicates that a
// restart is required (or in any case we don't have a useable
commit 663a8c79700da18e45ed5f69391f5fc1f2406229
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Fri Sep 26 09:11:53 2014 +0100
Don't use this quick hack on Android.
It *seems* to cause missing areas (at least in Impress).
(i.e. the bottom half or right side of headers on slides can sometimes
go missing, not using this hack fixes the problem for me).
Change-Id: I205531666e0ad12470020e5ff2568ebf16bc2f01
diff --git
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/combobox.h |1 -
vcl/source/control/combobox.cxx | 12
2 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit e5ed703b833d881b05a71808a5fc2f51903fd1c0
Author: Noel Grandin n...@peralex.com
Date: Thu Dec 4 09:55:07 2014 +0200
the return code COMBOBOX_ERROR is completely ignored
so let's turn it into an assert, since these failures are pretty fatal
anyhow
Change-Id: Idfb499e3b09f1c5413fae8a0961d968a0694beed
diff --git a/include/vcl/combobox.h b/include/vcl/combobox.h
index 047a24c..d51b670 100644
--- a/include/vcl/combobox.h
+++ b/include/vcl/combobox.h
@@ -24,7 +24,6 @@
#define COMBOBOX_APPEND (SAL_MAX_INT32)
#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
-#define COMBOBOX_ERROR (SAL_MAX_INT32)
#define COMBOBOX_MAX_ENTRIES(SAL_MAX_INT32 - 1)
#endif // INCLUDED_VCL_COMBOBOX_H
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index d35a64b..fca1716 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -845,8 +845,7 @@ void ComboBox::ImplUpdateFloatSelection()
sal_Int32 ComboBox::InsertEntry(const OUString rStr, sal_Int32 const nPos)
{
-if (nPos 0 || COMBOBOX_MAX_ENTRIES =
mpImplLB-GetEntryList()-GetEntryCount())
-return COMBOBOX_ERROR;
+assert(nPos = 0 COMBOBOX_MAX_ENTRIES
mpImplLB-GetEntryList()-GetEntryCount());
sal_Int32 nRealPos;
if (nPos == COMBOBOX_APPEND)
@@ -854,8 +853,7 @@ sal_Int32 ComboBox::InsertEntry(const OUString rStr,
sal_Int32 const nPos)
else
{
const sal_Int32 nMRUCount = mpImplLB-GetEntryList()-GetMRUCount();
-if (nPos COMBOBOX_MAX_ENTRIES - nMRUCount)
-return COMBOBOX_ERROR;
+assert(nPos = COMBOBOX_MAX_ENTRIES - nMRUCount);
nRealPos = nPos + nMRUCount;
}
@@ -868,8 +866,7 @@ sal_Int32 ComboBox::InsertEntry(const OUString rStr,
sal_Int32 const nPos)
sal_Int32 ComboBox::InsertEntryWithImage(
const OUString rStr, const Image rImage, sal_Int32 const nPos)
{
-if (nPos 0 || COMBOBOX_MAX_ENTRIES =
mpImplLB-GetEntryList()-GetEntryCount())
-return COMBOBOX_ERROR;
+assert(nPos = 0 COMBOBOX_MAX_ENTRIES
mpImplLB-GetEntryList()-GetEntryCount());
sal_Int32 nRealPos;
if (nPos == COMBOBOX_APPEND)
@@ -877,8 +874,7 @@ sal_Int32 ComboBox::InsertEntryWithImage(
else
{
const sal_Int32 nMRUCount = mpImplLB-GetEntryList()-GetMRUCount();
-if (nPos COMBOBOX_MAX_ENTRIES - nMRUCount)
-return COMBOBOX_ERROR;
+assert(nPos = COMBOBOX_MAX_ENTRIES - nMRUCount);
nRealPos = nPos + nMRUCount;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/sdr/contact/objectcontactofpageview.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 16d0e0b8077de0cb67e312b1b7397fd8ab7d03d8 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 4 13:28:09 2014 +0200 HAVE_FEATURE_DESKTOP is always defined, it is 0 or 1 One should not use #ifdef (or #if defined) on the macros from config_features.h. Fix mistake introduced in 663a8c79700da18e45ed5f69391f5fc1f2406229. diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 4722632..e2a1357 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -243,7 +243,7 @@ namespace sdr updateViewInformation2D(aNewViewInformation2D); drawinglayer::primitive2d::Primitive2DSequence xPrimitiveSequence; -#if defined( HAVE_FEATURE_DESKTOP ) || defined( ANDROID ) +#if HAVE_FEATURE_DESKTOP || defined( ANDROID ) // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D // and may use the MapMode from the Target OutDev in the DisplayInfo xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/cstylecast.cxx | 103 + compilerplugins/clang/store/cstylecast.cxx | 103 - 2 files changed, 103 insertions(+), 103 deletions(-) New commits: commit c20a0120d8b79346179e6599931108081bd5a49c Author: Noel Grandin n...@peralex.com Date: Thu Dec 4 13:38:53 2014 +0200 move the cstylecast clang plugin out of /store Change-Id: Iee78bd688ddb3e02deb1a3636d6a604838e97b09 diff --git a/compilerplugins/clang/store/cstylecast.cxx b/compilerplugins/clang/cstylecast.cxx similarity index 100% rename from compilerplugins/clang/store/cstylecast.cxx rename to compilerplugins/clang/cstylecast.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc
starmath/inc/document.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 5ea8f923ebc4acd82c566296b7ae80d140cc1c5f Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Dec 4 21:03:37 2014 +0900 -Wunused-macros Change-Id: I40aa11584b76ea2e3d4e0d13690893e340229172 diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 6da4299..e71a2f9 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_STARMATH_INC_DOCUMENT_HXX #define INCLUDED_STARMATH_INC_DOCUMENT_HXX -#define SMDLL 1 - #include rtl/ustring.hxx #include rtl/strbuf.hxx #include sfx2/docfac.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/Executable_lokconf_init.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa
libreofficekit/Executable_lokconf_init.mk | 42
libreofficekit/Module_libreofficekit.mk |4 --
libreofficekit/qa/lokconf_init/lokconf_init.cxx | 42
3 files changed, 88 deletions(-)
New commits:
commit e5cd9ee78b36a0f23e2b85b01ceb8899fe11c0fc
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Thu Dec 4 13:11:41 2014 +0100
Revert Implement lokconf_init.
This reverts commit 5acadbfb0c79fe51f8025b065b46b0ccd25c804d.
Conflicts:
libreofficekit/qa/lokconf_init/lokconf_init.cxx
Change-Id: I88221f660bcf15cbc29e90bfc3016b367570f9af
diff --git a/libreofficekit/Executable_lokconf_init.mk
b/libreofficekit/Executable_lokconf_init.mk
deleted file mode 100644
index 3e25f13..000
--- a/libreofficekit/Executable_lokconf_init.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Executable_Executable,lokconf_init))
-
-$(eval $(call gb_Executable_set_include,lokconf_init,\
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_use_libraries,lokconf_init, \
- cppu \
- sal \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,lokconf_init,\
-libreofficekit \
-))
-
-$(eval $(call gb_Executable_add_libs,lokconf_init,\
--lSM \
--lICE \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_libs,lokconf_init,\
--lm \
--ldl \
--lpthread \
-))
-endif
-
-$(eval $(call gb_Executable_add_exception_objects,lokconf_init,\
-libreofficekit/qa/lokconf_init/lokconf_init \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/libreofficekit/Module_libreofficekit.mk
b/libreofficekit/Module_libreofficekit.mk
index 2ad2d16..fe5ee15 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Module_Module,libreofficekit))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Module_add_targets,libreofficekit,\
-Executable_lokconf_init \
-))
-
# $(eval $(call gb_Module_add_check_targets,libreofficekit,\
# CppunitTest_libreofficekit_tiledrendering \
# ))
diff --git a/libreofficekit/qa/lokconf_init/lokconf_init.cxx
b/libreofficekit/qa/lokconf_init/lokconf_init.cxx
deleted file mode 100644
index aa12bc9..000
--- a/libreofficekit/qa/lokconf_init/lokconf_init.cxx
+++ /dev/null
@@ -1,42 +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/.
- */
-
-#include stdio.h
-#include string
-#include string.h
-
-#include sal/main.h
-
-#include LibreOfficeKit/LibreOfficeKit.h
-#include LibreOfficeKit/LibreOfficeKitInit.h
-
-using namespace std;
-
-// Using SAL_IMPLEMENT_MAIN means that we can directly use the same
-// arguments as would be provided to cppunittester, i.e. ensuring
-// that we're operating with the correct directories etc.
-SAL_IMPLEMENT_MAIN()
-{
-string sPath( getenv(INSTDIR) );
-sPath += /program;
-
-LibreOfficeKit* pOffice = lok_init( sPath.c_str() );
-
-// As this is the first init, pOffice should be NULL.
-// However there's no reason we shouldn't be able to operate
-// even if it isn't the first init.
-if ( pOffice )
-{
-pOffice-pClass-destroy( pOffice );
-pOffice = 0;
-}
-return 0;
-}
-
-/* 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: vcl/source
vcl/source/control/combobox.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f0609851293512b9f8c3f6f06e54bf67679a508d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 13:45:00 2014 +0100
loplugin:implicitboolconversion
Change-Id: I1a2ce5fe9034c67de9553fe8953e7de0fcc6b471
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index fca1716..462c61f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -866,7 +866,7 @@ sal_Int32 ComboBox::InsertEntry(const OUString rStr,
sal_Int32 const nPos)
sal_Int32 ComboBox::InsertEntryWithImage(
const OUString rStr, const Image rImage, sal_Int32 const nPos)
{
-assert(nPos = 0 COMBOBOX_MAX_ENTRIES
mpImplLB-GetEntryList()-GetEntryCount());
+assert(nPos = 0 COMBOBOX_MAX_ENTRIES
mpImplLB-GetEntryList()-GetEntryCount());
sal_Int32 nRealPos;
if (nPos == COMBOBOX_APPEND)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/LocaleNode.cxx | 62 +++---
1 file changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 3d5bd62089ffa21dd3538800a234b71e49d58316
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 4 13:49:50 2014 +0100
add missing newline to incError...() calls
Change-Id: I8ab36fd1e93b0d1297c95f47a3efd3603fd58c8f
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index 2c59ccc..16fb597 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -333,7 +333,7 @@ void LCInfoNode::generateCode (const OFileWriter of) const
{
aLanguage = languageNode-getChildAt(0)-getValue();
if (!(aLanguage.getLength() == 2 || aLanguage.getLength() == 3))
-incErrorStr( Error: langID '%s' not 2-3 characters, aLanguage);
+incErrorStr( Error: langID '%s' not 2-3 characters\n, aLanguage);
of.writeParameter(langID, aLanguage);
of.writeParameter(langDefaultName,
languageNode-getChildAt(1)-getValue());
}
@@ -343,7 +343,7 @@ void LCInfoNode::generateCode (const OFileWriter of) const
{
OUString aCountry( countryNode-getChildAt(0)-getValue());
if (!(aCountry.isEmpty() || aCountry.getLength() == 2))
-incErrorStr( Error: countryID '%s' not empty or more than 2
characters, aCountry);
+incErrorStr( Error: countryID '%s' not empty or more than 2
characters\n, aCountry);
of.writeParameter(countryID, aCountry);
of.writeParameter(countryDefaultName,
countryNode-getChildAt(1)-getValue());
}
@@ -354,9 +354,9 @@ void LCInfoNode::generateCode (const OFileWriter of) const
// If given Variant must be at least ll-Ssss and language must be 'qlt'
OUString aVariant( variantNode-getValue());
if (!(aVariant.isEmpty() || (aVariant.getLength() = 7
aVariant.indexOf('-') = 2)))
-incErrorStr( Error: invalid Variant '%s', aVariant);
+incErrorStr( Error: invalid Variant '%s'\n, aVariant);
if (!(aVariant.isEmpty() || aLanguage == qlt))
-incErrorStrStr( Error: Variant '%s' given but Language '%s' is
not 'qlt', aVariant, aLanguage);
+incErrorStrStr( Error: Variant '%s' given but Language '%s' is
not 'qlt'\n, aVariant, aLanguage);
of.writeParameter(Variant, aVariant);
}
else
@@ -614,10 +614,10 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
}
str = getAttr().getValueByName(replaceTo);
if (!strFrom.isEmpty() str.isEmpty())
-incErrorStr(replaceFrom=\%s\ replaceTo=\\ is empty replacement.,
strFrom);
+incErrorStr(replaceFrom=\%s\ replaceTo=\\ is empty
replacement.\n, strFrom);
// Locale data generator inserts for LangID, we need to adapt that.
if (str.endsWithIgnoreAsciiCase( -]))
-incErrorStr(replaceTo=\%s\ needs to be adapted to the real
LangID value., str);
+incErrorStr(replaceTo=\%s\ needs to be adapted to the real
LangID value.\n, str);
of.writeParameter(replaceTo, str, mnSection);
// Remember the replaceTo value for [CURRENCY] to check format codes.
if ( strFrom == [CURRENCY] )
@@ -674,7 +674,7 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
}
if ( currNode-getName() != FormatElement )
{
-incErrorStr( Error: Undefined element '%s' in LC_FORMAT,
currNode-getName());
+incErrorStr( Error: Undefined element '%s' in LC_FORMAT\n,
currNode-getName());
--formatCount;
continue; // for
}
@@ -688,7 +688,7 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
str = currNodeAttr.getValueByName(msgid);
if (!aMsgIdSet.insert( str).second)
-incErrorStr( Error: Duplicated msgid=\%s\ in FormatElement.,
str);
+incErrorStr( Error: Duplicated msgid=\%s\ in FormatElement.\n,
str);
of.writeParameter(FormatKey, str, formatCount);
str = currNodeAttr.getValueByName(default);
@@ -704,7 +704,7 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
aFormatIndex = currNodeAttr.getValueByName(formatindex);
sal_Int16 formatindex = (sal_Int16)aFormatIndex.toInt32();
if (!aFormatIndexSet.insert( formatindex).second)
-incErrorInt( Error: Duplicated formatindex=\%d\ in
FormatElement., formatindex);
+incErrorInt( Error: Duplicated formatindex=\%d\ in
FormatElement.\n, formatindex);
of.writeIntParameter(Formatindex, formatCount, formatindex);
// Ensure only one default per usage and type.
@@ -802,7 +802,7 @@ void LCFormatNode::generateCode (const OFileWriter of)
const
{
OUString aCode( n-getValue());
if (aCode.indexOf( [CURRENCY] ) = 0)
-
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) New commits: commit bbb18f679f5a50e9c709520d6c3260d3d9db5aa9 Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 4 13:25:33 2014 +0200 We want PDF signing to be non-experimental now Change-Id: Ic02d1f5169197edd8f9793befd45adf5db145a3b diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index b024d17..f835d7a 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -252,11 +252,6 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence PropertyValue mnInterfacePageId = AddTabPage(userinterface, ImpPDFTabViewerPage::Create, 0); mnViewPageId = AddTabPage(initialview, ImpPDFTabOpnFtrPage::Create, 0); -//remove tabpage if experimentalmode is not set -SvtMiscOptions aMiscOptions; -if (!aMiscOptions.IsExperimentalMode()) -RemoveTabPage(mnSigningPageId); - //last queued is the first to be displayed (or so it seems..) mnGeneralPageId = AddTabPage(general, ImpPDFTabGeneralPage::Create, 0 ); @@ -323,11 +318,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog() RemoveTabPage(mnViewPageId); RemoveTabPage(mnLinksPage); RemoveTabPage(mnSecurityPageId); - -//remove tabpage if experimentalmode is set -SvtMiscOptions aMiscOptions; -if (aMiscOptions.IsExperimentalMode()) -RemoveTabPage(mnSigningPageId); +RemoveTabPage(mnSigningPageId); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 85806, which changed state. Bug 85806 Summary: Hebrew and Arabic Is Not Working On MAC https://bugs.freedesktop.org/show_bug.cgi?id=85806 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 'libreoffice-4-3' - sc/source
sc/source/core/tool/token.cxx |4 1 file changed, 4 insertions(+) New commits: commit 3e40e71761e710f9226f6c9772143daf29cf454a Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Mon Dec 1 04:05:46 2014 +0100 avoid modifying range name references that are not affected, fdo#86518 Change-Id: I0822fb96ebcb30326bcdd88f3900e6e01c85bcf5 Reviewed-on: https://gerrit.libreoffice.org/13239 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 74c61a5..ebc072e 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -3236,6 +3236,10 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName( // column range of the reference is not entirely in the deleted column range. break; +if (aAbs.aStart.Tab() rCxt.maRange.aEnd.Tab() || aAbs.aEnd.Tab() rCxt.maRange.aStart.Tab()) +// wrong tables +break; + ScRange aDeleted = rCxt.maRange; aDeleted.aStart.IncRow(rCxt.mnRowDelta); aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - sw/source
sw/source/core/uibase/utlui/uitool.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit a765fcce6c629f3ff8e5843fc67f26d6b96e73d5
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 27 22:30:15 2014 +0100
fdo#79303: Revert fdo#70861 SwToSfxPageDescAttr: fix call to ...
... SvxExtParagraphTabPage
This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.
It is now simply wrong to claim that a SID_ATTR_PARA_PAGENUM item with
value 0 is set, when that is a valid offset value.
SwTxtShell::Execute() will call SfxToSwPageDescAttr() which pulls the
SID_ATTR_PARA_PAGENUM out of the item set and sets it.
Change-Id: If5a155c2874486b3ef7d01883fe73f8e5fca46fe
Signed-off-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit d12fc79394842951807ab8c58a810cd9c5848cb7)
Reviewed-on: https://gerrit.libreoffice.org/13175
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/uibase/utlui/uitool.cxx
b/sw/source/core/uibase/utlui/uitool.cxx
index b3e6259..175d11b 100644
--- a/sw/source/core/uibase/utlui/uitool.cxx
+++ b/sw/source/core/uibase/utlui/uitool.cxx
@@ -639,10 +639,9 @@ void SwToSfxPageDescAttr( SfxItemSet rCoreSet )
bPut = false;
}
-// TODO for now always pass a page number to cui, it can't make a
-// difference between 0 and no page number at the moment.
+if (oNumOffset)
{
-SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ?
oNumOffset.get() : 0 );
+SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() );
rCoreSet.Put( aPageNum );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - 2 commits - external/icu xmloff/source
external/icu/UnpackedTarball_icu.mk |2 +
external/icu/icu4c-icu11131.patch.1 | 68
external/icu/icu4c-scriptrun.patch | 58 ++
xmloff/source/draw/ximpshap.cxx | 32
4 files changed, 152 insertions(+), 8 deletions(-)
New commits:
commit 4a977d4eeec6fc7c80f60cc2819e19f39dc1a077
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 27 11:30:45 2014 +
Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] properties
regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09
commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
Author: Armin Le Grand a...@apache.org
Date: Wed Nov 21 13:23:01 2012 +
For backward compatibility take mirrorings in setTransformation into
account
Also found an error in SdrObjCustomShape::TRGetBaseGeometry when
MirrorY was used
(cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)
Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
Reviewed-on: https://gerrit.libreoffice.org/13149
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit d3b7bf16a58c02af2d1fdf5db2fa149c6815095c)
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 9e57326acebde972df22ea4368b5ce4822d51330)
Reviewed-on: https://gerrit.libreoffice.org/13150
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 2e573ab..74bc681 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3808,22 +3808,38 @@ void SdXMLCustomShapeContext::EndElement()
if(bFlippedX || bFlippedY)
{
-beans::PropertyValue aNewPoroperty;
+OUString sName;
if(bFlippedX)
+sName = MirroredX;
+else
+sName = MirroredY;
+
+//fdo#84043 overwrite the property if it already exists, otherwise
append it
+beans::PropertyValue* pItem;
+std::vector beans::PropertyValue ::iterator
aI(maCustomShapeGeometry.begin());
+std::vector beans::PropertyValue ::iterator
aE(maCustomShapeGeometry.end());
+while (aI != aE)
+{
+if (aI-Name == sName)
+break;
+++aI;
+}
+if (aI != aE)
{
-aNewPoroperty.Name = MirroredX;
+beans::PropertyValue rItem = *aI;
+pItem = rItem;
}
else
{
-aNewPoroperty.Name = MirroredY;
+maCustomShapeGeometry.push_back(beans::PropertyValue());
+pItem = maCustomShapeGeometry.back();
}
-aNewPoroperty.Handle = -1;
-aNewPoroperty.Value = sal_True;
-aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
-
-maCustomShapeGeometry.push_back(aNewPoroperty);
+pItem-Name = sName;
+pItem-Handle = -1;
+pItem-Value = sal_True;
+pItem-State = beans::PropertyState_DIRECT_VALUE;
}
}
commit f076fa33a4d301d7ee762a7195c76bfd68801e09
Author: Caolán McNamara caol...@redhat.com
Date: Sun Nov 30 20:38:42 2014 +
mirror fixes for fdo#78906 and deb#766788 into icu
(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
(cherry picked from commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf)
Conflicts:
external/icu/UnpackedTarball_icu.mk
Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
Reviewed-on: https://gerrit.libreoffice.org/13222
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/external/icu/UnpackedTarball_icu.mk
b/external/icu/UnpackedTarball_icu.mk
index f8b5dd8..aefc159 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
+ external/icu/icu4c-icu11131.patch.1 \
+ external/icu/icu4c-scriptrun.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/icu4c-icu11131.patch.1
b/external/icu/icu4c-icu11131.patch.1
new file mode 100644
index 000..e9978ab
--- /dev/null
+++ b/external/icu/icu4c-icu11131.patch.1
@@ -0,0 +1,68 @@
+---
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - vcl/generic
vcl/generic/glyphs/scrptrun.cxx |6 +-
vcl/generic/glyphs/scrptrun.h |4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit fd3e86eff5ee2535adc9caab5bcfd9a1e05b1f24
Author: Caolán McNamara caol...@redhat.com
Date: Sat Nov 29 16:44:12 2014 +
give us a parenStack which can grow to fit any input
Change-Id: Ic464184fe367da33bf8c4790b82656b140e3cbd0
(cherry picked from commit cced2f6b866877c39afe86f4af18622cb4022bef)
Reviewed-on: https://gerrit.libreoffice.org/13218
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index f72d296..6df7659 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -173,7 +173,11 @@ UBool ScriptRun::next()
// characters above it on the stack will be poped.
if (pairIndex = 0) {
if ((pairIndex 1) == 0) {
-parenStack[++parenSP].pairIndex = pairIndex;
+++parenSP;
+int32_t nVecSize = parenStack.size();
+if (parenSP == nVecSize)
+parenStack.resize(nVecSize + 128);
+parenStack[parenSP].pairIndex = pairIndex;
parenStack[parenSP].scriptCode = scriptCode;
} else if (parenSP = 0) {
int32_t pi = pairIndex ~1;
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 6e9bbd6..1c4d0fa 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -43,6 +43,7 @@
#include unicode/utypes.h
#include unicode/uobject.h
#include unicode/uscript.h
+#include vector
struct ScriptRecord
{
@@ -110,7 +111,7 @@ private:
int32_t scriptEnd;
UScriptCode scriptCode;
-ParenStackEntry parenStack[128];
+std::vectorParenStackEntry parenStack;
int32_t parenSP;
static int8_t highBit(int32_t value);
@@ -164,6 +165,7 @@ inline void ScriptRun::reset()
scriptEnd = charStart;
scriptCode = USCRIPT_INVALID_CODE;
parenSP = -1;
+parenStack.resize(128);
}
inline void ScriptRun::reset(int32_t start, int32_t length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - connectivity/source
connectivity/source/drivers/hsqldb/HView.cxx | 81 +--
connectivity/source/inc/hsqldb/HView.hxx | 11 +++
2 files changed, 63 insertions(+), 29 deletions(-)
New commits:
commit efaefdf1ca3b03a1db0a96c8a705595009263665
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 1 10:57:05 2014 +
Resolves: fdo#80938 fix SQL view to be editable
regression from
commit d60392fb5b387175dbd2e575848993c02c56922f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 6 12:05:24 2014 +
coverity#706316 help out coverity re tortured logic
Change-Id: I2ee7bd3b7421ae46878d1b565ef14dd7b0bbd10e
(cherry picked from commit 6269b62b525ec22471db56015ac2daed813ec5ff)
Reviewed-on: https://gerrit.libreoffice.org/13245
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx
b/connectivity/source/drivers/hsqldb/HView.cxx
index 6cf719a..0030032 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -101,7 +101,7 @@ namespace connectivity { namespace hsqldb
aRestoreCommand.appendAscii( CREATE VIEW );
aRestoreCommand.append ( sQualifiedName );
aRestoreCommand.appendAscii( AS );
-aRestoreCommand.append ( impl_getCommand_throw() );
+aRestoreCommand.append ( impl_getCommand_throwSQLException() );
OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() );
bool bDropSucceeded( false );
@@ -150,45 +150,47 @@ namespace connectivity { namespace hsqldb
{
// retrieve the very current command, don't rely on the base
classes cached value
// (which we initialized empty, anyway)
-try
-{
-_rValue = impl_getCommand_throw();
-}
-catch (const SQLException e)
-{
-throw WrappedTargetException(e.Message,
-static_cast XAlterView* ( const_cast HView* ( this ) ),
-::cppu::getCaughtException() );
-}
+_rValue = impl_getCommand_wrapSQLException();
+return;
}
HView_Base::getFastPropertyValue( _rValue, _nHandle );
}
+OUString HView::impl_getCommand() const
+{
+OUStringBuffer aCommand;
+aCommand.appendAscii( SELECT VIEW_DEFINITION FROM
INFORMATION_SCHEMA.SYSTEM_VIEWS );
+HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName,
m_Name, false );
+::utl::SharedUNOComponent XStatement xStatement; xStatement.set(
m_xConnection-createStatement(), UNO_QUERY_THROW );
+Reference XResultSet xResult( xStatement-executeQuery(
aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
+if ( !xResult-next() )
+{
+// hmm. There is no view view the name as we know it. Can only
mean some other instance
+// dropped this view meanwhile ...
+throw DisposedException();
+}
-OUString HView::impl_getCommand_throw() const
+Reference XRow xRow( xResult, UNO_QUERY_THROW );
+return xRow-getString( 1 );
+}
+
+OUString HView::impl_getCommand_wrapSQLException() const
{
OUString sCommand;
try
{
-OUStringBuffer aCommand;
-aCommand.appendAscii( SELECT VIEW_DEFINITION FROM
INFORMATION_SCHEMA.SYSTEM_VIEWS );
-HTools::appendTableFilterCrit( aCommand, m_CatalogName,
m_SchemaName, m_Name, false );
-::utl::SharedUNOComponent XStatement xStatement;
xStatement.set( m_xConnection-createStatement(), UNO_QUERY_THROW );
-Reference XResultSet xResult( xStatement-executeQuery(
aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
-if ( !xResult-next() )
-{
-// hmm. There is no view view the name as we know it. Can only
mean some other instance
-// dropped this view meanwhile ...
-throw DisposedException();
-}
-
-Reference XRow xRow( xResult, UNO_QUERY_THROW );
-sCommand = xRow-getString( 1 );
+sCommand = impl_getCommand();
+}
+catch( const RuntimeException )
+{
+throw;
+}
+catch( const SQLException e )
+{
+throw WrappedTargetException( e.Message, static_cast XAlterView*
( const_cast HView* ( this ) ), ::cppu::getCaughtException() );
}
-catch( const RuntimeException ) { throw; }
-catch( const SQLException ) { throw; }
catch( const Exception )
{
DBG_UNHANDLED_EXCEPTION();
@@ -197,6 +199,29 @@ namespace connectivity { namespace hsqldb
[Libreoffice-commits] core.git: include/svl svl/source
include/svl/zforlist.hxx| 11 +++
svl/source/numbers/zforlist.cxx |6 ++
2 files changed, 17 insertions(+)
New commits:
commit e957766a104cb2380d46d7a125ebd0c80eef81d0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Dec 4 09:06:46 2014 -0500
Putting this back in to fix Windows build.
Change-Id: I98262000956f10dc3b3da069b6bc286fec314a45
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 8d5b9fc..4b06d40 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -255,6 +255,8 @@ public:
sal_Unicode cZero );
~NfCurrencyEntry() {}
+NfCurrencyEntry* Clone() const;
+
/// Symbols and language identical
booloperator==( const NfCurrencyEntry r ) const;
@@ -302,6 +304,15 @@ public:
static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
};
+/**
+ * Necessary for ptr_vector on Windows. Please don't remove this, or at
+ * least check it on Windows before attempting to remove it.
+ */
+inline NfCurrencyEntry* new_clone( const NfCurrencyEntry r )
+{
+return r.Clone();
+}
+
typedef std::vector OUString NfWSStringsDtor;
class SvNumberFormatterRegistry_Impl;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index cb7af29..b9672a0 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3837,6 +3837,12 @@ NfCurrencyEntry::NfCurrencyEntry(
nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt),
nDigits(nDig), cZeroChar(cZero) {}
+NfCurrencyEntry* NfCurrencyEntry::Clone() const
+{
+return new NfCurrencyEntry(
+ aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat,
nDigits, cZeroChar);
+}
+
bool NfCurrencyEntry::operator==( const NfCurrencyEntry r ) const
{
return aSymbol == r.aSymbol
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/lotus/lotform.cxx | 40 +++--
1 file changed, 34 insertions(+), 6 deletions(-)
New commits:
commit 48801843d65ffa3e31196cabb36c597ff81c6d07
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Nov 24 16:04:20 2014 +0100
import @TERM and @CTERM functions from Lotus 1-2-3 files (related:
fdo#86241)
(cherry picked from commit 70ae5bb4182a99c17da8eb32b36baec3e7a48723)
Conflicts:
sc/source/filter/lotus/lotform.cxx
Change-Id: I864ad87aa0455c323a5235fa1230d3f2ac3ffbb4
Reviewed-on: https://gerrit.libreoffice.org/13105
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/filter/lotus/lotform.cxx
b/sc/source/filter/lotus/lotform.cxx
index aeeff6e..c567db9 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -138,6 +138,30 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz,
const sal_Char* pExtStri
eParam[ 2 ] = n0Token; //- 2. as Default
}
break;
+case ocZZR:
+{
+OSL_ENSURE( nAnz == 3,
+*LotusToSc::DoFunc(): TERM() or CTERM() need 3 parameters! );
+nAnz = 4;
+if ( OString(pExtString) == TERM )
+{
+// @TERM(pmt,int,fv) - NPER(int,-pmt,pv=0,fv)
+NegToken( eParam[ 2 ] );
+eParam[ 3 ] = eParam[ 1 ];
+eParam[ 1 ] = aPool.Store( 0.0 );
+}
+else //CTERM()
+{
+// @CTERM(int,fv,pv) - NPER(int,pmt=0,-pv,fv)
+NegToken( eParam[ 0 ] );
+nMerk0 = eParam[ 1 ];
+eParam[ 1 ] = eParam[ 0 ];
+eParam[ 0 ] = nMerk0;
+eParam[ 3 ] = eParam[ 2 ];
+eParam[ 2 ] = aPool.Store( 0.0 );
+}
+}
+break;
default:;
}
@@ -747,8 +771,8 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
FT_NotImpl, // 114 Call()
FT_FuncFix1,// 115 @@()
FT_FuncFix3,// 116 Rate()
-FT_FuncFix1,// 117 Term()
-FT_FuncFix1,// 118 Cterm()
+FT_FuncFix3,// 117 Term()
+FT_FuncFix3,// 118 Cterm()
FT_FuncFix3,// 119 Sln()
FT_FuncFix4,// 120 Syd(), Soy()
FT_FuncFix4,// 121 Ddb()
@@ -1278,8 +1302,8 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
FT_NotImpl, // 114 App - change in Bez.
FT_FuncFix1,// 115 @@() - new
FT_FuncFix3,// 116 Rate() - new
-FT_FuncFix3,// 117 Term() - change in Anz.
-FT_FuncFix3,// 118 Cterm() - change in Anz.
+FT_FuncFix3,// 117 Term()
+FT_FuncFix3,// 118 Cterm()
FT_FuncFix3,// 119 Sln()- new
FT_FuncFix4,// 120 Syd()- new
FT_FuncFix4,// 121 Ddb()- new
@@ -1809,8 +1833,8 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
NULL, // 114 Call()
NULL, // 115 @@()
NULL, // 116 Rate()
-ANN, // 117 Term()
-NULL, // 118 Cterm()
+TERM, // 117 Term()
+CTERM,// 118 Cterm()
NULL, // 119 Sln()
NULL, // 120 Syd(), Soy()
NULL, // 121 Ddb()
@@ -2024,6 +2048,10 @@ static DefTokenId lcl_KnownAddIn( const OString rTest )
eId=ocNormDist;
else if (rTest == CRITBINOMIAL)
eId=ocKritBinom;
+else if (rTest == TERM)
+eId=ocZZR;
+else if (rTest == CTERM)
+eId=ocZZR;
return eId;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/run
bin/run |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9eda6b307ba6c5426c40c4cad95e07e43858230e
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 4 15:33:24 2014 +0100
bin/run: Adapt to run on Debian so-called GNU/Linux systems too
Amazingly Debian does not ship the realpath(1) from coreutils but has a
separate source package for it, and it's not installed by default.
Use readlink -f instead.
Change-Id: I6e97c851e6ab96dac08771145e2ab39dd9c11c22
diff --git a/bin/run b/bin/run
index 4fb369f..a3acad6 100755
--- a/bin/run
+++ b/bin/run
@@ -30,14 +30,14 @@ exec ${exedir}/$@
else
-dir=$(realpath $(pwd))
+dir=$(readlink -f $(pwd))
while test ! -d ${dir}/instdir/program ; do
if test ${dir} = /; then
echo error: cannot find \program\ dir from \$(pwd)\
exit 1
fi
-dir=$(realpath ${dir}/..)
+dir=$(readlink -f ${dir}/..)
done
exedir=${dir}/workdir/LinkTarget/Executable
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - desktop/source include/osl sal/osl
desktop/source/lib/init.cxx |6 +-
include/osl/process.h|9 -
sal/osl/all/compat.cxx |4
sal/osl/unx/process_impl.cxx | 10 +-
sal/osl/w32/process.cxx | 10 +-
5 files changed, 7 insertions(+), 32 deletions(-)
New commits:
commit 0a40d6c3abba6f005e1b7806919e5169e032f985
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 15:52:03 2014 +0100
[API CHANGE] Remove osl_setCommandArgs
...it was added late in the LO 3.3 cycle apparently by error.
While this is strictly speaking an incompatible change, no client code
should
ever have called this deprecated, internal functionality anyway. An
aborting
stub is left in place for soname stability.
Change-Id: Ibbc96ccf76a07a80d732a0713c95ff7b6bf1e528
diff --git a/include/osl/process.h b/include/osl/process.h
index 205e6da..712bb0b 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -366,15 +366,6 @@ SAL_DLLPUBLIC sal_uInt32 SAL_CALL
osl_getCommandArgCount(void);
SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getCommandArg(
sal_uInt32 nArg, rtl_uString **strCommandArg);
-/** Determine whether or not the command args have already been set.
-
-Deprecated: This function is only for internal use
-
-@return The command args are already set, and may not be set again.
-@since LibreOffice 4.3
-*/
-SAL_DLLPUBLIC int SAL_CALL osl_areCommandArgsSet (void);
-
/** Set the command-line arguments as passed to the main-function of this
process.
Deprecated: This function is only for internal use. Passing the args from
main will
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index ef44215..3f072a1 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -23,6 +23,10 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
osl_acquireSemaphore(void *) {
for (;;) { std::abort(); } // avoid must return a value warnings
}
+SAL_DLLPUBLIC_EXPORT int SAL_CALL osl_areCommandArgsSet() {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_assertFailedLine(
char const *, sal_Int32, char const *)
{
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index b5c1fe7..62f2f78 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -190,14 +190,6 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32
nArg, rtl_uString ** strC
return (result);
}
-int SAL_CALL osl_areCommandArgsSet (void)
-{
-pthread_mutex_lock ((g_command_args.m_mutex));
-int nRet = (int) (g_command_args.m_nCount 0);
-pthread_mutex_unlock ((g_command_args.m_mutex));
-return nRet;
-}
-
/***
osl_setCommandArgs().
**/
diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx
index 0ab8580..087ee2e 100644
--- a/sal/osl/w32/process.cxx
+++ b/sal/osl/w32/process.cxx
@@ -361,15 +361,6 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32
nArg, rtl_uString **strCo
/***/
-int SAL_CALL osl_areCommandArgsSet(void)
-{
-osl_acquireMutex (*osl_getGlobalMutex());
-int nRet = (int) (g_command_args.m_nCount 0);
-osl_releaseMutex (*osl_getGlobalMutex());
-return nRet;
-}
-
-
void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
assert(argc 0);
commit 7fbfc12474b85b31c9d120898fff6e226d76d662
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 15:49:48 2014 +0100
Still no need for osl_setCommandArgs
(TOCTOU and all)
Change-Id: I81253c8790b631117634bafa4eea65991a975ba0
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8040f54..8a7ffd53 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -693,11 +693,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath)
// again (as an assert will fire), this will be the case e.g.
// for unit tests (and possibly if UNO is being used in addition
// to LOK in an external program).
-if (!osl_areCommandArgsSet())
-{
-SAL_INFO(lok, commandArgs not previously set);
-osl_setCommandArgs(2, pArgs);
-}
+osl_setCommandArgs(2, pArgs);
SAL_INFO(lok, attempting to initalize UNO);
initialize_uno(aAppURL);
SAL_INFO(lok, uno successfully initalized);
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 7d8cc81..b5c1fe7 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -205,7 +205,7 @@ void SAL_CALL osl_setCommandArgs (int argc, char ** argv)
{
assert(argc 0);
pthread_mutex_lock ((g_command_args.m_mutex));
-assert (g_command_args.m_nCount == 0);
+SAL_WARN_IF(g_command_args.m_nCount != 0, sal.osl, args already set);
if
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - filter/source vcl/source
filter/source/pdf/impdialog.cxx | 11 -
vcl/source/gdi/pdfwriter_impl.cxx | 42 +++---
2 files changed, 22 insertions(+), 31 deletions(-)
New commits:
commit 0268f7a50cc1f408ed3cbce11c025181036c69fe
Author: Tor Lillqvist t...@collabora.com
Date: Thu Dec 4 13:25:33 2014 +0200
We want PDF signing to be non-experimental now
Change-Id: Ic02d1f5169197edd8f9793befd45adf5db145a3b
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index b024d17..f835d7a 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -252,11 +252,6 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent,
Sequence PropertyValue
mnInterfacePageId = AddTabPage(userinterface,
ImpPDFTabViewerPage::Create, 0);
mnViewPageId = AddTabPage(initialview, ImpPDFTabOpnFtrPage::Create, 0);
-//remove tabpage if experimentalmode is not set
-SvtMiscOptions aMiscOptions;
-if (!aMiscOptions.IsExperimentalMode())
-RemoveTabPage(mnSigningPageId);
-
//last queued is the first to be displayed (or so it seems..)
mnGeneralPageId = AddTabPage(general, ImpPDFTabGeneralPage::Create, 0 );
@@ -323,11 +318,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog()
RemoveTabPage(mnViewPageId);
RemoveTabPage(mnLinksPage);
RemoveTabPage(mnSecurityPageId);
-
-//remove tabpage if experimentalmode is set
-SvtMiscOptions aMiscOptions;
-if (aMiscOptions.IsExperimentalMode())
-RemoveTabPage(mnSigningPageId);
+RemoveTabPage(mnSigningPageId);
}
commit 3a21f81d707198eb948a3a4059cb4637b66444f4
Author: Tor Lillqvist t...@collabora.com
Date: Thu Dec 4 12:39:38 2014 +0200
Use the vcl.pdfwriter logging tag instead of vcl.gdi
Change-Id: Idf000a8faee444e65c5f2fa20edde3eb70ddb371
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 1572b90..ffd9661 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6009,11 +6009,11 @@ bool PDFWriterImpl::finalizeSignature()
if (!cert)
{
-SAL_WARN(vcl.gdi, PDF Signing: Error occurred, certificate cannot
be reconstructed.);
+SAL_WARN(vcl.pdfwriter, PDF Signing: Error occurred, certificate
cannot be reconstructed.);
return false;
}
-SAL_WARN(vcl.gdi, PDF Signing: Certificate Subject:
cert-subjectName \n\tCertificate Issuer: cert-issuerName);
+SAL_WARN(vcl.pdfwriter, PDF Signing: Certificate Subject:
cert-subjectName \n\tCertificate Issuer: cert-issuerName);
// Prepare buffer and calculate PDF file digest
CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
@@ -6021,7 +6021,7 @@ bool PDFWriterImpl::finalizeSignature()
HashContextScope hc(HASH_Create(HASH_AlgSHA1));
if (!hc.get())
{
-SAL_WARN(vcl.gdi, PDF Signing: SHA1 HASH_Create failed!);
+SAL_WARN(vcl.pdfwriter, PDF Signing: SHA1 HASH_Create failed!);
return false;
}
@@ -6033,7 +6033,7 @@ bool PDFWriterImpl::finalizeSignature()
//FIXME: Check if SHA1 is calculated from the correct byterange
CHECK_RETURN( (osl::File::E_None == m_aFile.read(buffer.get(),
m_nSignatureContentOffset - 1 , bytesRead)) );
if (bytesRead != (sal_uInt64)m_nSignatureContentOffset - 1)
-SAL_WARN(vcl.gdi, PDF Signing: First buffer read failed!);
+SAL_WARN(vcl.pdfwriter, PDF Signing: First buffer read failed!);
HASH_Update(hc.get(), reinterpret_castconst unsigned
char*(buffer.get()), bytesRead);
@@ -6041,7 +6041,7 @@ bool PDFWriterImpl::finalizeSignature()
buffer.reset(new char[nLastByteRangeNo + 1]);
CHECK_RETURN( (osl::File::E_None == m_aFile.read(buffer.get(),
nLastByteRangeNo, bytesRead)) );
if (bytesRead != (sal_uInt64) nLastByteRangeNo)
-SAL_WARN(vcl.gdi, PDF Signing: Second buffer read failed!);
+SAL_WARN(vcl.pdfwriter, PDF Signing: Second buffer read failed!);
HASH_Update(hc.get(), reinterpret_castconst unsigned
char*(buffer.get()), bytesRead);
@@ -6056,21 +6056,21 @@ bool PDFWriterImpl::finalizeSignature()
NSSCMSMessage *cms_msg = NSS_CMSMessage_Create(NULL);
if (!cms_msg)
{
-SAL_WARN(vcl.gdi, PDF signing: can't create new CMS message.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't create new CMS
message.);
return false;
}
NSSCMSSignedData *cms_sd = NSS_CMSSignedData_Create(cms_msg);
if (!cms_sd)
{
-SAL_WARN(vcl.gdi, PDF signing: can't create CMS SignedData.);
+SAL_WARN(vcl.pdfwriter, PDF signing: can't create CMS SignedData.);
return false;
}
NSSCMSContentInfo *cms_cinfo = NSS_CMSMessage_GetContentInfo(cms_msg);
if (NSS_CMSContentInfo_SetContent_SignedData(cms_msg, cms_cinfo, cms_sd)
!= SECSuccess)
{
-SAL_WARN(vcl.gdi, PDF signing: Can't set CMS content signed data.);
+SAL_WARN(vcl.pdfwriter, PDF
Re: [Libreoffice-commits] osl_areCommandArgsSet
On 11/26/2014 02:58 PM, Stephan Bergmann wrote: On 07/31/2014 10:48 AM, Stephan Bergmann wrote: * was it necessary to backport osl_areCommandArgsSet to LO 4.3 (given I see no mention of LOK in https://wiki.documentfoundation.org/ReleaseNotes/4.3)? I'm still interested in an answer here; I'm planing on moving osl_areCommandArgsSet to an aborting stub in sal/osl/all/compat.cxx for LO 4.4 (after b'porting the above-mentioned 2163ec3691ece9a00927891645190a971f775295), on the assumption that its inclusion in 4.3 was a mistake and it thus will never have been called in a released product cf. http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a40d6c3abba6f005e1b7806919e5169e032f985 [API CHANGE] Remove osl_setCommandArgs ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/helper/xsecsign.cxx |2 -
xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 16
+-
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx |1
xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 12
+++
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 16
+-
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 13
+---
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 12
+++
7 files changed, 32 insertions(+), 40 deletions(-)
New commits:
commit 71c58fce69cc1a463d9b9a5711718211adf414fe
Author: Tor Lillqvist t...@collabora.com
Date: Thu Dec 4 16:55:19 2014 +0200
Bin noise comments
Change-Id: I084040ff90ee30aa83ac5d3ad11365768272ec65
diff --git a/xmlsecurity/source/helper/xsecsign.cxx
b/xmlsecurity/source/helper/xsecsign.cxx
index a44aa7c..b67933f 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -86,7 +86,7 @@ cssu::Reference cssxc::sax::XReferenceResolvedListener
XSecController::prepar
args[1] = cssu::makeAny(m_xSAXEventKeeper);
args[2] = cssu::makeAny(OUString::number(nIdOfSignatureElementCollector));
-//i39448 : for nss, the internal module is used for signing, which needs
to be improved later
+//for nss, the internal module is used for signing, which needs to be
improved later
sal_Int32 nEnvIndex =
internalSignatureInfor.signatureInfor.nSecurityEnvironmentIndex;
if( nEnvIndex 0 || nEnvIndex =
m_xSecurityContext-getSecurityEnvironmentNumber())
{// set defaultEnv
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 7b92f86..1ee9831 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -148,7 +148,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
setErrorRecorder( );
-pMngr = pSecEnv-createKeysManager() ; //i39448
+pMngr = pSecEnv-createKeysManager();
if( !pMngr ) {
throw RuntimeException() ;
}
@@ -157,7 +157,7 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
if( pEncCtx == NULL )
{
-pSecEnv-destroyKeysManager( pMngr ) ; //i39448
+pSecEnv-destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
return aTemplate;
@@ -167,13 +167,13 @@ SAL_CALL XMLEncryption_MSCryptImpl :: encrypt(
if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) 0 ) {
aTemplate-setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv-destroyKeysManager( pMngr ) ; //i39448
+pSecEnv-destroyKeysManager( pMngr );
clearErrorRecorder();
return aTemplate;
}
aTemplate-setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv-destroyKeysManager( pMngr ) ; //i39448
+pSecEnv-destroyKeysManager( pMngr );
//get the new EncryptedData element
if (isParentRef)
@@ -254,7 +254,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
setErrorRecorder( );
-pMngr = pSecEnv-createKeysManager() ; //i39448
+pMngr = pSecEnv-createKeysManager();
if( !pMngr ) {
throw RuntimeException() ;
}
@@ -263,7 +263,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
pEncCtx = xmlSecEncCtxCreate( pMngr ) ;
if( pEncCtx == NULL )
{
-pSecEnv-destroyKeysManager( pMngr ) ; //i39448
+pSecEnv-destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
return aTemplate;
@@ -273,7 +273,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
if( xmlSecEncCtxDecrypt( pEncCtx , pEncryptedData ) 0 || pEncCtx-result
== NULL ) {
aTemplate-setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_UNKNOWN);
xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv-destroyKeysManager( pMngr ) ; //i39448
+pSecEnv-destroyKeysManager( pMngr );
//throw XMLEncryptionException() ;
clearErrorRecorder();
@@ -306,7 +306,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
//Destroy the encryption context
xmlSecEncCtxDestroy( pEncCtx ) ;
-pSecEnv-destroyKeysManager( pMngr ) ; //i39448
+pSecEnv-destroyKeysManager( pMngr );
//get the decrypted element
XMLElementWrapper_XmlSecImpl * ret = new
XMLElementWrapper_XmlSecImpl(isParentRef?
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index 53307a7..dbe738b 100644
---
Re: [Libreoffice-commits] osl_areCommandArgsSet
On 12/04/2014 04:02 PM, Stephan Bergmann wrote: cf. http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a40d6c3abba6f005e1b7806919e5169e032f985 [API CHANGE] Remove osl_setCommandArgs ...where the commit message should of course have read Remove osl_areCommandArgsSet. Oh my, sorry for the confusion. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/run
bin/run | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 79233d98d98df1a56e623f35806183071499b194
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 4 16:08:42 2014 +0100
bin/run: add WNT support
Change-Id: I9dd1ae23d27c5733770314ca907b5d36b749fd74
diff --git a/bin/run b/bin/run
index a3acad6..341e7d5 100755
--- a/bin/run
+++ b/bin/run
@@ -9,7 +9,29 @@
# simple wrapper script to run non-installed executables from workdir
-if [ $(uname) = Darwin ]; then
+if uname | grep -i CYGWIN /dev/null; then
+
+dir=$(realpath $(pwd))
+
+while test ! -d ${dir}/instdir/program ; do
+if test ${dir} = /; then
+echo error: cannot find \program\ dir from \$(pwd)\
+exit 1
+fi
+dir=$(realpath ${dir}/..)
+done
+
+exedir=${dir}/workdir/LinkTarget/Executable
+export URE_BOOTSTRAP=file:///$(cygpath -m
${dir})/instdir/program/fundamental.ini
+export PATH=${PATH:+$PATH:}${dir}/instdir/program
+
+echo setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}
+echo setting search path to: ${PATH}
+echo execing: ${exedir}/$1
+
+exec ${exedir}/$@
+
+elif [ $(uname) = Darwin ]; then
dir=$(pwd)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
5 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 5 of 5 defect(s)
** CID 1256663: Same on both sides (CONSTANT_EXPRESSION_RESULT)
/sw/inc/ring.hxx: 186 in sw::RingIteratorSwPaM::equal(const
sw::RingIteratorSwPaM) const()
/sw/inc/ring.hxx: 186 in sw::RingIteratorSwViewShell::equal(const
sw::RingIteratorSwViewShell) const()
/sw/inc/ring.hxx: 186 in sw::RingIteratorconst SwPaM::equal(const
sw::RingIteratorconst SwPaM) const()
/sw/inc/ring.hxx: 186 in sw::RingIteratorconst SwViewShell::equal(const
sw::RingIteratorconst SwViewShell) const()
/sw/inc/ring.hxx: 186 in sw::RingIteratorconst
unnamed::TestRing::equal(const sw::RingIteratorconst unnamed::TestRing)
const()
/sw/inc/ring.hxx: 186 in sw::RingIteratorunnamed::TestRing::equal(const
sw::RingIteratorunnamed::TestRing) const()
** CID 1256665: Division or modulo by float zero (DIVIDE_BY_ZERO)
/vcl/opengl/program.cxx: 223 in OpenGLProgram::SetTransform(const rtl::OString
, const OpenGLTexture , const basegfx::B2DPoint , const basegfx::B2DPoint ,
const basegfx::B2DPoint )()
/vcl/opengl/program.cxx: 223 in OpenGLProgram::SetTransform(const rtl::OString
, const OpenGLTexture , const basegfx::B2DPoint , const basegfx::B2DPoint ,
const basegfx::B2DPoint )()
** CID 1256664: Division or modulo by float zero (DIVIDE_BY_ZERO)
/vcl/opengl/program.cxx: 223 in OpenGLProgram::SetTransform(const rtl::OString
, const OpenGLTexture , const basegfx::B2DPoint , const basegfx::B2DPoint ,
const basegfx::B2DPoint )()
/vcl/opengl/program.cxx: 223 in OpenGLProgram::SetTransform(const rtl::OString
, const OpenGLTexture , const basegfx::B2DPoint , const basegfx::B2DPoint ,
const basegfx::B2DPoint )()
** CID 1256669: Uninitialized pointer field (UNINIT_CTOR)
/sw/inc/ring.hxx: 62 in sw::RingSwViewShell::Ring()()
/sw/inc/ring.hxx: 62 in sw::Ringunnamed::TestRing::Ring()()
** CID 1256668: Uninitialized pointer field (UNINIT_CTOR)
/sw/inc/ring.hxx: 112 in sw::RingSwPaM::Ring(SwPaM *)()
/sw/inc/ring.hxx: 112 in sw::Ring_SaveMergeRedlines::Ring(_SaveMergeRedlines
*)()
/sw/inc/ring.hxx: 112 in sw::RingSwViewShell::Ring(SwViewShell *)()
*** CID 1256663: Same on both sides (CONSTANT_EXPRESSION_RESULT)
/sw/inc/ring.hxx: 186 in sw::RingIteratorSwPaM::equal(const
sw::RingIteratorSwPaM) const()
180 }
181 private:
182 friend class boost::iterator_core_access;
183 void increment()
184 { m_pCurrent = m_pCurrent ? m_pCurrent-GetNext() :
m_pStart-GetNext(); }
185 bool equal(RingIterator const other) const
CID 1256663: Same on both sides (CONSTANT_EXPRESSION_RESULT)
this-m_pStart == this-m_pStart is always true regardless of the
values of its operands because those operands are identical. This occurs as
the logical second operand of ''.
186 { return m_pCurrent == other.m_pCurrent m_pStart ==
m_pStart; }
187 T dereference() const
188 { return m_pCurrent ? *m_pCurrent : * m_pStart; }
189 T* m_pCurrent;
190 T* m_pStart;
191 };
/sw/inc/ring.hxx: 186 in sw::RingIteratorSwViewShell::equal(const
sw::RingIteratorSwViewShell) const()
180 }
181 private:
182 friend class boost::iterator_core_access;
183 void increment()
184 { m_pCurrent = m_pCurrent ? m_pCurrent-GetNext() :
m_pStart-GetNext(); }
185 bool equal(RingIterator const other) const
CID 1256663: Same on both sides (CONSTANT_EXPRESSION_RESULT)
this-m_pStart == this-m_pStart is always true regardless of the
values of its operands because those operands are identical. This occurs as
the logical second operand of ''.
186 { return m_pCurrent == other.m_pCurrent m_pStart ==
m_pStart; }
187 T dereference() const
188 { return m_pCurrent ? *m_pCurrent : * m_pStart; }
189 T* m_pCurrent;
190 T* m_pStart;
191 };
/sw/inc/ring.hxx: 186 in sw::RingIteratorconst SwPaM::equal(const
sw::RingIteratorconst SwPaM) const()
180 }
181 private:
182 friend class boost::iterator_core_access;
183 void increment()
184 { m_pCurrent = m_pCurrent ? m_pCurrent-GetNext() :
m_pStart-GetNext(); }
185 bool equal(RingIterator const other) const
CID 1256663: Same on both sides (CONSTANT_EXPRESSION_RESULT)
this-m_pStart == this-m_pStart is always
libcmis integration status
Hi Cedric, Mihai, Do you plan to do a libcmis release for LO 4.4 and then merge feature/gsoc14-libcmis2 to at least master? I'm asking as https://bugs.freedesktop.org/show_bug.cgi?id=62437 mentions this is not yet working on master at the moment (I can confirm that), and it seems that the current blocker for this is the lack of libcmis release. :-) Thanks a lot, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/ole/ndole.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6597fd871d5e60f5060fcf085741735d7683cf59 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Dec 4 10:43:02 2014 -0500 Build fix on Windows. Change-Id: Ifad333a5e7254bc11006df18dfff71f23da834fb diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index b8a2f09..b7020dc 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -57,6 +57,8 @@ #include vcl/graphicfilter.hxx #include comcore.hrc +#include deque + using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: C++11 on master (towards LO 4.5)
Stephan Bergmann wrote: Maintainers of active Windows tinderboxes (on cc, as of https://wiki.documentfoundation.org/Development/Tinderbox#List_of_registered_Tinderboxes), please make sure until, say, mid of next week (Dec 3) that they are using MSVC 2013 for master builds. To make it explicit: win@42 is updated working. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/security/CertificateCharacters.idl |4 offapi/com/sun/star/security/CertificateException.idl |5 - offapi/com/sun/star/security/CertificateValidity.idl |4 offapi/com/sun/star/security/CryptographyException.idl |5 - offapi/com/sun/star/security/DocumentDigitalSignatures.idl |3 --- offapi/com/sun/star/security/EncryptionException.idl |5 - offapi/com/sun/star/security/ExtAltNameType.idl |2 -- offapi/com/sun/star/security/KeyException.idl |5 - offapi/com/sun/star/security/NoPasswordException.idl |7 --- offapi/com/sun/star/security/SignatureException.idl |8 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl |5 - offapi/com/sun/star/security/XSanExtension.idl |4 offapi/com/sun/star/security/XSerialNumberAdapter.idl |2 -- offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl |5 - offapi/com/sun/star/xml/crypto/SecurityOperationStatus.idl |5 - offapi/com/sun/star/xml/crypto/XMLEncryption.idl |4 offapi/com/sun/star/xml/crypto/XMLEncryptionException.idl |8 offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl |5 - offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl |5 - offapi/com/sun/star/xml/crypto/XMLSignature.idl |5 - offapi/com/sun/star/xml/crypto/XMLSignatureException.idl |8 offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl |5 - offapi/com/sun/star/xml/crypto/XUriBinding.idl |5 - offapi/com/sun/star/xml/crypto/XXMLEncryption.idl |5 - offapi/com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl |6 -- offapi/com/sun/star/xml/crypto/XXMLSecurityTemplate.idl |5 - offapi/com/sun/star/xml/crypto/XXMLSignature.idl |4 offapi/com/sun/star/xml/crypto/XXMLSignatureTemplate.idl |5 - offapi/com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl |4 offapi/com/sun/star/xml/crypto/sax/Decryptor.idl |5 - offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl |4 offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl |5 - offapi/com/sun/star/xml/crypto/sax/ElementStackItem.idl |5 - offapi/com/sun/star/xml/crypto/sax/Encryptor.idl |5 - offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl |5 - offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl |3 --- offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl |7 +-- offapi/com/sun/star/xml/crypto/sax/XBlockerMonitor.idl |5 - offapi/com/sun/star/xml/crypto/sax/XDecryptionResultBroadcaster.idl |5 - offapi/com/sun/star/xml/crypto/sax/XDecryptionResultListener.idl |5 - offapi/com/sun/star/xml/crypto/sax/XElementStackKeeper.idl |5 - offapi/com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.idl |5 - offapi/com/sun/star/xml/crypto/sax/XEncryptionResultListener.idl |2 -- offapi/com/sun/star/xml/crypto/sax/XKeyCollector.idl |5 - offapi/com/sun/star/xml/crypto/sax/XMissionTaker.idl |5 - offapi/com/sun/star/xml/crypto/sax/XReferenceCollector.idl |5 - offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.idl |5 - offapi/com/sun/star/xml/crypto/sax/XReferenceResolvedListener.idl |5 - offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl |5 - offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeBroadcaster.idl |5 - offapi/com/sun/star/xml/crypto/sax/XSAXEventKeeperStatusChangeListener.idl |5 - offapi/com/sun/star/xml/crypto/sax/XSecurityController.idl |5 - offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl |5 - offapi/com/sun/star/xml/crypto/sax/XSignatureCreationResultBroadcaster.idl
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/swhtml.hxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 01225e0bb84c065549f058ac58c7825efe6635e3 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Dec 4 11:00:31 2014 -0500 More build fix on Windows. Change-Id: Icd853b1ce34752c7a063c6306f5a63a0a3ab1657 diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 2f17b75..c53f3c5 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -31,6 +31,8 @@ #include calbck.hxx #include htmlvsh.hxx +#include deque + class SfxMedium; class SfxViewFrame; class SdrObject; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/ring.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 513179b9381a8932c27fadeefa8dc8343cc4ce53
Author: Michael Stahl mst...@redhat.com
Date: Thu Dec 4 17:02:38 2014 +0100
coverity#1256663: sw: fix Ring::equals()
Change-Id: I199ad135fcb217866e8daa0797f4013f8acf4f6a
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 53b271d..8796dd0 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -188,7 +188,7 @@ namespace sw
void increment()
{ m_pCurrent = m_pCurrent ? m_pCurrent-GetNext() :
m_pStart-GetNext(); }
bool equal(RingIterator const other) const
-{ return m_pCurrent == other.m_pCurrent m_pStart ==
m_pStart; }
+{ return m_pCurrent == other.m_pCurrent m_pStart ==
other.m_pStart; }
T dereference() const
{ return m_pCurrent ? *m_pCurrent : * m_pStart; }
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/palettes/standard.soc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e95ae3278b71fc56fa6cdab9ecff4c5bdbdda583 Author: V Stuart Foote vstuart.fo...@utsa.edu Date: Thu Dec 4 17:08:53 2014 +0100 fdo#86511: Fix the RGB value of 'Sky blue 1' color. Change-Id: Ib64149f49072a51debff5b7c3c874a2b69f7dfc6 diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 1ed1412..a174401 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -37,7 +37,7 @@ draw:color draw:name=Magenta 1 draw:color=#ff99ff/ draw:color draw:name=Purple 1 draw:color=#cc66ff/ draw:color draw:name=Blue 1 draw:color=#ff/ - draw:color draw:name=Sky blue 1 draw:color=#ff/ +Â draw:color draw:name=Sky blue 1 draw:color=#66ccff/ draw:color draw:name=Cyan 1 draw:color=#99/ draw:color draw:name=Turquoise 1 draw:color=#66ff99/ draw:color draw:name=Green 1 draw:color=#99ff99/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 10 commits - sw/inc sw/source
sw/inc/ring.hxx |9 +++-
sw/source/core/crsr/crsrsh.cxx |9
sw/source/core/crsr/viscrs.cxx |7 +-
sw/source/core/doc/DocumentDrawModelManager.cxx | 22
sw/source/core/doc/DocumentTimerManager.cxx | 19 -
sw/source/core/doc/doccorr.cxx | 15 ++---
sw/source/core/doc/doclay.cxx | 26 +++-
7 files changed, 52 insertions(+), 55 deletions(-)
New commits:
commit 66b6611aae5dbfb68a958958a35e75725c8c1d9d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 4 17:39:10 2014 +0100
cid#1256668: uninit ptr field
Change-Id: I14f3bd9e3abd9562f47f21319da511df475b7fdd
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 7c898a0..5d5494e 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -109,6 +109,7 @@ namespace sw
template class T
inline RingT::Ring( T* pObj )
+: pPrev(static_cast T* (this))
{
T* pThis = static_cast T* (this);
if( !pObj )
commit 1b53effc6e1b305aed4f7ea59db13ffac55fe28c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 4 17:38:50 2014 +0100
cid#1256669: uninit ptr field
Change-Id: I6e3c5ac5281052b49c734b152ad4cd83021c6de9
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index bca6dba..7c898a0 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -80,6 +80,7 @@ namespace sw
* are alone in one.
*/
Ring()
+: pPrev(static_cast T* (this))
{ algo::init_header(static_cast T* (this)); }
/**
* Creates a new item and add it to an existing ring container.
commit 917d505bff114f6431368c61565720ba41b1d067
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 4 17:03:55 2014 +0100
cid#1256663: only allow comparing iterators from the same ring
Change-Id: I77eb186f0048a9bc335408bace96111e6cb2ca53
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 8796dd0..bca6dba 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -188,7 +188,12 @@ namespace sw
void increment()
{ m_pCurrent = m_pCurrent ? m_pCurrent-GetNext() :
m_pStart-GetNext(); }
bool equal(RingIterator const other) const
-{ return m_pCurrent == other.m_pCurrent m_pStart ==
other.m_pStart; }
+{
+// we never want to compare iterators from
+// different rings or starting points
+assert(m_pStart == other.m_pStart);
+return m_pCurrent == other.m_pCurrent;
+}
T dereference() const
{ return m_pCurrent ? *m_pCurrent : * m_pStart; }
/**
commit f5a42cf7afa2d5a1899f1c0d7c7093820703fba4
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 4 15:53:03 2014 +0100
use C++11 iteration
Change-Id: Icc47b1ead273ee02e85c35cb7ab0e06b48cc42c2
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx
b/sw/source/core/doc/DocumentTimerManager.cxx
index 0c8bff2..0e90c8c 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -89,20 +89,19 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *,
pTimer )
if( pTmpRoot
!SfxProgress::GetActiveProgress( m_rDoc.GetDocShell() ) )
{
-SwViewShell *pSh, *pStartSh;
-pSh = pStartSh =
m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell();
-do {
-if( pSh-ActionPend() )
+SwViewShell*
pShell(m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell());
+for(SwViewShell rSh : pShell-GetRingContainer())
+{
+if( rSh.ActionPend() )
{
pTimer-Start();
return 0;
}
-pSh = static_castSwViewShell*(pSh-GetNext());
-} while( pSh != pStartSh );
+}
if( pTmpRoot-IsNeedGrammarCheck() )
{
-bool bIsOnlineSpell = pSh-GetViewOptions()-IsOnlineSpell();
+bool bIsOnlineSpell = pShell-GetViewOptions()-IsOnlineSpell();
bool bIsAutoGrammar = false;
SvtLinguConfig().GetProperty( OUString(
UPN_IS_GRAMMAR_AUTO ) ) = bIsAutoGrammar;
@@ -145,8 +144,8 @@ IMPL_LINK( DocumentTimerManager, DoIdleJobs, Timer *,
pTimer )
pTmpRoot-StartAllAction();
// no jump on update of fields #i85168#
-const bool bOldLockView = pStartSh-IsViewLocked();
-pStartSh-LockView( true );
+const bool bOldLockView = pShell-IsViewLocked();
+pShell-LockView( true );
m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD
)-ModifyNotification( 0, 0 );// ChapterField
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
oox/source/vml/vmlformatting.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 9a63f1baddecb61f92eeadc484ac31fffdbc4bbf
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 2 14:51:09 2014 +
Resolves: fdo#70157 fix crash on loading
Change-Id: I0d248a195852c14cd95d4e337823076dd2fbc19d
(cherry picked from commit 8302d048653d9ac25d3cb9ab9277df715053ad6a)
(cherry picked from commit a757e1b1300dde12fb865c1efd64bfd2bef00e2c)
Reviewed-on: https://gerrit.libreoffice.org/13272
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 86b303e..8fca88d 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -378,9 +378,13 @@ void ConversionHelper::decodeVmlPath( ::std::vector
::std::vector Point r
break;
case CLOSE: // 0 param
-rPointLists.back().push_back( rPointLists.back()[ 0 ] );
-rFlagLists.back().push_back( rFlagLists.back()[ 0 ] );
-aCurrentPoint = rPointLists.back().back();
+SAL_WARN_IF(rPointLists.back().empty() ||
rPointLists.back().empty(), oox, empty pointlists at close);
+if (!rPointLists.back().empty()
!rFlagLists.back().empty())
+{
+rPointLists.back().push_back( rPointLists.back()[ 0 ]
);
+rFlagLists.back().push_back( rFlagLists.back()[ 0 ] );
+aCurrentPoint = rPointLists.back().back();
+}
break;
case END: // 0 param
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/uibase/docvw/PostItMgr.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1086ed32aacd2d6f9e98514f052567c1a9fc17fd
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 2 17:42:55 2014 +
Only call super-expensive Invalidate on scrollbar toggling
otherwise even using backspace in an annotated area will cause super slow
behaviour as each keystroke causes a full page render
This became a problem after
commit 0761f81643a6890457e9ef7d913ab5c88c2593a4
Date: Thu Dec 19 18:50:58 2013 +
123792: complete annotations on text ranges feature
but underlying problem was always there ready to trigger.
For this case only render the full page if the state
of comments scrollbars *toggles*, i.e. if there wasn't
scrollbars and there ends up still with no scrollbars
avoid the (bad) hack of invalidating the page
(cherry picked from commit 378c74ce290ab772f962db51ff8cba200cb40144)
Conflicts:
sw/source/uibase/docvw/PostItMgr.cxx
Change-Id: Ic7fd432d2317b0f5ad8d8773636f99fe75d660d6
(cherry picked from commit 7e75eab406c5e58e40987ab8a249dbacbb685551)
Reviewed-on: https://gerrit.libreoffice.org/13279
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/uibase/docvw/PostItMgr.cxx
b/sw/source/core/uibase/docvw/PostItMgr.cxx
index d51ebff..b36e86f 100644
--- a/sw/source/core/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/core/uibase/docvw/PostItMgr.cxx
@@ -764,7 +764,8 @@ void SwPostItMgr::LayoutPostIts()
}
else
{
-bUpdate = true;
+if (mPages[n]-bScrollbar)
+bUpdate = true;
mPages[n]-bScrollbar = false;
}
}
@@ -796,7 +797,6 @@ void SwPostItMgr::LayoutPostIts()
if ( bRepair )
CheckForRemovedPostIts();
}
-
// notes scrollbar is otherwise not drawn correctly for some cases
// scrollbar area is enough
if (bUpdate)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - cui/source
cui/source/dialogs/colorpicker.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 86f38a7af647a154ecfe12b90500e6c060793cf2
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 26 15:24:20 2014 +
Resolves: fdo#85590 'Pick a color' circle location is incorrect when opened
Change-Id: I18a00d0ab7acc30f4751c0e19cceffefdce90474
(cherry picked from commit 7716d86f46dea72bd0e99f7074f718d558e88f49)
(cherry picked from commit 037e65cbdd76dc06593a43adbd72427c8765736c)
Reviewed-on: https://gerrit.libreoffice.org/13135
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index a44c4c0..644cd73 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -623,6 +623,7 @@ void ColorFieldControl::Paint( const Rectangle rRect )
void ColorFieldControl::Resize()
{
UpdateBitmap();
+UpdatePosition();
Control::Resize();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Bjoern, Stephan, Michael M, Robinson, Jan-Marek, Cloph, Eike, Andras, Kendy, Miklos, Thorsten, Caolan, Adam, Jacobo, Norbert, David, Kohei, Markus * Completed Action Items: + come up with a proposal timing-wise (Cloph) + start building bibisect repositories (Robinson) [ built will up-load shortly ] + get Robinson access to TDFs Sun-Ultra-24 etc. (Cloph) + see also: https://redmine.documentfoundation.org/issues/597#note-21 + test system to get BSA fixed (Cloph) [ setup with a proxy to the testing instance of bugzilla, need to work out why xml-rpc login fails ] + merge calc / sidebar stripe enablement to 4.4 for now (Kendy) * Pending Action Items: + fix BSA login / XML-RPC issues (Cloph) + reach out to Tollef to organise bz migration date/time (Robinson) + get stats on bugzilla load / HW strength from Tollef (Robinson) [ talking to him after the call today ] + check Matus' startup performance measurement for layered images.zip (Kendy) + poke wrt. FOSDEM / BetaCoworking - ask him (Kendy) [ Cor poked, seems they're happy to have us for 2x days ] * Bugzilla migration update (Robinson) + going well + http://vm150.documentfoundation.org/ + please test out your tools vs. that. + talk to Tollef today to get a date. * Release Engineering update (Cloph) + 4.2.8 release + RC2 tagged currently still building on Windows + once done tonight - will start building 4.4.0 Beta2 + 4.3.5 RC2 + due to be tagged next week + 4.4.0 Beta 2 + plan to tag late-evening. + Lateish Feature collection: + OpenGL rendering for Windows by default for good drivers (various) + Blacklisting for Linux and Windows (Markus) [ now done / in 4.4 Beta 2 - list needs evolution ... most devices currently black-listed vs. Mozilla black-list a few white-listed. export SAL_FORCEGL=1 to skip the black-list ] + OpenGL/CL JPEG de-compression to texture (jpeg-turbo patch) [ patch pending here ]. + OneDrive bits [ urk ] + in the features / wiki page but ... + https://bugs.freedesktop.org/show_bug.cgi?id=62437 + no point merging the feature, until matching libcmis release (Miklos) + is there a story here ? can we get a libcmis release ? (Michael) AI:+ ask Cedric what is up (Miklos) + any objections to get it in for RC1 ? + none. + PDF signing - non-experimental (Kendy) + small patch to enable it in 4.4 + can always re-disable it if not working before release. + so far Linux OS/X work - Windows in progress. + any objections to enabling for RC1 ? + none. + Android / iOS Remote * Crashtest update (Markus) + expecting new hardware before Christmas. + Michael S fixed a problem with the ODF validator + found a bug - reporting errors with extension elements containing character content; now fixed. + new export asserts around duplicated attributes + ODS export ~200 assert issues around style export: + generating invalid files + otherwise the numbers look quite stable + a few more import crashers - related to duplicated attributes, + some filters to internal conversions to ODF: + export of OLE objects on import eg. * Large scale renames (Kendy) + any concerns wrt. s/Crsr/Cursor/ , s/Frm/Frame/ , s/Fmt/Format/ and similar? + of course with the care it needs - some include files have that in the name etc. + XML attributes with 'Frm' in them + git grep 'Crsr' | wc -l gives 5808 + Frm: 26837 + Fmt: 24992 + suggest postpone 'Frm' (Bjoern) + fears of 10x - 20x frame concepts + not worried wrt. cursor / format + we already have 'Frame' and 'Frm' everyone likes to call things 'Frame' + in sw:: namespace already have a 'Frame' class for binary DOC import/export (Miklos) + rtl:: namespace cleanup for strings - was done during the .3 release (Miklos) + less pain for cherry-picking ... + Another thing to queue for x.y.3 release is Window::Paint (Michael) + adding an OutputDevice reference + another data-point on fmt/frm - got quite confused (Sberg) + lots of permutations SwFmtFrm and SwFmtFlyFrm etc. + concerns trying to follow stack frames + if cleanup there; perhaps some improved naming too. + would support better names for Writer (Bjorn) + can re-write classes with Clang ? (Michael) + need to update documentation too (Miklos) + got
[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk
desktop/Library_sofficeapp.mk |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit f10086d664f0890c79323f6a76181c7196259a37 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Dec 4 12:15:11 2014 -0500 init.cxx is for now ANDROID and LINUX (unix?) only. It doesn't build on Windows. Let's exclude it. Change-Id: I153343e49318ee2ac63f95bbe6a2feeb26a96cff diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 80479b4..60daade 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -118,15 +118,18 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\ endif # liblibreoffice bits +ifeq ($(OS),ANDROID) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ + desktop/source/lib/lokandroid \ )) - -ifeq ($(OS),ANDROID) +else +ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ - desktop/source/lib/lokandroid \ + desktop/source/lib/init \ )) endif +endif ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Library_use_libraries,sofficeapp,tubes)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crsrsh.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 967331ef6a2765b7021bf835ce85f783257a936c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 4 18:04:56 2014 +0100
WaE: unused var
Change-Id: I4ba8632e8804f7fcc3511d01b28df1728e212ced
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index dc66cdd..5dd77ab 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2555,7 +2555,6 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex rIdx )
pNew-GetPoint()-nNode = *pNode-EndOfSectionNode();
// take care of all shells
-SwViewShell *pTmp = this;
for(SwViewShell rTmp : GetRingContainer())
{
if( rTmp.IsA( TYPE( SwCrsrShell )))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/unx
vcl/inc/generic/gendata.hxx |9 ++---
vcl/inc/unx/saldata.hxx |4 +++-
vcl/inc/unx/saldisp.hxx | 10 +-
vcl/opengl/x11/salvd.cxx |4 ++--
vcl/unx/generic/app/i18n_ic.cxx | 12 ++--
vcl/unx/generic/app/i18n_status.cxx |6 +++---
vcl/unx/generic/app/saldata.cxx |2 +-
vcl/unx/generic/app/saldisp.cxx |6 +++---
vcl/unx/generic/app/salinst.cxx |6 +++---
vcl/unx/generic/app/sm.cxx |8
vcl/unx/generic/dtrans/X11_selection.cxx |8
vcl/unx/generic/gdi/gcach_xpeer.cxx |2 +-
vcl/unx/generic/gdi/salbmp.cxx | 14 +++---
vcl/unx/generic/gdi/salgdi.cxx |4 ++--
vcl/unx/generic/gdi/salgdi2.cxx |2 +-
vcl/unx/generic/gdi/salvd.cxx|4 ++--
vcl/unx/generic/gdi/xrender_peer.cxx |2 +-
vcl/unx/generic/window/salframe.cxx |6 +++---
vcl/unx/generic/window/salobj.cxx| 10 +-
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +-
vcl/unx/gtk/window/gtkobject.cxx |2 +-
vcl/unx/gtk/window/gtksalmenu.cxx|2 +-
vcl/unx/x11/x11sys.cxx | 10 +-
23 files changed, 70 insertions(+), 65 deletions(-)
New commits:
commit 3042fa532a9b26203491b36f94d709c3b73e46ff
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 4 18:26:34 2014 +0100
Move SalGenericData::GetSalDisplay() out of generic/gendata.hxx
...as it needs SalDisplay to be a complete type, but unx/saldisp.hxx
depends on
X11 headers and can thus e.g. not be included in generic/gendata.hxx on
Android.
Change-Id: Iec5f51408eef0d6eb7e2d04105a7408372b06079
diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 6cd17b2..384c20a 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -12,12 +12,12 @@
#include osl/socket.hxx
-#include generic/gendisp.hxx
#include saldatabasic.hxx
-#include unx/saldisp.hxx
// Not the prettiest - but helpful for migrating old code ...
class GtkSalDisplay;
+class SalGenericDisplay;
+
enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4,
SAL_DATA_UNX, SAL_DATA_SVP,
@@ -61,11 +61,6 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error
// Not the prettiest - but helpful for migrating old code ...
-inline SalDisplay *GetSalDisplay() const
-{
-OSL_ASSERT( m_eType != SAL_DATA_GTK3 );
-return static_castSalDisplay *(GetDisplay());
-}
inline GtkSalDisplay *GetGtkDisplay() const
{
return (GtkSalDisplay *)GetDisplay();
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index f2f7b1e..2c58231 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -23,6 +23,7 @@
#include prex.h
#include postx.h
+#include unx/saldisp.hxx
#include unx/salunx.h
#include vcl/salgtype.hxx
#include salframe.hxx
@@ -68,7 +69,8 @@ public:
virtual voidinitNWF();
virtual voiddeInitNWF();
-SalDisplay* GetX11Display() const { return GetSalDisplay(); }
+SalDisplay* GetX11Display() const
+{ return vcl_sal::getSalDisplay(this); }
voidDeleteDisplay(); // for shutdown
inline SalXLib*GetLib() const { return pXLib_; }
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 5f0e894..896ac52 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -36,6 +36,7 @@ class SalXLib;
#include boost/unordered_map.hpp
#include tools/gen.hxx
#include salwtype.hxx
+#include generic/gendata.hxx
#include generic/gendisp.hxx
#include vclpluginapi.h
@@ -404,11 +405,18 @@ public:
voidSetupInput( SalI18N_InputMethod *pInputMethod );
};
-// get foreign key names
namespace vcl_sal {
+// get foreign key names
OUString getKeysymReplacementName(
const OUString pLang,
KeySym nSymbol );
+
+inline SalDisplay *getSalDisplay(SalGenericData const * data)
+{
+assert(data != nullptr);
+assert(data-GetType() != SAL_DATA_GTK3);
+return static_castSalDisplay *(data-GetDisplay());
+}
}
#endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX
diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index 7996cff..a8b18f9 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -47,10 +47,10 @@ X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice(
SalGraphics* pGraphics,
// TODO Check where a VirtualDevice is created from SystemGraphicsData
assert( pData == NULL ); (void)pData;
-mpDisplay = GetGenericData()-GetSalDisplay();
+mpDisplay =
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/unx/saldisp.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 4a8c18dcca2aa4eb6b1306d6312c8a7d9d7257a9 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 4 18:37:24 2014 +0100 Remove dead SalDisplay::GetSalDisplay declaration Change-Id: Ib24e857b19ceb6ca721b537351e95379a0992640 diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 896ac52..8b56e18 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -288,7 +288,6 @@ protected: voiddoDestruct(); voidaddXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight ); public: -static SalDisplay *GetSalDisplay( Display* display ); static bool BestVisual( Display *pDisp, int nScreen, XVisualInfo rVI ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - extensions/source
extensions/source/propctrlr/formcomponenthandler.cxx | 38 +--
1 file changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 6e7e7d0252bf030abf758469eebdb2030cc1d315
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 4 19:14:52 2014 +0100
fdo#65163 reintroduce embedded picture for form components
but not for report components (fdo#53001)
Change-Id: Ie07e1c2993304d4deb2124e72baa7a326b587918
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 63688cb..41c955d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -69,6 +69,7 @@
#include com/sun/star/inspection/PropertyLineElement.hpp
#include com/sun/star/resource/XStringResourceManager.hpp
#include com/sun/star/resource/MissingResourceException.hpp
+#include com/sun/star/report/XReportDefinition.hpp
#include com/sun/star/graphic/GraphicObject.hpp
#include com/sun/star/text/WritingMode2.hpp
@@ -127,6 +128,7 @@ namespace pcr
using namespace sdb;
using namespace sdbc;
using namespace sdbcx;
+using namespace report;
using namespace container;
using namespace ui::dialogs;
using namespace inspection;
@@ -2775,8 +2777,17 @@ namespace pcr
aFileDlg.SetTitle(aStrTrans);
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
-Reference XModel xModel( impl_getContextDocument_nothrow() );
-bool bHandleNonLink = false;
+bool bHandleNonLink;
+{
+Reference XModel xModel( impl_getContextDocument_nothrow() );
+bHandleNonLink = xModel.is();
+// Not implemented in reports
+if (bHandleNonLink)
+{
+Reference XReportDefinition xReportDef( xModel,
::com::sun::star::uno::UNO_QUERY );
+bHandleNonLink = !xReportDef.is();
+}
+}
Reference XFilePickerControlAccess
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(),
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the
controller interface on the file picker!);
commit 589795d8b45f2c9b48497e038da67fc5beb82d2d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 4 19:04:46 2014 +0100
Revert coverity#735424 Logically dead code
This reverts commit 1f22e2f954baeec825190ded03510cb6c8069d93.
in preparation for fix for fdo#65163
Conflicts:
extensions/source/propctrlr/formcomponenthandler.cxx
Change-Id: Ifa252ac66724dd3e4b257e3bb6679d9503f8a9db
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 41167b0..63688cb 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2765,6 +2765,7 @@ namespace pcr
bool FormComponentPropertyHandler::impl_browseForImage_nothrow( Any
_out_rNewValue, ::osl::ClearableMutexGuard _rClearBeforeDialog ) const
{
+bool bIsLink = true;// reflect the legacy behavior
OUString aStrTrans = m_pInfoService-getPropertyTranslation(
PROPERTY_ID_IMAGE_URL );
::sfx2::FileDialogHelper aFileDlg(
@@ -2775,6 +2776,7 @@ namespace pcr
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
Reference XModel xModel( impl_getContextDocument_nothrow() );
+bool bHandleNonLink = false;
Reference XFilePickerControlAccess
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(),
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the
controller interface on the file picker!);
@@ -2783,8 +2785,8 @@ namespace pcr
// do a preview by default
xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0,
css::uno::Any(true));
-xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK,
0, css::uno::Any(true));
-
xController-enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK, false);
+xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK,
0, css::uno::Any(bIsLink));
+
xController-enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK,
bHandleNonLink );
}
@@ -2800,7 +2802,24 @@ namespace pcr
bool bSuccess = ( 0 == aFileDlg.Execute() );
if ( bSuccess )
{
-_out_rNewValue = aFileDlg.GetPath();
+if ( bHandleNonLink xController.is() )
+{
+
xController-getValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) =
bIsLink;
+}
+if ( !bIsLink )
+{
+Graphic aGraphic;
+aFileDlg.GetGraphic(
[Libreoffice-commits] core.git: 2 commits - extensions/source
extensions/source/propctrlr/formcomponenthandler.cxx | 38 +--
1 file changed, 34 insertions(+), 4 deletions(-)
New commits:
commit ac49b8abb40098edb8f650037a2b5742b35c415f
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 4 19:14:52 2014 +0100
fdo#65163 reintroduce embedded picture for form components
but not for report components (fdo#53001)
Change-Id: Ie07e1c2993304d4deb2124e72baa7a326b587918
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 63688cb..41c955d 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -69,6 +69,7 @@
#include com/sun/star/inspection/PropertyLineElement.hpp
#include com/sun/star/resource/XStringResourceManager.hpp
#include com/sun/star/resource/MissingResourceException.hpp
+#include com/sun/star/report/XReportDefinition.hpp
#include com/sun/star/graphic/GraphicObject.hpp
#include com/sun/star/text/WritingMode2.hpp
@@ -127,6 +128,7 @@ namespace pcr
using namespace sdb;
using namespace sdbc;
using namespace sdbcx;
+using namespace report;
using namespace container;
using namespace ui::dialogs;
using namespace inspection;
@@ -2775,8 +2777,17 @@ namespace pcr
aFileDlg.SetTitle(aStrTrans);
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
-Reference XModel xModel( impl_getContextDocument_nothrow() );
-bool bHandleNonLink = false;
+bool bHandleNonLink;
+{
+Reference XModel xModel( impl_getContextDocument_nothrow() );
+bHandleNonLink = xModel.is();
+// Not implemented in reports
+if (bHandleNonLink)
+{
+Reference XReportDefinition xReportDef( xModel,
::com::sun::star::uno::UNO_QUERY );
+bHandleNonLink = !xReportDef.is();
+}
+}
Reference XFilePickerControlAccess
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(),
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the
controller interface on the file picker!);
commit c8b7165b9ff1e656f9ea484b3fb0c8f5aa06810a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 4 19:04:46 2014 +0100
Revert coverity#735424 Logically dead code
This reverts commit 1f22e2f954baeec825190ded03510cb6c8069d93.
in preparation for fix for fdo#65163
Conflicts:
extensions/source/propctrlr/formcomponenthandler.cxx
Change-Id: Ifa252ac66724dd3e4b257e3bb6679d9503f8a9db
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 41167b0..63688cb 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2765,6 +2765,7 @@ namespace pcr
bool FormComponentPropertyHandler::impl_browseForImage_nothrow( Any
_out_rNewValue, ::osl::ClearableMutexGuard _rClearBeforeDialog ) const
{
+bool bIsLink = true;// reflect the legacy behavior
OUString aStrTrans = m_pInfoService-getPropertyTranslation(
PROPERTY_ID_IMAGE_URL );
::sfx2::FileDialogHelper aFileDlg(
@@ -2775,6 +2776,7 @@ namespace pcr
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
Reference XModel xModel( impl_getContextDocument_nothrow() );
+bool bHandleNonLink = false;
Reference XFilePickerControlAccess
xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(),
FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the
controller interface on the file picker!);
@@ -2783,8 +2785,8 @@ namespace pcr
// do a preview by default
xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0,
css::uno::Any(true));
-xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK,
0, css::uno::Any(true));
-
xController-enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK, false);
+xController-setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK,
0, css::uno::Any(bIsLink));
+
xController-enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK,
bHandleNonLink );
}
@@ -2800,7 +2802,24 @@ namespace pcr
bool bSuccess = ( 0 == aFileDlg.Execute() );
if ( bSuccess )
{
-_out_rNewValue = aFileDlg.GetPath();
+if ( bHandleNonLink xController.is() )
+{
+
xController-getValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) =
bIsLink;
+}
+if ( !bIsLink )
+{
+Graphic aGraphic;
+aFileDlg.GetGraphic(
[Bug 87003] Kill BOOST_FOREACH on master and use C++11s range-based for() loops instead
https://bugs.freedesktop.org/show_bug.cgi?id=87003 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Priority|medium |low CC||libreoffice@lists.freedeskt ||op.org Severity|enhancement |trivial -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 87003] Kill BOOST_FOREACH on master and use C++11s range-based for() loops instead
https://bugs.freedesktop.org/show_bug.cgi?id=87003 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup -- 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-4' - extras/source
extras/source/palettes/standard.soc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa2ac4cf5fc268b07dab42c2f610fb62f214a69c Author: V Stuart Foote vstuart.fo...@utsa.edu Date: Thu Dec 4 17:08:53 2014 +0100 fdo#86511: Fix the RGB value of 'Sky blue 1' color. Change-Id: Ib64149f49072a51debff5b7c3c874a2b69f7dfc6 diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 1ed1412..a174401 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -37,7 +37,7 @@ draw:color draw:name=Magenta 1 draw:color=#ff99ff/ draw:color draw:name=Purple 1 draw:color=#cc66ff/ draw:color draw:name=Blue 1 draw:color=#ff/ - draw:color draw:name=Sky blue 1 draw:color=#ff/ +Â draw:color draw:name=Sky blue 1 draw:color=#66ccff/ draw:color draw:name=Cyan 1 draw:color=#99/ draw:color draw:name=Turquoise 1 draw:color=#66ff99/ draw:color draw:name=Green 1 draw:color=#99ff99/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source sd/source
sc/source/ui/src/popup.src| 14 -
sd/source/ui/app/menuids_tmpl.src | 55 --
sd/source/ui/app/popup.src|2 -
3 files changed, 71 deletions(-)
New commits:
commit a7ae3480928b76be707db57b7089eb72095b4737
Author: Yousuf Philips philip...@hotmail.com
Date: Sun Nov 30 20:16:21 2014 +0400
removal of font name, font size and text alignment from context menus
apply the change made for writer in fdo#81132 to the other modules
Change-Id: Ic7f3252048be070c7e4d5e6ff1b7463b5af9d489
Reviewed-on: https://gerrit.libreoffice.org/13214
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 82268dd..d49620e 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -365,20 +365,6 @@ Menu RID_POPUP_EDIT
MenuItem { Separator = TRUE ; };
-MenuItem // Menu-Controller
- // Menu-Controller
- // Menu-Controller
- // Menu-Controller
-{
-ITEM_FORMAT_ATTR_CHAR_FONT
-};
-MenuItem // Menu-Controller
- // Menu-Controller
- // Menu-Controller
- // Menu-Controller
-{
-ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
-};
MenuItem
{
Text [ en-US ] = Style ;
diff --git a/sd/source/ui/app/menuids_tmpl.src
b/sd/source/ui/app/menuids_tmpl.src
index cb89cdc..8bdfe05 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -391,18 +391,6 @@
#define MN_TEXT_ATTR\
MenuItem\
{\
-Identifier = SID_ATTR_CHAR_FONT ; \
-HelpId = CMD_SID_ATTR_CHAR_FONT ; \
-Text [ en-US ] = ~Font ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \
-HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \
-Text [ en-US ] = ~Size ; \
-};\
-MenuItem\
-{\
Identifier = DUMMY ; \
Command = .uno:StyleMenu ; \
Text [ en-US ] = St~yle ; \
@@ -515,49 +503,6 @@
Text [ en-US ] = S~pecial Character... ; \
};
- // test orientation
-#define MN_TEXT_ALIGN\
-MenuItem\
-{\
-Identifier = DUMMY + 2 ; \
-Command = .uno:AlignTextMenu ; \
-Text [ en-US ] = A~lignment ; \
-SubMenu = Menu\
-{\
-ItemList = \
-{\
-MenuItem\
-{\
-Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
-HelpId = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \
-RadioCheck = TRUE ; \
-Text [ en-US ] = ~Left ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \
-HelpId = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \
-RadioCheck = TRUE ; \
-Text [ en-US ] = ~Right ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \
-HelpId = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \
-RadioCheck = TRUE ; \
-Text [ en-US ] = ~Centered ; \
-};\
-MenuItem\
-{\
-Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
-HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
-RadioCheck = TRUE ; \
-Text [ en-US ] = Justified ; \
-};\
-};\
-};\
-};
-
// object orientation
#define MN_OBJECT_ALIGN \
MenuItem\
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 19f5448..f08ddc3 100644
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
@@ -51,7 +51,6 @@ Menu RID_DRAW_TEXTOBJ_INSIDE_POPUP
MN_TEXTATTR
SEPARATOR
MN_TEXT_ATTR
-MN_TEXT_ALIGN
MN_LINESPACING_ATTR
SEPARATOR
MN_CHAR_PARAGRAPH
@@ -78,7 +77,6 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP
MN_TEXTATTR
SEPARATOR
MN_TEXT_ATTR
-MN_TEXT_ALIGN
MN_LINESPACING_ATTR
SEPARATOR
MN_CHAR_PARAGRAPH
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TableData.hxx| 13 ++---
writerfilter/source/dmapper/TableManager.cxx | 17 -
writerfilter/source/dmapper/TableManager.hxx |2 +-
3 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 3c232768cff2f981f6bcd2a1df978e53eefd964e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Dec 4 21:32:13 2014 +0100
No need to have TableData as a template
Change-Id: I136f844c3823443a8a42eb7a6e41d3805b085bd1
diff --git a/writerfilter/source/dmapper/TableData.hxx
b/writerfilter/source/dmapper/TableData.hxx
index 69c9f5c..73bc7e7 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -264,13 +264,12 @@ public:
}
};
-template typename T
/**
Class that holds the data of a table.
*/
class TableData
{
-typedef typename RowDataT, TablePropertyMapPtr::Pointer_t RowPointer_t;
+typedef RowDatacss::uno::Referencecss::text::XTextRange,
TablePropertyMapPtr::Pointer_t RowPointer_t;
typedef ::std::vectorRowPointer_t Rows;
/**
@@ -296,10 +295,10 @@ class TableData
/**
initialize mpRow
*/
-void newRow() { mpRow = RowPointer_t(new RowDataT,
TablePropertyMapPtr()); }
+void newRow() { mpRow = RowPointer_t(new
RowDatacss::uno::Referencecss::text::XTextRange, TablePropertyMapPtr()); }
public:
-typedef boost::shared_ptrTableData T Pointer_t;
+typedef boost::shared_ptrTableData Pointer_t;
TableData(unsigned int nDepth) : mnDepth(nDepth) { newRow(); }
~TableData() {}
@@ -326,7 +325,7 @@ public:
@param end end handle of the cell
@param pProps properties of the cell
*/
-void addCell(const T start, TablePropertyMapPtr pProps)
+void addCell(const css::uno::Referencecss::text::XTextRange start,
TablePropertyMapPtr pProps)
{
mpRow-addCell(start, pProps);
}
@@ -336,7 +335,7 @@ public:
@parm endend handle of the cell
*/
-void endCell(const T end)
+void endCell(const css::uno::Referencecss::text::XTextRange end)
{
mpRow-endCell(end);
}
@@ -373,7 +372,7 @@ public:
/**
Return the table properties.
*/
-TablePropertyMapPtr getTableProperties( )
+TablePropertyMapPtr getTableProperties()
{
return mpTableProps;
}
diff --git a/writerfilter/source/dmapper/TableManager.cxx
b/writerfilter/source/dmapper/TableManager.cxx
index 7c2b558..cf6e318 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -38,7 +38,7 @@ void TableManager::openCell(const
css::uno::Referencecss::text::XTextRange rH
if (mTableDataStack.size() 0)
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
+TableData::Pointer_t pTableData = mTableDataStack.top();
pTableData-addCell(rHandle, pProps);
}
@@ -211,7 +211,7 @@ void TableManager::closeCell(const
css::uno::Referencecss::text::XTextRange r
if (mTableDataStack.size() 0)
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
+TableData::Pointer_t pTableData = mTableDataStack.top();
pTableData-endCell(rHandle);
}
@@ -225,7 +225,7 @@ void TableManager::ensureOpenCell(TablePropertyMapPtr
pProps)
if (mTableDataStack.size() 0)
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
+TableData::Pointer_t pTableData = mTableDataStack.top();
if (pTableData.get() != nullptr)
{
@@ -264,7 +264,7 @@ void TableManager::endParagraphGroup()
if (mnTableDepth 0)
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
+TableData::Pointer_t pTableData = mTableDataStack.top();
if (isRowEnd())
{
@@ -304,7 +304,7 @@ void TableManager::resolveCurrentTable()
{
try
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData = mTableDataStack.top();
+TableData::Pointer_t pTableData = mTableDataStack.top();
unsigned int nRows = pTableData-getRowCount();
@@ -358,7 +358,7 @@ void TableManager::endLevel()
#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != nullptr)
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData;
+TableData::Pointer_t pTableData;
if (mTableDataStack.size() 0)
pTableData = mTableDataStack.top();
@@ -379,7 +379,7 @@ void TableManager::startLevel()
#ifdef DEBUG_WRITERFILTER
if (mpTableLogger != nullptr)
{
-TableData css::uno::Referencecss::text::XTextRange ::Pointer_t
pTableData;
+TableData::Pointer_t pTableData;
if (mTableDataStack.size() 0)
Re: C++11 on master (towards LO 4.5)
On Wed, 2014-12-03 at 15:35 +0100, Stephan Bergmann wrote: On 11/28/2014 09:22 AM, Stephan Bergmann wrote: Maintainers of active Windows tinderboxes (on cc, as of https://wiki.documentfoundation.org/Development/Tinderbox#List_of_registered_Tinderboxes), please make sure until, say, mid of next week (Dec 3) that they are using MSVC 2013 for master builds. I'll then make configure fail on anything less. In place now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c3ff6323e1bfd7f9ca676b2edb2647699ed405f Master requires MSVC 2013 now. It's not a big deal for me (because I am just looking for trouble, not trying to get work done), but maybe somebody cares: my attempt to run LibreOffice installed from (I am retyping this with newlines added) http://dev-build.libreoffice.org/daily/master/Win-x86@43/current/ libo-master~2014-12-04_02.44.11_LibreOfficeDev_4.5.0.0.alpha0_Win_x86.msi on Windows Vista fails with message This application has failed to start because MSVCR120.dll was not found. Re-installing the application may fix this problem. A comparison with my previous installation, TinderBox: Win-x86@51-TDF, Branch:MASTER, Time: 2014-11-28_08:54:54, shows that program/ within the older installation has msvc480.dll but the newer version does not. Neither program/ has MSVCR120.dll. HTH, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/sfxbasemodel.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ef1f3b6713118c5eb43da7fa85caf40107b468c1 Author: Michael Stahl mst...@redhat.com Date: Thu Dec 4 21:46:44 2014 +0100 sfx2: reset the error code before 2nd load with repair (related: fdo#56245) (regression from c7c385bb8e42d2051bcf05fd75b2146fe9852317) Change-Id: I39eca96b45ad974a7e1a6913aa811c6b03ceced7 diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 7e34a7b..19cbdf4 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1883,6 +1883,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence beans::PropertyValue seqA pMedium-ResetError(); pMedium-CloseStorage(); m_pData-m_pObjectShell-PrepareSecondTryLoad_Impl(); +nError = ERRCODE_NONE; if ( !m_pData-m_pObjectShell-DoLoad(pMedium) ) nError=ERRCODE_IO_GENERAL; if (m_pData-m_pObjectShell-GetErrorCode()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 42 commits - android/Bootstrap android/experimental android/mobile-config.py configmgr/source desktop/inc desktop/source framework/source sal/android solenv/bin vcl/and
android/Bootstrap/Makefile.shared |3 android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java | 59 android/Bootstrap/src/org/libreoffice/kit/Document.java |4 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java | 33 android/Bootstrap/src/org/libreoffice/kit/Office.java | 13 android/experimental/LOAndroid3/res/menu/view_menu.xml |4 android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java | 29 android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java |4 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java |9 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java | 42 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java | 116 - android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 17 android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java | 14 android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java | 35 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java | 10 android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |3 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/OnInterceptTouchListener.java | 14 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/Axis.java | 337 +++ android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/DynamicTileLayer.java | 20 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 475 +++- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 972 ++ android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerController.java | 265 -- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 18 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java | 14 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 34 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java | 24 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java | 323 +++ android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java | 40 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java | 78 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 41 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/Axis.java | 337 --- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomController.java | 953 - android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/PanZoomTarget.java | 24 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/SimpleScaleGestureDetector.java | 303 --- android/experimental/LOAndroid3/src/java/org/mozilla/gecko/ui/SubdocumentScrollHelper.java | 78 android/mobile-config.py | 65 configmgr/source/components.cxx |4 configmgr/source/parsemanager.cxx |6 configmgr/source/parsemanager.hxx |1 desktop/inc/app.hxx |1 desktop/source/lib/init.cxx | 87 desktop/source/lib/lokandroid.cxx | 46 framework/source/layoutmanager/layoutmanager.cxx |6 framework/source/services/taskcreatorsrv.cxx | 17 sal/android/libreofficekit-jni.c | 17 solenv/bin/native-code.py |4 vcl/android/androidinst.cxx |2 47
[Libreoffice-commits] core.git: 3 commits - basctl/source include/svx reportdesign/inc reportdesign/source sc/inc sc/source sd/inc sd/source svx/source sw/inc sw/source
basctl/source/dlged/dlgedpage.cxx| 21 +-
basctl/source/inc/dlgedpage.hxx |9 ++
include/svx/fmpage.hxx | 12 ++-
include/svx/obj3d.hxx|8 ++
include/svx/svdpage.hxx | 32 ++---
reportdesign/inc/RptPage.hxx |4 -
reportdesign/source/core/sdr/RptPage.cxx | 15
sc/inc/drawpage.hxx | 10 ++
sc/source/core/data/drawpage.cxx | 23 ++
sd/inc/sdpage.hxx|6 +
sd/source/core/sdpage2.cxx | 28 +---
svx/source/engine3d/obj3d.cxx| 11 ++-
svx/source/form/fmpage.cxx | 22 +-
svx/source/inc/fmpgeimp.hxx |2
svx/source/svdraw/svdpage.cxx| 105 +++
sw/inc/dpage.hxx | 15 +++-
sw/source/core/draw/dpage.cxx| 54 +++
17 files changed, 271 insertions(+), 106 deletions(-)
New commits:
commit d242b464b1b9299c14552e7cc369f2c4810644a7
Author: David Tardon dtar...@redhat.com
Date: Thu Dec 4 22:00:10 2014 +0100
be more explicit
Change-Id: I33b639b3505d5db2ea8b708d80e68e576ec53308
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index e0bb633..7376f26 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -42,7 +42,7 @@ private:
public:
TYPEINFO_OVERRIDE();
-DlgEdPage( DlgEdModel rModel, bool bMasterPage = false );
+explicit DlgEdPage( DlgEdModel rModel, bool bMasterPage = false );
virtual ~DlgEdPage();
virtual SdrPage* Clone() const SAL_OVERRIDE;
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 8b90dbb..74d3ec1 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
public:
TYPEINFO_OVERRIDE();
-FmFormPage(FmFormModel rModel, bool bMasterPage=false);
+explicit FmFormPage(FmFormModel rModel, bool bMasterPage=false);
virtual ~FmFormPage();
virtual voidSetModel(SdrModel* pNewModel) SAL_OVERRIDE;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index cbacc8c..55a2740 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -490,7 +490,7 @@ protected:
public:
TYPEINFO_OVERRIDE();
-SdrPage(SdrModel rNewModel, bool bMasterPage=false);
+explicit SdrPage(SdrModel rNewModel, bool bMasterPage=false);
virtual ~SdrPage();
virtual SdrPage* Clone() const SAL_OVERRIDE;
virtual SdrPage* Clone(SdrModel* pNewModel) const;
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index 9f294e3..2573434 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -29,7 +29,7 @@ class ScDrawPage: public FmFormPage
ScDrawPage operator=(const ScDrawPage) SAL_DELETED_FUNCTION;
public:
-ScDrawPage(ScDrawLayer rNewModel, bool bMasterPage = false);
+explicit ScDrawPage(ScDrawLayer rNewModel, bool bMasterPage = false);
virtual ~ScDrawPage();
virtual ScDrawPage* Clone() const SAL_OVERRIDE;
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index dfd4083..fee4a83 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -64,7 +64,7 @@ protected:
void Init();
public:
-FmFormPageImpl( FmFormPage _rPage );
+explicit FmFormPageImpl( FmFormPage _rPage );
~FmFormPageImpl();
void initFrom( FmFormPageImpl i_foreignImpl );
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 82078ce..c748816 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -34,7 +34,7 @@ class SwDPage : public FmFormPage, public SdrObjUserCall
SwDoc* pDoc;
public:
-SwDPage(SwDrawModel rNewModel, bool bMasterPage=false);
+explicit SwDPage(SwDrawModel rNewModel, bool bMasterPage=false);
virtual ~SwDPage();
virtual SwDPage* Clone() const SAL_OVERRIDE;
commit 51bacc6a065f380a26b8cc2e5c18ff0ab4162ac3
Author: David Tardon dtar...@redhat.com
Date: Thu Dec 4 21:39:43 2014 +0100
impl. Clone for all subclasses of SdrPage
Change-Id: Ie370161e51ff83cb605bc57d317ff945404e5611
diff --git a/basctl/source/dlged/dlgedpage.cxx
b/basctl/source/dlged/dlgedpage.cxx
index 15f7f12..b3ed46c 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -47,8 +47,19 @@ DlgEdPage::~DlgEdPage()
SdrPage* DlgEdPage::Clone() const
{
+return Clone(0);
+}
+
+SdrPage* DlgEdPage::Clone(SdrModel* const pNewModel) const
+{
DlgEdPage* const pNewPage = new DlgEdPage( *this );
-pNewPage-lateInit( *this );
+DlgEdModel* pDlgEdModel = 0;
+if ( pNewModel )
+{
+pDlgEdModel = dynamic_castDlgEdModel*( pNewModel );
+assert(pDlgEdModel);
+}
+pNewPage-lateInit( *this, pDlgEdModel );
return pNewPage;
}
diff --git a/basctl/source/inc/dlgedpage.hxx
[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk
desktop/Library_sofficeapp.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 6b096f273ac9d7bbe93d2cb083958b3a04866d73 Author: Michael Stahl mst...@redhat.com Date: Thu Dec 4 23:09:36 2014 +0100 desktop: do not link sofficeapp against sw library Change-Id: I747d3e9d86f1a50b8e951c0feb351072d432cda0 diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 60daade..65c92a3 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\ sfx \ svl \ svt \ -sw \ tk \ tl \ ucbhelper \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
V Stuart Foote license statement
All of my personal past and future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. http://www.mozilla.org/MPL/2.0/ https://www.gnu.org/licenses/lgpl.html Additionally, to the extent possible under law, I waive all copyright and related or neighboring rights to my past future Artwork and Design contributions to the LibreOffice project, and similarly to The Document Foundation, placing such contributions under CC0: http://creativecommons.org/publicdomain/zero/1.0 V Stuart Foote San Antonio, Texas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ca8b351ff0870f7cabc7f80fa0b07f34be3d97c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Fri Dec 5 02:13:36 2014 +0100 Updated core Project: translations 6f495a7b8861c4e507c879e752f2d510c41ded17 diff --git a/translations b/translations index 785ac02..6f495a7 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 785ac022485a58261114efbe220c921fc7c87efd +Subproject commit 6f495a7b8861c4e507c879e752f2d510c41ded17 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 5 commits - include/vcl vcl/inc vcl/opengl vcl/source vcl/unx
include/vcl/opengl/OpenGLContext.hxx |7
vcl/inc/cairotextrender.hxx |1
vcl/inc/opengl/framebuffer.hxx |8
vcl/inc/openglgdiimpl.hxx|2
vcl/opengl/framebuffer.cxx | 26 +-
vcl/opengl/gdiimpl.cxx | 36 ++-
vcl/opengl/salbmp.cxx|2
vcl/source/opengl/OpenGLContext.cxx | 255 ---
vcl/unx/generic/gdi/cairotextrender.cxx |4
vcl/unx/generic/gdi/openglx11cairotextrender.cxx | 48 +++-
vcl/unx/generic/gdi/openglx11cairotextrender.hxx |1
vcl/unx/generic/gdi/x11cairotextrender.cxx |6
vcl/unx/generic/gdi/x11cairotextrender.hxx |1
vcl/unx/generic/window/salframe.cxx | 11
14 files changed, 299 insertions(+), 109 deletions(-)
New commits:
commit fb2574334c3da0630484de74d22a6f25d21d507a
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Thu Dec 4 22:27:38 2014 -0500
vcl: Don't keep a reference to the texture in the FBO object
Change-Id: I240d2b44e77d28af3cd5952b6d666a1709c4c54a
diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx
index e9c9065..915008c 100644
--- a/vcl/inc/opengl/framebuffer.hxx
+++ b/vcl/inc/opengl/framebuffer.hxx
@@ -18,10 +18,10 @@
class VCL_PLUGIN_PUBLIC OpenGLFramebuffer
{
private:
-GLuintmnId;
-OpenGLTexture maAttachedTexture;
+GLuint mnId;
int mnWidth;
int mnHeight;
+GLuint mnAttachedTexture;
public:
OpenGLFramebuffer();
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index e760b53..c4dfb05 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -17,6 +17,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() :
mnId( 0 ),
mnWidth( 0 ),
mnHeight( 0 ),
+mnAttachedTexture( 0 ),
mpPrevFramebuffer( NULL ),
mpNextFramebuffer( NULL )
{
@@ -45,30 +46,37 @@ void OpenGLFramebuffer::Unbind()
bool OpenGLFramebuffer::IsFree() const
{
-return (!maAttachedTexture);
+return (!mnAttachedTexture);
}
bool OpenGLFramebuffer::IsAttached( const OpenGLTexture rTexture ) const
{
-return ( maAttachedTexture == rTexture );
+return ( mnAttachedTexture == rTexture.Id() );
}
void OpenGLFramebuffer::AttachTexture( const OpenGLTexture rTexture )
{
+if( rTexture.Id() == mnAttachedTexture )
+return;
+
SAL_INFO( vcl.opengl, Attaching texture rTexture.Id() to
framebuffer (int)mnId );
-maAttachedTexture = rTexture;
+mnAttachedTexture = rTexture.Id();
mnWidth = rTexture.GetWidth();
mnHeight = rTexture.GetHeight();
glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
-maAttachedTexture.Id(), 0 );
+mnAttachedTexture, 0 );
CHECK_GL_ERROR();
}
void OpenGLFramebuffer::DetachTexture()
{
-maAttachedTexture = OpenGLTexture();
-glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, 0, 0 );
-CHECK_GL_ERROR();
+if( mnAttachedTexture != 0 )
+{
+CHECK_GL_ERROR();
+mnAttachedTexture = 0;
+glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, 0, 0 );
+CHECK_GL_ERROR();
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f186da3f21c3b6633123be95131f62d6b390491e
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Thu Dec 4 22:25:56 2014 -0500
vcl: Re-use a framebuffer of the same size when possible
Change-Id: Id9c7932976ce9d9282776c20d93d9cca4d290056
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 84174c1..11d37fa 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -210,16 +210,19 @@ public:
// use these methods right after setting a context to make sure drawing
happens
// in the right FBO (default one is for onscreen painting)
+bool BindFramebuffer( OpenGLFramebuffer* pFramebuffer );
bool AcquireDefaultFramebuffer();
-bool AcquireFramebuffer( OpenGLFramebuffer* pFramebuffer );
OpenGLFramebuffer* AcquireFramebuffer( const OpenGLTexture rTexture );
void ReleaseFramebuffer( OpenGLFramebuffer* pFramebuffer );
+void ReleaseFramebuffer( const OpenGLTexture rTexture );
+void ReleaseFramebuffers();
// retrieve a program from the cache or compile/link it
OpenGLProgram* GetProgram( const OUString rVertexShader, const
OUString rFragmentShader );
OpenGLProgram* UseProgram( const OUString rVertexShader, const
OUString rFragmentShader );
bool isCurrent();
+void clearCurrent();
void makeCurrent();
void resetCurrent();
void
Re: V Stuart Foote license statement
Thanks, added to https://wiki.documentfoundation.org/Development/Developers On 2014-12-05 02:34 AM, V Stuart Foote wrote: V Stuart Foote ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: License Statement: Gal Bar-Nissan
thanks, added to https://wiki.documentfoundation.org/Development/Developers On 2014-12-03 11:53 AM, Gal Bar-Nissan wrote: License statement: All of my past and future contributions to the LibreOffice project are under LGPLv3+/GPLv3+/MPL until further notice. -- appicon.png *Gal Bar-Nissan* Twitter http://www.twitter.com/cloudoninc|LinkedIn http://www.linkedin.com/company/cloudon |Facebook http://www.facebook.com/cloudoninc|Blog http://site.cloudon.com/blog ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDParser.cpp | 14 +-
src/lib/VSDParser.h |4
2 files changed, 1 insertion(+), 17 deletions(-)
New commits:
commit 25a2ba5fc9551f736192c3cca092aad69a98db09
Author: David Tardon dtar...@redhat.com
Date: Fri Dec 5 08:50:10 2014 +0100
Revert avoid infinite recursion when reading a broken file
Streams can legitimately be read more than once. (In ideal world, we
would keep the parsed data and just reuse it if/when the same stream
pointer was encountered again, instead of parsing it repeatedly. There
is a room for future improvement there :-)
This reverts commit 770e649b1b30e2b43e62d00ed06b4ff33f8305e0.
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 65702b4..388e84d 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -27,7 +27,7 @@ libvisio::VSDParser::VSDParser(librevenge::RVNGInputStream
*input, librevenge::R
m_currentShapeLevel(0), m_currentShapeID(MINUS_ONE),
m_extractStencils(false), m_colours(),
m_isBackgroundPage(false), m_isShapeStarted(false), m_shadowOffsetX(0.0),
m_shadowOffsetY(0.0),
m_currentGeometryList(0), m_currentGeomListCount(0), m_fonts(), m_names(),
m_namesMapMap(),
-m_currentPageName(), m_handledStreams()
+m_currentPageName()
{}
libvisio::VSDParser::~VSDParser()
@@ -113,7 +113,6 @@ bool libvisio::VSDParser::parseMain()
Pointer trailerPointer;
readPointer(m_input, trailerPointer);
- m_handledStreams.insert(trailerPointer.Offset);
bool compressed = ((trailerPointer.Format 2) == 2);
unsigned shift = 0;
if (compressed)
@@ -133,8 +132,6 @@ bool libvisio::VSDParser::parseMain()
return false;
_handleLevelChange(0);
- m_handledStreams.clear();
- m_handledStreams.insert(trailerPointer.Offset);
VSDStyles styles = stylesCollector.getStyleSheets();
@@ -232,15 +229,6 @@ void
libvisio::VSDParser::handleStreams(librevenge::RVNGInputStream *input, unsi
if (ptr.Type == 0)
continue;
- std::setunsigned::iterator it = m_handledStreams.find(ptr.Offset);
- if (it != m_handledStreams.end())
- {
-VSD_DEBUG_MSG((Stream at offset %d has already been handled.
Skipping...\n, ptr.Offset));
-continue;
- }
-
- m_handledStreams.insert(it, ptr.Offset);
-
if (ptr.Type == VSD_FONTFACES)
FontFaces[i] = ptr;
else if (ptr.Type == VSD_NAME_LIST2)
diff --git a/src/lib/VSDParser.h b/src/lib/VSDParser.h
index e8da164..2df8547 100644
--- a/src/lib/VSDParser.h
+++ b/src/lib/VSDParser.h
@@ -12,7 +12,6 @@
#include stdio.h
#include iostream
-#include set
#include vector
#include stack
#include map
@@ -168,9 +167,6 @@ protected:
std::mapunsigned, std::mapunsigned, VSDName m_namesMapMap;
VSDName m_currentPageName;
- // Sanity check, to avoid problems with broken files.
- std::setunsigned m_handledStreams;
-
private:
VSDParser();
VSDParser(const VSDParser );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/framework
include/framework/addonsoptions.hxx |7 --- 1 file changed, 7 deletions(-) New commits: commit e53f881b5c5c8968ab060b5e19a2fbebc1510e00 Author: Jennifer Liebel jliebe...@gmail.com Date: Fri Dec 5 07:50:21 2014 + fdo#84938: removed unused defines Change-Id: I8ce6621ad9e1971a0d586e324d49e9a209857057 Reviewed-on: https://gerrit.libreoffice.org/13307 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 79ff32e..02c42f0 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -48,13 +48,6 @@ #define STATUSBARITEM_STRING_AUTOSIZE AutoSize #define STATUSBARITEM_STRING_OWNERDRAW OwnerDraw -#define ADDONSMENUITEM_URL_LEN 3 -#define ADDONSMENUITEM_TITLE_LEN5 -#define ADDONSMENUITEM_TARGET_LEN 6 -#define ADDONSMENUITEM_SUBMENU_LEN 7 -#define ADDONSMENUITEM_CONTEXT_LEN 7 -#define ADDONSMENUITEM_IMAGEIDENTIFIER_LEN 15 - #define ADDONSMENUITEM_PROPERTYNAME_URL OUString(ADDONSMENUITEM_STRING_URL ) #define ADDONSMENUITEM_PROPERTYNAME_TITLE OUString(ADDONSMENUITEM_STRING_TITLE ) #define ADDONSMENUITEM_PROPERTYNAME_TARGET OUString(ADDONSMENUITEM_STRING_TARGET ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jennifer Liebel committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e53f881b5c5c8968ab060b5e19a2fbebc1510e00 fdo#84938: removed unused defines It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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-qa] minutes of ESC call ...
* Present: + Bjoern, Stephan, Michael M, Robinson, Jan-Marek, Cloph, Eike, Andras, Kendy, Miklos, Thorsten, Caolan, Adam, Jacobo, Norbert, David, Kohei, Markus * Completed Action Items: + come up with a proposal timing-wise (Cloph) + start building bibisect repositories (Robinson) [ built will up-load shortly ] + get Robinson access to TDFs Sun-Ultra-24 etc. (Cloph) + see also: https://redmine.documentfoundation.org/issues/597#note-21 + test system to get BSA fixed (Cloph) [ setup with a proxy to the testing instance of bugzilla, need to work out why xml-rpc login fails ] + merge calc / sidebar stripe enablement to 4.4 for now (Kendy) * Pending Action Items: + fix BSA login / XML-RPC issues (Cloph) + reach out to Tollef to organise bz migration date/time (Robinson) + get stats on bugzilla load / HW strength from Tollef (Robinson) [ talking to him after the call today ] + check Matus' startup performance measurement for layered images.zip (Kendy) + poke wrt. FOSDEM / BetaCoworking - ask him (Kendy) [ Cor poked, seems they're happy to have us for 2x days ] * Bugzilla migration update (Robinson) + going well + http://vm150.documentfoundation.org/ + please test out your tools vs. that. + talk to Tollef today to get a date. * Release Engineering update (Cloph) + 4.2.8 release + RC2 tagged currently still building on Windows + once done tonight - will start building 4.4.0 Beta2 + 4.3.5 RC2 + due to be tagged next week + 4.4.0 Beta 2 + plan to tag late-evening. + Lateish Feature collection: + OpenGL rendering for Windows by default for good drivers (various) + Blacklisting for Linux and Windows (Markus) [ now done / in 4.4 Beta 2 - list needs evolution ... most devices currently black-listed vs. Mozilla black-list a few white-listed. export SAL_FORCEGL=1 to skip the black-list ] + OpenGL/CL JPEG de-compression to texture (jpeg-turbo patch) [ patch pending here ]. + OneDrive bits [ urk ] + in the features / wiki page but ... + https://bugs.freedesktop.org/show_bug.cgi?id=62437 + no point merging the feature, until matching libcmis release (Miklos) + is there a story here ? can we get a libcmis release ? (Michael) AI:+ ask Cedric what is up (Miklos) + any objections to get it in for RC1 ? + none. + PDF signing - non-experimental (Kendy) + small patch to enable it in 4.4 + can always re-disable it if not working before release. + so far Linux OS/X work - Windows in progress. + any objections to enabling for RC1 ? + none. + Android / iOS Remote * Crashtest update (Markus) + expecting new hardware before Christmas. + Michael S fixed a problem with the ODF validator + found a bug - reporting errors with extension elements containing character content; now fixed. + new export asserts around duplicated attributes + ODS export ~200 assert issues around style export: + generating invalid files + otherwise the numbers look quite stable + a few more import crashers - related to duplicated attributes, + some filters to internal conversions to ODF: + export of OLE objects on import eg. * Large scale renames (Kendy) + any concerns wrt. s/Crsr/Cursor/ , s/Frm/Frame/ , s/Fmt/Format/ and similar? + of course with the care it needs - some include files have that in the name etc. + XML attributes with 'Frm' in them + git grep 'Crsr' | wc -l gives 5808 + Frm: 26837 + Fmt: 24992 + suggest postpone 'Frm' (Bjoern) + fears of 10x - 20x frame concepts + not worried wrt. cursor / format + we already have 'Frame' and 'Frm' everyone likes to call things 'Frame' + in sw:: namespace already have a 'Frame' class for binary DOC import/export (Miklos) + rtl:: namespace cleanup for strings - was done during the .3 release (Miklos) + less pain for cherry-picking ... + Another thing to queue for x.y.3 release is Window::Paint (Michael) + adding an OutputDevice reference + another data-point on fmt/frm - got quite confused (Sberg) + lots of permutations SwFmtFrm and SwFmtFlyFrm etc. + concerns trying to follow stack frames + if cleanup there; perhaps some improved naming too. + would support better names for Writer (Bjorn) + can re-write classes with Clang ? (Michael) + need to update documentation too (Miklos) + got
[Libreoffice-qa] Question about [Bug 86401] Error after close LibreOffice
Hi, Could anybody look at this bug and provide feedback, please? https://bugs.freedesktop.org/show_bug.cgi?id=86401 I think that it is bug not in the LibreOffice code. But I may mistake. What information should be collected for its specification? Thank you in advance. Lera ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LibreOffice 4.2.8 RC2 test builds available
Hi *, for the upcoming new version 4.2.8, the builds for rc2 are now available on pre-releases. 4.2.8 is an additional release to finish off the LibreOffice 4.2 codeline. See https://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.8_release for the complete schedule. Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.2.8 rc1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-8-release-4.2.8.2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [ANN] LibreOffice 4.2.8 RC2 test builds available
On Fri, 05 Dec 2014 02:35:42 +0100, Christian Lohmaier lohma...@googlemail.com wrote: Hi *, for the upcoming new version 4.2.8, the builds for rc2 are now available on pre-releases. 4.2.8 is an additional release to finish off the LibreOffice 4.2 codeline. . The list of fixed bugs relative to 4.2.8 rc1 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-8-release-4.2.8.2.log please also update the web page with RC1 and RC2 bugfix list. https://wiki.documentfoundation.org/WikiAction/edit/Releases/4.2.8/RC1 https://wiki.documentfoundation.org/WikiAction/edit/Releases/4.2.8/RC2 ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
