[Libreoffice-commits] core.git: Branch 'feature/lok_dialog' - 16 commits - comphelper/source desktop/qa desktop/source include/comphelper include/LibreOfficeKit include/sfx2 include/vcl libreofficekit
Rebased ref, commits from common ancestor:
commit 37540c4429390fa5f7d659631dc7ec3739f77766
Author: Pranav Kant
Date: Sat Jul 29 11:20:34 2017 +0530
lokdialog: Set up intial posting mouse events to dialogs
Events from the dialog in GTV are forwarded correctly, but the events
are still not processed by the dialog in core.
Change-Id: Ib95ac0a3cd23f6cc2763c21425a67402b15f2de2
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c67cc15412af..20face8e65ae 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -536,6 +536,11 @@ static void doc_postKeyEvent(LibreOfficeKitDocument* pThis,
int nType,
int nCharCode,
int nKeyCode);
+static void doc_postDialogKeyEvent(LibreOfficeKitDocument* pThis,
+ const char* pDialogId,
+ int nType,
+ int nCharCode,
+ int nKeyCode);
static void doc_postMouseEvent (LibreOfficeKitDocument* pThis,
int nType,
int nX,
@@ -543,6 +548,14 @@ static void doc_postMouseEvent (LibreOfficeKitDocument*
pThis,
int nCount,
int nButtons,
int nModifier);
+static void doc_postDialogMouseEvent (LibreOfficeKitDocument* pThis,
+ const char* pDialogId,
+ int nType,
+ int nX,
+ int nY,
+ int nCount,
+ int nButtons,
+ int nModifier);
static void doc_postUnoCommand(LibreOfficeKitDocument* pThis,
const char* pCommand,
const char* pArguments,
@@ -610,7 +623,9 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference
initializeForRendering = doc_initializeForRendering;
m_pDocumentClass->registerCallback = doc_registerCallback;
m_pDocumentClass->postKeyEvent = doc_postKeyEvent;
+m_pDocumentClass->postDialogKeyEvent = doc_postDialogKeyEvent;
m_pDocumentClass->postMouseEvent = doc_postMouseEvent;
+m_pDocumentClass->postDialogMouseEvent = doc_postDialogMouseEvent;
m_pDocumentClass->postUnoCommand = doc_postUnoCommand;
m_pDocumentClass->setTextSelection = doc_setTextSelection;
m_pDocumentClass->getTextSelection = doc_getTextSelection;
@@ -2065,10 +2080,24 @@ static void doc_postKeyEvent(LibreOfficeKitDocument*
pThis, int nType, int nChar
gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";
return;
}
-
pDoc->postKeyEvent(nType, nCharCode, nKeyCode);
}
+static void doc_postDialogKeyEvent(LibreOfficeKitDocument* pThis, const char*
pDialogId, int nType, int nCharCode, int nKeyCode)
+{
+SolarMutexGuard aGuard;
+
+IDialogRenderable* pDoc = getDialogRenderable(pThis);
+if (!pDoc)
+{
+gImpl->maLastExceptionMsg = "Document doesn't support dialog
rendering";
+return;
+}
+
+vcl::DialogID aDialogID = OUString::createFromAscii(pDialogId);
+pDoc->postDialogKeyEvent(aDialogID, nType, nCharCode, nKeyCode);
+}
+
/** Class to react on finishing of a dispatched command.
This will call a LOK_COMMAND_FINISHED callback when postUnoCommand was
@@ -2220,6 +2249,21 @@ static void doc_postMouseEvent(LibreOfficeKitDocument*
pThis, int nType, int nX,
}
}
+static void doc_postDialogMouseEvent(LibreOfficeKitDocument* pThis, const
char* pDialogId, int nType, int nX, int nY, int nCount, int nButtons, int
nModifier)
+{
+SolarMutexGuard aGuard;
+
+IDialogRenderable* pDoc = getDialogRenderable(pThis);
+if (!pDoc)
+{
+gImpl->maLastExceptionMsg = "Document doesn't support dialog
rendering";
+return;
+}
+
+vcl::DialogID aDialogID = OUString::createFromAscii(pDialogId);
+pDoc->postDialogMouseEvent(aDialogID, nType, nX, nY, nCount, nButtons,
nModifier);
+}
+
static void doc_setTextSelection(LibreOfficeKitDocument* pThis, int nType, int
nX, int nY)
{
SolarMutexGuard aGuard;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h
b/include/LibreOfficeKit/LibreOfficeKit.h
index a37b2ecdb13d..ebb6587a373e 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -257,6 +257,23 @@ struct _LibreOfficeKitDocumentClass
/// WIP
void (*paintDialog) (LibreOfficeKitDocument* pThis, const char* pDialogId,
unsigned char* pBuffer, int* nWidth, int* nHeight);
+/// WIP
+void (*postDialogKeyEvent) (LibreOfficeKitDocument* pThis,
+const char* pDialogId,
+
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 16 -
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 153 ++
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2
writerfilter/source/ooxml/OOXMLPropertySet.cxx|8
writerfilter/source/ooxml/OOXMLPropertySet.hxx|3
5 files changed, 69 insertions(+), 113 deletions(-)
New commits:
commit fb497a1bd0287999819f12388c73d86f793fae76
Author: Mike Kaganski
Date: Sat Jul 29 10:55:52 2017 +0300
OOXMLPropertySet: simplify adding property; use pointer_t consistently
Change-Id: I0f457e60da1ca765dfdb1458b9de629b0dbeccad
Reviewed-on: https://gerrit.libreoffice.org/40545
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index c4eda1d02186..77e30bf386e2 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -356,23 +356,15 @@ OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet
OOXMLValue::Pointer_t pPayloadValue(new OOXMLBinaryValue(pPicture));
-OOXMLProperty::Pointer_t pPayloadProperty
-(new OOXMLProperty(NS_ooxml::LN_payload, pPayloadValue,
- OOXMLProperty::ATTRIBUTE));
-
OOXMLPropertySet::Pointer_t pBlipSet(new OOXMLPropertySet);
-pBlipSet->add(pPayloadProperty);
+pBlipSet->add(NS_ooxml::LN_payload, pPayloadValue,
OOXMLProperty::ATTRIBUTE);
OOXMLValue::Pointer_t pBlipValue(new OOXMLPropertySetValue(pBlipSet));
-OOXMLProperty::Pointer_t pBlipProperty
-(new OOXMLProperty(NS_ooxml::LN_blip, pBlipValue,
- OOXMLProperty::ATTRIBUTE));
-
OOXMLPropertySet * pProps = new OOXMLPropertySet;
-pProps->add(pBlipProperty);
+pProps->add(NS_ooxml::LN_blip, pBlipValue, OOXMLProperty::ATTRIBUTE);
return pProps;
}
@@ -380,9 +372,9 @@ OOXMLPropertySet * OOXMLDocumentImpl::getPicturePropSet
void OOXMLDocumentImpl::resolvePicture(Stream & rStream,
const OUString & rId)
{
-OOXMLPropertySet * pProps = getPicturePropSet(rId);
+OOXMLPropertySet::Pointer_t pProps(getPicturePropSet(rId));
-rStream.props(writerfilter::Reference::Pointer_t(pProps));
+rStream.props(pProps);
}
OUString OOXMLDocumentImpl::getTargetForId(const OUString & rId)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 1bf94413caa6..c82b62113876 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -305,21 +305,17 @@ void OOXMLFastContextHandler::sendTableDepth() const
{
if (mnTableDepth > 0)
{
-OOXMLPropertySet * pProps = new OOXMLPropertySet;
+OOXMLPropertySet::Pointer_t pProps(new OOXMLPropertySet);
{
OOXMLValue::Pointer_t pVal =
OOXMLIntegerValue::Create(mnTableDepth);
-OOXMLProperty::Pointer_t pProp
-(new OOXMLProperty(NS_ooxml::LN_tblDepth, pVal,
OOXMLProperty::SPRM));
-pProps->add(pProp);
+pProps->add(NS_ooxml::LN_tblDepth, pVal, OOXMLProperty::SPRM);
}
{
OOXMLValue::Pointer_t pVal = OOXMLIntegerValue::Create(1);
-OOXMLProperty::Pointer_t pProp
-(new OOXMLProperty(NS_ooxml::LN_inTbl, pVal,
OOXMLProperty::SPRM));
-pProps->add(pProp);
+pProps->add(NS_ooxml::LN_inTbl, pVal, OOXMLProperty::SPRM);
}
-
mpStream->props(writerfilter::Reference::Pointer_t(pProps));
+mpStream->props(pProps);
}
}
@@ -396,20 +392,18 @@ void OOXMLFastContextHandler::endParagraphGroup()
void OOXMLFastContextHandler::startSdt()
{
-OOXMLPropertySet * pProps = new OOXMLPropertySet;
+OOXMLPropertySet::Pointer_t pProps(new OOXMLPropertySet);
OOXMLValue::Pointer_t pVal = OOXMLIntegerValue::Create(1);
-OOXMLProperty::Pointer_t pProp(new
OOXMLProperty(NS_ooxml::LN_CT_SdtBlock_sdtContent, pVal,
OOXMLProperty::ATTRIBUTE));
-pProps->add(pProp);
-mpStream->props(writerfilter::Reference::Pointer_t(pProps));
+pProps->add(NS_ooxml::LN_CT_SdtBlock_sdtContent, pVal,
OOXMLProperty::ATTRIBUTE);
+mpStream->props(pProps);
}
void OOXMLFastContextHandler::endSdt()
{
-OOXMLPropertySet * pProps = new OOXMLPropertySet;
+OOXMLPropertySet::Pointer_t pProps(new OOXMLPropertySet);
OOXMLValue::Pointer_t pVal = OOXMLIntegerValue::Create(1);
-OOXMLProperty::Pointer_t pProp(new
OOXMLProperty(NS_ooxml::LN_CT_SdtBlock_sdtEndContent, pVal,
OOXMLProperty::ATTRIBUTE));
-pProps->add(pProp);
-mpStream->props(writerfilter::Reference::Pointer_t(pProps));
+pProps->add(NS_ooxml::LN_CT_SdtBlock_sdtEndContent, pVal,
OOXMLProperty::ATTRIBUTE);
+mpStream->props(pProps);
}
void
Contact with Community
Hi, My name is Christopher Díaz Riveros, I'm a software development student in Lima, Peru. For some time now I have been supporting my Linux community, Gentoo Linux, and I have discovered a wide world of possibilities in open source. I tell you this because it has been so much benefit in my training as a developer that I am determined to start a new community in my country to be able to make technology-related career students find an open source community in which they can learn to work and get the same positive effect that I have had on mine. I have already been talking to some teachers, I am about to begin my final year of studies in institute, and they agree to start the community with students of the institution. As one of the main problems when getting involved with a community here is English, and few are able to have fluent conversations in that language, as it is a bit intimidating for most to approach an open source community. My community hopes to get in touch with different open source projects throughout the world and seeks to be a mid-point to interact among young people and communities. Having said all this I have only to offer the community of LibreOffice, the availability of our community (we still do not have a definite name) and see if anyone is interested in supporting this group of developers here and with a bit of luck to be able to turn it into a movement of all Latin America. Thanks and any kind of feedback is welcome :) Christopher Diaz Riveros ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0720c94db31d61dd9ee3c6bcd95f49003493a71b Author: Olivier Hallot Date: Sat Jul 29 10:59:28 2017 -0300 Updated core Project: help 4d6f86d203814a211eae9dfacd4baf195ca4ff1d tdf#97745 housekeeping Fix links in bookmarks.js Better font size for Index and Contents Fix CSS file Change-Id: I42966be1d88b12393b6dd95adb2719baf76a025c Reviewed-on: https://gerrit.libreoffice.org/40549 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a0efca32e5eb..4d6f86d20381 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a0efca32e5ebee152776ac81f8e4f59892faead0 +Subproject commit 4d6f86d203814a211eae9dfacd4baf195ca4ff1d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/get_bookmark.xsl help3xsl/get_tree.xsl help3xsl/xhp2html.sh
help3xsl/default.css |5
help3xsl/get_bookmark.xsl | 50 --
help3xsl/get_tree.xsl |2 -
help3xsl/xhp2html.sh |2 -
4 files changed, 34 insertions(+), 25 deletions(-)
New commits:
commit 4d6f86d203814a211eae9dfacd4baf195ca4ff1d
Author: Olivier Hallot
Date: Sat Jul 29 10:59:28 2017 -0300
tdf#97745 housekeeping
Fix links in bookmarks.js
Better font size for Index and Contents
Fix CSS file
Change-Id: I42966be1d88b12393b6dd95adb2719baf76a025c
Reviewed-on: https://gerrit.libreoffice.org/40549
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 3a83d55d4..6fcfc3297 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -389,8 +389,12 @@ header input[type=checkbox],
top: 2px;
left: 2px;
}
+#Index ul {
+padding-left:15px;
+}
#Index ul li {
list-style-type: none;
+font-size: 11pt;
}
#Index p {
font-size: 16pt;
@@ -478,6 +482,7 @@ header input[type=checkbox],
padding: 0;
margin: 0;
list-style: none;
+font-size: 11pt;
}
.contents-treeview {
/*font: normal 11px "Segoe UI", Arial, Sans-serif;*/
diff --git a/help3xsl/get_bookmark.xsl b/help3xsl/get_bookmark.xsl
index 1a153c89e..d0fd8f19a 100644
--- a/help3xsl/get_bookmark.xsl
+++ b/help3xsl/get_bookmark.xsl
@@ -55,22 +55,37 @@ xsltproc get_bookmark.xsl
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -92,17 +107,6 @@ xsltproc get_bookmark.xsl
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help3xsl/get_tree.xsl b/help3xsl/get_tree.xsl
index c80ba1b95..4f959ad5a 100644
--- a/help3xsl/get_tree.xsl
+++ b/help3xsl/get_tree.xsl
@@ -8,7 +8,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh
index d4e172c0b..eb2696a6e 100755
--- a/help3xsl/xhp2html.sh
+++ b/help3xsl/xhp2html.sh
@@ -89,7 +89,7 @@ echo 'copy global service files'
cp index.html $here'/html/'
cp help.js $here'/html/'$productversion'/'
cp jquery-3.1.1.min.js $here'/html/'$productversion'/'
-cp normalize.js $here'/html/'$productversion'/'
+cp normalize.css $here'/html/'$productversion'/'
cp default.css $here'/html/'$productversion'/'
cp -rap ../source/media $here'/html/'$productversion'/'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/drawingml/shape.hxx |2 ++
oox/source/drawingml/shape.cxx |6 ++
sd/qa/unit/data/pptx/tdf109223.pptx |binary
sd/qa/unit/import-tests.cxx | 34 ++
4 files changed, 42 insertions(+)
New commits:
commit d742c0019435d0bc90c9342492583636099a057f
Author: Tamás Zolnai
Date: Sat Jul 29 21:43:41 2017 +0200
tdf#109223: PPTX: Vertical flip of child shape is not imported correctly
Group shape level vertical flip is not handled well. Recent handling
of group shape's transformation makes it hard to import this attribute,
but we can import the right text direction at least.
Change-Id: Ib9e39e3dcb28a95fabc61c13152a3f7296fbd4c3
Reviewed-on: https://gerrit.libreoffice.org/40554
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 6591ebc3b8d1..c98bf4e3f254 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -137,6 +137,7 @@ public:
voidsetRotation( sal_Int32 nRotation ) {
mnRotation = nRotation; }
voidsetFlip( bool bFlipH, bool bFlipV ) {
mbFlipH = bFlipH; mbFlipV = bFlipV; }
+voidapplyParentTextFlipV(bool bTextFlipV) {
mbInheritedTextFlipV = bTextFlipV; }
voidaddChild( const ShapePtr& rChildPtr ) {
maChildren.push_back( rChildPtr ); }
std::vector< ShapePtr >&getChildren() { return maChildren; }
@@ -310,6 +311,7 @@ private:
sal_Int32 mnRotation;
boolmbFlipH;
boolmbFlipV;
+boolmbInheritedTextFlipV; // Used by group
shapes only
boolmbHidden;
boolmbHiddenMasterShape; // master shapes can
be hidden in layout slides
// we need separate
flag because we don't want
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 3368cd0c315a..ccc73d8b47c9 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -115,6 +115,7 @@ Shape::Shape( const sal_Char* pServiceName, bool
bDefaultHeight )
, mnRotation( 0 )
, mbFlipH( false )
, mbFlipV( false )
+, mbInheritedTextFlipV(false)
, mbHidden( false )
, mbHiddenMasterShape( false )
, mbLockedCanvas( false )
@@ -156,6 +157,7 @@ Shape::Shape( const ShapePtr& pSourceShape )
, mnRotation( pSourceShape->mnRotation )
, mbFlipH( pSourceShape->mbFlipH )
, mbFlipV( pSourceShape->mbFlipV )
+, mbInheritedTextFlipV(pSourceShape->mbInheritedTextFlipV)
, mbHidden( pSourceShape->mbHidden )
, mbHiddenMasterShape( pSourceShape->mbHiddenMasterShape )
, mbLockedCanvas( pSourceShape->mbLockedCanvas )
@@ -312,6 +314,7 @@ void Shape::applyShapeReference( const Shape&
rReferencedShape, bool bUseText )
mnRotation = rReferencedShape.mnRotation;
mbFlipH = rReferencedShape.mbFlipH;
mbFlipV = rReferencedShape.mbFlipV;
+mbInheritedTextFlipV = rReferencedShape.mbInheritedTextFlipV;
mbHidden = rReferencedShape.mbHidden;
}
@@ -385,6 +388,7 @@ void Shape::addChildren(
std::vector< ShapePtr >::iterator aIter( rMaster.maChildren.begin() );
while( aIter != rMaster.maChildren.end() ) {
(*aIter)->setMasterTextListStyle( mpMasterTextListStyle );
+(*aIter)->applyParentTextFlipV(mbInheritedTextFlipV != mbFlipV);
(*aIter++)->addShape( rFilterBase, pTheme, rxShapes,
aChildTransformation, getFillProperties(), pShapeMap );
}
}
@@ -1065,6 +1069,8 @@ Reference< XShape > const & Shape::createAndInsert(
if( getTextBody() )
{
sal_Int32 nTextRotateAngle = static_cast< sal_Int32 >(
getTextBody()->getTextProperties().moRotation.get( 0 ) );
+if(mbInheritedTextFlipV)
+nTextRotateAngle -= 180 * 6;
/* OOX measures text rotation clockwise in 1/6th degrees,
relative to the containing shape. setTextRotateAngle wants
degrees anticlockwise. */
diff --git a/sd/qa/unit/data/pptx/tdf109223.pptx
b/sd/qa/unit/data/pptx/tdf109223.pptx
new file mode 100755
index ..0f68796e8e14
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf109223.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 58681c8e4224..dab76b1dde7d 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -163,6 +163,7 @@ public:
void testTdf108925();
void testTdf109067();
void testSmartArt1();
+void testTdf109223();
bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber,
std::vector& rExpected);
void testPatternImport();
@@ -234,6 +235,7 @@ public:
CPPUNIT_TEST(testTdf1089
[Libreoffice-commits] libcdr.git: configure.ac m4/dlp_fallthrough.m4 src/lib
configure.ac |1 m4/dlp_fallthrough.m4 | 65 + src/lib/CMXParser.cpp |2 - src/lib/libcdr_utils.h |8 ++ 4 files changed, 75 insertions(+), 1 deletion(-) New commits: commit 0e23de6ce871a646f9e1f33b8b5ea90e30eb9e95 Author: David Tardon Date: Sat Jul 29 17:02:25 2017 +0200 suppress GCC 7 fallthrough warning Change-Id: I6a1da60f75130e897191f20910aab9a3a46b5b57 diff --git a/configure.ac b/configure.ac index 78b34f4..39770dd 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ AC_CANONICAL_HOST AX_CXX_COMPILE_STDCXX_11 AX_GCC_FUNC_ATTRIBUTE([format]) +DLP_FALLTHROUGH PKG_PROG_PKG_CONFIG([0.20]) diff --git a/m4/dlp_fallthrough.m4 b/m4/dlp_fallthrough.m4 new file mode 100644 index 000..99e6be5 --- /dev/null +++ b/m4/dlp_fallthrough.m4 @@ -0,0 +1,65 @@ +# +# SYNOPSIS +# +# DLP_FALLTHROUGH +# +# DESCRIPTION +# +# This macro checks if the compiler supports a fallthrough warning +# suppression attribute in GCC or CLANG style. +# +# If a fallthrough warning suppression attribute is supported define +# HAVE_
[Libreoffice-commits] core.git: Branch 'feature/lok_dialog' - 2 commits - include/vcl libreofficekit/qa sw/source vcl/source
include/vcl/dialog.hxx |2
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 10 ++
libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx |2
libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 50
--
libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx | 15 ++-
sw/source/uibase/uno/unotxdoc.cxx |2
vcl/source/window/dialog.cxx| 25
+
7 files changed, 74 insertions(+), 32 deletions(-)
New commits:
commit 23e767261983273c5d6efe61396546f694df7af5
Author: Pranav Kant
Date: Sat Jul 29 18:08:21 2017 +0530
lokdialog: Trigger repaint on all opened dialog with invalidate
This is just a hack to temporarily trigger paints for all the opened
dialogs whenever a dialog invalidation callback is emitted. This solves
the problem for some of the dialogs where hard coded uno command, which
we are using as dialog IDs in GTV, doesn't match with the dialog id
contained in the payload of the invalidation callback.
With this SearchDialog, AcceptChangeTracking and few others are
responding well to mouse clicks and invalidate instantaneously while to
invalidate and repaint some other dialogs, one needs to refocus them.
Change-Id: Iac2acbda60c8e2d0eabe65440f3fbda3ef271d7a
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index ab28f23578ec..077e2577f384 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -442,6 +442,16 @@
gtv_application_window_get_child_window_by_id(GtvApplicationWindow* window, cons
return ret;
}
+// temporary function to invalidate all opened dialogs
+// because currently the dialog id returned in dialog invalidation payload
+// doesn't match our hard-coded list of dialog ids (uno commands) for some
dialogs
+GList*
+gtv_application_window_get_all_child_windows(GtvApplicationWindow* window)
+{
+GtvApplicationWindowPrivate* priv = getPrivate(window);
+return priv->m_pChildWindows;
+}
+
GtvApplicationWindow*
gtv_application_window_new(GtkApplication* app)
{
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
index c16425566967..239471ae4ac8 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
@@ -105,6 +105,8 @@ void
gtv_application_window_unregister_child_window(GtvApplicationWindow* window
GtkWindow* gtv_application_window_get_child_window_by_id(GtvApplicationWindow*
window, const gchar* pWinId);
+GList* gtv_application_window_get_all_child_windows(GtvApplicationWindow*
window);
+
G_END_DECLS
#endif /* GTV_APPLICATION_WINDOW_H */
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index 2a620b58000d..7a9fa7712900 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -63,11 +63,13 @@ pixelToTwip(float fInput)
return (fInput / 96 / 1.0 /* zoom */) * 1440.0f;
}
+#if 0
static float
twipToPixel(float fInput)
{
return fInput / 1440.0f * 96 * 1.0 /* zoom */;
}
+#endif
static void
gtv_lok_dialog_draw(GtkWidget* pDialogDrawingArea, cairo_t* pCairo, gpointer)
diff --git
a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index a549d852c786..8f86ecd43ca7 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -281,14 +281,23 @@ void LOKDocViewSigHandlers::comment(LOKDocView* pDocView,
gchar* pComment, gpoin
}
}
-void LOKDocViewSigHandlers::dialogInvalidate(LOKDocView* pDocView, gchar*
pDialogId, gpointer)
+void LOKDocViewSigHandlers::dialogInvalidate(LOKDocView* pDocView, gchar*
/*pDialogId*/, gpointer)
{
GtvApplicationWindow* window =
GTV_APPLICATION_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(pDocView)));
-GtkWindow* pDialog = gtv_application_window_get_child_window_by_id(window,
pDialogId);
-if (pDialog)
+//GtkWindow* pDialog =
gtv_application_window_get_child_window_by_id(window, pDialogId);
+
+// temporary hack to invalidate all open dialogs
+GList* pChildWins = gtv_application_window_get_all_child_windows(window);
+GList* pIt = nullptr;
+for (pIt = pChildWins; pIt != nullptr; pIt = pIt->next)
+{
+gtv_lok_dialog_invalidate(GTV_LOK_DIALOG(pIt->data));
+}
+/* if (pDialog)
{
gtv_lok_dialog_invalidate(GTV_LOK_DIALOG(pDialog));
}
+*/
}
gbool
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/global2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 14b211478d2eded45f3e966e579a50c41325c216
Author: Caolán McNamara
Date: Sat Jul 29 12:03:48 2017 +0100
ofz: no shell during testing
Change-Id: I8be6ed363c9028b9fb85ff1829b5bffe1210bbf1
Reviewed-on: https://gerrit.libreoffice.org/40548
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index ab50f5aae7a4..a0262f30f13e 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -309,7 +309,7 @@ OUString ScGlobal::GetAbsDocName( const OUString& rFileName,
SfxObjectShell* pShell )
{
OUString aAbsName;
-if ( !pShell->HasName() )
+if (!pShell || !pShell->HasName())
{ // maybe relative to document path working directory
INetURLObject aObj;
SvtPathOptions aPathOpt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: 2 commits - src/lib
src/lib/VSDContentCollector.cpp | 11 ++-
src/lib/VSDMetaData.cpp |4 ++--
src/lib/VSDParser.cpp |2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 5755a70ac2e9522963ff037f55edccb483e6
Author: David Tardon
Date: Sat Jul 29 13:17:39 2017 +0200
do not append UTF-8 chars by code unit
Change-Id: I9b0279b99d59ab69c1d720e865462b4e03b671bc
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index bc7fa42..b3a5ffc 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -3572,11 +3572,12 @@ void
libvisio::VSDContentCollector::appendCharacters(librevenge::RVNGString &tex
return appendCharacters(text, characters);
if (format == VSD_TEXT_UTF8)
{
-for (std::vector::const_iterator iter = characters.begin();
- iter != characters.end(); ++iter)
-{
- text.append((const char)*iter);
-}
+// TODO: revisit for librevenge 0.1
+std::vector buf;
+buf.reserve(characters.size() + 1);
+buf.assign(characters.begin(), characters.end());
+buf.push_back(0);
+text.append(reinterpret_cast(buf.data()));
return;
}
diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 7241b00..1b5bb88 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -253,8 +253,8 @@ librevenge::RVNGString
libvisio::VSDMetaData::readCodePageString(librevenge::RVN
{
//
http://msdn.microsoft.com/en-us/library/windows/desktop/dd374130%28v=vs.85%29.aspx
// says this is UTF-8.
-for (std::vector::const_iterator i = characters.begin(); i
!= characters.end(); ++i)
- string.append((const char)*i);
+characters.push_back(0);
+string.append(reinterpret_cast(characters.data()));
}
else
{
commit 0a7e952f63add0b2127be11dc8371f9c037160c5
Author: David Tardon
Date: Sat Jul 29 13:21:37 2017 +0200
fix debug build
Change-Id: Ic475c5808bae006d34a95d530c0a7f7e69e399f4
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 3827313..aae8cb6 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -188,9 +188,9 @@ catch (...)
bool libvisio::VSDParser::parseDocument(librevenge::RVNGInputStream *input,
unsigned shift)
{
+ std::set visited;
try
{
-std::set visited;
handleStreams(input, VSD_TRAILER_STREAM, shift, 0, visited);
assert(visited.empty());
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2017-30-07_02:35:16 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/tbsdy/workbench' - 2 commits - Repository.mk sal/Executable_executeprocess.mk sal/Executable_processcmdlineargs.mk sal/Module_sal.mk sal/workben
Repository.mk |2 sal/Executable_executeprocess.mk | 31 sal/Executable_processcmdlineargs.mk | 31 sal/Module_sal.mk |2 sal/workben/osl/batch.bat | 19 +++ sal/workben/osl/batch.sh |2 sal/workben/osl/executeprocess.cxx | 83 + sal/workben/osl/processcmdlineargs.cxx | 75 + 8 files changed, 245 insertions(+) New commits: commit cd2179ddb6f7f88b67c5ad9a0a0ff919c93606b4 Author: Chris Sherlock Date: Sun Jul 30 01:31:11 2017 +1000 sal workben: Demonstrate osl_executeProcess() Change-Id: I7b6e3d89601b78deec7e78f5817a4980b4007ebf diff --git a/Repository.mk b/Repository.mk index f82bfed6ba51..8413facda420 100644 --- a/Repository.mk +++ b/Repository.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ processworkdir \ getprocessinfo \ processcmdlineargs \ +executeprocess \ )) $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ diff --git a/sal/Executable_executeprocess.mk b/sal/Executable_executeprocess.mk new file mode 100644 index ..7294ab0e8745 --- /dev/null +++ b/sal/Executable_executeprocess.mk @@ -0,0 +1,31 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Executable_Executable,executeprocess)) + +$(eval $(call gb_Executable_set_include,executeprocess,\ +$$(INCLUDE) \ +-I$(SRCDIR)/sal/inc \ +)) + +$(eval $(call gb_Library_add_defs,executeprocess,\ +-DSAL_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Executable_use_libraries,executeprocess,\ +sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,executeprocess,\ +sal/workben/osl/executeprocess \ +)) + +$(call gb_Executable_get_clean_target,executeprocess) : + rm -f $(WORKDIR)/LinkTarget/Executable/executeprocess +# vim: set ts=4 sw=4 et: diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 95f88ffbd1ef..4f6118210247 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,sal,\ Executable_processworkdir \ Executable_getprocessinfo \ Executable_processcmdlineargs \ +Executable_executeprocess \ )) $(eval $(call gb_Module_add_check_targets,sal,\ diff --git a/sal/workben/osl/batch.bat b/sal/workben/osl/batch.bat new file mode 100755 index ..e27f7191bfc2 --- /dev/null +++ b/sal/workben/osl/batch.bat @@ -0,0 +1,19 @@ +rem +rem This file is part of the LibreOffice project. +rem +rem This Source Code Form is subject to the terms of the Mozilla Public +rem License, v. 2.0. If a copy of the MPL was not distributed with this +rem file, You can obtain one at http://mozilla.org/MPL/2.0/. +rem +rem This file incorporates work covered by the following license notice: +rem +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed +rem with this work for additional information regarding copyright +rem ownership. The ASF licenses this file to you under the Apache +rem License, Version 2.0 (the "License"); you may not use this file +rem except in compliance with the License. You may obtain a copy of +rem the License at http://www.apache.org/licenses/LICENSE-2.0 . +rem +@echo off +echo "Hello world" \ No newline at end of file diff --git a/sal/workben/osl/batch.sh b/sal/workben/osl/batch.sh new file mode 100755 index ..fd3828c6ae42 --- /dev/null +++ b/sal/workben/osl/batch.sh @@ -0,0 +1,2 @@ +#!/bin/sh +echo "Hello world" \ No newline at end of file diff --git a/sal/workben/osl/executeprocess.cxx b/sal/workben/osl/executeprocess.cxx new file mode 100644 index ..5e925e8defc4 --- /dev/null +++ b/sal/workben/osl/executeprocess.cxx @@ -0,0 +1,83 @@ +/* -*- 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
[Libreoffice-commits] libmspub.git: 2 commits - src/lib
src/lib/MSPUBCollector.cpp |2 +-
src/lib/MSPUBMetaData.cpp |4 ++--
src/lib/PolygonUtils.cpp | 12 ++--
src/lib/libmspub_utils.cpp | 14 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 77655b7e8dfd05669c3bc1c691a882fa45251cf5
Author: David Tardon
Date: Sat Jul 29 12:54:50 2017 +0200
use vector::data()
Change-Id: I8ff2210e36df47c3fcc34a2357425668d6bbfb03
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index b071cb6..981d345 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1174,7 +1174,7 @@ const char *MSPUBCollector::getCalculatedEncoding() const
goto csd_fail;
}
// don't worry, the below call doesn't require a null-terminated string.
- ucsdet_setText(ucd, (const char *)(&m_allText[0]), m_allText.size(),
&status);
+ ucsdet_setText(ucd, (const char *)m_allText.data(), m_allText.size(),
&status);
if (U_FAILURE(status))
{
goto csd_fail;
diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index 5a9c3d1..7020b69 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -6381,19 +6381,19 @@ bool isShapeTypeRectangle(ShapeType type)
std::shared_ptr getFromDynamicCustomShape(const
DynamicCustomShape &dcs)
{
return std::shared_ptr(new CustomShape(
- dcs.m_vertices.empty() ? NULL :
&dcs.m_vertices[0],
+ dcs.m_vertices.empty() ? NULL :
dcs.m_vertices.data(),
dcs.m_vertices.size(),
- dcs.m_elements.empty() ? NULL :
&dcs.m_elements[0],
+ dcs.m_elements.empty() ? NULL :
dcs.m_elements.data(),
dcs.m_elements.size(),
- dcs.m_calculations.empty() ?
NULL : &dcs.m_calculations[0],
+ dcs.m_calculations.empty() ?
NULL : dcs.m_calculations.data(),
dcs.m_calculations.size(),
dcs.m_defaultAdjustValues.empty() ? NULL :
- &dcs.m_defaultAdjustValues[0],
+ dcs.m_defaultAdjustValues.data(),
dcs.m_defaultAdjustValues.size(),
- dcs.m_textRectangles.empty() ?
NULL : &dcs.m_textRectangles[0],
+ dcs.m_textRectangles.empty() ?
NULL : dcs.m_textRectangles.data(),
dcs.m_textRectangles.size(),
dcs.m_coordWidth,
dcs.m_coordHeight,
- dcs.m_gluePoints.empty() ? NULL
: &dcs.m_gluePoints[0],
+ dcs.m_gluePoints.empty() ? NULL
: dcs.m_gluePoints.data(),
dcs.m_gluePoints.size(),
dcs.m_adjustShiftMask
));
diff --git a/src/lib/libmspub_utils.cpp b/src/lib/libmspub_utils.cpp
index 05627a9..1540e21 100644
--- a/src/lib/libmspub_utils.cpp
+++ b/src/lib/libmspub_utils.cpp
@@ -333,7 +333,7 @@ void readNBytes(librevenge::RVNGInputStream *input,
unsigned long length, std::v
return;
}
out = std::vector(numBytesRead);
- memcpy(&out[0], tmpBuffer, numBytesRead);
+ memcpy(out.data(), tmpBuffer, numBytesRead);
return;
}
@@ -387,7 +387,7 @@ void appendCharacters(librevenge::RVNGString &text, const
std::vector
Date: Sat Jul 29 12:46:16 2017 +0200
do not append UTF-8 string by code units
Change-Id: I7b8f01fb875336d7d736cf24553fbb82e44fa5ec
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index c298bd1..f9ffb8f 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -252,8 +252,8 @@ librevenge::RVNGString
libmspub::MSPUBMetaData::readCodePageString(librevenge::R
{
//
http://msdn.microsoft.com/en-us/library/windows/desktop/dd374130%28v=vs.85%29.aspx
// says this is UTF-8.
-for (std::vector::const_iterator i = characters.begin(); i
!= characters.end(); ++i)
- string.append((const char)*i);
+characters.push_back(0);
+string.append(reinterpret_cast(characters.data()));
}
else
{
diff --git a/src/lib/libmspub_utils.cpp b/src/lib/libmspub_utils.cpp
index 00a6f30..05627a9 100644
--- a/src/lib/libmspub_utils.cpp
+++ b/src/lib/libmspub_utils.cpp
@@ -237,17 +237,17 @@ static void _appendUCS4(librevenge::RVNGString &text,
unsigned ucs4Character)
len = 6;
}
- unsigned char outbuf[6] = { 0, 0, 0, 0, 0, 0 };
+ char outbuf[7] = { 0 };
int i;
for (i = len - 1; i > 0;
[Libreoffice-commits] core.git: include/svx officecfg/registry sc/source svtools/source svx/source svx/util
include/svx/tbcontrl.hxx| 21 +-
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 +
sc/source/ui/app/scdll.cxx |1
svtools/source/uno/popupwindowcontroller.cxx| 11 +
svx/source/tbxctrls/tbcontrl.cxx| 73
+-
svx/util/svxcore.component |4
6 files changed, 76 insertions(+), 45 deletions(-)
New commits:
commit 9f61005dd9c4bf86e92e4c60677cf06a949a7af7
Author: Maxim Monastirsky
Date: Wed May 3 02:25:07 2017 +0300
tdf#109309 Currency dropdown is misplaced under Wayland
- Base SvxCurrencyToolBoxControl on PopupWindowController,
so we still allow tearoff, but without marking the window
as self-decorated (unless actually teared-off).
- Add support for toggle state to PopupWindowController.
Change-Id: I60e004e6ada3efe092352cb93be5aae346073f83
Reviewed-on: https://gerrit.libreoffice.org/40557
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 6fb31324f2a6..22fd4e72910f 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -137,6 +137,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -248,7 +249,7 @@ public:
const SfxPoolItem* pState) override;
};
-class SVX_DLLPUBLIC SvxCurrencyToolBoxControl : public SfxToolBoxControl
+class SVX_DLLPUBLIC SvxCurrencyToolBoxControl : public
svt::PopupWindowController
{
private:
OUString m_aFormatString;
@@ -257,18 +258,24 @@ private:
public:
static void GetCurrencySymbols( std::vector& rList, bool bFlag,
std::vector& rCurrencyList );
-SFX_DECL_TOOLBOX_CONTROL();
-SvxCurrencyToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox&
rBox );
+
+explicit SvxCurrencyToolBoxControl( const
css::uno::Reference& rContext );
virtual ~SvxCurrencyToolBoxControl() override;
-virtual void Select( sal_uInt16 nSelectModifier ) override;
-virtual VclPtr CreatePopupWindow() override;
+
+// XToolbarController
+virtual void SAL_CALL execute( sal_Int16 nSelectModifier ) override;
+
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
-
-
#endif // INCLUDED_SVX_TBCONTRL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index e6448e98ff86..35c874fdfb1b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1177,6 +1177,17 @@
com.sun.star.comp.svx.FrameToolBoxControl
+
+
+ .uno:NumberFormatCurrency
+
+
+ com.sun.star.sheet.SpreadsheetDocument
+
+
+ com.sun.star.comp.svx.CurrencyToolBoxControl
+
+
.uno:FontColor
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 747340e150bd..8e7b3d6aaab1 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -154,7 +154,6 @@ void ScDLL::Init()
// Own Controller
ScZoomSliderControl
::RegisterControl(SID_PREVIEW_SCALINGFACTOR, pMod);
-SvxCurrencyToolBoxControl ::RegisterControl(SID_NUMBER_CURRENCY,
pMod);
// SvxToolboxController
SvxTbxCtlDraw ::RegisterControl(SID_INSERT_DRAW,
pMod);
diff --git a/svtools/source/uno/popupwindowcontroller.cxx
b/svtools/source/uno/popupwindowcontroller.cxx
index dd4f6cf7a820..166a58d262ed 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -178,8 +178,15 @@ void SAL_CALL PopupWindowController::dispose()
// XStatusListener
void SAL_CALL PopupWindowController::statusChanged( const
frame::FeatureStateEvent& rEvent )
{
-svt::ToolboxController::statusChanged(rEvent);
-enable( rEvent.IsEnabled );
+ToolBox* pToolBox = nullptr;
+sal_uInt16 nItemId = 0;
+if ( getToolboxId( nItemId, &pToolBox ) )
+{
+bool bValue = false;
+rEvent.State >>= bValue;
+pToolBox->CheckItem( nItemId, bValue );
+pToolBox->EnableItem( nItemId, rEvent.IsEnabled );
+}
}
Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow()
diff --git a/
Reliable Version of LibreOffice
Hello I want to build libreoffice for android and do some change on it but there are many problem I have faced to them. First of all I didn't find a reliable and good version on github for downloading it and doing my changes. I downloaded latest version of it by running this command but there is some bugs in it. git clone git://anongit.freedesktop.org/libreoffice/core libreoffice Anyway I have one ask from you : would you send me a link from a reliable and good source code that build with no error please? -- View this message in context: http://nabble.documentfoundation.org/Reliable-Version-of-LibreOffice-tp4219328.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
