[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/table/svdotable.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit a3f38bdaaff91abdf2e0f01d0b6370aa958e4a20
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 10 16:54:59 2013 +
correctly dispose to avoid cyclic dependencies
accessibility cruft is still listening to dead tables so crashes in
slidesorting in main panel if moved slide has tables in it after visiting
slide
sorter once.
(cherry picked from commit 0b8e2e5efe20519e8b5563314bac0cbb84a3b967)
Conflicts:
svx/source/table/svdotable.cxx
Change-Id: I09f9a73b01fb2ddf059402146acdc7bd823798b9
Reviewed-on: https://gerrit.libreoffice.org/7051
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index bed3988..474d42d 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -268,9 +268,9 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32
nColumns, sal_Int32 n
mpTableObj = pTable;
mxTable = new TableModel( pTable );
mxTable-init( nColumns, nRows );
-mpLayouter = new TableLayouter( mxTable );
Reference XModifyListener xListener( static_cast
::com::sun::star::util::XModifyListener* (this) );
mxTable-addModifyListener( xListener );
+mpLayouter = new TableLayouter( mxTable );
UpdateWritingMode();
LayoutTable( mpTableObj-aRect, true, true );
mpTableObj-maLogicRect = mpTableObj-aRect;
@@ -282,6 +282,8 @@ SdrTableObjImpl SdrTableObjImpl::operator=( const
SdrTableObjImpl rSource )
{
if (this != rSource)
{
+disconnectTableStyle();
+
if( mpLayouter )
{
delete mpLayouter;
@@ -307,6 +309,8 @@ SdrTableObjImpl SdrTableObjImpl::operator=( const
SdrTableObjImpl rSource )
ApplyCellStyles();
mpTableObj-aRect = mpTableObj-maLogicRect;
LayoutTable( mpTableObj-aRect, false, false );
+
+connectTableStyle();
}
return *this;
}
@@ -453,8 +457,22 @@ bool SdrTableObjImpl::ApplyCellStyles()
void SdrTableObjImpl::dispose()
{
+disconnectTableStyle();
+mxTableStyle.clear();
+
+if( mpLayouter )
+{
+delete mpLayouter;
+mpLayouter = 0;
+}
+
if( mxTable.is() )
+{
+Reference XModifyListener xListener( static_cast
::com::sun::star::util::XModifyListener* (this) );
+mxTable-removeModifyListener( xListener );
mxTable-dispose();
+mxTable.clear();
+}
}
//
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source
svx/source/table/accessibletableshape.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit fcd101173cd3436f17a57dbe116f2ed35219a1e5
Author: Caolán McNamara caol...@redhat.com
Date: Wed Dec 11 11:57:34 2013 +
disposed but not dtored
just die when you are supposed to, without this endless amounts of
accessiblity
cells remain after sorting slides with tables in them
(cherry picked from commit 1c28065d8fe3e9a1394a7ecfc29e95a9639a1012)
Conflicts:
svx/source/table/accessibletableshape.cxx
Change-Id: Ice9a86b8b806e58f9bf871341a38f7729798dda9
(cherry picked from commit a90e08cb15e712e1d15a16de9a2677e57d81fd13)
Reviewed-on: https://gerrit.libreoffice.org/7052
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/svx/source/table/accessibletableshape.cxx
b/svx/source/table/accessibletableshape.cxx
index a5e910e..8872591 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -113,6 +113,12 @@ void AccessibleTableShapeImpl::dispose()
{
if( mxTable.is() )
{
+//remove all the cell's acc object in table's dispose.
+for( AccessibleCellMap::iterator iter( maChildMap.begin() ); iter !=
maChildMap.end(); iter++ )
+{
+(*iter).second-dispose();
+}
+maChildMap.clear();
Reference XModifyListener xListener( this );
mxTable-removeModifyListener( xListener );
mxTable.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmloff/source
xmloff/source/text/txtfldi.cxx |2 +-
xmloff/source/text/txtimp.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit bedc707bffdfe906a15036a40da1b9179d91b4fc
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:05:06 2013 +0100
fdo#72697 accept future loext:sender-initials
... of to-be text:sender-initials
Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5
(cherry picked from commit 1379294741ff85d4c09d9ded7579ad50dea88fb7)
Reviewed-on: https://gerrit.libreoffice.org/7076
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 875677c..3d99acf 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3669,7 +3669,7 @@ SvXMLImportContext*
XMLAnnotationImportContext::CreateChildContext(
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
rLocalName, aDateBuffer);
}
-else if( XML_NAMESPACE_TEXT == nPrefix )
+else if( XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
if( IsXMLToken( rLocalName, XML_SENDER_INITIALS ) )
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index b5028ae..24221a6 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -155,7 +155,8 @@ static SvXMLTokenMapEntry aTextPElemTokenMap[] =
// sender fields
{ XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME},
{ XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME },
-{ XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
+{ XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS
},
+{ XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS
},
{ XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE },
{ XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION },
{ XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 18
+-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit c8a237e87e909bb9fc8105fcad01317901f08c45
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sat Dec 14 06:00:18 2013 +0100
odbc DBMetaData: NULL pattern equivalent to %, not %foo
Change-Id: Ief475a1bf6e65b4786e8ee9c025b204f143a30e0
Reviewed-on: https://gerrit.libreoffice.org/7080
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index fbb1b59..7b524cc 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -849,7 +849,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any
catalog, const OUString
OString aPKQ,aPKO,aPKN,aCOL;
const OUString *pSchemaPat = NULL;
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
pSchemaPat = schemaPattern;
else
pSchemaPat = NULL;
@@ -946,7 +946,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges(
const Any catalog, cons
{
const OUString *pSchemaPat = NULL;
-if(schema.toChar() != '%')
+if(schema != %)
pSchemaPat = schema;
else
pSchemaPat = NULL;
@@ -981,7 +981,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any
catalog,
{
const OUString *pSchemaPat = NULL;
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
pSchemaPat = schemaPattern;
else
pSchemaPat = NULL;
@@ -1049,7 +1049,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns(
const Any catalog,
{
const OUString *pSchemaPat = NULL;
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
pSchemaPat = schemaPattern;
else
pSchemaPat = NULL;
@@ -1083,7 +1083,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const
Any catalog, const OUStri
{
const OUString *pSchemaPat = NULL;
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
pSchemaPat = schemaPattern;
else
pSchemaPat = NULL;
@@ -1127,7 +1127,7 @@ void
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
const OUString *pSchemaPat = NULL;
-if(schema.toChar() != '%')
+if(schema != %)
pSchemaPat = schema;
else
pSchemaPat = NULL;
@@ -1214,7 +1214,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const
Any catalog, const OUStr
{
const OUString *pSchemaPat = NULL;
-if(schema.toChar() != '%')
+if(schema != %)
pSchemaPat = schema;
else
pSchemaPat = NULL;
@@ -1243,7 +1243,7 @@ void
ODatabaseMetaDataResultSet::openTablePrivileges(const Any catalog, const O
{
const OUString *pSchemaPat = NULL;
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
pSchemaPat = schemaPattern;
else
pSchemaPat = NULL;
@@ -1273,7 +1273,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const
Any catalog, const OUStri
{
const OUString *pSchemaPat = NULL;
-if(schema.toChar() != '%')
+if(schema != %)
pSchemaPat = schema;
else
pSchemaPat = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmloff/source
xmloff/source/text/txtflde.cxx | 38 +++---
1 file changed, 27 insertions(+), 11 deletions(-)
New commits:
commit c062276a068a14df530fa21e9099a489a26b2096
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:30:34 2013 +0100
fdo#72697 actually write this only in ODF 1.2 extended
(cherry picked from commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8)
Conflicts:
xmloff/source/text/txtflde.cxx
Change-Id: I32097cc4b8a67615b0b6d6172cafd0edad7469b6
(cherry picked from commit 4031765b004dded31f04c54f9a055b7a3d0053f2)
Reviewed-on: https://gerrit.libreoffice.org/7078
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 0ad8fcb..6855a3b 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1752,14 +1752,17 @@ void XMLTextFieldExport::ExportFieldHelper(
GetExport().Characters(aBuffer.makeStringAndClear());
}
-// initials
-OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet) );
-if( !aInitials.isEmpty() )
+if (SvtSaveOptions().GetODFDefaultVersion()
SvtSaveOptions::ODFVER_012)
{
-SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_SENDER_INITIALS, sal_True,
- sal_False );
-GetExport().Characters(aInitials);
+// initials
+OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet)
);
+if( !aInitials.isEmpty() )
+{
+SvXMLElementExport aCreatorElem( GetExport(),
XML_NAMESPACE_TEXT,
+XML_SENDER_INITIALS, sal_True,
+sal_False );
+GetExport().Characters(aInitials);
+}
}
com::sun::star::uno::Reference com::sun::star::text::XText xText;
@@ -2226,10 +2229,23 @@ void XMLTextFieldExport::ExportElement(enum
XMLTokenEnum eElementName,
if (eElementName != XML_TOKEN_INVALID)
{
// Element
-SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- eElementName, bAddSpace, bAddSpace );
-// export content
-GetExport().Characters(sContent);
+if (eElementName == XML_SENDER_INITIALS)
+{
+if (SvtSaveOptions().GetODFDefaultVersion()
SvtSaveOptions::ODFVER_012)
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
+eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
+}
+else
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
+ eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
} else {
// always export content
GetExport().Characters(sContent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Disabling unit tests, redux
On 12/16/2013 06:56 AM, Keith Curtis wrote: It appears when making changes to individual C++ files that my computer spends about 90% of the build time running unit tests. I tried make -sr all to disable them, but it still ran lots: http://lists.freedesktop.org/archives/libreoffice/2011-March/009422.html I tried hacking on the makefile but got lost. Can this shortcut be re-enabled or is there a new way now? Sometimes, you just want to add a printf. The build process works great otherwise. * When you just add a debugging printf to some .cxx file in module foo, you can do make foo instead of just make to only rebuild module foo, which usually suffices today to get the effect into the instdir installation. * For debugging purposes, note that there is SAL_DEBUG with added usefulness compared to printf. * If all else fails, there appears to be make build-nocheck. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dbaccess/source
dbaccess/source/core/api/RowSet.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 4f93ef75127d32da84bbf0275e679a0c9ce7b98d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Dec 2 23:55:43 2013 +0100
fdo#72163: fix safer way
Do not dispose m_xComposer, might still be used by our m_pCache.
Change-Id: I6540c035c9159017c694b36e676721ec3e42db51
Reviewed-on: https://gerrit.libreoffice.org/7094
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 6002747..6a3ba0a 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2260,7 +2260,6 @@ sal_Bool ORowSet::impl_initComposer_throw( OUString
_out_rCommandToExecute )
{
try
{
-::comphelper::disposeComponent( m_xComposer );
m_xComposer.set( xFactory-createInstance(
SERVICE_NAME_SINGLESELECTQUERYCOMPOSER ), UNO_QUERY_THROW );
}
catch (const Exception ) { m_xComposer = NULL; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dbaccess/source
dbaccess/source/core/api/RowSet.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 5f9d293732bfbf39c2663f28d7f59a2a94339f5a Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Dec 16 06:14:19 2013 +0100 Revert fdo#72163 after updating m_xComposer, command facets are not dirty This reverts commit d4a709cbf4710555b1518816f1eaa9b43dc5cae7. This caused too many bugs to be cleaned up within a stable branch: - unittest failure; fixed (in master) only for the unittested driver. (commit 917f9576349240796dfc0cef0f38c9b861c316e7 Issue of RowSet and Statement each thinking they own the ResultSet, and both calling dispose on it... After this revert, will not happen because RowSet will never generate two ResultSets from the same Statement.) Still needs fixing for all other drivers... Not realistic in a stable branch. - fdo#72696 - fdo#72463 fdo#72163 is now fixed in libreoffice-4-1 by what was originally thought as the belts and suspenders approach, in commit fdo#72163: fix safer way. Change-Id: I7af95aa73f2001989ec3679f58eb455ebfd7eb38 Reviewed-on: https://gerrit.libreoffice.org/7095 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 6a3ba0a..47d7829 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2294,8 +2294,6 @@ sal_Bool ORowSet::impl_initComposer_throw( OUString _out_rCommandToExecute ) _out_rCommandToExecute = m_xComposer-getQueryWithSubstitution(); -m_bCommandFacetsDirty = sal_False; - return bUseEscapeProcessing; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: registry and extension problems on master 4.3 Linux 64bit
On 12/13/2013 07:30 PM, Alex Thurgood wrote: Have there been recent changes to component or extension registration, as I'm seeing this in my master build of today, Linux 64bit : instdir/program/soffice Python exception: class 'AttributeError': 'module' object has no attribute 'writeRegistryInfo', traceback follows /home/Development/libo/core/instdir/program/pythonloader.py:152 in function writeRegistryInfo() [return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )] warn:desktop.deployment:25026:1:desktop/source/deployment/registry/dp_backend.cxx:683: unexpected RuntimeException class 'AttributeError': 'module' object has no attribute 'writeRegistryInfo', traceback follows /home/Development/libo/core/instdir/program/pythonloader.py:152 in function writeRegistryInfo() [return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )] When does that output appear? When starting instdir/program/soffice? What is your autogen.input? I did some modifications on Friday that might have had an impact on this, but cannot reproduce your problem. warn:configmgr:25045:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/Development/libo/core/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu5ro02d.tmp/Addons.xcu warn:configmgr:25045:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/Development/libo/core/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu5ro02d.tmp/Addons.xcu I assume you configured --enable-ext-google-docs? Those are bugs in that extension, which are harmless and ignored, though. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/Library_passive_native.mk
desktop/Library_passive_native.mk |4 1 file changed, 4 insertions(+) New commits: commit e3d62eff008c241d96b1e3745c09fa9cdb1d17fe Author: Stephan Bergmann sberg...@redhat.com Date: Mon Dec 16 10:02:21 2013 +0100 Missing boost_headers Change-Id: I6ad89134dbecf043fc3e07f035b43cb504a4fafb diff --git a/desktop/Library_passive_native.mk b/desktop/Library_passive_native.mk index 2181941..ac2c0bc 100644 --- a/desktop/Library_passive_native.mk +++ b/desktop/Library_passive_native.mk @@ -15,6 +15,10 @@ $(eval $(call gb_Library_add_exception_objects,passive_native, \ $(eval $(call gb_Library_set_componentfile,passive_native,desktop/test/deployment/passive/passive_native)) +$(eval $(call gb_Library_use_externals,passive_native, \ +boost_headers \ +)) + $(eval $(call gb_Library_use_libraries,passive_native, \ cppu \ cppuhelper \ ___ 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/unocore/unocrsrhelper.cxx | 66 +++
1 file changed, 66 insertions(+)
New commits:
commit b39265c9728b52352d13aef5fb6a28540ebc93aa
Author: Adam Co rattles2...@gmail.com
Date: Mon Dec 2 18:47:52 2013 +0200
Add support in the 'makeRedline' function for 'formatting properties'
This patch adds support in the 'makeRedline' function to allow it to
receive from the importer the format changes that were done when
'Track Changes' was turned on.
(Following commit will be for the importer code)
Reviewed on:
https://gerrit.libreoffice.org/6902
Change-Id: Ieb06dcdf15fd39d0ad928795f90146dc2f060e77
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index 0543f65..8783e5a 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1213,8 +1213,74 @@ void makeRedline( SwPaM rPaM,
DateTime( Date( aStamp.Day, aStamp.Month, aStamp.Year ), Time(
aStamp.Hours, aStamp.Minutes, aStamp.Seconds ) ) );
}
+SwRedlineExtraData_FormattingChanges* pRedlineExtraData = NULL;
+
+// Read the 'Redline Revert Properties' from the parameters
+uno::Sequence beans::PropertyValue aRevertProperties;
+uno::Any aRevertPropertiesValue;
+aRevertPropertiesValue =
aPropMap.getUnpackedValueOrDefault(RedlineRevertProperties,
aRevertPropertiesValue);
+
+// Check if the value exists
+if ( aRevertPropertiesValue = aRevertProperties )
+{
+// sw/source/core/unocore/unoport.cxx#83 is where it's decided what
map gets used for a text portion
+// so it's PROPERTY_MAP_TEXTPORTION_EXTENSIONS, unless it's a redline
portion
+SfxItemPropertySet const rPropSet =
(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXTPORTION_EXTENSIONS));
+
+// Check if there are any properties
+if (aRevertProperties.getLength())
+{
+SwDoc *const pDoc = rPaM.GetDoc();
+OUString aUnknownExMsg, aPropertyVetoExMsg;
+
+// Build set of attributes we want to fetch
+std::vectorsal_uInt16 aWhichPairs;
+std::vectorSfxItemPropertySimpleEntry const* aEntries;
+aEntries.reserve(aRevertProperties.getLength());
+for (sal_Int32 i = 0; i aRevertProperties.getLength(); ++i)
+{
+const OUString rPropertyName = aRevertProperties[i].Name;
+SfxItemPropertySimpleEntry const* pEntry =
rPropSet.getPropertyMap().getByName(rPropertyName);
+
+// Queue up any exceptions until the end ...
+if (!pEntry)
+{
+aUnknownExMsg += Unknown property: ' + rPropertyName +
' ;
+break;
+}
+else if (pEntry-nFlags beans::PropertyAttribute::READONLY)
+{
+aPropertyVetoExMsg += Property is read-only: ' +
rPropertyName + ' ;
+break;
+}
+else
+{
+// FIXME: we should have some nice way of merging ranges
surely ?
+aWhichPairs.push_back(pEntry-nWID);
+aWhichPairs.push_back(pEntry-nWID);
+}
+aEntries.push_back(pEntry);
+}
+
+if (!aWhichPairs.empty())
+{
+aWhichPairs.push_back(0); // terminate
+SfxItemSet aItemSet(pDoc-GetAttrPool(), aWhichPairs[0]);
+
+for (size_t i = 0; i aEntries.size(); ++i)
+{
+SfxItemPropertySimpleEntry const*const pEntry =
aEntries[i];
+const uno::Any rValue = aRevertProperties[i].Value;
+rPropSet.setPropertyValue(*pEntry, rValue, aItemSet);
+}
+pRedlineExtraData = new SwRedlineExtraData_FormattingChanges(
aItemSet );
+}
+}
+}
+
SwRedline* pRedline = new SwRedline( aRedlineData, rPaM );
RedlineMode_t nPrevMode = pRedlineAccess-GetRedlineMode( );
+pRedline-SetExtraData( pRedlineExtraData );
pRedlineAccess-SetRedlineMode_intern(nsRedlineMode_t::REDLINE_ON);
bool bRet = pRedlineAccess-AppendRedline( pRedline, false );
___
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/DomainMapper.cxx | 18 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
writerfilter/source/dmapper/PropertyIds.cxx |1 +
writerfilter/source/dmapper/PropertyIds.hxx |1 +
5 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit 75236ba0aa6089dd6bad42cfee627a997a0a4238
Author: Adam Co rattles2...@gmail.com
Date: Tue Dec 3 12:27:28 2013 +0200
DOCX Import of 'run formatting track changes'
This patch adds support for the import of 'run formatting track changes'
in the DOCX filter.
It detects the 'rPrChange'-'rPr' node and stores all the properties
that it processes in the redline object.
Reviewed on:
https://gerrit.libreoffice.org/6908
Change-Id: Ia60d7c2c4cbbad1afb8fd33cfdbd61b2c9433e09
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 26dfa11..4633ced 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3475,6 +3475,24 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
m_pImpl-RemoveCurrentRedline( );
break;
case NS_ooxml::LN_CT_RPrChange_rPr:
+// Push all the current 'Character' properties to the stack, so that
we don't store them
+// as 'tracked changes' by mistake
+m_pImpl-PushProperties(CONTEXT_CHARACTER);
+
+// Resolve all the properties that are under the 'rPrChange'-'rPr'
XML node
+resolveSprmProps(*this, rSprm );
+
+if (m_pImpl-GetTopContext())
+{
+// Get all the properties that were processed in the
'rPrChange'-'rPr' XML node
+uno::Sequence beans::PropertyValue
currentRedlineRevertProperties = m_pImpl-GetTopContext()-GetPropertyValues();
+
+// Store these properties in the current redline object
+m_pImpl-SetCurrentRedlineRevertProperties(
currentRedlineRevertProperties );
+}
+
+// Pop back out the character properties that were on the run
+m_pImpl-PopProperties(CONTEXT_CHARACTER);
break;
case NS_ooxml::LN_object:
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1e4bdf4..502cae5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1566,12 +1566,14 @@ void DomainMapper_Impl::CreateRedline( uno::Reference
text::XTextRange xRange
break;
}
uno::Reference text::XRedline xRedline( xRange,
uno::UNO_QUERY_THROW );
-beans::PropertyValues aRedlineProperties( 2 );
+beans::PropertyValues aRedlineProperties( 3 );
beans::PropertyValue * pRedlineProperties =
aRedlineProperties.getArray( );
pRedlineProperties[0].Name = rPropNameSupplier.GetName(
PROP_REDLINE_AUTHOR );
pRedlineProperties[0].Value = pRedline-m_sAuthor;
pRedlineProperties[1].Name = rPropNameSupplier.GetName(
PROP_REDLINE_DATE_TIME );
pRedlineProperties[1].Value = lcl_DateStringToDateTime(
pRedline-m_sDate );
+pRedlineProperties[2].Name = rPropNameSupplier.GetName(
PROP_REDLINE_REVERT_PROPERTIES );
+pRedlineProperties[2].Value = pRedline-m_aRevertProperties;
xRedline-makeRedline( sType, aRedlineProperties );
}
@@ -3934,6 +3936,12 @@ void DomainMapper_Impl::SetCurrentRedlineToken(
sal_Int32 nToken )
pCurrent-m_nToken = nToken;
}
+void DomainMapper_Impl::SetCurrentRedlineRevertProperties(
uno::Sequencebeans::PropertyValue aProperties )
+{
+RedlineParamsPtr pCurrent( GetTopRedline( ) );
+if ( pCurrent.get( ) )
+pCurrent-m_aRevertProperties = aProperties;
+}
void DomainMapper_Impl::RemoveCurrentRedline( )
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index b13924b..10943c4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -259,6 +259,9 @@ struct RedlineParams
OUString m_sDate;
sal_Int32 m_nId;
sal_Int32 m_nToken;
+
+/// This can hold properties of runs that had formatted 'track changes'
properties
+uno::Sequencebeans::PropertyValue m_aRevertProperties;
};
typedef boost::shared_ptr RedlineParams RedlineParamsPtr;
@@ -675,6 +678,7 @@ public:
void SetCurrentRedlineDate( OUString sDate );
void SetCurrentRedlineId( sal_Int32 nId );
void SetCurrentRedlineToken( sal_Int32 nToken );
+void SetCurrentRedlineRevertProperties(
uno::Sequencebeans::PropertyValue aProperties );
void RemoveCurrentRedline( );
void ResetParaRedline( );
void
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 48 +++
1 file changed, 48 insertions(+)
New commits:
commit 4b53d798394f56b99950d280d6cfd93e65d09ee1
Author: Adam Co rattles2...@gmail.com
Date: Tue Dec 3 12:40:34 2013 +0200
Export redline 'formatting changes' back to DOCX
This patch adds support for the export of any redline 'formatting changes'
properties that were imported from a DOCX file under the
'rPrChange'-'rPr' XML node.
Change-Id: Iffb4ce9f6606013a1f6f937d2e62ef0cf9e015b5
Reviewed-on: https://gerrit.libreoffice.org/6909
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 41aa1a8..b7f06a0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -30,6 +30,7 @@
#include tgrditem.hxx
#include fmtruby.hxx
#include breakit.hxx
+#include redline.hxx
#include comphelper/string.hxx
#include oox/token/tokens.hxx
@@ -1571,6 +1572,53 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedline)
FSNS( XML_w, XML_date ), aDate.getStr(),
FSEND );
+// Check if there is any extra data stored in the redline object
+if (pRedline-GetExtraData())
+{
+const SwRedlineExtraData* pExtraData = pRedline-GetExtraData();
+const SwRedlineExtraData_FormattingChanges* pFormattingChanges =
dynamic_castconst SwRedlineExtraData_FormattingChanges*(pExtraData);
+
+// Check if the extra data is of type 'formatting changes'
+if (pFormattingChanges)
+{
+// Get the item set that holds all the changes properties
+const SfxItemSet *pChangesSet =
pFormattingChanges-GetItemSet();
+if (pChangesSet)
+{
+m_pSerializer-mark();
+
+m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND );
+
+// The 'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList',
'm_pCharLangAttrList' are used to hold information
+// that should be collected by different properties in the
core, and are all flushed together
+// to the DOCX when the function
'WriteCollectedRunProperties' gets called.
+// So we need to store the current status of these lists,
so that we can revert back to them when
+// we are done exporting the redline attributes.
+::sax_fastparser::FastAttributeList
*pFontsAttrList_Original = m_pFontsAttrList;
+::sax_fastparser::FastAttributeList
*pEastAsianLayoutAttrList_Original = m_pEastAsianLayoutAttrList;
+::sax_fastparser::FastAttributeList
*pCharLangAttrList_Original= m_pCharLangAttrList;
+m_pFontsAttrList = NULL;
+m_pEastAsianLayoutAttrList = NULL;
+m_pCharLangAttrList= NULL;
+
+// Output the redline item set
+m_rExport.OutputItemSet( *pChangesSet, false, true,
i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
+
+// Write the collected run properties that are stored in
'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
+WriteCollectedRunProperties();
+
+// Revert back the original values that were stored in
'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
+m_pFontsAttrList = pFontsAttrList_Original;
+m_pEastAsianLayoutAttrList =
pEastAsianLayoutAttrList_Original;
+m_pCharLangAttrList= pCharLangAttrList_Original;
+
+m_pSerializer-endElementNS( XML_w, XML_rPr );
+
+m_pSerializer-mergeTopMarks(
sax_fastparser::MERGE_MARKS_PREPEND );
+}
+}
+}
+
m_pSerializer-endElementNS( XML_w, XML_rPrChange );
break;
___
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/docnode/nodedump.cxx | 31 ++-
1 file changed, 22 insertions(+), 9 deletions(-)
New commits:
commit 0aab035de49f4bc061a6a71d0500c8b8a79c1248
Author: Adam Co rattles2...@gmail.com
Date: Sun Dec 8 15:54:33 2013 +0200
Add 'redline - paragraph index' to XML node dump
This change adds an output of the 'redline paragraph index' when dumping the
data model to an XML. It also changes the way the paragraph text is dumped
to the XML (it is better viewed in the XML this way).
Conflicts:
sw/source/core/docnode/nodedump.cxx
Reviewed on:
https://gerrit.libreoffice.org/6990
Change-Id: I176270047bb4be838972117add5f3588b5573cfe
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 76f2217..6696c1d 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -381,7 +381,9 @@ void SwTxtNode::dumpAsXml( xmlTextWriterPtr w )
for( int i = 0; i 32; ++i )
txt = txt.replace( i, '*' );
OString txt8 = OUStringToOString( txt, RTL_TEXTENCODING_UTF8 );
+writer.startElement(inner_text);
xmlTextWriterWriteString( writer, BAD_CAST( txt8.getStr()));
+writer.endElement( );
if (GetFmtColl())
{
@@ -485,7 +487,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
{
const SwPosition* pStart = pRedline-Start();
-writer.startElement( start_swposition );
+writer.startElement( swposition_start );
//writer.writeFormatAttribute( ptr, %p, pStart );
{
const SwNodeIndex pStartNodeIndex = pStart-nNode;
@@ -499,16 +501,18 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
//writer.endElement( );// swnode
writer.writeFormatAttribute( swnode_type, TMP_FORMAT,
pStartSwNode.GetNodeType() );
+writer.writeFormatAttribute( paragraph_index, %d,
(int)pStartNodeIndex.GetIndex() );
+
const SwIndexpStartContent = pStart-nContent;
//writer.startElement( swindex );
//writer.writeFormatAttribute( ptr, %p, pStartContent
);
//writer.writeFormatAttribute( content_index, %d,
pStartContent.GetIndex() );
//writer.endElement( );// swindex
-writer.writeFormatAttribute( swindex_content_index,
TMP_FORMAT_I32, pStartContent.GetIndex() );
+writer.writeFormatAttribute( character_index,
TMP_FORMAT_I32, pStartContent.GetIndex() );
}
//writer.endElement( );// swnodeindex
}
-writer.endElement( );// start_swposition
+writer.endElement( );// swposition_start
const SwPosition* pEnd;
@@ -525,7 +529,7 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
pEnd = pRedline-GetPoint();
}
-writer.startElement( end___swposition );
+writer.startElement( swposition_end );
//writer.writeFormatAttribute( ptr, %p, pStart );
{
const SwNodeIndex pEndNodeIndex = pEnd-nNode;
@@ -539,26 +543,35 @@ void SwRedlineTbl::dumpAsXml( xmlTextWriterPtr w )
//writer.endElement( );// swnode
writer.writeFormatAttribute( swnode_type, TMP_FORMAT,
pEndSwNode.GetNodeType() );
+writer.writeFormatAttribute( paragraph_index, %d,
(int)pEndNodeIndex.GetIndex() );
+
const SwIndexpEndContent = pEnd-nContent;
//writer.startElement( swindex );
//writer.writeFormatAttribute( ptr, %p, pEndContent );
//writer.writeFormatAttribute( content_index, %d,
pEndContent.GetIndex() );
//writer.endElement( );// swindex
-writer.writeFormatAttribute( swindex_content_index,
TMP_FORMAT_I32, pEndContent.GetIndex() );
+writer.writeFormatAttribute( character_index,
TMP_FORMAT_I32, pEndContent.GetIndex() );
}
//writer.endElement( );// swnodeindex
}
writer.writeFormatAttribute( end_is, %s, BAD_CAST(bEndIsMark ?
mark : point));
-writer.endElement( );// end_swposition
+writer.endElement( );// swposition_end
//const SwRedlineData aRedlineData = pRedline-GetRedlineData();
const SwRedlineExtraData* pExtraRedlineData =
pRedline-GetExtraData();
writer.startElement( extra_redline_data );
{
-if (pExtraRedlineData == NULL)
-writer.writeFormatAttribute( data, %s, BAD_CAST(
none ) );
+const SwRedlineExtraData_FmtColl* pExtraData_FmtColl
= dynamic_castconst
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |7 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 36 +++---
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 12 +++
3 files changed, 28 insertions(+), 27 deletions(-)
New commits:
commit f02abd7182493e786377fe324c97572af39c0a9f
Author: Adam Co rattles2...@gmail.com
Date: Sun Dec 8 16:52:07 2013 +0200
Changed 'Para Change' to 'Para Marker Change' in DOCX importer
This cosmetic change in function names is in order to better reflect
the purpose of these functions and variables.
They do NOT represent a change in the paragraph itself.
Change-Id: I8792ef5b43453d16ce5238906593ca2d5ac87a29
Reviewed-on: https://gerrit.libreoffice.org/6991
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4633ced..ff90bc5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3453,7 +3453,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
}
break;
case NS_ooxml::LN_paratrackchange:
-m_pImpl-StartParaChange( );
+m_pImpl-StartParaMarkerChange( );
case NS_ooxml::LN_trackchange:
case NS_ooxml::LN_EG_RPrContent_rPrChange:
{
@@ -3465,10 +3465,11 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
{
case ooxml::OOXML_mod :
case ooxml::OOXML_ins :
-case ooxml::OOXML_del : break;
+case ooxml::OOXML_del :
+break;
default: OSL_FAIL( redline token other than mod, ins or del );
}
-m_pImpl-EndParaChange( );
+m_pImpl-EndParaMarkerChange( );
}
break;
case NS_ooxml::LN_endtrackchange:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 502cae5..07d7df2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -162,7 +162,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bLineNumberingSet( false ),
m_bIsInFootnoteProperties( false ),
m_bIsCustomFtnMark( false ),
-m_bIsParaChange( false ),
+m_bIsParaMarkerChange( false ),
m_bParaChanged( false ),
m_bIsFirstParaInSection( true ),
m_bIsLastParaInSection( false ),
@@ -1136,7 +1136,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
xCur-gotoEnd( false );
xCur-goLeft( 1 , true );
uno::Reference text::XTextRange xParaEnd( xCur,
uno::UNO_QUERY );
-CheckParaRedline( xParaEnd );
+CheckParaMarkerRedline( xParaEnd );
m_bIsFirstParaInSection = false;
m_bIsLastParaInSection = false;
@@ -1584,12 +1584,12 @@ void DomainMapper_Impl::CreateRedline( uno::Reference
text::XTextRange xRange
}
}
-void DomainMapper_Impl::CheckParaRedline( uno::Reference text::XTextRange
xRange )
+void DomainMapper_Impl::CheckParaMarkerRedline( uno::Reference
text::XTextRange xRange )
{
-if ( m_pParaRedline.get( ) )
+if ( m_pParaMarkerRedline.get( ) )
{
-CreateRedline( xRange, m_pParaRedline );
-ResetParaRedline( );
+CreateRedline( xRange, m_pParaMarkerRedline );
+ResetParaMarkerRedline( );
}
}
@@ -1611,14 +1611,14 @@ void DomainMapper_Impl::CheckRedline( uno::Reference
text::XTextRange xRange
m_aRedlines.top().swap( aCleaned );
}
-void DomainMapper_Impl::StartParaChange( )
+void DomainMapper_Impl::StartParaMarkerChange( )
{
-m_bIsParaChange = true;
+m_bIsParaMarkerChange = true;
}
-void DomainMapper_Impl::EndParaChange( )
+void DomainMapper_Impl::EndParaMarkerChange( )
{
-m_bIsParaChange = false;
+m_bIsParaMarkerChange = false;
}
@@ -3863,23 +3863,23 @@ void DomainMapper_Impl::AddNewRedline( )
{
RedlineParamsPtr pNew( new RedlineParams );
pNew-m_nToken = ooxml::OOXML_mod;
-if ( !m_bIsParaChange )
+if ( !m_bIsParaMarkerChange )
{
m_aRedlines.top().push_back( pNew );
}
else
{
-m_pParaRedline.swap( pNew );
+m_pParaMarkerRedline.swap( pNew );
}
}
RedlineParamsPtr DomainMapper_Impl::GetTopRedline( )
{
RedlineParamsPtr pResult;
-if ( !m_bIsParaChange m_aRedlines.top().size( ) 0 )
+if ( !m_bIsParaMarkerChange m_aRedlines.top().size( ) 0 )
pResult = m_aRedlines.top().back( );
-else if ( m_bIsParaChange )
-pResult = m_pParaRedline;
+else if ( m_bIsParaMarkerChange )
+pResult = m_pParaMarkerRedline;
return pResult;
}
@@ -3952,12 +3952,12 @@ void
[Libreoffice-commits] core.git: oox/source writerfilter/source
oox/source/token/tokens.txt |1
writerfilter/source/dmapper/DomainMapper.cxx | 28 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 +++-
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
5 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit ae7f8bed4bc4d7490a158c14d077c5323bd50466
Author: Adam Co rattles2...@gmail.com
Date: Sun Dec 8 16:56:21 2013 +0200
DOCX Import of 'paragraph formatting track changes'
This patch adds support for the import of 'paragraph formatting
track changes' in the DOCX filter.
It detects the 'pPrChange'-'pPr' node and stores all the properties
that it processes in the redline object.
Change-Id: I3cce83dad4d46c2216ca36393b6572f0fc9d2ed7
Reviewed-on: https://gerrit.libreoffice.org/6992
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index fbdd2fc..ca7f69e 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -280,6 +280,7 @@ Override
Page
Pages
ParagraphAlign
+ParagraphFormat
Paragraphs
PartName
PasswordChar
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ff90bc5..5b38153 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3454,10 +3454,17 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break;
case NS_ooxml::LN_paratrackchange:
m_pImpl-StartParaMarkerChange( );
+case NS_ooxml::LN_CT_PPr_pPrChange:
case NS_ooxml::LN_trackchange:
case NS_ooxml::LN_EG_RPrContent_rPrChange:
{
m_pImpl-AddNewRedline( );
+
+if (nSprmId == NS_ooxml::LN_CT_PPr_pPrChange)
+{
+m_pImpl-SetCurrentRedlineToken( ooxml::OOXML_ParagraphFormat );
+}
+
resolveSprmProps(*this, rSprm );
// now the properties author, date and id should be available
sal_Int32 nToken = m_pImpl-GetCurrentRedlineToken();
@@ -3466,6 +3473,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case ooxml::OOXML_mod :
case ooxml::OOXML_ins :
case ooxml::OOXML_del :
+case ooxml::OOXML_ParagraphFormat :
break;
default: OSL_FAIL( redline token other than mod, ins or del );
}
@@ -3495,6 +3503,26 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
// Pop back out the character properties that were on the run
m_pImpl-PopProperties(CONTEXT_CHARACTER);
break;
+case NS_ooxml::LN_CT_PPrChange_pPr:
+// Push all the current 'Paragraph' properties to the stack, so that
we don't store them
+// as 'tracked changes' by mistake
+m_pImpl-PushProperties(CONTEXT_PARAGRAPH);
+
+// Resolve all the properties that are under the 'pPrChange'-'pPr'
XML node
+resolveSprmProps(*this, rSprm );
+
+if (m_pImpl-GetTopContext())
+{
+// Get all the properties that were processed in the
'pPrChange'-'pPr' XML node
+uno::Sequence beans::PropertyValue
currentRedlineRevertProperties = m_pImpl-GetTopContext()-GetPropertyValues();
+
+// Store these properties in the current redline object
+m_pImpl-SetCurrentRedlineRevertProperties(
currentRedlineRevertProperties );
+}
+
+// Pop back out the character properties that were on the run
+m_pImpl-PopProperties(CONTEXT_PARAGRAPH);
+break;
case NS_ooxml::LN_object:
{
writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 07d7df2..f726ed0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1564,6 +1564,9 @@ void DomainMapper_Impl::CreateRedline( uno::Reference
text::XTextRange xRange
case ooxml::OOXML_del:
sType = rPropNameSupplier.GetName( PROP_DELETE );
break;
+case ooxml::OOXML_ParagraphFormat:
+sType = rPropNameSupplier.GetName( PROP_PARAGRAPH_FORMAT );
+break;
}
uno::Reference text::XRedline xRedline( xRange,
uno::UNO_QUERY_THROW );
beans::PropertyValues aRedlineProperties( 3 );
@@ -1602,8 +1605,9 @@ void DomainMapper_Impl::CheckRedline( uno::Reference
text::XTextRange xRange
CreateRedline( xRange, *pIt );
// Adding the non-mod redlines to the temporary vector
-if ( pIt-get( ) ( ( *pIt )-m_nToken 0x ) !=
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Ceri Mitchell cmitch...@ad-holdings.co.uk changed: What|Removed |Added Depends on||72645 --- Comment #126 from Ceri Mitchell cmitch...@ad-holdings.co.uk --- I nominate bug 72645 Function GETPIVOTDATA does not work as it did upto 4.0.6 -- 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 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #127 from Ceri Mitchell cmitch...@ad-holdings.co.uk --- I nominate Bug 72645 GETPIVOTDATA does not work as it did up to 4.0.6 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - desktop/Extension_test-active.mk desktop/Jar_active_java.mk desktop/Library_active_native.mk desktop/Module_desktop.mk desktop/test include/sal Repository.m
Repository.mk |2 desktop/Extension_test-active.mk | 23 ++ desktop/Jar_active_java.mk | 28 ++ desktop/Library_active_native.mk | 28 ++ desktop/Module_desktop.mk |8 desktop/test/deployment/active/Dispatch.java | 95 -- desktop/test/deployment/active/META-INF/manifest.xml | 34 +++ desktop/test/deployment/active/Provider.java | 74 --- desktop/test/deployment/active/Services.java | 65 -- desktop/test/deployment/active/active_native.cxx |2 desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java | 95 ++ desktop/test/deployment/active/com/sun/star/comp/test/deployment/Provider.java | 74 +++ desktop/test/deployment/active/com/sun/star/comp/test/deployment/Services.java | 65 ++ desktop/test/deployment/active/makefile.mk | 78 desktop/test/deployment/active/manifest.xml | 34 --- include/sal/log-areas.dox |1 solenv/gbuild/Extension.mk |1 17 files changed, 360 insertions(+), 347 deletions(-) New commits: commit 1327020b6723ef988fe4e8399a87ce70e21419d7 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Dec 16 11:23:54 2013 +0100 Re-enable building test-active.oxt Change-Id: I56bd0630f8d238488d9d6598d87acefe1a08fdf0 diff --git a/Repository.mk b/Repository.mk index d4a103c..3362b71 100644 --- a/Repository.mk +++ b/Repository.mk @@ -630,6 +630,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ + active_native \ mysqlc \ passive_native \ )) @@ -676,6 +677,7 @@ $(eval $(call gb_Helper_register_jars,OOO, \ $(eval $(call gb_Helper_register_jars,OXT, \ EvolutionarySolver \ + active_java \ mediawiki \ nlpsolver \ passive_java \ diff --git a/desktop/Extension_test-active.mk b/desktop/Extension_test-active.mk new file mode 100644 index 000..fbb329f --- /dev/null +++ b/desktop/Extension_test-active.mk @@ -0,0 +1,23 @@ +# -*- 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_Extension_Extension,test-active,desktop/test/deployment/active,nodeliver)) + +$(eval $(call gb_Extension_add_files,test-active,, \ +$(SRCDIR)/desktop/test/deployment/active/Addons.xcu \ +$(SRCDIR)/desktop/test/deployment/active/ProtocolHandler.xcu \ +$(SRCDIR)/desktop/test/deployment/active/active_python.py \ +$(call gb_Jar_get_target,active_java) \ +)) + +$(eval $(call gb_Extension_add_libraries,test-active, \ +active_native \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk new file mode 100644 index 000..5fa49e84 --- /dev/null +++ b/desktop/Jar_active_java.mk @@ -0,0 +1,28 @@ +# -*- 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_Jar_Jar,active_java)) + +$(eval $(call gb_Jar_add_sourcefiles,active_java, \ +desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch \ +desktop/test/deployment/active/com/sun/star/comp/test/deployment/Provider \ +desktop/test/deployment/active/com/sun/star/comp/test/deployment/Services \ +)) + +$(eval $(call gb_Jar_set_manifest,active_java,$(SRCDIR)/desktop/test/deployment/active/MANIFEST.MF)) + +$(eval $(call gb_Jar_set_packageroot,active_java,com)) + +$(eval $(call gb_Jar_use_jars,active_java, \ +juh \ +ridl \ +unoil \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Library_active_native.mk b/desktop/Library_active_native.mk new file mode 100644 index 000..7c09c10 --- /dev/null +++ b/desktop/Library_active_native.mk @@ -0,0 +1,28 @@ +# -*- 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.
[Libreoffice-commits] core.git: 2 commits - fpicker/Module_fpicker.mk fpicker/source fpicker/uiconfig fpicker/UIConfig_fps.mk include/svtools
fpicker/Module_fpicker.mk |1
fpicker/UIConfig_fps.mk| 16 +++
fpicker/source/office/OfficeFilePicker.hrc |2
fpicker/source/office/QueryFolderName.hxx | 46 +
fpicker/source/office/iodlg.cxx| 56
fpicker/source/office/iodlg.hrc|9 -
fpicker/source/office/iodlg.src| 45 -
fpicker/uiconfig/ui/foldernamedialog.ui| 135 +
include/svtools/QueryFolderName.hxx| 57
9 files changed, 220 insertions(+), 147 deletions(-)
New commits:
commit 53a3a31cf14ac35345c58553bc259130e1e70711
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 10:36:06 2013 +
move this QueryFolderName into fpicker
Change-Id: I1b7b26ceef86e0dcc642d760b8413a822c125a2b
diff --git a/include/svtools/QueryFolderName.hxx
b/fpicker/source/office/QueryFolderName.hxx
similarity index 78%
rename from include/svtools/QueryFolderName.hxx
rename to fpicker/source/office/QueryFolderName.hxx
index 6f5381e..2984f35 100644
--- a/include/svtools/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX
-#define INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX
+#ifndef INCLUDED_QUERYFOLDERNAME_HXX
+#define INCLUDED_QUERYFOLDERNAME_HXX
#include vcl/fixed.hxx
#include vcl/button.hxx
@@ -25,13 +25,6 @@
#include vcl/dialog.hxx
#include vcl/layout.hxx
-//-
-namespace svtools {
-
-//-
-// QueryFolderNameDialog
-//-
-
class QueryFolderNameDialog : public ModalDialog
{
private:
@@ -48,7 +41,6 @@ public:
OUString GetName() const { return m_pNameEdit-GetText(); }
};
-}
-#endif // INCLUDED_SVTOOLS_QUERYFOLDERNAME_HXX
+#endif // INCLUDED_QUERYFOLDERNAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index face054..0e5b467 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -49,7 +49,7 @@
#include iodlgimp.hxx
#include svtools/inettbc.hxx
#include unotools/syslocale.hxx
-#include svtools/QueryFolderName.hxx
+#include QueryFolderName.hxx
#include rtl/ustring.hxx
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/ucb/UniversalContentBroker.hpp
@@ -773,7 +773,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl,
PushButton*, EMPTYARG )
SmartContent aContent( pThis-_pFileView-GetViewURL( ) );
OUString aTitle;
aContent.getTitle( aTitle );
-svtools::QueryFolderNameDialog aDlg( pThis, aTitle,
SVT_RESSTR(STR_SVT_NEW_FOLDER) );
+QueryFolderNameDialog aDlg( pThis, aTitle, SVT_RESSTR(STR_SVT_NEW_FOLDER)
);
sal_Bool bHandled = sal_False;
while ( !bHandled )
@@ -3332,10 +3332,6 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl )
return 0;
}
-// QueryFolderNameDialog
---
-
-namespace svtools {
-
QueryFolderNameDialog::QueryFolderNameDialog(Window* _pParent,
const OUString rTitle, const OUString rDefaultText, OUString* pGroupName)
: ModalDialog(_pParent, FolderNameDialog, fps/ui/foldernamedialog.ui)
@@ -3382,6 +3378,4 @@ IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl)
return 0;
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ae22d6388827958cfd89cd702b8c3c41ff9821e5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 10:27:27 2013 +
convert query folder dialog to .ui
Change-Id: I844b45b4cc9834550d0d187dfdbc69686e512e5d
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 9134398..573d76c 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,fpicker))
$(eval $(call gb_Module_add_targets,fpicker,\
Library_fps_office \
+ UIConfig_fps \
))
$(eval $(call gb_Module_add_l10n_targets,fpicker,\
diff --git a/fpicker/UIConfig_fps.mk b/fpicker/UIConfig_fps.mk
new file mode 100644
index 000..c18b90c
--- /dev/null
+++ b/fpicker/UIConfig_fps.mk
@@ -0,0 +1,16 @@
+# -*- 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_UIConfig_UIConfig,fps))
+
+$(eval $(call gb_UIConfig_add_uifiles,fps,\
+ fpicker/uiconfig/ui/foldernamedialog \
+))
+
+# vim: set noet sw=4
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0351b59aea2b87c2685c0963a57145bdc75a7a86 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 10:42:28 2013 + Updated core Project: help 0bbe85ad404d96d7b3a994b0c5bd82e931c88c98 diff --git a/helpcontent2 b/helpcontent2 index 392217f..0bbe85a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 392217fbe5d2432d2834e4593457cb2d236b99dd +Subproject commit 0bbe85ad404d96d7b3a994b0c5bd82e931c88c98 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 0bbe85ad404d96d7b3a994b0c5bd82e931c88c98 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 10:42:28 2013 + drop unused helpids Change-Id: Id761a2bd14b18c5a1faf862efc1b14f4174a3e1b diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 31bdf29..27b2856 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5978,7 +5978,6 @@ fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_PASSWORD,1334641705, fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_READONLY,1334641704, fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_OPTIONS,1334641707, fpicker_Edit_DLG_SVT_EXPLORERFILE_ED_EXPLORERFILE_FILENAME,1334642719, -fpicker_Edit_DLG_SVT_QUERYFOLDERNAME_ED_SVT_QUERYFOLDERNAME_DLG_NAME,1334659083, fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_DETAILSVIEW,1334652429, fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LISTVIEW,1334652428, fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER,1334652427, @@ -5986,7 +5985,6 @@ fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE,1334644259, fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_SHARED_LISTBOX,1334644257, fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD,1334652943, fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP,1334652942, -fpicker_ModalDialog_DLG_SVT_QUERYFOLDERNAME,1334657024, fpicker_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN,1334645264, framework_MultiLineEdit_DLG_LICENSE_ML_LICENSE,1077938699, framework_PushButton_DLG_LICENSE_PB_ACCEPT,1077940759, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH 2/5] cmake: Use target export feature
This eliminates the need for a Findcppunit.cmake script in projects
needing the cppunit library. The project configuration files are
installed along with the library itself and provide information about
where to find the library and how to use it.
A prominent example of this method are the Qt5 libraries, which are
shipping CMake project configuration files by default.
Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de
---
CMakeLists.txt| 5 -
cmake/ExportTargets.cmake | 40 +
cppunitConfig.cmake.in| 46 +++
cppunitConfigVersion.cmake.in | 29 +++
src/cppunit/CMakeLists.txt| 1 +
5 files changed, 120 insertions(+), 1 deletion(-)
create mode 100644 cmake/ExportTargets.cmake
create mode 100644 cppunitConfig.cmake.in
create mode 100644 cppunitConfigVersion.cmake.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c61228f..3b011b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ include(Versioning)
# Build options
option(BUILD_SHARED_LIBS Build cppunit as shared or static library ON)
-if(BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS AND WIN32)
add_definitions(-DCPPUNIT_BUILD_DLL)
endif()
@@ -43,3 +43,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
# Subdirectories
add_subdirectory(include)
add_subdirectory(src)
+
+# Export targets
+include(ExportTargets)
diff --git a/cmake/ExportTargets.cmake b/cmake/ExportTargets.cmake
new file mode 100644
index 000..7282aab
--- /dev/null
+++ b/cmake/ExportTargets.cmake
@@ -0,0 +1,40 @@
+#=
+# CppUnit - The C++ Unit Test Library
+# Copyright (c) 2013 - The Document Foundation
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#=
+
+# Export targets
+if(WIN32 AND NOT CYGWIN)
+set(INSTALL_CMAKE_DIR CMake)
+else()
+set(INSTALL_CMAKE_DIR lib/cmake/cppunit)
+endif()
+
+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR
+${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}
+${CMAKE_INSTALL_PREFIX}/include)
+configure_file(cppunitConfig.cmake.in
+${PROJECT_BINARY_DIR}/cppunitConfig.cmake @ONLY)
+configure_file(cppunitConfigVersion.cmake.in
+${PROJECT_BINARY_DIR}/cppunitConfigVersion.cmake @ONLY)
+
+install(FILES
+${PROJECT_BINARY_DIR}/cppunitConfig.cmake
+${PROJECT_BINARY_DIR}/cppunitConfigVersion.cmake
+DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT dev)
+
+install(EXPORT cppunitLibraryDepends DESTINATION ${INSTALL_CMAKE_DIR})
diff --git a/cppunitConfig.cmake.in b/cppunitConfig.cmake.in
new file mode 100644
index 000..23e7cae
--- /dev/null
+++ b/cppunitConfig.cmake.in
@@ -0,0 +1,46 @@
+#=
+# CppUnit - The C++ Unit Test Library
+# Copyright (c) 2013 - The Document Foundation
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#=
+#
+# - CMake config file for cppunit
+# It defines the following variables
+# CPPUNIT_INCLUDE_DIRS - include directories for cppunit
+# CPPUNIT_LIBRARY - the cppunit base library
+# CPPUNIT_LIBRARIES- all of the cppunit libraries to link against
+# CPPUNIT_FOUND- the cppunit library has been found
+
+if(NOT TARGET cppunit AND NOT cppunit_BINARY_DIR)
+# Compute paths
+get_filename_component(CPPUNIT_CMAKE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+
[PATCH 4/5] doc: Add support for generating the API documentation
Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de
---
CMakeLists.txt | 7 +-
doc/CMakeLists.txt | 59 ++
doc/Doxyfile.in| 558 +++--
3 files changed, 346 insertions(+), 278 deletions(-)
create mode 100644 doc/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b011b4..b6b40a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,8 @@ include(PlatformChecks)
include(Versioning)
# Build options
-option(BUILD_SHARED_LIBS Build cppunit as shared or static library ON)
+option(BUILD_SHARED_LIBSBuild cppunit as shared or static library
ON)
+option(CPPUNIT_BUILD_APIDOC Adds a build target for generating the API
documentation OFF)
if(BUILD_SHARED_LIBS AND WIN32)
add_definitions(-DCPPUNIT_BUILD_DLL)
@@ -44,5 +45,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
add_subdirectory(include)
add_subdirectory(src)
+if(CPPUNIT_BUILD_APIDOC)
+add_subdirectory(doc)
+endif()
+
# Export targets
include(ExportTargets)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 000..238716b
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,59 @@
+#=
+# CppUnit - The C++ Unit Test Library
+# Copyright (c) 2013 - The Document Foundation
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#=
+
+# doxygen targets
+find_package(LATEX)
+find_package(Doxygen REQUIRED)
+
+# Add build options
+option(CPPUNIT_BUILD_APIDOC_ALWAYS Always builds the documentation when
buildingOFF)
+option(CPPUNIT_INSTALL_APIDOC Installs the doxygen-generated
documentation OFF)
+if(LATEX_COMPILER)
+option(CPPUNIT_BUILD_APIDOC_LATEX Generate LaTex API documentation
OFF)
+endif()
+
+if(CPPUNIT_BUILD_APIDOC_LATEX)
+set(_CPPUNIT_GENERATE_LATEX YES CACHE INTERNAL Variable for Doxyfile)
+else()
+set(_CPPUNIT_GENERATE_LATEX NO CACHE INTERNAL Variable for Doxyfile)
+endif()
+
+if(DOXYGEN_DOT_FOUND)
+set(_CPPUNIT_USE_DOT YES CACHE INTERNAL Variable for using the Graphviz
dot tool)
+else()
+set(_CPPUNIT_USE_DOT NO CACHE INTERNAL Variable for using the Graphviz
dot tool)
+endif()
+
+# Setup config files
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+ ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+
+if(CPPUNIT_BUILD_APIDOC_ALWAYS)
+set(_cppunit_apidoc_all ALL)
+endif()
+
+add_custom_target(apidoc ${_cppunit_apidoc_all}
+COMMAND ${DOXYGEN_EXECUTABLE}
+${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+WORKING_DIRECTORY ${cppunit_SOURCE_DIR}
+COMMENT Generating HTML documentation)
+
+if(CPPUNIT_INSTALL_APIDOC)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cppunit DESTINATION
share/doc)
+endif()
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 4398a64..f33e683 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -11,201 +11,201 @@
# General configuration options
#---
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
PROJECT_NAME = CppUnit
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER= Version @VERSION@
+PROJECT_NUMBER= Version @CPPUNIT_VERSION@
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be
[PATCH 1/5] Add CMake build system for cppunit library
Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de
---
CMakeLists.txt | 45 ++
cmake/CheckCXXSourcefileCompiles.cmake | 99 ++
cmake/CheckCXXTypeExists.cmake | 35
cmake/CheckCXXTypeExists.cpp.in| 6 ++
cmake/PlatformChecks.cmake | 139 +++
cmake/Versioning.cmake | 47 +++
cmake/have_casts.cpp | 25 ++
cmake/have_namespaces.cpp | 32 +++
cmake/have_rtti.cpp| 28 +++
cmake/string_compare_signature.cpp | 30 +++
include/CMakeLists.txt | 23 ++
include/config-auto.h.in | 147 +
include/cppunit/TestAssert.h | 2 +-
src/CMakeLists.txt | 20 +
src/cppunit/CMakeLists.txt | 105 +++
15 files changed, 782 insertions(+), 1 deletion(-)
create mode 100644 CMakeLists.txt
create mode 100644 cmake/CheckCXXSourcefileCompiles.cmake
create mode 100644 cmake/CheckCXXTypeExists.cmake
create mode 100644 cmake/CheckCXXTypeExists.cpp.in
create mode 100644 cmake/PlatformChecks.cmake
create mode 100644 cmake/Versioning.cmake
create mode 100644 cmake/have_casts.cpp
create mode 100644 cmake/have_namespaces.cpp
create mode 100644 cmake/have_rtti.cpp
create mode 100644 cmake/string_compare_signature.cpp
create mode 100644 include/CMakeLists.txt
create mode 100644 include/config-auto.h.in
create mode 100644 src/CMakeLists.txt
create mode 100644 src/cppunit/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000..c61228f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,45 @@
+#=
+# CppUnit - The C++ Unit Test Library
+# Copyright (c) 2013 - The Document Foundation
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#=
+
+project(cppunit C CXX)
+cmake_minimum_required(VERSION 2.8.7)
+
+# Add project specific CMake module path
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+# Perform platform and compiler feature checks
+include(PlatformChecks)
+
+# Versioning
+include(Versioning)
+
+# Build options
+option(BUILD_SHARED_LIBS Build cppunit as shared or static library ON)
+
+if(BUILD_SHARED_LIBS)
+add_definitions(-DCPPUNIT_BUILD_DLL)
+endif()
+
+# Include paths
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
+# Subdirectories
+add_subdirectory(include)
+add_subdirectory(src)
diff --git a/cmake/CheckCXXSourcefileCompiles.cmake
b/cmake/CheckCXXSourcefileCompiles.cmake
new file mode 100644
index 000..9e7a351
--- /dev/null
+++ b/cmake/CheckCXXSourcefileCompiles.cmake
@@ -0,0 +1,99 @@
+# - Check if given C++ source in the specified file compiles and links into an
executable
+# CHECK_CXX_SOURCEFILE_COMPILES(file var [FAIL_REGEX fail-regex])
+# file - source file to try to compile, must define 'main'
+# var- variable to store whether the source code compiled
+# fail-regex - fail if test output matches this regex
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+# CMAKE_REQUIRED_FLAGS = string of compile command line flags
+# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+# CMAKE_REQUIRED_INCLUDES = list of include directories
+# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+#
+# Original implementation by:
+#=
+# Copyright 2005-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+#
+# This macro overwrites the original macro shipped with the CMake distribution
in a way that
+#
[PATCH 5/5] src: Fix build with Borland C++ compiler
Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de --- src/cppunit/PlugInManager.cpp | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp index 4f8b371..0ebe4c5 100644 --- a/src/cppunit/PlugInManager.cpp +++ b/src/cppunit/PlugInManager.cpp @@ -1,6 +1,10 @@ #include cppunit/config/SourcePrefix.h #include cppunit/XmlOutputterHook.h -#include stdint.h +#include cppunit/config-auto.h + +#ifdef CPPUNIT_HAVE_STDINT_H +#include stdint.h +#endif #if !defined(CPPUNIT_NO_TESTPLUGIN) #include cppunit/extensions/TestFactoryRegistry.h @@ -8,6 +12,9 @@ #include cppunit/plugin/TestPlugIn.h #include cppunit/plugin/DynamicLibraryManager.h +#ifndef CPPUNIT_HAVE_STDINT_H +typedef unsigned int* uintptr_t; +#endif CPPUNIT_NS_BEGIN -- 1.8.3.2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 0/5] Add CMake build system
This patchset introduces a CMake based build system for building the CppUnit libraries on different platforms and compilers. The following compilers/platforms were tested: - Windows 7 (x86_64): * MinGW 4.8.1 * MSVC Professional 2013 * MSVC Express 2012 * Borland C++ Compiler 5.5.1 - Windows XP: * MSVC Express 2010 -Linux (Ubuntu 13.10 amd64) * GCC 4.8.0 Please note that currently only the cppunit _library_ and nothing else is built. Support for the examples and platform specific test runners is currently in development. Bernhard Sessler (5): Add CMake build system for cppunit library cmake: Use target export feature include: Let the build system handle detecting the features doc: Add support for generating the API documentation src: Fix build with Borland C++ compiler CMakeLists.txt | 53 cmake/CheckCXXSourcefileCompiles.cmake | 99 ++ cmake/CheckCXXTypeExists.cmake | 35 +++ cmake/CheckCXXTypeExists.cpp.in| 6 + cmake/ExportTargets.cmake | 40 +++ cmake/PlatformChecks.cmake | 145 + cmake/Versioning.cmake | 47 +++ cmake/have_casts.cpp | 25 ++ cmake/have_default_template_args.cpp | 35 +++ cmake/have_namespaces.cpp | 32 ++ cmake/have_rtti.cpp| 28 ++ cmake/string_compare_signature.cpp | 30 ++ cppunitConfig.cmake.in | 46 +++ cppunitConfigVersion.cmake.in | 29 ++ doc/CMakeLists.txt | 59 doc/Doxyfile.in| 558 + include/CMakeLists.txt | 23 ++ include/config-auto.h.in | 150 + include/cppunit/Portability.h | 22 +- include/cppunit/TestAssert.h | 2 +- include/cppunit/config/config-bcb5.h | 47 --- include/cppunit/config/config-evc4.h | 57 include/cppunit/config/config-msvc6.h | 64 src/CMakeLists.txt | 20 ++ src/cppunit/CMakeLists.txt | 106 +++ src/cppunit/PlugInManager.cpp | 9 +- 26 files changed, 1308 insertions(+), 459 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 cmake/CheckCXXSourcefileCompiles.cmake create mode 100644 cmake/CheckCXXTypeExists.cmake create mode 100644 cmake/CheckCXXTypeExists.cpp.in create mode 100644 cmake/ExportTargets.cmake create mode 100644 cmake/PlatformChecks.cmake create mode 100644 cmake/Versioning.cmake create mode 100644 cmake/have_casts.cpp create mode 100644 cmake/have_default_template_args.cpp create mode 100644 cmake/have_namespaces.cpp create mode 100644 cmake/have_rtti.cpp create mode 100644 cmake/string_compare_signature.cpp create mode 100644 cppunitConfig.cmake.in create mode 100644 cppunitConfigVersion.cmake.in create mode 100644 doc/CMakeLists.txt create mode 100644 include/CMakeLists.txt create mode 100644 include/config-auto.h.in delete mode 100644 include/cppunit/config/config-bcb5.h create mode 100644 src/CMakeLists.txt create mode 100644 src/cppunit/CMakeLists.txt -- 1.8.3.2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 3/5] include: Let the build system handle detecting the features
This includes a cleanup of the specialized configuration header
files, as supported features are detected during the configuration
stage and do not need to be hard coded into the headers for different
platforms.
Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de
---
cmake/PlatformChecks.cmake| 6
cmake/have_default_template_args.cpp | 35 +++
include/config-auto.h.in | 3 ++
include/cppunit/Portability.h | 22 ++--
include/cppunit/config/config-bcb5.h | 47 -
include/cppunit/config/config-evc4.h | 57 ---
include/cppunit/config/config-msvc6.h | 64 ---
7 files changed, 54 insertions(+), 180 deletions(-)
create mode 100644 cmake/have_default_template_args.cpp
delete mode 100644 include/cppunit/config/config-bcb5.h
diff --git a/cmake/PlatformChecks.cmake b/cmake/PlatformChecks.cmake
index 657bf3b..e6ff590 100644
--- a/cmake/PlatformChecks.cmake
+++ b/cmake/PlatformChecks.cmake
@@ -123,6 +123,12 @@
check_cxx_sourcefile_compiles(${PROJECT_SOURCE_DIR}/cmake/have_casts.cpp
CPPUNIT_HAVE_CPP_CAST)
check_cxx_sourcefile_compiles(${PROJECT_SOURCE_DIR}/cmake/string_compare_signature.cpp
CPPUNIT_FUNC_STRING_COMPARE_SIZE_FIRST)
+check_cxx_sourcefile_compiles(${PROJECT_SOURCE_DIR}/cmake/have_default_template_args.cpp
+ CPPUNIT_HAVE_DEFAULT_TEMPLATE_ARGS)
+
+if(NOT CPPUNIT_HAVE_DEFAULT_TEMPLATE_ARGS)
+set(CPPUNIT_STD_NEED_ALLOCATOR 1 CACHE INTERNAL Default template
parameters not supported)
+endif()
if(NOT CPPUNIT_FUNC_STRING_COMPARE_SIZE_FIRST)
set(CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 1
diff --git a/cmake/have_default_template_args.cpp
b/cmake/have_default_template_args.cpp
new file mode 100644
index 000..465c391
--- /dev/null
+++ b/cmake/have_default_template_args.cpp
@@ -0,0 +1,35 @@
+//=
+// CppUnit - The C++ Unit Test Library
+// Copyright (c) 2013 - The Document Foundation
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//=
+
+// Check whether the compiler supports default arguments for template
parameters
+templatetypename T=int
+class Foo
+{
+public:
+T bar(T param)
+{
+return param;
+}
+};
+
+int main()
+{
+Foo f;
+return f.bar(0);
+}
diff --git a/include/config-auto.h.in b/include/config-auto.h.in
index 309e291..ad5b8d3 100644
--- a/include/config-auto.h.in
+++ b/include/config-auto.h.in
@@ -73,6 +73,9 @@
/* define if the compiler supports C++ style casts */
#cmakedefine CPPUNIT_HAVE_CPP_CAST 1
+/* define if the compiler does not support default arguments for template
parameters */
+#cmakedefine CPPUNIT_STD_NEED_ALLOCATOR 1
+
/* Define if you have the shl_load function. */
#cmakedefine CPPUNIT_HAVE_SHL_LOAD 1
diff --git a/include/cppunit/Portability.h b/include/cppunit/Portability.h
index a21f1a2..7d32c97 100644
--- a/include/cppunit/Portability.h
+++ b/include/cppunit/Portability.h
@@ -5,24 +5,23 @@
# define WIN32 1
#endif
+/* include automatically generated configuration */
+#include cppunit/config-auto.h
+
/* include platform specific config */
-#if defined(__BORLANDC__)
-# include cppunit/config/config-bcb5.h
-#elif defined (_MSC_VER)
+#if defined (_MSC_VER)
# if _MSC_VER == 1200 defined(_WIN32_WCE) //evc4
#include cppunit/config/config-evc4.h
# else
#include cppunit/config/config-msvc6.h
# endif
-#else
-#include cppunit/config-auto.h
#endif
// Version number of package
-#ifndef CPPUNIT_VERSION
+#ifndef CPPUNIT_VERSION
#define CPPUNIT_VERSION 1.13.0
#endif
-
+
#include cppunit/config/CppUnitApi.h// define CPPUNIT_API
CPPUNIT_NEED_DLL_DECL
#include cppunit/config/SelectDllLoader.h
@@ -44,7 +43,7 @@
# define CPPUNIT_ENABLE_CU_TEST_MACROS0
#endif
-/* Define to 1 if the preprocessor expands (#foo) to foo (quotes incl.)
+/* Define to 1 if the preprocessor expands (#foo) to foo (quotes incl.)
I don't think there is any C preprocess that does NOT support this! */
#if
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/IDocumentRedlineAccess.hxx|1
sw/source/core/unocore/unocrsrhelper.cxx |2
sw/source/filter/ww8/attributeoutputbase.hxx |2
sw/source/filter/ww8/docxattributeoutput.cxx | 60 +++
sw/source/filter/ww8/docxattributeoutput.hxx |2
sw/source/filter/ww8/rtfattributeoutput.cxx |2
sw/source/filter/ww8/rtfattributeoutput.hxx |2
sw/source/filter/ww8/wrtw8nds.cxx| 68 +++
sw/source/filter/ww8/wrtww8.hxx |3 -
sw/source/filter/ww8/ww8attributeoutput.hxx |2
10 files changed, 127 insertions(+), 17 deletions(-)
New commits:
commit e52f14efaa53b496599b51fb064a933183731fca
Author: Adam Co rattles2...@gmail.com
Date: Sun Dec 8 17:14:14 2013 +0200
Export redline 'paragraph formatting changes' back to DOCX
This patch adds support for the export of any redline of type
'paragraph formatting changes' properties that were imported from
a DOCX file under the 'pPrChange'-'pPr' XML node.
Reviewed on:
https://gerrit.libreoffice.org/6993
Change-Id: Ieea5bbb219f444e382f22948944e038bb661ec7c
diff --git a/sw/inc/IDocumentRedlineAccess.hxx
b/sw/inc/IDocumentRedlineAccess.hxx
index 8fd1555..ddea588 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -64,6 +64,7 @@ namespace nsRedlineType_t
const RedlineType_t REDLINE_FORMAT = 0x2;// Attributes have been applied.
const RedlineType_t REDLINE_TABLE = 0x3;// Table structure has been
altered.
const RedlineType_t REDLINE_FMTCOLL = 0x4;// Style has been altered
(Autoformat!).
+const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes
have been changed
// When larger than 128, flags can be inserted.
const RedlineType_t REDLINE_NO_FLAG_MASK = 0x7F;
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index 8783e5a..d0bde04 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1184,6 +1184,8 @@ void makeRedline( SwPaM rPaM,
eType = nsRedlineType_t::REDLINE_FORMAT;
else if ( rRedlineType == TextTable )
eType = nsRedlineType_t::REDLINE_TABLE;
+else if ( rRedlineType == ParagraphFormat )
+eType = nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT;
else if( !rRedlineType.startsWith( Insert ))
throw lang::IllegalArgumentException();
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 8060368..be3615a 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -160,7 +160,7 @@ public:
virtual void StartParagraphProperties() = 0;
/// Called after we end outputting the attributes.
-virtual void EndParagraphProperties() = 0;
+virtual void EndParagraphProperties( const SwRedlineData* pRedlineData ) =
0;
/// Empty paragraph.
virtual void EmptyParagraph() = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b7f06a0..01d8afd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -676,8 +676,12 @@ void
DocxAttributeOutput::WriteCollectedParagraphProperties()
}
}
-void DocxAttributeOutput::EndParagraphProperties()
+void DocxAttributeOutput::EndParagraphProperties( const SwRedlineData*
pRedlineData )
{
+// Call the 'Redline' function. This will add redline (change-tracking)
information that regards to paragraph properties.
+// This includes changes like 'Bold', 'Underline', 'Strikethrough' etc.
+Redline( pRedlineData );
+
WriteCollectedParagraphProperties();
// Merge the marks for the ordered elements
@@ -1618,10 +1622,62 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedline)
}
}
}
-
m_pSerializer-endElementNS( XML_w, XML_rPrChange );
+break;
+
+case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:
+m_pSerializer-startElementNS( XML_w, XML_pPrChange,
+FSNS( XML_w, XML_id ), aId.getStr(),
+FSNS( XML_w, XML_author ), aAuthor.getStr(),
+FSNS( XML_w, XML_date ), aDate.getStr(),
+FSEND );
+
+// Check if there is any extra data stored in the redline object
+if (pRedline-GetExtraData())
+{
+const SwRedlineExtraData* pExtraData = pRedline-GetExtraData();
+const SwRedlineExtraData_FormattingChanges* pFormattingChanges =
dynamic_castconst SwRedlineExtraData_FormattingChanges*(pExtraData);
+
+// Check if the extra data is of type 'formatting changes'
+if (pFormattingChanges)
+{
+// Get the item set that holds all the changes properties
+const SfxItemSet
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
sfx2/UIConfig_sfx.mk |1
sfx2/source/appl/app.hrc |2
sfx2/source/appl/newhelp.cxx | 29 +--
sfx2/source/appl/newhelp.hrc |8 --
sfx2/source/appl/newhelp.hxx | 12 ---
sfx2/source/appl/newhelp.src | 52 --
sfx2/uiconfig/ui/bookmarkdialog.ui | 136 +
7 files changed, 148 insertions(+), 92 deletions(-)
New commits:
commit 0136616a5a005cc2237f020d46718bdb78f33c2b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 11:08:29 2013 +
convert help bookmark dialog to .ui
Change-Id: I7831bc63f66ab7fe30f5648efc2f733c6bd90d0e
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index a693f2d..c389696 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,sfx))
$(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/alienwarndialog \
+ sfx2/uiconfig/ui/bookmarkdialog \
sfx2/uiconfig/ui/checkin \
sfx2/uiconfig/ui/custominfopage \
sfx2/uiconfig/ui/descriptioninfopage \
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 6a5a97c..84050c0 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -46,7 +46,7 @@
#define TP_HELP_INDEX (RID_SFX_APP_START+101)
#define TP_HELP_SEARCH (RID_SFX_APP_START+102)
#define TP_HELP_BOOKMARKS (RID_SFX_APP_START+103)
-#define DLG_HELP_ADDBOOKMARK(RID_SFX_APP_START+104)
+
#define MENU_HELP_BOOKMARKS (RID_SFX_APP_START+105)
#define RID_INFO_NOSEARCHRESULTS(RID_SFX_APP_START+106)
#define RID_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107)
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index bcef1d2..8bd2f5f 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -3388,35 +3388,20 @@ sal_Bool SfxHelpWindow_Impl::HasHistorySuccessor() const
// class SfxAddHelpBookmarkDialog_Impl ---
-SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl( Window* pParent,
sal_Bool bRename ) :
-
-ModalDialog( pParent, SfxResId( DLG_HELP_ADDBOOKMARK ) ),
-
-aTitleFT( this, SfxResId( FT_BOOKMARK_TITLE ) ),
-aTitleED( this, SfxResId( ED_BOOKMARK_TITLE ) ),
-aOKBtn ( this, SfxResId( PB_BOOKMARK_OK ) ),
-aEscBtn ( this, SfxResId( PB_BOOKMARK_CANCEL ) ),
-aHelpBtn( this, SfxResId( PB_BOOKMARK_HELP ) )
-
-{
-if ( bRename )
-SetText( SfxResId(STR_BOOKMARK_RENAME).toString() );
-
-FreeResource();
-}
-
-// ---
-
-SfxAddHelpBookmarkDialog_Impl::~SfxAddHelpBookmarkDialog_Impl()
+SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent,
sal_Bool bRename)
+: ModalDialog( pParent, BookmarkDialog, sfx/ui/bookmarkdialog.ui)
{
+get(m_pTitleED, entry);
+if (bRename)
+SetText(getFixedText(alttitle)-GetText());
}
// ---
void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString rTitle )
{
-aTitleED.SetText( rTitle );
-aTitleED.SetSelection( Selection( 0, rTitle.getLength() ) );
+m_pTitleED-SetText( rTitle );
+m_pTitleED-SetSelection( Selection( 0, rTitle.getLength() ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc
index 6f85a86..bfaab51 100644
--- a/sfx2/source/appl/newhelp.hrc
+++ b/sfx2/source/appl/newhelp.hrc
@@ -49,14 +49,6 @@
// Content TabPage
#define LB_CONTENTS 10
-// Add to bookmarks dialog
-#define FT_BOOKMARK_TITLE 10
-#define ED_BOOKMARK_TITLE 11
-#define PB_BOOKMARK_OK 12
-#define PB_BOOKMARK_CANCEL 13
-#define PB_BOOKMARK_HELP14
-#define STR_BOOKMARK_RENAME 15
-
// Index Window: Id's of the tabpages
#define HELP_INDEX_PAGE_FIRST 1
#define HELP_INDEX_PAGE_CONTENTSHELP_INDEX_PAGE_FIRST
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e62af43..0ebbcf6 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -582,18 +582,12 @@ public:
class SfxAddHelpBookmarkDialog_Impl : public ModalDialog
{
private:
-FixedText aTitleFT;
-EditaTitleED;
-OKButtonaOKBtn;
-CancelButtonaEscBtn;
-HelpButton aHelpBtn;
-
+Edit* m_pTitleED;
public:
SfxAddHelpBookmarkDialog_Impl( Window* pParent, sal_Bool bRename =
sal_True );
-~SfxAddHelpBookmarkDialog_Impl();
-voidSetTitle( const OUString rTitle );
-inline OUString GetTitle()
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/shared/05/0150.xhp |2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit 78b1b459cb6dd8d3df6223918a41828df42d32a4 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 11:13:51 2013 + update help ids for help-bookmark help ids Change-Id: Ie9f78cd89cc8f2f71c6d93ae424a279be2b1e48c diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 27b2856..c01783e 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6358,7 +6358,6 @@ sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025, sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO4,1078102027, -sfx2_Edit_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE,1083901963, sfx2_Edit_DLG_NEW_FILE_ED_KEYWORDS,1107380285, sfx2_Edit_DLG_NEW_FILE_ED_THEMA,1107380279, sfx2_Edit_DLG_NEW_FILE_ED_TITLE,1107380280, @@ -6372,7 +6371,6 @@ sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781, sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812, sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203, sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824, -sfx2_ModalDialog_DLG_HELP_ADDBOOKMARK,1083899904, sfx2_ModalDialog_MD_DDE_LINKEDIT,1082212352, sfx2_ModalDialog_RID_URLOPEN,1112571904, sfx2_ModalDialog_RID_WARN_PRINTTRANSPARENCY,1113047040, diff --git a/source/text/shared/05/0150.xhp b/source/text/shared/05/0150.xhp index 6316800..e1b584d 100644 --- a/source/text/shared/05/0150.xhp +++ b/source/text/shared/05/0150.xhp @@ -35,7 +35,7 @@ bookmark branch=index xml-lang=en-US id=bm_id3153244bookmark_valueHelp; bookmarks/bookmark_valuebookmark_valuebookmarks; Help/bookmark_value/bookmarkparagraph role=paragraph id=par_id3153244 l10n=E xml-lang=en-US oldref=1 localize=false/ paragraph id=hd_id3154349 role=heading level=1 oldref=2 l10n=U xml-lang=en-USvariable id=doc_titlelink href=text/shared/05/0150.xhp name=Managing BookmarksManaging Bookmarks/link/variable/paragraph - bookmark branch=hid/sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE xml-lang=en-US id=bm_id3143284 localize=false/paragraph l10n=U role=paragraph id=par_id3154840 xml-lang=en-US oldref=11ahelp hid=SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE visibility=hiddenDisplays the name of the bookmarked page. You can also type a new name for the bookmark./ahelp/paragraph + bookmark branch=hid/sfx/ui/bookmarkdialog/BookmarkDialog xml-lang=en-US id=bm_id3143284 localize=false/paragraph l10n=U role=paragraph id=par_id3154840 xml-lang=en-US oldref=11ahelp hid=sfx/ui/bookmarkdialog/BookmarkDialog visibility=hiddenDisplays the name of the bookmarked page. You can also type a new name for the bookmark./ahelp/paragraph table id=tbl_id3154228 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5116cd97a9dc90b2402f7e1d0c6922eedacd37ea Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 11:13:51 2013 + Updated core Project: help 78b1b459cb6dd8d3df6223918a41828df42d32a4 diff --git a/helpcontent2 b/helpcontent2 index 0bbe85a..78b1b45 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0bbe85ad404d96d7b3a994b0c5bd82e931c88c98 +Subproject commit 78b1b459cb6dd8d3df6223918a41828df42d32a4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/MessageBoxResults.idl |2 ++
offapi/com/sun/star/awt/MessageBoxType.idl|2 ++
2 files changed, 4 insertions(+)
New commits:
commit 7a6ca9e81c71786b267fde8328c84bb10966c27c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 16 12:31:06 2013 +0100
Missing @since tags
Change-Id: I649a37c5e4e1c8aa26f94fd5ab41fccd0309b288
diff --git a/offapi/com/sun/star/awt/MessageBoxResults.idl
b/offapi/com/sun/star/awt/MessageBoxResults.idl
index 5c63d6e..4c4ccf5 100644
--- a/offapi/com/sun/star/awt/MessageBoxResults.idl
+++ b/offapi/com/sun/star/awt/MessageBoxResults.idl
@@ -23,6 +23,8 @@
module com { module sun { module star { module awt {
/** These constants are used to specify a result of executing a XMessageBox.
+
+@since LibreOffice 4.2
*/
constants MessageBoxResults
{
diff --git a/offapi/com/sun/star/awt/MessageBoxType.idl
b/offapi/com/sun/star/awt/MessageBoxType.idl
index 1dfc839..3275101 100644
--- a/offapi/com/sun/star/awt/MessageBoxType.idl
+++ b/offapi/com/sun/star/awt/MessageBoxType.idl
@@ -21,6 +21,8 @@
module com { module sun { module star { module awt {
/** specifies the type of a XMessageBox.
+
+@since LibreOffice 4.2
*/
published enum MessageBoxType
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - offapi/com
offapi/com/sun/star/awt/MessageBoxResults.idl |2 ++
offapi/com/sun/star/awt/MessageBoxType.idl|2 ++
2 files changed, 4 insertions(+)
New commits:
commit 0fe50b05de83098864d1067563844ae7c5ffaa26
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 16 12:31:06 2013 +0100
Missing @since tags
Change-Id: I649a37c5e4e1c8aa26f94fd5ab41fccd0309b288
(cherry picked from commit 7a6ca9e81c71786b267fde8328c84bb10966c27c)
diff --git a/offapi/com/sun/star/awt/MessageBoxResults.idl
b/offapi/com/sun/star/awt/MessageBoxResults.idl
index 5c63d6e..4c4ccf5 100644
--- a/offapi/com/sun/star/awt/MessageBoxResults.idl
+++ b/offapi/com/sun/star/awt/MessageBoxResults.idl
@@ -23,6 +23,8 @@
module com { module sun { module star { module awt {
/** These constants are used to specify a result of executing a XMessageBox.
+
+@since LibreOffice 4.2
*/
constants MessageBoxResults
{
diff --git a/offapi/com/sun/star/awt/MessageBoxType.idl
b/offapi/com/sun/star/awt/MessageBoxType.idl
index 1dfc839..3275101 100644
--- a/offapi/com/sun/star/awt/MessageBoxType.idl
+++ b/offapi/com/sun/star/awt/MessageBoxType.idl
@@ -21,6 +21,8 @@
module com { module sun { module star { module awt {
/** specifies the type of a XMessageBox.
+
+@since LibreOffice 4.2
*/
published enum MessageBoxType
{
___
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/filter/ww8/attributeoutputbase.hxx |5 +-
sw/source/filter/ww8/docxattributeoutput.cxx | 58 ---
sw/source/filter/ww8/docxattributeoutput.hxx |8 +--
sw/source/filter/ww8/rtfattributeoutput.cxx |2
sw/source/filter/ww8/rtfattributeoutput.hxx |2
sw/source/filter/ww8/wrtw8nds.cxx|3 -
sw/source/filter/ww8/ww8atr.cxx | 44
sw/source/filter/ww8/ww8attributeoutput.hxx |2
8 files changed, 93 insertions(+), 31 deletions(-)
New commits:
commit 8c5b4bb03cdf3fd5e794cfd8de68b00eb5de48fb
Author: Adam Co rattles2...@gmail.com
Date: Thu Dec 12 17:42:50 2013 +0200
Support DOCX exporting 'Track Changes - Deleted Paragraph Mark'
This patch adds support for the DOCX exporter to export the
'Track Changes' of type 'Deleted Paragraph Marker'.
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
Reviewed on:
https://gerrit.libreoffice.org/7061
Change-Id: Ia4f5933c9058d74fe8f47fc578747be972774340
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index be3615a..73ec4fb 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -160,7 +160,7 @@ public:
virtual void StartParagraphProperties() = 0;
/// Called after we end outputting the attributes.
-virtual void EndParagraphProperties( const SwRedlineData* pRedlineData ) =
0;
+virtual void EndParagraphProperties( const SwRedlineData* pRedlineData,
const SwRedlineData* pRedlineParagraphMarkerDeleted ) = 0;
/// Empty paragraph.
virtual void EmptyParagraph() = 0;
@@ -635,6 +635,9 @@ public:
/// Exports the definition (image, size) of a single numbering picture
bullet.
virtual void BulletDefinition(int /*nId*/, const Graphic /*rGraphic*/,
Size /*aSize*/) {}
+// Returns whether or not the 'SwTxtNode' has a paragraph marker deleted
(using 'track changes')
+virtual const SwRedlineData* IsParagraphMarkerDeleted( const SwTxtNode
rNode );
+
};
#endif // INCLUDED_SW_SOURCE_FILTER_WW8_ATTRIBUTEOUTPUTBASE_HXX
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 01d8afd..f113f39 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -676,7 +676,7 @@ void
DocxAttributeOutput::WriteCollectedParagraphProperties()
}
}
-void DocxAttributeOutput::EndParagraphProperties( const SwRedlineData*
pRedlineData )
+void DocxAttributeOutput::EndParagraphProperties( const SwRedlineData*
pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted )
{
// Call the 'Redline' function. This will add redline (change-tracking)
information that regards to paragraph properties.
// This includes changes like 'Bold', 'Underline', 'Strikethrough' etc.
@@ -684,6 +684,21 @@ void DocxAttributeOutput::EndParagraphProperties( const
SwRedlineData* pRedlineD
WriteCollectedParagraphProperties();
+// Write 'Paragraph Mark' properties
+bool bIsParagraphMarkProperties = false; // In future - get the 'paragraph
marker' properties as a parameter
+if (bIsParagraphMarkProperties || pRedlineParagraphMarkerDeleted)
+{
+m_pSerializer-startElementNS( XML_w, XML_rPr, FSEND );
+
+if ( pRedlineParagraphMarkerDeleted )
+{
+StartRedline( pRedlineParagraphMarkerDeleted );
+EndRedline( pRedlineParagraphMarkerDeleted );
+}
+
+m_pSerializer-endElementNS( XML_w, XML_rPr );
+}
+
// Merge the marks for the ordered elements
m_pSerializer-mergeTopMarks( );
@@ -793,7 +808,7 @@ void DocxAttributeOutput::EndRun()
}
// if there is some redlining in the document, output it
-StartRedline();
+StartRedline( m_pRedlineData );
DoWriteBookmarks( );
WriteCommentRanges();
@@ -811,7 +826,9 @@ void DocxAttributeOutput::EndRun()
WritePendingPlaceholder();
// if there is some redlining in the document, output it
-EndRedline();
+EndRedline( m_pRedlineData );
+
+m_pRedlineData = NULL;
if ( m_closeHyperlinkInThisRun )
{
@@ -1551,17 +1568,17 @@ void DocxAttributeOutput::FieldVanish( const OUString
rTxt, ww::eField eType )
// The difference between 'Redline' and 'StartRedline'+'EndRedline' is that:
// 'Redline' is used for tracked changes of formatting information of a run
like Bold, Underline. (the 'w:rPrChange' is inside the 'run' node)
// 'StartRedline' is used to output tracked changes of run insertion and
deletion (the run is inside the 'w:ins' node)
-void DocxAttributeOutput::Redline( const SwRedlineData* pRedline)
+void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData)
{
-if ( !pRedline )
+if ( !pRedlineData )
return;
-OString aId( OString::number( pRedline-GetSeqNo()
For libmspub A Dependency Missing from Required List
Hi, I'm following one of the contacts on your webpage www.freedesktop.org/wiki/Software/libmspub/ In configuring libmspub, configure complained that librevenge was missing. I found and installed that program. The libmspub's configure was happy and everything installed ok. The above-listed webpage lists Dependencies but librevenge is not shown. Thought you'd want to know. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement
Hi All, For the record, All contributions past and present made to LibreOffice from Pavel Haraticky are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from Pavel Haraticky are available under the terms the MPL / LGPLv3+. Regards Pavel Haraticky ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +
sw/source/core/ole/ndole.cxx|5 +++--
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit bee397a1e35fbc2717c56a8bd4a631ccfc185b6b
Author: Tushar Bende tushar.be...@synerzip.com
Date: Mon Dec 9 19:13:36 2013 +0530
fdo#68211: Fix for General input/output error while opening file
Description: Docx containing floating table with formula was giving
General input/output error while opening in LibreOffice. Reason being
within xLoader-filter() it was calling
EmbeddedObjectContainer::RemoveEmbeddedObject() with bClose value as
sal_True(default value in function declaration)
and hence it was removing embedded object from container and also it was
closing it.Fix includes passing this bClose
value as sal_false (which means remove object from container but don't
close it.)
verified code changes for various floating table docx and normal docx
containing tables and formulas.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7009
Change-Id: I9c2d3f8c4099f9f753b2a1b027f9072cd4effeb5
diff --git a/sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx
b/sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx
new file mode 100644
index 000..ecabbd6
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7428200..aede328 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2136,6 +2136,15 @@ DECLARE_OOXMLEXPORT_TEST(testCrashWhileSave,
testCrashWhileSave.docx)
CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:ftr/w:tbl/w:tr/w:tc[1]/w:p[1]/w:pPr/w:pStyle, val).match(Normal));
}
+DECLARE_OOXMLEXPORT_TEST(testFileOpenInputOutputError,floatingtbl_with_formula.docx)
+{
+ // Docx containing Floating table with formula was giving General
input/output error while opening in LibreOffice
+ xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+ if (!pXmlDoc)
+ return;
+ assertXPath(pXmlDoc, /w:document/w:body/w:p[1]/w:pPr/w:pStyle, val,
Normal);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index e3793af..6473912 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -715,10 +715,11 @@ SwOLEObj::~SwOLEObj()
// successful closing of the object will automatically clear the
reference then
xOLERef.Lock(sal_False);
-// Always remove object from conteiner it is connected to
+// Always remove object from container it is connected to
try
{
-pCnt-RemoveEmbeddedObject( aName );
+// remove object from container but don't close it
+pCnt-RemoveEmbeddedObject( aName, sal_False);
}
catch ( uno::Exception )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH 5/5] src: Fix build with Borland C++ compiler
On Mon, Dec 16, 2013 at 4:48 AM, Bernhard Sessler bernhard.sess...@corscience.de wrote: Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de --- src/cppunit/PlugInManager.cpp | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp index 4f8b371..0ebe4c5 100644 --- a/src/cppunit/PlugInManager.cpp +++ b/src/cppunit/PlugInManager.cpp @@ -1,6 +1,10 @@ #include cppunit/config/SourcePrefix.h #include cppunit/XmlOutputterHook.h -#include stdint.h +#include cppunit/config-auto.h + +#ifdef CPPUNIT_HAVE_STDINT_H +#include stdint.h +#endif #if !defined(CPPUNIT_NO_TESTPLUGIN) #include cppunit/extensions/TestFactoryRegistry.h @@ -8,6 +12,9 @@ #include cppunit/plugin/TestPlugIn.h #include cppunit/plugin/DynamicLibraryManager.h +#ifndef CPPUNIT_HAVE_STDINT_H +typedef unsigned int* uintptr_t; uintptr_t is a scalar integer that has the 'size' of void*.. not a pointer to an int iow uint32_t if sizeof(void*) == 4 uint64_t if sizeof(void*) == 8 uintptr_t foo = 4; foo += 2; = foo should be 6 not 12; ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: configure.ac src/lib
configure.ac |1
src/lib/VSDXMLHelper.cpp | 50 +++
2 files changed, 13 insertions(+), 38 deletions(-)
New commits:
commit c43a413414a8bd3cf4d61b5716606bfe8b4d060e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Dec 16 13:35:48 2013 +0100
Words cannot tell the love we have towards boost
Change-Id: I0ab0b4858348a6b75de319672df808b6c73af87d
diff --git a/configure.ac b/configure.ac
index 7fa0150..9e4df06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,7 @@ AC_SUBST(ZLIB_LIBS)
AC_CHECK_HEADERS(
boost/algorithm/string.hpp \
+ boost/lexical_cast.hpp \
boost/optional.hpp \
boost/spirit/include/classic.hpp,
[],
diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp
index 2367a45..bef794d 100644
--- a/src/lib/VSDXMLHelper.cpp
+++ b/src/lib/VSDXMLHelper.cpp
@@ -34,6 +34,7 @@
#include istream
#include vector
#include boost/algorithm/string.hpp
+#include boost/lexical_cast.hpp
#include libxml/xmlIO.h
#include libxml/xmlstring.h
#include librevenge-stream/librevenge-stream.h
@@ -140,65 +141,38 @@ libvisio::Colour libvisio::xmlStringToColour(const
xmlChar *s)
long libvisio::xmlStringToLong(const xmlChar *s)
{
+ using boost::lexical_cast;
+ using boost::bad_lexical_cast;
if (xmlStrEqual(s, BAD_CAST(Themed)))
return 0;
- char *end;
- errno = 0;
- long value = strtol((const char *)s, end, 0);
-
- if ((ERANGE == errno (LONG_MAX == value || LONG_MIN == value)) || (errno
!value))
+ try
{
-VSD_DEBUG_MSG((Throwing XmlParserException\n));
-throw XmlParserException();
+return boost::lexical_castlong, const char *((const char *)s);
}
- else if (*end)
+ catch (const boost::bad_lexical_cast )
{
VSD_DEBUG_MSG((Throwing XmlParserException\n));
throw XmlParserException();
}
-
- return value;
+ return 0;
}
double libvisio::xmlStringToDouble(const xmlChar *s)
{
if (xmlStrEqual(s, BAD_CAST(Themed)))
-return 0;
-
- char *end;
- std::string doubleStr((const char *)s);
-
-#ifndef __ANDROID__
- std::string decimalPoint(localeconv()-decimal_point);
-#else
- std::string decimalPoint(.);
-#endif
- if (!decimalPoint.empty() decimalPoint != .)
- {
-if (!doubleStr.empty())
-{
- std::string::size_type pos;
- while ((pos = doubleStr.find(.)) != std::string::npos)
-doubleStr.replace(pos,1,decimalPoint);
-}
- }
+return 0.0;
- errno = 0;
- double value = strtod(doubleStr.c_str(), end);
-
- if ((ERANGE == errno) || (errno !value))
+ try
{
-VSD_DEBUG_MSG((Throwing XmlParserException\n));
-throw XmlParserException();
+return boost::lexical_castdouble, const char *((const char *)s);
}
- else if (*end)
+ catch (const boost::bad_lexical_cast )
{
VSD_DEBUG_MSG((Throwing XmlParserException\n));
throw XmlParserException();
}
-
- return value;
+ return 0.0;
}
bool libvisio::xmlStringToBool(const xmlChar *s)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH 5/5] src: Fix build with Borland C++ compiler
Hi, On 16.12.2013 13:14, Norbert Thiebaud wrote: On Mon, Dec 16, 2013 at 4:48 AM, Bernhard Sessler bernhard.sess...@corscience.de wrote: Signed-off-by: Bernhard Sessler bernhard.sess...@corscience.de --- src/cppunit/PlugInManager.cpp | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp index 4f8b371..0ebe4c5 100644 --- a/src/cppunit/PlugInManager.cpp +++ b/src/cppunit/PlugInManager.cpp @@ -1,6 +1,10 @@ snip +#ifndef CPPUNIT_HAVE_STDINT_H +typedef unsigned int* uintptr_t; uintptr_t is a scalar integer that has the 'size' of void*.. not a pointer to an int iow uint32_t if sizeof(void*) == 4 uint64_t if sizeof(void*) == 8 uintptr_t foo = 4; foo += 2; = foo should be 6 not 12; Argh, sorry, didn't pay attention here. I will fix that in an updated patchset. Thanks for the comment, good find. Regards, Bernhard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/fmcomp/dbaexchange.cxx | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 6d42e7a35b1b887e86a5f9b9eacd5e5b951df8bf
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 12:34:56 2013 +
fix out of range access
this is broken since 6e4a21ff22345a24e4d530725814c436a1bdd49a
the original commit in 2001.
I imagine the idea was to strip a trailing sal_Unicode(11) from the
end of the string and then recalculate if the string is empty, but
seeing as it has chugged away for the last 12+ years like this I'm
relunctant to change it to what it might have originally been
intended to do and instead just remove the stuff which was never
executed.
Change-Id: I73d5108ece8e716d78a4898117e0ee2d51822015
diff --git a/svx/source/fmcomp/dbaexchange.cxx
b/svx/source/fmcomp/dbaexchange.cxx
index e5a974d..ff0e74f 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -464,15 +464,8 @@ namespace svx
break;
}
-sal_Int32 nDescriptorLen = m_sCompatibleObjectDescription.getLength();
-if (nDescriptorLen)
-{
-if (m_sCompatibleObjectDescription[nDescriptorLen] == 11)
-m_sCompatibleObjectDescription =
m_sCompatibleObjectDescription.copy(0, nDescriptorLen - 1);
-
-if (nDescriptorLen)
-AddFormat(SOT_FORMATSTR_ID_SBA_DATAEXCHANGE);
-}
+if (!m_sCompatibleObjectDescription.isEmpty())
+AddFormat(SOT_FORMATSTR_ID_SBA_DATAEXCHANGE);
}
//
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 661f7bdefc8215f742951727b93395d47293cf0e
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 16 13:53:30 2013 +0100
m_bHasActive must be false after last visible entry is removed
...otherwise, ExtensionBox_Impl::RecalcAll would crash in
CalcActiveHeight(-1).
Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3b9a3fe..dd10ae0 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries()
if ( nPos m_nActive )
m_nActive -= 1;
else if ( ( nPos == m_nActive ) ( nPos == (long)
m_vEntries.size() - 1 ) )
+{
m_nActive -= 1;
+if (m_nActive == -1)
+{
+m_bHasActive = false;
+}
+}
m_vRemovedEntries.push_back( *iIndex );
m_vEntries.erase( iIndex );
iIndex = m_vEntries.begin() + nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - desktop/source
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 72fcd182fd89aee7eea8e42cba777a5dae1ca4ef
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 16 13:53:30 2013 +0100
m_bHasActive must be false after last visible entry is removed
...otherwise, ExtensionBox_Impl::RecalcAll would crash in
CalcActiveHeight(-1).
Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850
(cherry picked from commit 661f7bdefc8215f742951727b93395d47293cf0e)
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3b9a3fe..dd10ae0 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries()
if ( nPos m_nActive )
m_nActive -= 1;
else if ( ( nPos == m_nActive ) ( nPos == (long)
m_vEntries.size() - 1 ) )
+{
m_nActive -= 1;
+if (m_nActive == -1)
+{
+m_bHasActive = false;
+}
+}
m_vRemovedEntries.push_back( *iIndex );
m_vEntries.erase( iIndex );
iIndex = m_vEntries.begin() + nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuitbxform.cxx | 21 +-
cui/source/dialogs/fmsearch.hrc |1
cui/source/dialogs/tbxform.src| 60 ---
cui/source/inc/cuitbxform.hxx | 14 +---
cui/uiconfig/ui/recordnumberdialog.ui | 105 ++
helpcontent2 |2
8 files changed, 118 insertions(+), 87 deletions(-)
New commits:
commit 1bb4a66904509faf1954a87e95c7299f5f502580
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 12:57:52 2013 +
convert goto record dialog to .ui
Change-Id: I2bc2c5837556da73cc60e0e5b906ddb4f01844d9
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 15966db..3265c7e 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/showcols.src \
cui/source/dialogs/srchxtra.src \
cui/source/dialogs/svuidlg.src \
-cui/source/dialogs/tbxform.src \
cui/source/options/certpath.src \
cui/source/options/connpooloptions.src \
cui/source/options/dbregister.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index c540b0e..d90ef32 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querynoloadedfiledialog \
cui/uiconfig/ui/querynosavefiledialog \
cui/uiconfig/ui/querysavelistdialog \
+ cui/uiconfig/ui/recordnumberdialog \
cui/uiconfig/ui/rotationtabpage \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
diff --git a/cui/source/dialogs/cuitbxform.cxx
b/cui/source/dialogs/cuitbxform.cxx
index 263102d..3c1f7cf 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -30,25 +30,16 @@
#include cuitbxform.hxx
#include sfx2/viewfrm.hxx
#include sfx2/viewsh.hxx
-#include fmsearch.hrc
-
-//
-// class FmInputRecordNoDialog
-//
FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
-:ModalDialog( pParent, CUI_RES(RID_SVX_DLG_INPUTRECORDNO))
-,m_aLabel(this, CUI_RES(1))
-,m_aRecordNo(this, CUI_RES(1))
-,m_aOk(this, CUI_RES(1))
-,m_aCancel(this, CUI_RES(1))
+: ModalDialog( pParent, RecordNumberDialog,
cui/ui/recordnumberdialog.ui)
{
-m_aRecordNo.SetMin(1);
-m_aRecordNo.SetMax(0x7FFF);
-m_aRecordNo.SetStrictFormat(sal_True);
-m_aRecordNo.SetDecimalDigits(0);
+get(m_pRecordNo, entry-nospin);
-FreeResource();
+m_pRecordNo-SetMin(1);
+m_pRecordNo-SetMax(0x7FFF);
+m_pRecordNo-SetStrictFormat(sal_True);
+m_pRecordNo-SetDecimalDigits(0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index a58ecb8..3b65fdb 100644
--- a/cui/source/dialogs/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -21,7 +21,6 @@
#include svl/solar.hrc
-#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10)
#define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11)
#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7)
#define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85)
diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src
deleted file mode 100644
index 5b6fc4a..000
--- a/cui/source/dialogs/tbxform.src
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include fmsearch.hrc
-
-ModalDialog RID_SVX_DLG_INPUTRECORDNO
-{
-HelpID = cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 130 , 45 ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-Text [ en-US ] = Record Number;
-
-FixedText 1
-{
-
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 5cfa752cb51b7a4129fca02287c860e297782632 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 12:58:56 2013 + drop unused helpids Change-Id: I6098a8d5d932634ac9e59a8d6722e4f688cfb18c diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index c01783e..ff03c51 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6819,7 +6819,6 @@ svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872, svx_ModalDialog_RID_SVXDLG_GALLERY_THEMEID,1243627520, svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224, svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744, -svx_ModalDialog_RID_SVX_DLG_INPUTRECORDNO,1368817664, svx_ModalDialog_RID_SVX_DLG_SHOWGRIDCOLUMNS,1368834048, svx_ModalDialog_RID_SVX_MDLG_FONTWORK_CHARSPACING,1237893120, svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592, @@ -6844,7 +6843,6 @@ svx_NumericField_RID_SVXFLOAT_3D_NUM_HORIZONTAL,3388495897, svx_NumericField_RID_SVXFLOAT_3D_NUM_VERTICAL,3388495899, svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_1,701569025, svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026, -svx_NumericField_RID_SVX_DLG_INPUTRECORDNO_1,1368823809, svx_NumericField_RID_SVX_GRFFILTER_DLG_POSTER_DLG_FILTERPOSTER_NUM_POSTER,1243076610, svx_NumericField_RID_SVX_SPLITCELLDLG_ED_COUNT,1238292482, svx_PatternField_RID_SVXPAGE_INET_PROXY_ED_DNS,703288939, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDXMLHelper.cpp |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 105a2594b2f882b6a60e16311c9b172452fd70d4 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Dec 16 14:21:24 2013 +0100 Force C locale for the lexical cast conversions Change-Id: Ice5a8e733129970d64fd209d01907b747fc3b62d diff --git a/src/lib/VSDXMLHelper.cpp b/src/lib/VSDXMLHelper.cpp index bef794d..1a9fae0 100644 --- a/src/lib/VSDXMLHelper.cpp +++ b/src/lib/VSDXMLHelper.cpp @@ -27,9 +27,10 @@ * instead of those above. */ -#include string.h -#include errno.h -#include limits.h +#ifndef BOOST_LEXICAL_CAST_ASSUME_C_LOCALE +#define BOOST_LEXICAL_CAST_ASSUME_C_LOCALE 1 +#endif + #include sstream #include istream #include vector ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/AllLangResTarget_pcr.mk extensions/source extensions/uiconfig extensions/UIConfig_spropctrlr.mk
extensions/AllLangResTarget_pcr.mk |1
extensions/UIConfig_spropctrlr.mk |1
extensions/source/propctrlr/fontdialog.cxx | 13 -
extensions/source/propctrlr/fontdialog.hxx |2
extensions/source/propctrlr/fontdialog.src | 50 --
extensions/source/propctrlr/formlocalid.hrc|3
extensions/source/propctrlr/formresid.hrc |5
extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui | 133 +
8 files changed, 143 insertions(+), 65 deletions(-)
New commits:
commit 1913d534d25c848555e9ff6c4827dee1656d846b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 13:20:43 2013 +
convert control font dialog to .ui
Change-Id: I44f6f587dffe047d4aef7e32233bafe54a77cb6d
diff --git a/extensions/AllLangResTarget_pcr.mk
b/extensions/AllLangResTarget_pcr.mk
index 415cb55..30ff253 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\
extensions/source/propctrlr/propres.src \
extensions/source/propctrlr/formres.src \
extensions/source/propctrlr/pcrmiscres.src \
- extensions/source/propctrlr/fontdialog.src \
extensions/source/propctrlr/selectlabeldialog.src \
extensions/source/propctrlr/formlinkdialog.src \
extensions/source/propctrlr/listselectiondlg.src \
diff --git a/extensions/UIConfig_spropctrlr.mk
b/extensions/UIConfig_spropctrlr.mk
index faf134a..3186668 100644
--- a/extensions/UIConfig_spropctrlr.mk
+++ b/extensions/UIConfig_spropctrlr.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr))
$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
+ extensions/uiconfig/spropctrlr/ui/controlfontdialog \
extensions/uiconfig/spropctrlr/ui/taborder \
))
diff --git a/extensions/source/propctrlr/fontdialog.cxx
b/extensions/source/propctrlr/fontdialog.cxx
index 6d3e38c..aafe50d 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -170,13 +170,14 @@ namespace pcr
//
//
ControlCharacterDialog::ControlCharacterDialog(Window* _pParent, const
SfxItemSet _rCoreSet)
-:SfxTabDialog(_pParent, PcrRes(RID_TABDLG_FONTDIALOG), _rCoreSet)
+: SfxTabDialog(_pParent, ControlFontDialog,
+modules/spropctrlr/ui/controlfontdialog.ui, _rCoreSet)
+, m_nCharsId(0)
{
-FreeResource();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-DBG_ASSERT(pFact, CreateFactory fail!);
-AddTabPage(TABPAGE_CHARACTERS,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), 0 );
-AddTabPage(TABPAGE_CHARACTERS_EXT,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0 );
+assert(pFact); //CreateFactory fail!
+m_nCharsId = AddTabPage(font,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), 0 );
+AddTabPage(fonteffects,
pFact-GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0 );
}
//
@@ -583,7 +584,7 @@ namespace pcr
void ControlCharacterDialog::PageCreated( sal_uInt16 _nId, SfxTabPage
_rPage )
{
SfxAllItemSet aSet(*(GetInputSetImpl()-GetPool()));
-if ( _nId == TABPAGE_CHARACTERS ) {
+if ( _nId == m_nCharsId ) {
aSet.Put (SvxFontListItem(static_castconst
SvxFontListItem(GetInputSetImpl()-Get(CFID_FONTLIST;
aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_HIDE_LANGUAGE));
_rPage.PageCreated(aSet);
diff --git a/extensions/source/propctrlr/fontdialog.hxx
b/extensions/source/propctrlr/fontdialog.hxx
index ae288235..485c573 100644
--- a/extensions/source/propctrlr/fontdialog.hxx
+++ b/extensions/source/propctrlr/fontdialog.hxx
@@ -63,6 +63,8 @@ namespace pcr
protected:
virtual void PageCreated(sal_uInt16 _nId, SfxTabPage _rPage);
+private:
+sal_uInt16 m_nCharsId;
};
//
} // namespace pcr
diff --git a/extensions/source/propctrlr/fontdialog.src
b/extensions/source/propctrlr/fontdialog.src
deleted file mode 100644
index ec30df8..000
--- a/extensions/source/propctrlr/fontdialog.src
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c853d983a1cbeadbd65357e386e208984b148c7 Author: László Németh nem...@numbertext.org Date: Mon Dec 16 14:40:13 2013 +0100 Updated core Project: dictionaries 569915c40dc4b3df1f75abe9e1202e0d66f03281 diff --git a/dictionaries b/dictionaries index bdd76ca..569915c 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit bdd76ca138ded701c4436ca09d6961009bc1114b +Subproject commit 569915c40dc4b3df1f75abe9e1202e0d66f03281 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5614deeefc6565ce52ce0533be7ae3ff9f69b140 Author: László Németh nem...@numbertext.org Date: Mon Dec 16 14:40:13 2013 +0100 Updated core Project: dictionaries 87fa06e3bb58afaef81ccd7de5c929b50793722f diff --git a/dictionaries b/dictionaries index c89feb3..87fa06e 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit c89feb36ab8a4770881e29635aa60ab2717f28a6 +Subproject commit 87fa06e3bb58afaef81ccd7de5c929b50793722f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ea8b95d49ecd41bd6f14c43977cf8a9eb7f188f1 Author: László Németh nem...@numbertext.org Date: Mon Dec 16 14:40:13 2013 +0100 Updated core Project: dictionaries 5f8da97962f29a0e2216c1dd4fb8f78dfed9fc14 diff --git a/dictionaries b/dictionaries index 7ac7087..5f8da97 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7ac7087863c1940937b3dd9616a22a61e28f24f6 +Subproject commit 5f8da97962f29a0e2216c1dd4fb8f78dfed9fc14 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb08e967a134d650a56c7c13f37cb254d46ecfed Author: László Németh nem...@numbertext.org Date: Mon Dec 16 14:40:13 2013 +0100 Updated core Project: dictionaries a776e2b888ba5d1824540e53d5002ff1ba050fe2 diff --git a/dictionaries b/dictionaries index 3bb9a7d..a776e2b 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 3bb9a7d303fbf1bf10a67a220598abb38363032c +Subproject commit a776e2b888ba5d1824540e53d5002ff1ba050fe2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help in the issue fdo#70807
Hi guys! I'm trying to solve the issues fdo#70807. I putted some points in the bug, but I need to understand where the code set a style as used. Can someone point to me where a style is set as used inside the code base? Thanks since now! signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/crypto/AgileEngine.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a088b9791aa19ecfe3baf551435773b039f1a12e
Author: Douglas Mencken dougmenc...@gmail.com
Date: Mon Dec 16 09:34:58 2013 -0500
Use sal_Int32 to satisfy oox/helper/helper.hxx's convertLittleEndian
Fixes build error no matching function for call to
oox::ByteOrderConverter::convertLittleEndian(int)
Change-Id: I899f151ff99737247ce4090f59897eba842c40ba
Reviewed-on: https://gerrit.libreoffice.org/7099
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/oox/source/crypto/AgileEngine.cxx
b/oox/source/crypto/AgileEngine.cxx
index f56e669..86d7025 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -106,7 +106,7 @@ bool AgileEngine::calculateHashFinal(const OUString
rPassword, vectorsal_uInt8
vectorsal_uInt8 data(mInfo.hashSize + 4, 0);
-for (int i = 0; i mInfo.spinCount; i++)
+for (sal_Int32 i = 0; i mInfo.spinCount; i++)
{
ByteOrderConverter::writeLittleEndian( data[0], i );
std::copy(hash.begin(), hash.end(), data.begin() + 4);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: For libmspub A Dependency Missing from Required List
Hi, On Sun, Dec 15, 2013 at 12:05:12AM -0500, Alan Feuerbacher wrote: Hi, I'm following one of the contacts on your webpage www.freedesktop.org/wiki/Software/libmspub/ In configuring libmspub, configure complained that librevenge was missing. The page describes stable branch for now. I suppose I should update it... I found and installed that program. The libmspub's configure was happy and everything installed ok. I wonder where did you find something to install, as we have not released anything yet :-) There is only git. The above-listed webpage lists Dependencies but librevenge is not shown. Thought you'd want to know. We are well avare of it. (That is, I and Fridrich are avare of it...) Out of curiosity: why are you building libmspub? Are you interested in contributing? (if yes, welcome :-) Or do you work on a project that wants to use it? In that case I recommend using stable branch until librevenge's interface is finalized. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - accessibility/inc accessibility/source include/svtools svtools/source
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx |5 -
accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx | 39
-
accessibility/source/extended/AccessibleGridControl.cxx| 31
---
accessibility/source/extended/AccessibleGridControlBase.cxx| 41
++
accessibility/source/extended/AccessibleGridControlHeader.cxx | 11
+-
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |5 -
accessibility/source/extended/AccessibleGridControlTable.cxx | 38
-
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 22
+++--
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 38
-
include/svtools/accessibletable.hxx|2
svtools/source/table/tablecontrol_impl.cxx |2
11 files changed, 107 insertions(+), 127 deletions(-)
New commits:
commit 158b4df6033d4fdadadebeaa6099465fdef2e368
Author: Michael Stahl mst...@redhat.com
Date: Mon Dec 16 16:16:15 2013 +0100
svtools: rename IAccessibleTableControl::dispose()
... to not confuse it with XComponent::dispose().
Change-Id: I056fdf77f9116d1c22f8ca9313a0ea313fb1c4aa
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 3752fcc..8996a64 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -228,7 +228,7 @@ protected:
{
return this;
}
-void dispose();
+void DisposeAccessImpl() SAL_OVERRIDE;
virtual sal_Bool isAlive() const
{
return isContextAlive();
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index c56f6bd..5ee23f6 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -421,7 +421,7 @@ AccessibleGridControlAccess::~AccessibleGridControlAccess()
}
//
-
-void AccessibleGridControlAccess::dispose()
+void AccessibleGridControlAccess::DisposeAccessImpl()
{
SolarMutexGuard g;
diff --git a/include/svtools/accessibletable.hxx
b/include/svtools/accessibletable.hxx
index 285ab84..8b89684 100644
--- a/include/svtools/accessibletable.hxx
+++ b/include/svtools/accessibletable.hxx
@@ -139,7 +139,7 @@ public:
/** disposes the accessible implementation, so that it becomes defunc
*/
-virtual void dispose() = 0;
+virtual void DisposeAccessImpl() = 0;
/** checks whether the accessible implementation, and its context, are
still alive
@return TRUE/, if the object is not disposed or disposing.
diff --git a/svtools/source/table/tablecontrol_impl.cxx
b/svtools/source/table/tablecontrol_impl.cxx
index e27dbac..f4238c9 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2727,7 +2727,7 @@ namespace svt { namespace table
void TableControl_Impl::disposeAccessible()
{
if ( m_pAccessibleTable )
-m_pAccessibleTable-dispose();
+m_pAccessibleTable-DisposeAccessImpl();
m_pAccessibleTable = NULL;
}
commit 449e0c9c7378ba32039bd5934c26011d682a8a91
Author: Michael Stahl mst...@redhat.com
Date: Mon Dec 16 16:09:19 2013 +0100
accessibility: don't crash if the TableControl is dead
AccessibleGridControlAccess: clear the m_pTable member in dispose() so
it is no longer accessed later.
Change-Id: I490c84ce1bee55c9c69eb29b81ddfbe808301797
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index c4ed353..3752fcc 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -195,7 +195,7 @@ class AccessibleGridControlAccess :public
AccessibleGridControlAccess_Base
private:
::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible
m_xParent;
-::svt::table::IAccessibleTablem_rTable;
+::svt::table::IAccessibleTable *m_pTable;
::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessibleContext
m_xContext;
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 8ce5800..c56f6bd 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -407,10 +407,11 @@ void
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/README | 18 ++ 1 file changed, 18 insertions(+) New commits: commit 5964792a5ab8df46475362c36d0620c8bf92223b Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Dec 16 16:27:16 2013 +0100 sw/qa/extras: document XPath checks Change-Id: I78cd22485bd5d76ca37fa07e2e2eeae1da5bfea3 diff --git a/sw/qa/extras/README b/sw/qa/extras/README index e933843..b2c003f 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -32,6 +32,21 @@ once after the initial import -- so you can see if the export fails due to an import problem in fact -- and once after the export and import. The test method should still assert the document model only, as discussed above. +=== Direct XPath assertions + +An other alternative is to assert the resulted export document directly. +Currently this is only implemented for DOCX, which is a zipped XML, so it's +possible to evaluate XPath checks. A check looks like this: + +xmlDocPtr pXmlDoc = parseExport(word/document.xml); +if (!pXmlDoc) +return; +assertXPath(pXmlDoc, xpath selecting the node, attribute, value); + +It's important to check for the NULL pointer here, it's expected that it'll be +NULL when the test runs first (after the first import), as there is nothing +exported yet. + == Helper methods When two or more tests do the same (for example determine the number of @@ -52,6 +67,9 @@ that productive. Xray can help in this case. Download it from: http://bernard.marcelly.perso.sfr.fr/index2.html +(Mirror in case a new version behaves in a strange way: +http://people.freedesktop.org/~vmiklos/2013/XrayTool52_en.sxw) + It's an SXW file, start Writer, Tools - Options - LibreOffice - Security, Macro Security, and there choose Low. Then open the SXW, and click `Install Xray`. Now you can close the SXW. Open your testcase, which is imported ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/dialogs/hangulhanjadlg.cxx | 35 ++-
cui/source/dialogs/hangulhanjadlg.hrc | 13 --
cui/source/dialogs/hangulhanjadlg.src | 52 ---
cui/source/inc/cuires.hrc |1
cui/source/inc/hangulhanjadlg.hxx | 16 +--
cui/source/inc/helpid.hrc |1
cui/uiconfig/ui/hangulhanjaadddialog.ui | 151
8 files changed, 169 insertions(+), 101 deletions(-)
New commits:
commit 963888a3a03f39d780902e30d03cb0053070412a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 15:33:43 2013 +
convert hangul-hanja new dict dialog to .ui
Change-Id: I18fdd834916aa1e15720698104c5ad989ee61986
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index d90ef32..486ace4 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
+ cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hatchpage \
cui/uiconfig/ui/hyphenate \
cui/uiconfig/ui/insertfloatingframe \
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 662f6ef..d6fa7dd 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1181,11 +1181,11 @@ namespace svx
IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl)
{
-OUString aName(comphelper::string::stripEnd(m_aDictNameED.GetText(),
' '));
+OUString aName(comphelper::string::stripEnd(m_pDictNameED-GetText(),
' '));
m_bEntered = !aName.isEmpty();
if( m_bEntered )
-m_aDictNameED.SetText( aName ); // do this in case of trailing
chars have been deleted
+m_pDictNameED-SetText( aName ); // do this in case of
trailing chars have been deleted
EndDialog( RET_OK );
return 0;
@@ -1193,39 +1193,28 @@ namespace svx
IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl)
{
-OUString aName(comphelper::string::stripEnd(m_aDictNameED.GetText(), '
'));
+OUString aName(comphelper::string::stripEnd(m_pDictNameED-GetText(),
' '));
-m_aOkBtn.Enable( !aName.isEmpty() );
+m_pOkBtn-Enable( !aName.isEmpty() );
return 0;
}
-HangulHanjaNewDictDialog::HangulHanjaNewDictDialog( Window* _pParent )
-:ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA_NEWDICT
) )
-,m_aNewDictFL ( this, CUI_RES( FL_NEWDICT ) )
-,m_aDictNameFT ( this, CUI_RES( FT_DICTNAME ) )
-,m_aDictNameED ( this, CUI_RES( ED_DICTNAME ) )
-,m_aOkBtn ( this, CUI_RES( PB_NEWDICT_OK ) )
-,m_aCancelBtn ( this, CUI_RES( PB_NEWDICT_ESC ) )
-,m_aHelpBtn ( this, CUI_RES( PB_NEWDICT_HLP ) )
-
-,m_bEntered ( false )
+HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(Window* pParent)
+: ModalDialog(pParent, HangulHanjaAddDialog,
cui/ui/hangulhanjaadddialog.ui)
+, m_bEntered(false)
{
-m_aOkBtn.SetClickHdl( LINK( this, HangulHanjaNewDictDialog, OKHdl ) );
-
-m_aDictNameED.SetModifyHdl( LINK( this, HangulHanjaNewDictDialog,
ModifyHdl ) );
-
-FreeResource();
-}
+get(m_pOkBtn, ok);
+get(m_pDictNameED, entry);
-HangulHanjaNewDictDialog::~HangulHanjaNewDictDialog()
-{
+m_pOkBtn-SetClickHdl( LINK( this, HangulHanjaNewDictDialog, OKHdl ) );
+m_pDictNameED-SetModifyHdl( LINK( this, HangulHanjaNewDictDialog,
ModifyHdl ) );
}
bool HangulHanjaNewDictDialog::GetName( OUString _rRetName ) const
{
if( m_bEntered )
-_rRetName = comphelper::string::stripEnd(m_aDictNameED.GetText(),
' ');
+_rRetName = comphelper::string::stripEnd(m_pDictNameED-GetText(),
' ');
return m_bEntered;
}
diff --git a/cui/source/dialogs/hangulhanjadlg.hrc
b/cui/source/dialogs/hangulhanjadlg.hrc
index b433816..bcce1ef 100644
--- a/cui/source/dialogs/hangulhanjadlg.hrc
+++ b/cui/source/dialogs/hangulhanjadlg.hrc
@@ -115,19 +115,6 @@
#define HHO_ROW_a4 (HHO_ROW_a3+14)
#define HHO_ROW_a5 (HHO_ROW_a4+4)
-
-// Hangul / Hanja New Dictonary Dialog
-#define FL_NEWDICT 1
-
-#define FT_DICTNAME 1
-
-#define ED_DICTNAME 1
-
-#define PB_NEWDICT_OK 1
-#define PB_NEWDICT_ESC 2
-#define PB_NEWDICT_HLP 3
-
-
// Hangul Hanja Edit Custom Dictionary Dialog
#define MAXNUM_SUGGESTIONS 50
diff --git a/cui/source/dialogs/hangulhanjadlg.src
b/cui/source/dialogs/hangulhanjadlg.src
index ebe6657..eb71de1 100644
--- a/cui/source/dialogs/hangulhanjadlg.src
+++ b/cui/source/dialogs/hangulhanjadlg.src
@@ -272,58 +272,6 @@ ModalDialog
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/shared/01/06201000.xhp |6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 7553e9bbbdce95b10ff4f8833f168e3e43b4af1d Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 15:40:17 2013 + update help ids for add new hangul-hanja dict Change-Id: I7e1d3142e11bad9e5dc2863c5cab4e71b720bcc7 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ff03c51..ef549cf 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2146,7 +2146,6 @@ HID_HANGULDLG_SUGGESTIONS,40038, HID_HANGULDLG_SUGGESTIONS_GRID,40039, HID_HANGULDLG_SUGGESTIONS_LIST,40040, HID_HANGULHANJA_EDIT_DLG,39992, -HID_HANGULHANJA_NEWDICT_DLG,39991, HID_HANGULHANJA_OPT_DICTS_LB,39994, HID_HANGULHANJA_OPT_DLG,39990, HID_HELPAGENT_TIP_BOX,33159, @@ -6595,7 +6594,6 @@ svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_1,1237665793, svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_2,1237665794, svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_3,1237665795, svx_Edit_RID_SVX_MDLG_HANGULHANJA_EDIT_ED_4,1237665796, -svx_Edit_RID_SVX_MDLG_HANGULHANJA_NEWDICT_ED_DICTNAME,1237682177, svx_FloatingWindow_RID_SVXDLG_CONTOUR,1782005760, svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DEPTH,1790640128, svx_FloatingWindow_RID_SVXFLOAT_EXTRUSION_DIRECTION,1790590976, diff --git a/source/text/shared/01/06201000.xhp b/source/text/shared/01/06201000.xhp index d9118a2..e6f3f20 100644 --- a/source/text/shared/01/06201000.xhp +++ b/source/text/shared/01/06201000.xhp @@ -35,13 +35,13 @@ paragraph role=paragraph id=par_idN10546 xml-lang=en-US l10n=NEWDefine options for the link href=text/shared/01/0620.xhpHangul/Hanja conversion/link./paragraph bookmark xml-lang=en-US branch=hid/CUI_HID_HANGULHANJA_OPT_DICTS_LB id=bm_id3277077 localize=false/ paragraph role=heading id=par_idN1055F xml-lang=en-US level=2 l10n=NEWUser-defined dictionaries/paragraph -paragraph role=paragraph id=par_idN10563 xml-lang=en-US l10n=NEWahelp hid=HID_HANGULHANJA_NEWDICT_DLGLists all user-defined dictionaries. Select the check box next to the dictionary that you want to use. Clear the check box next to the dictionary that you do not want to use./ahelp/paragraph +paragraph role=paragraph id=par_idN10563 xml-lang=en-US l10n=NEWahelp hid=cui/ui/hangulhanjaadddialog/HangulHanjaAddDialogLists all user-defined dictionaries. Select the check box next to the dictionary that you want to use. Clear the check box next to the dictionary that you do not want to use./ahelp/paragraph bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW id=bm_id4629657 localize=false/ paragraph role=heading id=par_idN1057A xml-lang=en-US level=2 l10n=NEWNew/paragraph paragraph role=paragraph id=par_idN1057E xml-lang=en-US l10n=NEWahelp hid=svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEWOpens the New dictionary dialog box, where you can create a new dictionary./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME id=bm_id871.0001 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/hangulhanjaadddialog/entry id=bm_id871.0001 localize=false/ paragraph role=heading id=par_idN10595 xml-lang=en-US level=3 l10n=NEWName/paragraph -paragraph role=paragraph id=par_idN10599 xml-lang=en-US l10n=NEWahelp hid=svx:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAMEEnter a name for the dictionary./ahelp To display the new dictionary in the emphUser-defined dictionaries/emph list box, click emphOK/emph./paragraph +paragraph role=paragraph id=par_idN10599 xml-lang=en-US l10n=NEWahelp hid=cui/ui/hangulhanjaadddialog/entryEnter a name for the dictionary./ahelp To display the new dictionary in the emphUser-defined dictionaries/emph list box, click emphOK/emph./paragraph bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT id=bm_id6776635 localize=false/ paragraph role=heading id=par_idN105B5 xml-lang=en-US level=2 l10n=NEWEdit/paragraph paragraph role=paragraph id=par_idN105B9 xml-lang=en-US l10n=NEWahelp hid=svx:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDITOpens the link href=text/shared/01/06202000.xhpEdit Custom Dictionary/link dialog where you can edit any user-defined dictionary./ahelp/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6ae7d7734d7cba05db12a087c7fa13abbb2c0797 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 15:40:17 2013 + Updated core Project: help 7553e9bbbdce95b10ff4f8833f168e3e43b4af1d diff --git a/helpcontent2 b/helpcontent2 index 5cfa752..7553e9b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5cfa752cb51b7a4129fca02287c860e297782632 +Subproject commit 7553e9bbbdce95b10ff4f8833f168e3e43b4af1d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_Lo_Xcconfig.mk ios/CustomTarget_MobileLibreOffice_app.mk ios/Module_ios.mk
ios/CustomTarget_Lo_Xcconfig.mk | 34 ++ ios/CustomTarget_MobileLibreOffice_app.mk | 14 +--- ios/Module_ios.mk |1 3 files changed, 37 insertions(+), 12 deletions(-) New commits: commit 4dd32d6b2e265611d57c0b16e4b67ced3c64bce4 Author: Tor Lillqvist t...@collabora.com Date: Mon Dec 16 17:45:52 2013 +0200 Split out the setup of lo.xcconfig into a separate CustomTarget Change-Id: If486cf470583205763722766da57303de904b321 diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk new file mode 100644 index 000..b6032da --- /dev/null +++ b/ios/CustomTarget_Lo_Xcconfig.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,ios/Lo_Xcconfig)) + +LO_XCCONFIG = $(BUILDDIR)/ios/lo.xcconfig + +$(call gb_CustomTarget_get_target,ios/Lo_Xcconfig): $(LO_XCCONFIG) + +.PHONY : $(LO_XCCONFIG) + +$(LO_XCCONFIG) : +# Edit in the list of all our (static) libs in the Xcode +# configuration file. + all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \ + sed -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs| $(LO_XCCONFIG) $(LO_XCCONFIG).new mv $(LO_XCCONFIG).new $(LO_XCCONFIG) + +# When SRCDIR!=BUILDDIR, Xcode is used on the project in the +# *source* tree (because that is where the source files are). Copy +# the configuration file to the corresponding source dir so that +# Xcode can find it. + if test $(SRCDIR) != $(BUILDDIR); then \ + cp $(LO_XCCONFIG) $(SRCDIR)/ios; \ + fi + +# Do *not* remove $(LO_XCCONFIG) in a clean target. It is created +# during configury, not in this custom gbuild makefile. + +# vim: set noet sw=4 ts=4: diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk index 122b067..262cf9d 100644 --- a/ios/CustomTarget_MobileLibreOffice_app.mk +++ b/ios/CustomTarget_MobileLibreOffice_app.mk @@ -8,7 +8,6 @@ #- Env -LO_XCCONFIG:= lo.xcconfig DEST_RESOURCE := MobileLibreOffice/resource_link BUILDID:=$(shell cd $(SRCDIR) git log -1 --format=%H) @@ -30,7 +29,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/MobileLibreOffice)) #== # Build -$(call gb_CustomTarget_get_target,ios/MobileLibreOffice): MobileLibreOffice_setup +# Depend on the custom target that sets up lo.xcconfig +$(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig) MobileLibreOffice_setup #== $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(call MobileLibreOfficeXcodeBuild, clean build) @@ -41,16 +41,6 @@ MobileLibreOffice_setup: #== $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) - # Libs # - # Create the link flags in the xcconfig for Xcode linkage - all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \ - sed -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs| $(BUILDDIR)/ios/$(LO_XCCONFIG) $(BUILDDIR)/ios/$(LO_XCCONFIG).new mv $(BUILDDIR)/ios/$(LO_XCCONFIG).new $(BUILDDIR)/ios/$(LO_XCCONFIG) - - # Copy lo.xcconfig to source dir for the Xcode projects - if test $(SRCDIR) != $(BUILDDIR); then \ - cp $(BUILDDIR)/ios/$(LO_XCCONFIG) $(SRCDIR)/ios; \ - fi - # Resources # rm -rf $(DEST_RESOURCE) 2/dev/null mkdir -p $(DEST_RESOURCE) diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk index 671e9f3..caf3220 100644 --- a/ios/Module_ios.mk +++ b/ios/Module_ios.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,ios)) ifeq ($(OS),IOS) $(eval $(call gb_Module_add_targets,ios,\ + CustomTarget_Lo_Xcconfig \ Executable_LibreOffice \ CustomTarget_LibreOffice_app \ CustomTarget_MobileLibreOffice_app \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk
include/svx/fontworkgallery.hxx |7 -
svx/UIConfig_svx.mk |3
svx/inc/fontworkgallery.hrc |2
svx/source/tbxctrls/fontworkgallery.cxx | 21 +
svx/source/tbxctrls/fontworkgallery.src | 54 --
svx/uiconfig/ui/fontworkspacingdialog.ui | 112 +++
6 files changed, 119 insertions(+), 80 deletions(-)
New commits:
commit fc946896bae5091b539db8929706dd3971129139
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 15:51:40 2013 +
convert fontwork spacing dialog to .ui
Change-Id: I0cf7fb84974741a162addb6c1fc393d3328f21cb
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 3e1f7bf..1105bd6 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -66,15 +66,10 @@ public:
class FontworkCharacterSpacingDialog : public ModalDialog
{
-FixedText maFLScale;
-MetricField maMtrScale;
-OKButtonmaOKButton;
-CancelButtonmaCancelButton;
-HelpButton maHelpButton;
+MetricField* m_pMtrScale;
public:
FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale );
-~FontworkCharacterSpacingDialog();
sal_Int32 getScale() const;
};
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index a031a2d..004cae2 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -19,8 +19,9 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/extrustiondepthdialog \
- svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/fontworkspacingdialog \
+ svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index de2665d..4946a8c 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -22,8 +22,6 @@
#define CTL_FAVORITES 2
#define BTN_OK 3
#define BTN_CANCEL 4
-#define MF_VALUE7
-#define FT_VALUE8
#define BTN_HELP9
#define STR_CLICK_TO_ADD_TEXT 1
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index db5131b..db81609 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -726,29 +726,16 @@ Sequence OUString SAL_CALL
FontworkCharacterSpacingControl::getSupportedServi
return FontworkCharacterSpacingControl_getSupportedServiceNames();
}
-//
-// FontworkCharacterSpacingDialog
-//
-
FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( Window*
pParent, sal_Int32 nScale )
-: ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_FONTWORK_CHARSPACING ) ),
-maFLScale( this, SVX_RES( FT_VALUE ) ),
-maMtrScale( this, SVX_RES( MF_VALUE ) ),
-maOKButton( this, SVX_RES( BTN_OK ) ),
-maCancelButton( this, SVX_RES( BTN_CANCEL ) ),
-maHelpButton( this, SVX_RES( BTN_HELP ) )
-{
-maMtrScale.SetValue( nScale );
-FreeResource();
-}
-
-FontworkCharacterSpacingDialog::~FontworkCharacterSpacingDialog()
+: ModalDialog( pParent, FontworkSpacingDialog ,
svx/ui/fontworkspacingdialog.ui )
{
+get(m_pMtrScale, entry);
+m_pMtrScale-SetValue( nScale );
}
sal_Int32 FontworkCharacterSpacingDialog::getScale() const
{
-return (sal_Int32)maMtrScale.GetValue();
+return (sal_Int32)m_pMtrScale-GetValue();
}
}
diff --git a/svx/source/tbxctrls/fontworkgallery.src
b/svx/source/tbxctrls/fontworkgallery.src
index 2e5f179..9e049a9 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -214,58 +214,4 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
};
};
-ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
-{
-HelpID = svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 139 , 64 ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-
-Text [ en-US ] = Fontwork Character Spacing ;
-
-OKButton BTN_OK
-{
-Pos = MAP_APPFONT ( 83 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 83 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-HelpButton BTN_HELP
-{
-Pos = MAP_APPFONT ( 83 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-FixedText FT_VALUE
-{
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 76 , 8 ) ;
-Text[
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff43e50682f7b81fb89b97f0b5429480f009 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 15:55:07 2013 + Updated core Project: help 884765268982ae9ddd2724473ad29d3a05e4ad30 diff --git a/helpcontent2 b/helpcontent2 index 7553e9b..8847652 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7553e9bbbdce95b10ff4f8833f168e3e43b4af1d +Subproject commit 884765268982ae9ddd2724473ad29d3a05e4ad30 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 884765268982ae9ddd2724473ad29d3a05e4ad30 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 15:55:07 2013 + drop unused help ids Change-Id: Ia9e3e9dc9abb9cf5befc0e249aaa3bb38ff4aea8 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ef549cf..e3d15c5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6800,7 +6800,6 @@ svx_MetricField_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT,1243027 svx_MetricField_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH,1243027970, svx_MetricField_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA,1243060738, svx_MetricField_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_MTR_THRESHOLD,1243044354, -svx_MetricField_RID_SVX_MDLG_FONTWORK_CHARSPACING_MF_VALUE,1237899783, svx_ModalDialog_DLG_CHINESEDICTIONARY,1078673408, svx_ModalDialog_DLG_CHINESETRANSLATION,1078657024, svx_ModalDialog_DLG_DOCUMENTLINK,1346109440, @@ -6818,7 +6817,6 @@ svx_ModalDialog_RID_SVXDLG_GALLERY_THEMEID,1243627520, svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224, svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744, svx_ModalDialog_RID_SVX_DLG_SHOWGRIDCOLUMNS,1368834048, -svx_ModalDialog_RID_SVX_MDLG_FONTWORK_CHARSPACING,1237893120, svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592, svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336, svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basctl/Module_basctl.mk chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module_desktop.mk extensions/Module_extensions.mk filt
basctl/Module_basctl.mk |2 +- chart2/Module_chart2.mk |2 +- cui/Module_cui.mk |2 +- dbaccess/Module_dbaccess.mk | 14 +++--- desktop/Module_desktop.mk |2 +- extensions/Module_extensions.mk |4 ++-- filter/Module_filter.mk |2 +- framework/Module_framework.mk |2 +- padmin/Module_padmin.mk |2 +- postprocess/Module_postprocess.mk |4 +++- reportdesign/Module_reportdesign.mk |2 +- sc/Module_sc.mk |2 +- sd/Module_sd.mk |4 ++-- sfx2/Module_sfx2.mk |2 +- solenv/gbuild/Module.mk |4 ++-- starmath/Module_starmath.mk |2 +- svtools/Module_svtools.mk |2 +- svx/Module_svx.mk |2 +- sw/Module_sw.mk |8 uui/Module_uui.mk |2 +- vcl/Module_vcl.mk |2 +- xmlsecurity/Module_xmlsecurity.mk |2 +- 22 files changed, 36 insertions(+), 34 deletions(-) New commits: commit e125dee18a6dcaf9a7f07c7e26fc44d111f2a7d5 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Dec 16 16:52:29 2013 +0100 postprocess registry is a l10n-relevant target Change-Id: I349fb24a388775c58be7a326832b3fc0ec38180f diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index 9ed1a75..d3d5a95 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -16,9 +16,11 @@ $(eval $(call gb_Module_add_targets,postprocess,\ CustomTarget_images \ CustomTarget_registry \ Package_images \ - Package_registry \ Rdb_services \ )) +$(eval $(call gb_Module_add_l10n_targets,postprocess,\ + Package_registry \ +)) ifeq ($(WINDOWS_BUILD_SIGNING),TRUE) $(eval $(call gb_Module_add_targets,postprocess,\ commit 78c7eb35076ed9d6749730f299cb8e87a2033753 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Dec 16 16:51:35 2013 +0100 uiconfig is a l10n-relevant target Change-Id: I8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06 diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 5da59c9..92d3553 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\ endif -$(eval $(call gb_Module_add_targets,basctl,\ +$(eval $(call gb_Module_add_l10n_targets,basctl,\ UIConfig_basicide \ )) diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 49a8c51..a7751e9 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -12,11 +12,11 @@ $(eval $(call gb_Module_Module,chart2)) $(eval $(call gb_Module_add_targets,chart2,\ Library_chartcontroller \ Library_chartcore \ - UIConfig_chart2 \ )) $(eval $(call gb_Module_add_l10n_targets,chart2,\ AllLangResTarget_chartcontroller \ + UIConfig_chart2 \ )) $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk index 62398b3..2a2fca4 100644 --- a/cui/Module_cui.mk +++ b/cui/Module_cui.mk @@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,cui)) $(eval $(call gb_Module_add_targets,cui,\ Library_cui \ - UIConfig_cui \ )) $(eval $(call gb_Module_add_l10n_targets,cui,\ AllLangResTarget_cui \ + UIConfig_cui \ )) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 5c05968..b9d7d56 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -18,13 +18,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ Library_dbmm \ Library_dbu \ Library_sdbt \ - UIConfig_dbaccess \ - UIConfig_dbapp \ - UIConfig_dbbrowser \ - UIConfig_dbquery \ - UIConfig_dbrelation \ - UIConfig_dbtable \ - UIConfig_dbtdata \ )) $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ @@ -32,6 +25,13 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ AllLangResTarget_dbmm \ AllLangResTarget_dbu \ AllLangResTarget_sdbt \ + UIConfig_dbaccess \ + UIConfig_dbapp \ + UIConfig_dbbrowser \ + UIConfig_dbquery \ + UIConfig_dbrelation \ + UIConfig_dbtable \ + UIConfig_dbtdata \ )) ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index b54bc96..c325176 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -20,13 +20,13 @@ $(eval $(call gb_Module_add_targets,desktop,\ $(if $(ENABLE_HEADLESS),,Library_spl) \ Package_branding \ $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \ -UIConfig_deployment \ )) $(eval $(call gb_Module_add_l10n_targets,desktop,\ AllLangResTarget_deployment \ AllLangResTarget_deploymentgui \
[Libreoffice-commits] core.git: oox/source
oox/source/export/shapes.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit f873ee187b67e9fb3a08ed2735b494e823fe7dd9 Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Dec 16 17:19:30 2013 +0100 oox: fix ShapeExport::WriteRectangleShape() for docx This fixes testFdo60990 in CppunitTest_sw_ooxmlexport when DML export is enabled in non-experimental mode. Change-Id: If69bdb6ed8798ccd3e5e3bb55ec4d2a598fd6060 diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 3e9a082..6a793b7 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -661,7 +661,7 @@ ShapeExport ShapeExport::WriteRectangleShape( Reference XShape xShape ) FSHelperPtr pFS = GetFS(); -pFS-startElementNS( mnXmlNamespace, XML_sp, FSEND ); +pFS-startElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_sp : XML_wsp), FSEND ); sal_Int32 nRadius = 0; @@ -677,6 +677,8 @@ ShapeExport ShapeExport::WriteRectangleShape( Reference XShape xShape ) } // non visual shape properties +if (GetDocumentType() == DOCUMENT_DOCX) +pFS-singleElementNS( mnXmlNamespace, XML_cNvSpPr, FSEND ); pFS-startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND ); pFS-singleElementNS( mnXmlNamespace, XML_cNvPr, XML_id, I32S( GetNewShapeID( xShape ) ), @@ -701,7 +703,7 @@ ShapeExport ShapeExport::WriteRectangleShape( Reference XShape xShape ) // write text WriteTextBox( xShape, mnXmlNamespace ); -pFS-endElementNS( mnXmlNamespace, XML_sp ); +pFS-endElementNS( mnXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX ? XML_sp : XML_wsp) ); return *this; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Accessible labels in alerts claim to be ROLE_PASSWORD_TEXT
Hello again So I didn't really find the time that I wanted to put on this but, I will at least try to account for what I found out this far. Caolán McNamara skrev 2013-11-05 13:59: On Mon, 2013-11-04 at 17:07 +0100, Niklas Johansson wrote: An other issue around this message box was the VclBox surrounding the buttons, that gets the role FILLER but should probably have the role PANEL. Changing the sal_uInt16 VclBox::getDefaultAccessibleRole() const to return PANEL made NVDA read the dialog content when the dialog got displayed. After a closer look my suggestion above is wrong. ... In general where I'm hoping to get to is that LibreOffice reports the same sort of hierarchy and types for a .ui that gtk would if it was rendering it. I *think* gtk defaults to PANEL for containers but FILLER for GtkBox, which is where those defaults in layout.cxx come from. Yep that is what we want. And I do believe that you are correct about the default roles. Looking closer (see below) at a messagebox created in glade you don't see any PANEL so question is do gtk use a container to group it's labels and override the default roles or does it use something else? I did the same and looked in Accerciser at the complete accessibility tree: - frame - alert - filler - filler - icon - filler - label - label -filler - push button - push button Sorry for not being able to report anything more interesting at this time. I probably need to let this rest for a while and concentrate on translation for LibreOffice 4.2. /Niklas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibO 4.2.0.0 - Configuration page
Hi Thomas Did you find any good way to disable the Expert Config page? Searching the code I found this: http://opengrok.libreoffice.org/xref/core/configmgr/source/winreg.cxx That gives an example how one could hide the the config leaf in the options dialog, only problem is that the function got moved from it's own leaf into it's own window that opens from a button on the advanced leaf. Does anyone know if that button has a uno-command linked to it? In that case we could block that command by adding a xcd-file. Until further notice this is an example of a xcd-file for hiding the whole advanced leaf. ?xml version=1.0? oor:data xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:oor=http://openoffice.org/2001/registry; dependency file=main / !-- Hide Tools - Options - LibreOffice - Advanced -- oor:component-data xmlns:install=http://openoffice.org/2004/installation; oor:name=OptionsDialog oor:package=org.openoffice.Office node oor:name=OptionsDialogGroups node oor:name=ProductName oor:op=fuse node oor:name=Pages node oor:name=Java oor:op=fuse prop oor:name=Hide valuetrue/value /prop /node /node /node /node /oor:component-data /oor:data I even got it to work by changing the windows registry like this. [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\LibreOffice\org.openoffice.Office.OptionsDialog\OptionsDialogGroups\ProductName/#fuse\Pages\Java/#fuse\Hide] Value=true Regards, Niklas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a459f969d20ba3f77db58493c45819429996e67 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Nov 21 12:35:34 2013 +0100 l10n and non-l10n targets missing dep on build Change-Id: Ia6d09a1625819593291649369a7533bbd2ee8227 Reviewed-on: https://gerrit.libreoffice.org/6981 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/Makefile.in b/Makefile.in index 6918e22..8c64940 100644 --- a/Makefile.in +++ b/Makefile.in @@ -225,7 +225,7 @@ ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif -build-nocheck check debugrun help slowcheck translations unitcheck subsequentcheck : build +build-non-l10n-only build-l10n-only build-nocheck check debugrun help slowcheck translations unitcheck subsequentcheck : build cross-toolset: bootstrap fetch $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basctl/Module_basctl.mk chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module_desktop.mk extensions/Module_ext
Makefile.in |9 +- basctl/Module_basctl.mk |2 chart2/Module_chart2.mk |2 cui/Module_cui.mk |2 dbaccess/Module_dbaccess.mk | 14 +-- desktop/Module_desktop.mk |2 extensions/Module_extensions.mk |4 filter/Module_filter.mk |2 framework/Module_framework.mk |2 padmin/Module_padmin.mk |2 postprocess/Module_postprocess.mk |4 reportdesign/Module_reportdesign.mk |2 sc/Module_sc.mk |2 sd/Module_sd.mk |4 sfx2/Module_sfx2.mk |2 solenv/gbuild/AllLangHelp.mk|3 solenv/gbuild/AllLangPackage.mk |2 solenv/gbuild/AllLangResTarget.mk |3 solenv/gbuild/Module.mk |4 solenv/gbuild/TargetLocations.mk|1 solenv/gbuild/UIConfig.mk |3 solenv/gbuild/extensions/post_PackageInfo.mk| 99 solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 starmath/Module_starmath.mk |2 svtools/Module_svtools.mk |2 svx/Module_svx.mk |2 sw/Module_sw.mk |8 - uui/Module_uui.mk |2 vcl/Module_vcl.mk |2 xmlsecurity/Module_xmlsecurity.mk |2 30 files changed, 154 insertions(+), 38 deletions(-) New commits: commit 59b4f353d867b0dfd37c6166d2b2456495584787 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Nov 21 14:47:20 2013 +0100 initial install-package-foo target for partial installs make packageinfo target add uiconfig file translations add missing l10n config files add missing help files in packageinfo Reviewed-on: https://gerrit.libreoffice.org/6754 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com Conflicts: helpcontent2 translations a2498a118e729276a78ef3a4eb43b5d0b302d326 9bb39bdd677af4be0da621370c51eb9e22ecc33f a7e654cdeffd832f51016ff51aa180fe3924ff4e 4ee41fdb600cb3a89da387dffe64e6a30192761c 349fb24a388775c58be7a326832b3fc0ec38180f 8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06 Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8 Reviewed-on: https://gerrit.libreoffice.org/6982 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/Makefile.in b/Makefile.in index 8c64940..206f5ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck +.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo MAKECMDGOALS?=all @@ -220,12 +220,12 @@ endif $(if $(filter build check,$(MAKECMDGOALS)),all) \ $(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \ $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) \ - $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check,$(MAKECMDGOALS)) + $(filter all build-l10n-only build-non-l10n-only debugrun help slowcheck translations unitcheck subsequentcheck check packageinfo,$(MAKECMDGOALS)) ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif -build-non-l10n-only build-l10n-only build-nocheck check debugrun help slowcheck translations unitcheck subsequentcheck : build +build-non-l10n-only build-l10n-only build-nocheck check debugrun help slowcheck translations unitcheck subsequentcheck packageinfo: build cross-toolset: bootstrap fetch $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools @@ -302,6 +302,9 @@ distro-pack-install: install $(SRCDIR)/bin/distro-install-sdk $(SRCDIR)/bin/distro-install-file-lists +install-package-%: + $(GNUMAKE) $(GMAKE_OPTIONS) -f
Re: LibO 4.2.0.0 - Configuration page
Hi Niklas, On Mon, Dec 16, 2013 at 6:44 PM, Niklas Johansson sleeping.pil...@gmail.com wrote: Hi Thomas Did you find any good way to disable the Expert Config page? Four days ago Kendy added a config item, it is /org.openoffice.Office.Common/Security/EnableExpertConfiguration with values true/false; defaults to true. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/winreg.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1aceb7bdaeb4043baf84f3b160738889e8061136
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Dec 16 19:57:06 2013 +0100
change config example in comment
because Expert Config is no longer a leaf in option page tree,
it became a standalone window.
Change-Id: Ib82b5eb958073d1afbd9ad2b8493e2670dee591b
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index 2969598..995169c 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -53,14 +53,14 @@ namespace {
// /item
//
// Another example:
-//
[HKEY_LOCAL_MACHINE\Policies\LibreOffice\org.openoffice.Office.OptionsDialog\OptionsDialogGroups\ProductName/#fuse\Pages\AboutConfig/#fuse\Hide]
+//
[HKEY_LOCAL_MACHINE\Policies\LibreOffice\org.openoffice.Office.OptionsDialog\OptionsDialogGroups\ProductName/#fuse\Pages\Java/#fuse\Hide]
// Value=true
// becomes the following in configuration:
-// !-- Hide Tools - Options - LibreOffice - Expert Config panel --
+// !-- Hide Tools - Options - LibreOffice - Advanced panel --
// item oor:path=/org.openoffice.Office.OptionsDialog/OptionsDialogGroups
// node oor:name=ProductName oor:op=fuse
// node oor:name=Pages
-// node oor:name=AboutConfig oor:op=fuse
+// node oor:name=Java oor:op=fuse
// prop oor:name=Hide
// valuetrue/value
// /prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Module.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0d35caf02d4744f55f123326e65441126b8a99bf Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Mon Dec 16 19:57:36 2013 +0100 silence warning introduced by e125dee1 (Shut up, Wesley!) Change-Id: Id08f07ec47b5d3e34e1ef1e73475bfe6b10268c9 diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 1440f67..754d2cb 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -227,7 +227,7 @@ endif endef define gb_Module_add_target -$(if $(filter AllLang% Dictionary% UIConfig%,$(2)),$(warning target $(2) should be a l10n target)) +$(if $(filter AllLang% Dictionary% UIConfig% Package_registry,$(2)),$(warning target $(2) should be a l10n target)) $(call gb_Module__read_targetfile,$(1),$(2),target) $(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET) @@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef define gb_Module_add_l10n_target -$(if $(filter AllLang% Dictionary% UIConfig%,$(2)),,$(warning target $(2) should not be a l10n target)) +$(if $(filter AllLang% Dictionary% UIConfig% Package_registry,$(2)),,$(warning target $(2) should not be a l10n target)) $(call gb_Module__read_targetfile,$(1),$(2),target) $(call gb_Module_get_l10n_target,$(1)) : $$(gb_Module_CURRENTTARGET) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 62475] Remove pointless comments and ASCII art
https://bugs.freedesktop.org/show_bug.cgi?id=62475 Jorendc jore...@libreoffice.org changed: What|Removed |Added Attachment #76683|text/plain |text/x-perl mime type|| -- 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: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuigaldlg.cxx | 19 +
cui/source/dialogs/gallery.src| 47
cui/source/inc/cuigaldlg.hxx | 13 ---
cui/source/inc/gallery.hrc|3
cui/source/inc/helpid.hrc |1
cui/uiconfig/ui/gallerytitledialog.ui | 126 ++
7 files changed, 135 insertions(+), 75 deletions(-)
New commits:
commit 627b0e8b095dc3a08c6716db0fa6a6376125468e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 17:15:45 2013 +
convert gallery title dialog to .ui
Change-Id: I432b8c36e28576d016c58d972299aa804963829e
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 486ace4..005c0ef 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
+ cui/uiconfig/ui/gallerytitledialog \
cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hatchpage \
cui/uiconfig/ui/hyphenate \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ee03268..60bbe95 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -520,21 +520,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl,
INetURLObject*, pURL )
return 0;
}
-// ---
-// - TitleDialog -
-// ---
-
-TitleDialog::TitleDialog( Window* pParent, const OUString rOldTitle ) :
-ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
-maOk( this, CUI_RES( BTN_OK ) ),
-maCancel( this, CUI_RES( BTN_CANCEL ) ),
-maHelp ( this, CUI_RES( BTN_HELP ) ),
-maFL ( this, CUI_RES( FL_TITLE ) ),
-maEdit ( this, CUI_RES( EDT_TITLE ) )
+TitleDialog::TitleDialog(Window* pParent, const OUString rOldTitle)
+: ModalDialog (pParent, GalleryTitleDialog,
cui/ui/gallerytitledialog.ui)
{
-FreeResource();
-maEdit.SetText( rOldTitle );
-maEdit.GrabFocus();
+get(m_pEdit, entry);
+m_pEdit-SetText( rOldTitle );
+m_pEdit-GrabFocus();
}
// ---
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index 93505da..f20bef1 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -219,53 +219,6 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
/**/
-ModalDialog RID_SVXDLG_GALLERY_TITLE
-{
-HelpId = HID_GALLERY_TITLE;
-OutputSize = TRUE ;
-Border = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 168 , 63 ) ;
-Text [ en-US ] = Enter Title ;
-Moveable = TRUE ;
-
-OkButton BTN_OK
-{
-DefButton = TRUE ;
-Pos = MAP_APPFONT ( 112 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 112 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-HelpButton BTN_HELP
-{
-Pos = MAP_APPFONT ( 112 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-
-FixedLine FL_TITLE
-{
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 100 , 8 ) ;
-Text [ en-US ] = Title ;
-};
-Edit EDT_TITLE
-{
-HelpId = HID_GALLERY_TITLE_EDIT;
-Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 18 ) ;
-Size = MAP_APPFONT ( 88, 12 ) ;
-};
-};
-
-/**/
-
ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
{
HelpId = HID_GALLERY_SEARCH ;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 10fe82d..bb851d6 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -176,17 +176,10 @@ public:
class TitleDialog : public ModalDialog
{
private:
-
-OKButtonmaOk;
-CancelButtonmaCancel;
-HelpButton maHelp;
-FixedLine maFL;
-EditmaEdit;
-
+Edit* m_pEdit;
public:
-
-TitleDialog( Window* pParent, const OUString rOldText
);
-OUStringGetTitle() const { return maEdit.GetText(); }
+TitleDialog(Window* pParent, const OUString rOldText);
+OUString GetTitle() const { return m_pEdit-GetText(); }
};
class GalleryIdDialog : public ModalDialog
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index c9e8ed7..823901de 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -20,7 +20,6 @@
// Gallery TabDialogs/TabPages
#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2)
-#define RID_SVXDLG_GALLERY_TITLE(RID_CUI_GALLERY_START + 82)
#define
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/scfuncs.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7d79caeb5c3706276fc8295004ae6f69ace99509
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Dec 16 20:09:54 2013 +0100
typo: start period is S, thus 'A = 1' - 'S = 1'
Change-Id: I23ffb5288cda22dcf98bba2d16ae7cf6f9d66825
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 63794f5..bc48a14 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1529,7 +1529,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 9 // Description of Parameter 4
{
-Text [ en-US ] = The start period. The first period to be taken
into account. A = 1 denotes the very first period. ;
+Text [ en-US ] = The start period. The first period to be taken
into account. S = 1 denotes the very first period. ;
};
String 10 // Name of Parameter 5
{
@@ -1593,7 +1593,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 9 // Description of Parameter 4
{
-Text [ en-US ] = The start period. The first period to be taken
into account. A = 1 denotes the very first period. ;
+Text [ en-US ] = The start period. The first period to be taken
into account. S = 1 denotes the very first period. ;
};
String 10 // Name of Parameter 5
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/externalrefmgr.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bc8f614ad85c441620f0e0388155f6ce83dbc124
Author: Douglas Mencken dougmenc...@gmail.com
Date: Mon Dec 16 09:20:43 2013 -0500
Do not use C++11 std::vector.data(), use an alternative instead
Note that there is no need to check for empty(), because
matrix is always initialized with all empty elements in this code.
Change-Id: If05b3b12d7209b99fcbb09f7c97e74476fb9ce06
Reviewed-on: https://gerrit.libreoffice.org/7098
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 4646103..81075a3 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1392,13 +1392,13 @@ inline T ColumnBatchT::getValue(ScRefCellValue
raCell) const
template
inline void ColumnBatchsvl::SharedString::putValues(ScMatrixRef xMat, const
SCCOL nCol) const
{
-xMat-PutString(maStorage.data(), maStorage.size(), nCol, mnRowStart);
+xMat-PutString(maStorage.front(), maStorage.size(), nCol, mnRowStart);
}
templateclass T
inline void ColumnBatchT::putValues(ScMatrixRef xMat, const SCCOL nCol)
const
{
-xMat-PutDouble(maStorage.data(), maStorage.size(), nCol, mnRowStart);
+xMat-PutDouble(maStorage.front(), maStorage.size(), nCol, mnRowStart);
}
static ScTokenArray* convertToTokenArray(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 735bd120c9ee2d9bb3514907936c27efb75d7282 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 19:21:35 2013 + Updated core Project: help a527273352071934f391c38c9e22395d168d79cd diff --git a/helpcontent2 b/helpcontent2 index 8847652..a527273 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 884765268982ae9ddd2724473ad29d3a05e4ad30 +Subproject commit a527273352071934f391c38c9e22395d168d79cd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |2 -- source/text/shared/00/0101.xhp |4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) New commits: commit a527273352071934f391c38c9e22395d168d79cd Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 19:21:35 2013 + update help ids for gallery title dialog .ui conversion Change-Id: I40407750653a011a34aecc15d62c25e802976794 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e3d15c5..209248a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2082,8 +2082,6 @@ HID_GALLERY_PROPERTIES_GENERAL,33826, HID_GALLERY_RENAME,33776, HID_GALLERY_SEARCH,33772, HID_GALLERY_THEMELIST,34179, -HID_GALLERY_TITLE,33961, -HID_GALLERY_TITLE_EDIT,33962, HID_GALLERY_WINDOW,33775, HID_GENERIC_SQL_ERROR,38828, HID_GLBLTREEUPD_ALL,53035, diff --git a/source/text/shared/00/0101.xhp b/source/text/shared/00/0101.xhp index 3b386fb..879bcf1 100644 --- a/source/text/shared/00/0101.xhp +++ b/source/text/shared/00/0101.xhp @@ -41,8 +41,8 @@ bookmark xml-lang=en-US branch=hid/SVX_HID_GALLERY_MN_PREVIEW id=bm_id3156560 localize=false/ paragraph role=paragraph id=par_id3158428 xml-lang=en-US l10n=CHG oldref=15ahelp hid=HID_GALLERY_MN_PREVIEWTheemph Preview /emphcommand displays the selected graphic./ahelp/paragraph bookmark xml-lang=en-US branch=hid/SVX_HID_GALLERY_TITLE id=bm_id3152926 localize=false/ -!-- removed HID SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLE -- -paragraph role=paragraph id=par_id3154522 xml-lang=en-US l10n=CHG oldref=19ahelp hid=SVX:EDIT:RID_SVXDLG_GALLERY_TITLE:EDT_TITLEAssigns a title to a selected Gallery object./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/gallerytitledialog/GalleryTitleDialog id=bm_id3155892 localize=false/ +paragraph role=paragraph id=par_id3154522 xml-lang=en-US l10n=CHG oldref=19ahelp hid=cui/ui/gallerytitledialog/GalleryTitleDialogAssigns a title to a selected Gallery object./ahelp/paragraph bookmark xml-lang=en-US branch=hid/SVX_HID_GALLERY_MN_DELETE id=bm_id3155892 localize=false/ paragraph role=paragraph id=par_id3149750 xml-lang=en-US l10n=U oldref=17ahelp hid=HID_GALLERY_MN_DELETEDeletes the selected graphic after confirmation./ahelp/paragraph /body ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 70/557310027f12ac362fed5376578c1e577ff4d9
70/557310027f12ac362fed5376578c1e577ff4d9 |1 + 1 file changed, 1 insertion(+) New commits: commit 0325f511e625993f0e4a3ed3b5518dd05a895d29 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 19:23:18 2013 + Notes added by 'git notes add' diff --git a/70/557310027f12ac362fed5376578c1e577ff4d9 b/70/557310027f12ac362fed5376578c1e577ff4d9 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/70/557310027f12ac362fed5376578c1e577ff4d9 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/src/scfuncs.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f1afdddfe6a7048c79f7224c3b2feaa70e2265db
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Dec 16 20:09:54 2013 +0100
typo: start period is S, thus 'A = 1' - 'S = 1'
Change-Id: I23ffb5288cda22dcf98bba2d16ae7cf6f9d66825
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 455c231..d9e406c 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1529,7 +1529,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 9 // Description of Parameter 4
{
-Text [ en-US ] = The start period. The first period to be taken
into account. A = 1 denotes the very first period. ;
+Text [ en-US ] = The start period. The first period to be taken
into account. S = 1 denotes the very first period. ;
};
String 10 // Name of Parameter 5
{
@@ -1593,7 +1593,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
String 9 // Description of Parameter 4
{
-Text [ en-US ] = The start period. The first period to be taken
into account. A = 1 denotes the very first period. ;
+Text [ en-US ] = The start period. The first period to be taken
into account. S = 1 denotes the very first period. ;
};
String 10 // Name of Parameter 5
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a5/e2f13046bcfa5704406668d3731ad7c5ff48e4
a5/e2f13046bcfa5704406668d3731ad7c5ff48e4 |1 + 1 file changed, 1 insertion(+) New commits: commit 3bf8859bc15e6ec0c61dc4621cdd9674d0c1811b Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 19:31:54 2013 + Notes added by 'git notes add' diff --git a/a5/e2f13046bcfa5704406668d3731ad7c5ff48e4 b/a5/e2f13046bcfa5704406668d3731ad7c5ff48e4 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/a5/e2f13046bcfa5704406668d3731ad7c5ff48e4 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibO 4.2.0.0 - Configuration page
Hi Andras Andras Timar skrev 2013-12-16 19:49: Four days ago Kendy added a config item, it is /org.openoffice.Office.Common/Security/EnableExpertConfiguration with values true/false; defaults to true. Best regards, Andras Thanks a lot for the information and thanks to Kendy for adding the config item. /Niklas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Wiki editing page
HTML links are not parsed in the Copyright Warning when trying to edit any page: Please note that all contributions to The Document Foundation Wiki are considered to be released under the the a href=http://creativecommons.org/licenses/by-sa/3.0/;Creative Commons Attribution-ShareAlike 3.0 Unported License/a, unless otherwise specified. This does not include the source code of LibreOffice, which is licensed under the GNU Lesser General Public License (a href=http://www.libreoffice.org/download/license/;LGPLv3/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our a href=http://wiki.documentfoundation.org/TradeMark_Policy;trademark policy/a (see Project:Copyrights for details). If you do not want your writing to be edited mercilessly and redistributed at will, then do not submit it here. The Document Foundation Wiki doesn't have password storing enabled. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |6 +-
sc/source/ui/inc/viewdata.hxx|6 ++
sc/source/ui/view/viewdata.cxx |9 +
3 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit 70ce8987feeb06255eaeb7663bb076a8f4e0593f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Dec 16 15:04:09 2013 -0500
Check IsRefMode() before accessing the ref range.
Else you'd end up with wrong ref range values. Also in
selectAllAccessibleChildren(), the code is probably meant to select
all sheet, rather than setting the top-left reference position twice
in a row.
Change-Id: I895896418476ffea0862e8df4e03f6efc4c91dd2
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 40d2d39..5fa5740 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1131,7 +1131,7 @@ void SAL_CALL
ScViewData *pViewData = mpViewShell-GetViewData();
mpViewShell-InitRefMode( 0, 0, pViewData-GetTabNo(),
SC_REFTYPE_REF );
pViewData-SetRefStart(0,0,pViewData-GetTabNo());
-pViewData-SetRefStart(MAXCOL,MAXROW,pViewData-GetTabNo());
+pViewData-SetRefEnd(MAXCOL,MAXROW,pViewData-GetTabNo());
mpViewShell-UpdateRef(MAXCOL, MAXROW, pViewData-GetTabNo());
}
else
@@ -1559,6 +1559,10 @@ void ScAccessibleSpreadsheet::FireFirstCellFocus()
void ScAccessibleSpreadsheet::NotifyRefMode()
{
ScViewData *pViewData = mpViewShell-GetViewData();
+if (!pViewData-IsRefMode())
+// Not in reference mode. Bail out.
+return;
+
sal_uInt16 nRefStartX =pViewData-GetRefStartX();
sal_Int32 nRefStartY=pViewData-GetRefStartY();
sal_uInt16 nRefEndX=pViewData-GetRefEndX();
commit 087c2fddce7b38d67c1168f9d28134819dac57b1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Dec 16 15:03:25 2013 -0500
Make this non-inline (for easier debugging).
Change-Id: I2b7a84c56b8130c6566eb971ba6ba0c3ee487c86
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index ca90f3e..58267c1 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -375,10 +375,8 @@ public:
voidSetRefMode( bool bNewMode, ScRefType eNewType )
{ bIsRefMode = bNewMode; eRefType =
eNewType; }
-voidSetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
-{ nRefStartX = nNewX; nRefStartY = nNewY;
nRefStartZ = nNewZ; }
-voidSetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
-{ nRefEndX = nNewX; nRefEndY = nNewY; nRefEndZ =
nNewZ; }
+voidSetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ );
+voidSetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ );
voidResetDelMark() { bDelMarkValid =
false; }
voidSetDelMark( const ScRange rRange )
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 1b6daf0..9f74c84 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3018,6 +3018,15 @@ ScAddress ScViewData::GetCurPos() const
return ScAddress( GetCurX(), GetCurY(), GetTabNo() );
}
+void ScViewData::SetRefStart( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
+{
+nRefStartX = nNewX; nRefStartY = nNewY; nRefStartZ = nNewZ;
+}
+
+void ScViewData::SetRefEnd( SCCOL nNewX, SCROW nNewY, SCTAB nNewZ )
+{
+nRefEndX = nNewX; nRefEndY = nNewY; nRefEndZ = nNewZ;
+}
void ScViewData::AddPixelsWhile( long rScrY, long nEndPixels, SCROW rPosY,
SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: For libmspub A Dependency Missing from Required List
On 15 déc. 2013, at 06:05, Alan Feuerbacher wrote: Hi, Hello Alan, I'm following one of the contacts on your webpage www.freedesktop.org/wiki/Software/libmspub/ In configuring libmspub, configure complained that librevenge was missing. I found and installed that program. The libmspub's configure was happy and everything installed ok. we are actually working on creating a new library librevenge, see for details : http://fridrich.blogspot.fr/2013/11/libreoffice-import-filters-what-is.html . Unfortunately, this also means that there exists two versions of each concerned filters : - the actual version based on the libwpd/libwpg libraries: libmspub-0.0.4, - and the future version based on librevenge: libmspub-0.1.0, and that some webpages are not yet updated :-~ The above-listed webpage lists Dependencies but librevenge is not shown. Thought you'd want to know. -- Amicalement, Laurent. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/qa sc/source
formula/source/core/resource/core_resource.src | 42
include/formula/compiler.hrc |8
include/formula/opcode.hxx |6
sc/inc/helpids.h |6
sc/qa/unit/subsequent_filters-test.cxx | 18 -
sc/qa/unit/ucalc.cxx |6
sc/source/core/inc/interpre.hxx|5
sc/source/core/tool/interpr3.cxx | 22 +-
sc/source/core/tool/interpr4.cxx | 16 +
sc/source/filter/excel/xlformula.cxx |8
sc/source/filter/oox/formulabase.cxx |8
sc/source/ui/src/scfuncs.src | 232 +
12 files changed, 354 insertions(+), 23 deletions(-)
New commits:
commit 924f9d7ea89899848dba512a428e5f64e44ee534
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Sun Dec 1 12:40:41 2013 +0100
fdo#72158 Add Excel 2010 functions
LOGNORM.DIST, LOGNORM.INV, NORM.DIST, NORM.INV, NORM.S.DIST, NORM.S.INV
Change-Id: I695e0645642af1757a1dd7d7f0f15c9515e21309
Reviewed-on: https://gerrit.libreoffice.org/6883
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 84faa58..fbd3503 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -137,9 +137,11 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_EVEN { Text = EVEN ; };
String SC_OPCODE_ODD { Text = ODD ; };
String SC_OPCODE_STD_NORM_DIST { Text = LEGACY.NORMSDIST ; };
+String SC_OPCODE_STD_NORM_DIST_MS { Text = COM.MICROSOFT.NORM.S.DIST ; };
String SC_OPCODE_FISHER { Text = FISHER ; };
String SC_OPCODE_FISHER_INV { Text = FISHERINV ; };
String SC_OPCODE_S_NORM_INV { Text = LEGACY.NORMSINV ; };
+String SC_OPCODE_S_NORM_INV_MS { Text = COM.MICROSOFT.NORM.S.INV ; };
String SC_OPCODE_GAMMA_LN { Text = GAMMALN ; };
String SC_OPCODE_GAMMA_LN_MS { Text = COM.MICROSOFT.GAMMALN.PRECISE ; };
String SC_OPCODE_ERROR_TYPE { Text = ORG.OPENOFFICE.ERRORTYPE ; };
@@ -194,6 +196,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ST_DEV_S { Text = COM.MICROSOFT.STDEV.S ; };
String SC_OPCODE_B { Text = BINOM.DIST.RANGE ; };
String SC_OPCODE_NORM_DIST { Text = NORMDIST ; };
+String SC_OPCODE_NORM_DIST_MS { Text = COM.MICROSOFT.NORM.DIST ; };
String SC_OPCODE_EXP_DIST { Text = EXPONDIST ; };
String SC_OPCODE_EXP_DIST_MS { Text = COM.MICROSOFT.EXPON.DIST ; };
String SC_OPCODE_BINOM_DIST { Text = BINOMDIST ; };
@@ -285,6 +288,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_HYP_GEOM_DIST { Text = HYPGEOMDIST ; };
String SC_OPCODE_HYP_GEOM_DIST_MS { Text = COM.MICROSOFT.HYPGEOM.DIST ;
};
String SC_OPCODE_LOG_NORM_DIST { Text = LOGNORMDIST ; };
+String SC_OPCODE_LOG_NORM_DIST_MS { Text = COM.MICROSOFT.LOGNORM.DIST ;
};
String SC_OPCODE_T_DIST { Text = LEGACY.TDIST ; };
String SC_OPCODE_F_DIST { Text = LEGACY.FDIST ; };
String SC_OPCODE_F_DIST_LT { Text = COM.MICROSOFT.F.DIST ; };
@@ -316,6 +320,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_FREQUENCY { Text = FREQUENCY ; };
String SC_OPCODE_QUARTILE { Text = QUARTILE ; };
String SC_OPCODE_NORM_INV { Text = NORMINV ; };
+String SC_OPCODE_NORM_INV_MS { Text = COM.MICROSOFT.NORM.INV ; };
String SC_OPCODE_CONFIDENCE { Text = CONFIDENCE ; };
String SC_OPCODE_CONFIDENCE_N { Text = COM.MICROSOFT.CONFIDENCE.NORM ; };
String SC_OPCODE_CONFIDENCE_T { Text = COM.MICROSOFT.CONFIDENCE.T ; };
@@ -350,6 +355,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_CHI_TEST { Text = LEGACY.CHITEST ; };
String SC_OPCODE_CHI_TEST_MS { Text = COM.MICROSOFT.CHISQ.TEST ; };
String SC_OPCODE_LOG_INV { Text = LOGINV ; };
+String SC_OPCODE_LOG_INV_MS { Text = COM.MICROSOFT.LOGNORM.INV ; };
String SC_OPCODE_TABLE_OP { Text = MULTIPLE.OPERATIONS ; };
String SC_OPCODE_BETA_DIST { Text = BETADIST ; };
String SC_OPCODE_BETA_INV { Text = BETAINV ; };
@@ -511,9 +517,11 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_EVEN { Text = EVEN ; };
String SC_OPCODE_ODD { Text = ODD ; };
String SC_OPCODE_STD_NORM_DIST { Text = NORMSDIST ; };
+String SC_OPCODE_STD_NORM_DIST_MS { Text = _xlfn.NORM.S.DIST ; };
String SC_OPCODE_FISHER { Text = FISHER ; };
String SC_OPCODE_FISHER_INV { Text = FISHERINV ; };
String SC_OPCODE_S_NORM_INV { Text = NORMSINV ; };
+String SC_OPCODE_S_NORM_INV_MS { Text = _xlfn.NORM.S.INV ; };
String SC_OPCODE_GAMMA_LN { Text = GAMMALN ; };
String SC_OPCODE_GAMMA_LN_MS { Text = _xlfn.GAMMALN.PRECISE ; };
String SC_OPCODE_ERROR_TYPE { Text = ERRORTYPE ; };
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72125, which changed state. Bug 72125 Summary: Expert config dialog takes too much time to come up https://bugs.freedesktop.org/show_bug.cgi?id=72125 What|Removed |Added Status|REOPENED|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: cppuhelper/test cppu/qa cppu/source include/com include/comphelper include/cppuhelper include/o3tl include/sal l10ntools/source rsc/source sal/rtl
cppu/qa/test_unotype.cxx | 18 --
cppu/source/uno/data.cxx |2 +-
cppuhelper/test/testcmp/TestComponent.hxx |5 -
include/com/sun/star/uno/Any.hxx |3 +--
include/com/sun/star/uno/Sequence.hxx |6 --
include/comphelper/implbase_var.hxx |3 ---
include/cppuhelper/compbase1.hxx | 10 --
include/cppuhelper/compbase10.hxx | 10 --
include/cppuhelper/compbase11.hxx | 10 --
include/cppuhelper/compbase12.hxx | 10 --
include/cppuhelper/compbase2.hxx | 10 --
include/cppuhelper/compbase3.hxx | 10 --
include/cppuhelper/compbase4.hxx | 10 --
include/cppuhelper/compbase5.hxx | 10 --
include/cppuhelper/compbase6.hxx | 10 --
include/cppuhelper/compbase7.hxx | 10 --
include/cppuhelper/compbase8.hxx | 10 --
include/cppuhelper/compbase9.hxx | 10 --
include/cppuhelper/implbase1.hxx |5 -
include/o3tl/heap_ptr.hxx | 22 --
include/sal/types.h | 16 ++--
l10ntools/source/cfglex.l |2 --
l10ntools/source/srclex.l |2 --
l10ntools/source/xrmlex.l |2 --
rsc/source/parser/rscyacc.y |2 --
sal/rtl/alloc_cache.cxx | 15 ---
26 files changed, 4 insertions(+), 219 deletions(-)
New commits:
commit 66397a4fd222757a8bd651c0c297615319eac4a5
Author: Jelle van der Waa je...@vdwaa.nl
Date: Mon Dec 16 20:28:45 2013 +0100
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I5150eec33228e18e274a8ae4effd3f185851b7f4
Reviewed-on: https://gerrit.libreoffice.org/7103
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index 474e5c9..7ec88cc 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -224,9 +224,7 @@ void Test::testUnoType() {
::rtl::OUString(
com.sun.star.beans.PropertyChangeEvent),
t.getTypeName());
-#if !(defined __SUNPRO_CC __SUNPRO_CC = 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(::cppu::UnoType DerivedStruct2 ::get() == t);
-#endif
t = ::cppu::UnoType css::beans::Optional ::sal_Int8 ::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
@@ -243,9 +241,7 @@ void Test::testUnoType() {
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(com.sun.star.uno.RuntimeException),
t.getTypeName());
-#if !(defined __SUNPRO_CC __SUNPRO_CC = 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(::cppu::UnoType DerivedException2 ::get() == t);
-#endif
t = ::cppu::UnoType css::uno::XInterface ::get();
CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
@@ -266,12 +262,10 @@ void Test::testUnoType() {
CPPUNIT_ASSERT(
::cppu::UnoType
css::uno::Reference css::uno::XComponentContext ::get() == t);
-#if !(defined __SUNPRO_CC __SUNPRO_CC = 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(::cppu::UnoType DerivedInterface2 ::get() == t);
CPPUNIT_ASSERT(
::cppu::UnoType css::uno::Reference DerivedInterface2 ::get() ==
t);
-#endif
}
void Test::testGetTypeFavourUnsigned() {
@@ -467,14 +461,12 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::getTypeFavourUnsigned(
static_cast css::beans::PropertyChangeEvent * (0)) ==
::getCppuType(static_cast css::beans::PropertyChangeEvent * (0)));
-#if !(defined __SUNPRO_CC __SUNPRO_CC = 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast DerivedStruct2 * (0)) ==
::cppu::UnoType css::beans::PropertyChangeEvent ::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast DerivedStruct2 * (0)) ==
::getCppuType(static_cast DerivedStruct2 * (0)));
-#endif
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(
static_cast css::beans::Optional ::sal_Int8 * (0)) ==
@@ -505,14 +497,12 @@ void Test::testGetTypeFavourUnsigned() {
::cppu::getTypeFavourUnsigned(
static_cast css::uno::RuntimeException * (0)) ==
::getCppuType(static_cast css::uno::RuntimeException * (0)));
-#if !(defined __SUNPRO_CC __SUNPRO_CC = 0x550) // erroneous ambiguity
stated
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast DerivedException2 * (0)) ==
::cppu::UnoType css::uno::RuntimeException ::get());
CPPUNIT_ASSERT(
::cppu::getTypeFavourUnsigned(static_cast DerivedException2 * (0)) ==
[Bug 72598] [Easyhack] Remove SunStudio cruft from code base
https://bugs.freedesktop.org/show_bug.cgi?id=72598 --- Comment #3 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jelle van der Waa committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=66397a4fd222757a8bd651c0c297615319eac4a5 fdo#72598 Remove SunStudio cruft from code base 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-commits] core.git: hwpfilter/source include/sal
hwpfilter/source/grammar.cxx |2 +-
include/sal/types.h |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f2111a7ed11410ac80cd1b700315881d8b8ee7dd
Author: Michael Stahl mst...@redhat.com
Date: Mon Dec 16 21:59:51 2013 +0100
remove SGI compiler checks
Change-Id: I8b4bce4b9c0cc457732b2de4af93049010de1097
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index ba7c712..e10c598 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -379,7 +379,7 @@ static const short yycheck[] = {11,
#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
-#if (!defined (__STDC__) defined (sparc)) || defined (__sparc__) || defined
(__sparc) || defined (__sgi) || (defined (__sun) defined (__i386))
+#if (!defined (__STDC__) defined (sparc)) || defined (__sparc__) || defined
(__sparc) || (defined (__sun) defined (__i386))
#define YYSTACK_USE_ALLOCA
#include sal/alloca.h
#else /* not sparc */
diff --git a/include/sal/types.h b/include/sal/types.h
index cc04246..11d62ae 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -88,7 +88,7 @@ typedef unsigned char sal_uInt8;
#define SAL_PRIuUINT64 I64u
#define SAL_PRIxUINT64 I64x
#define SAL_PRIXUINT64 I64X
-#elif defined (__GNUC__) || defined (sgi)
+#elif defined (__GNUC__)
#if SAL_TYPES_SIZEOFLONG == 8
typedef signed long int sal_Int64;
typedef unsigned long int sal_uInt64;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuigaldlg.cxx| 27 +++-
cui/source/dialogs/gallery.src | 41
cui/source/inc/cuigaldlg.hxx| 19 +
cui/source/inc/gallery.hrc |3
cui/uiconfig/ui/gallerythemeiddialog.ui | 103
6 files changed, 122 insertions(+), 72 deletions(-)
New commits:
commit aaa808d69918ee58908f4cd78c5b7b6f24ee3c5c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 16 21:06:18 2013 +
convert gallery theme id dialog to .ui
Change-Id: Iad468b19a24efc4044a46301f6421648aac7cd6a
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 005c0ef..8101925 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
+ cui/uiconfig/ui/gallerythemeiddialog \
cui/uiconfig/ui/gallerytitledialog \
cui/uiconfig/ui/hangulhanjaadddialog \
cui/uiconfig/ui/hatchpage \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 60bbe95..be45aed 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -521,7 +521,7 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*,
pURL )
}
TitleDialog::TitleDialog(Window* pParent, const OUString rOldTitle)
-: ModalDialog (pParent, GalleryTitleDialog,
cui/ui/gallerytitledialog.ui)
+: ModalDialog(pParent, GalleryTitleDialog,
cui/ui/gallerytitledialog.ui)
{
get(m_pEdit, entry);
m_pEdit-SetText( rOldTitle );
@@ -532,24 +532,21 @@ TitleDialog::TitleDialog(Window* pParent, const OUString
rOldTitle)
// - GalleryIdDialog -
// ---
-GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
-ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
-aBtnOk ( this, CUI_RES( BTN_OK ) ),
-aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
-aFLId ( this, CUI_RES( FL_ID ) ),
-aLbResName ( this, CUI_RES( LB_RESNAME ) ),
-pThm( _pThm )
+GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm )
+: ModalDialog(pParent, GalleryThemeIDDialog,
cui/ui/gallerythemeiddialog.ui)
+, pThm(_pThm )
{
-FreeResource();
+get(m_pBtnOk, ok);
+get(m_pLbResName, entry);
-aLbResName.InsertEntry( OUString( !!! No Id !!! ) );
+m_pLbResName-InsertEntry( OUString( !!! No Id !!! ) );
-GalleryTheme::InsertAllThemes( aLbResName );
+GalleryTheme::InsertAllThemes(*m_pLbResName);
-aLbResName.SelectEntryPos( (sal_uInt16) pThm-GetId() );
-aLbResName.GrabFocus();
+m_pLbResName-SelectEntryPos( (sal_uInt16) pThm-GetId() );
+m_pLbResName-GrabFocus();
-aBtnOk.SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
+m_pBtnOk-SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
}
//
-
@@ -574,7 +571,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
InfoBox aBox( this, aStr );
aBox.Execute();
-aLbResName.GrabFocus();
+m_pLbResName-GrabFocus();
bDifferentThemeExists = sal_True;
}
}
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index f20bef1..cba3d94 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -318,47 +318,6 @@ ModalDialog RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS
};
};
-ModalDialog RID_SVXDLG_GALLERY_THEMEID
-{
-HelpID = cui:ModalDialog:RID_SVXDLG_GALLERY_THEMEID;
-OutputSize = TRUE ;
-Border = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 180 , 63 ) ;
-Text [ en-US ] = Theme ID ;
-Moveable = TRUE ;
-OkButton BTN_OK
-{
-Pos = MAP_APPFONT ( 124 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 124 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-FixedLine FL_ID
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = ID;
-};
-ListBox LB_RESNAME
-{
-HelpID = cui:ListBox:RID_SVXDLG_GALLERY_THEMEID:LB_RESNAME;
-Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 100 , 60 ) ;
-TabStop = TRUE ;
-DropDown = TRUE ;
-HScroll = TRUE ;
-VScroll = TRUE ;
-};
-};
-
String RID_SVXSTR_GALLERY_NOFILES
{
Text [ en-US ] = No Files ;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index bb851d6..67d2f9e 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 42c72859913ff0464ee1dbb2be83ae28860d7d21 Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 21:13:29 2013 + Updated core Project: help 166fd12aa598fb2296fc87308b31c31410d0cd0c diff --git a/helpcontent2 b/helpcontent2 index a527273..166fd12 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a527273352071934f391c38c9e22395d168d79cd +Subproject commit 166fd12aa598fb2296fc87308b31c31410d0cd0c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 166fd12aa598fb2296fc87308b31c31410d0cd0c Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 16 21:13:29 2013 + drop unused help ids Change-Id: I0cef786cfb209840e8d966804c79cecb5ed2642b diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 209248a..6553a7f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6679,7 +6679,6 @@ svx_ListBox_RID_SVXDLG_BMPMASK_LB_4,3391950340, svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341, svx_ListBox_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE,1251200831, svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769, -svx_ListBox_RID_SVXDLG_GALLERY_THEMEID_LB_RESNAME,1243631105, svx_ListBox_RID_SVXDLG_MULTIPATH_LB_MULTIPATH,1240878603, svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103, svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083, @@ -6811,7 +6810,6 @@ svx_ModalDialog_RID_DEFAULTABOUT,1078001664, svx_ModalDialog_RID_DLG_NEWLIB,1242333184, svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136, svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872, -svx_ModalDialog_RID_SVXDLG_GALLERY_THEMEID,1243627520, svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224, svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744, svx_ModalDialog_RID_SVX_DLG_SHOWGRIDCOLUMNS,1368834048, ___ 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/text/SwGrammarMarkUp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 42aec34a5d83d863e050da85f88b31417c44b698
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Mon Dec 16 22:34:42 2013 +0100
Fix a previous commit
Thanks to Thomas Arnhold for noticing and reporting
Change-Id: Ia23746b3834b3fb3dbbadfdada96d98958b0e00c
diff --git a/sw/source/core/text/SwGrammarMarkUp.cxx
b/sw/source/core/text/SwGrammarMarkUp.cxx
index 53c4264..07c7272 100644
--- a/sw/source/core/text/SwGrammarMarkUp.cxx
+++ b/sw/source/core/text/SwGrammarMarkUp.cxx
@@ -50,7 +50,7 @@ void SwGrammarMarkUp::MoveGrammar( sal_Int32 nPos, sal_Int32
nDiff )
while( pIter != maSentence.end() )
{
if( *pIter = nEnd )
-*pIter += *pIter;
+*pIter += nDiff;
else
*pIter = nPos;
++pIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 70449, which changed state. Bug 70449 Summary: StartCenter: it is not possible to easily navigate through recent used files with the keyboard https://bugs.freedesktop.org/show_bug.cgi?id=70449 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
Re: Wiki editing page
On Mon, Dec 16, 2013 at 12:01 PM, Tae Wong seotaewon...@gmail.com wrote: HTML links are not parsed in the Copyright Warning when trying to edit any page: Please note that all contributions to The Document Foundation Wiki are considered to be released under the the a href=http://creativecommons.org/licenses/by-sa/3.0/;Creative Commons Attribution-ShareAlike 3.0 Unported License/a, unless otherwise specified. This does not include the source code of LibreOffice, which is licensed under the GNU Lesser General Public License (a href=http://www.libreoffice.org/download/license/;LGPLv3/a). LibreOffice and The Document Foundation are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our a href=http://wiki.documentfoundation.org/TradeMark_Policy;trademark policy/a (see Project:Copyrights for details). If you do not want your writing to be edited mercilessly and redistributed at will, then do not submit it here. The Document Foundation Wiki doesn't have password storing enabled. Hi Tae, For website-related issues, please use the website mailing list: webs...@global.libreoffice.org ...or file a bug: https://www.libreoffice.org/get-help/bug Cheers, --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2013-12-17
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + fdo#54938: Convert i18npool to use cppu::supportsService in https://gerrit.libreoffice.org/7109 from Marcos Souza about module i18npool + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza about module android, animations, build, chart2, include, ios, odk, postprocess, sd, slideshow + add support for double-tap to go back a transition in https://gerrit.libreoffice.org/7107 from Christian Lohmaier about module android + fdo#70465 SvTreeListBox::GetLevelChildCount refactored in https://gerrit.libreoffice.org/7106 from Efe Gürkan Yalaman about module svtools + Do not expose TXTNODE_MAX and cleanup related code/comments in https://gerrit.libreoffice.org/7105 from Matteo Casalin about module sw + fdo#72598 Remove SunStudio cruft from code base in https://gerrit.libreoffice.org/7104 from Jelle van der Waa about module sal, sd, sdext, toolkit, ucb, vcl + move from ActionBarSherlock to corresponding android support lib in https://gerrit.libreoffice.org/7082 from Christian Lohmaier about module android + Add tablet specific landscape layout. in https://gerrit.libreoffice.org/7102 from Andrzej Hunt about module android + gbuild: Fix and check package dependencies. in https://gerrit.libreoffice.org/7081 from Matúš Kukan about module build, cli_ure, i18nlangtag, odk, solenv + sdremote: show notes also in landscape orientation in https://gerrit.libreoffice.org/6889 from Christian Lohmaier about module android + remove BluetoothOperator wrapper in https://gerrit.libreoffice.org/7092 from Christian Lohmaier about module android + fix previous commit in https://gerrit.libreoffice.org/7101 from Markus Mohrhard about module oox + fdo#72217 : Fix for corruption area chart with data labels after Round Tr in https://gerrit.libreoffice.org/7000 from Rajashri Udhoji about module oox + fix chart tests in https://gerrit.libreoffice.org/7100 from Markus Mohrhard about module chart2 + Written Unit test case of chart export. in https://gerrit.libreoffice.org/7071 from Pallavi Jadhav about module chart2 + fdo#72306 Axis names were lost after saving file on LO. in https://gerrit.libreoffice.org/7002 from Sushil Shinde about module oox, xmloff + fdo#72563 : Pageref field tag not preserved in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji about module sw + Revert code that push copy of 'rPr' inside 'pPr' in DOCX export in https://gerrit.libreoffice.org/7058 from Adam CloudOn about module sw + get rid of some useless indirection/wrapper functions in https://gerrit.libreoffice.org/7089 from Christian Lohmaier about module android + fdo#72304 Preserve Chart data table properties during ODF import/export. in https://gerrit.libreoffice.org/7048 from Nikhil Walvekar about module chart2, include, offapi, xmloff + fdo#72219: Fix for corruption of symbols in docx in https://gerrit.libreoffice.org/6955 from Rohit Deshmukh about module i18npool, sw + FILESAVE: DOCX. Added null check to avoid crash. in https://gerrit.libreoffice.org/7096 from Nikhil Walvekar about module sw End of freshness * Merged changes on master for project core changed in the last 25 hours: + fdo#72598 Remove SunStudio cruft from code base in https://gerrit.libreoffice.org/7103 from Jelle van der Waa + fdo#72158 Add Excel 2010 functions in https://gerrit.libreoffice.org/6883 from Winfried Donkers + Do not use C++11 std::vector.data(), use an alternative instead in https://gerrit.libreoffice.org/7098 from Douglas Mencken + Use sal_Int32 to satisfy oox/helper/helper.hxx's convertLittleEndian in https://gerrit.libreoffice.org/7099 from Douglas Mencken + fdo#68211: Fix for General input/output error while opening file in https://gerrit.libreoffice.org/7009 from Tushar Bende + Support DOCX exporting 'Track Changes - Deleted Paragraph Mark' in https://gerrit.libreoffice.org/7061 from Adam CloudOn + Export redline 'paragraph formatting changes' back to DOCX in https://gerrit.libreoffice.org/6993 from Adam CloudOn + DOCX Import of 'paragraph formatting track changes' in https://gerrit.libreoffice.org/6992 from Adam CloudOn + Changed 'Para Change' to 'Para Marker Change' in DOCX importer in https://gerrit.libreoffice.org/6991 from Adam CloudOn + Add 'redline - paragraph index' to XML node dump in https://gerrit.libreoffice.org/6990 from Adam CloudOn + Export redline 'formatting changes' back to DOCX in https://gerrit.libreoffice.org/6909 from Adam CloudOn + DOCX Import of 'run formatting track changes' in https://gerrit.libreoffice.org/6908 from Adam CloudOn + Add support in the 'makeRedline' function for 'formatting properties' in https://gerrit.libreoffice.org/6902 from Adam CloudOn * Abandoned changes on master for project core changed in the last 25
[Libreoffice-commits] core.git: cli_ure/Library_cli_cppuhelper_native.mk i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk odk/CustomTarget_check.mk RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk |7 ++- cli_ure/Library_cli_cppuhelper_native.mk|4 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk |2 +- odk/CustomTarget_check.mk |6 +- solenv/gbuild/Package.mk|2 ++ solenv/gbuild/WinResTarget.mk |5 - solenv/gbuild/platform/com_MSC_class.mk |5 - solenv/gbuild/platform/mingw.mk |2 -- 8 files changed, 6 insertions(+), 27 deletions(-) New commits: commit 85d1e39d742d7798369b0071f9a5de5f62810d39 Author: Matúš Kukan matus.ku...@collabora.com Date: Sat Dec 14 11:17:30 2013 +0100 gbuild: Fix and check package dependencies. Change-Id: Ia54def7a404e07974eb1e8a556f4659cd974e7f8 Reviewed-on: https://gerrit.libreoffice.org/7081 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Matúš Kukan matus.ku...@collabora.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b44927e..3d9a4bf 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -399,9 +399,6 @@ $(call gb_LinkTarget_set_include,$(1),\ ) ifeq ($(COM),MSC) -$(call gb_LinkTarget_use_package,$(1),\ - mythes \ -) $(call gb_LinkTarget_use_static_libraries,$(1),\ mythes \ ) @@ -997,14 +994,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ endif define gb_LinkTarget__use_librdf -$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) - ifeq ($(COM),MSC) $(call gb_LinkTarget_use_libraries,$(1),\ raptor2 \ rdf \ ) else +$(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) + $(call gb_LinkTarget_add_libs,$(1),\ -L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \ -L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \ diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 39c13c8..fa55e42 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -34,10 +34,6 @@ $(eval $(call gb_Library_use_internal_bootstrap_api,cli_cppuhelper,\ udkapi \ )) -$(eval $(call gb_Library_use_packages,cli_cppuhelper,\ - cli_ure_cliuno \ -)) - $(eval $(call gb_Library_use_libraries,cli_cppuhelper,\ cppu \ cppuhelper \ diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index 3907641..b50653c 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -34,7 +34,7 @@ $(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DENABLE_LIBL ifeq ($(SYSTEM_LIBLANGTAG),YES) $(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DSYSTEM_LIBLANGTAG)) else -$(eval $(call gb_CppunitTest_use_package,i18nlangtag_test_languagetag,langtag_data)) +$(eval $(call gb_CppunitTest_use_package,i18nlangtag_test_languagetag,liblangtag_data)) endif endif diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 88af63a..295f353 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -32,17 +32,13 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Executable_get_target,$(exe))) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ - $(if $(filter WNT,$(OS)),\ - $(call gb_Package_get_target,odk_config_win),\ - $(call gb_Package_get_target,odk_config_notwin) \ - ) \ + $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_lib) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ - $(call gb_Package_get_target,odk_uno_loader_classes) \ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Helper_print_on_error,\ diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 5b9586b..5cbe70c 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -79,6 +79,7 @@ $(call gb_Package_get_preparation_target,%) : # Package_foo makefiles. $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) + $(if $(PACAKGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/hsqldb/HUser.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c302a773d4cabca7f7bc5871be6c2003b05fafa3
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Dec 17 07:29:54 2013 +0100
cppcheck: fix statements that begin with string constant
Change-Id: I42427beeae06f607e60aeeb7142714fd1f5d740d
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx
b/connectivity/source/drivers/hsqldb/HUser.cxx
index dc6d8d8..297591e 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -228,7 +228,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString
objName, sal_Int32 obj
{
ReferenceXDatabaseMetaData xMeta = m_xConnection-getMetaData();
OUString sGrant = GRANT + sPrivs +
- ON +
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
+ ON +
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
TO + m_Name;
ReferenceXStatement xStmt = m_xConnection-createStatement();
@@ -254,7 +254,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString
objName, sal_Int32 ob
{
ReferenceXDatabaseMetaData xMeta = m_xConnection-getMetaData();
OUString sGrant = REVOKE + sPrivs +
- ON +
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
+ ON +
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
FROM + m_Name;
ReferenceXStatement xStmt = m_xConnection-createStatement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
