[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/checkconfigmacros.cxx| 30 +--
compilerplugins/clang/compat.hxx | 56 -
compilerplugins/clang/externandnotdefined.cxx |2
compilerplugins/clang/implicitboolconversion.cxx |6 --
compilerplugins/clang/literaltoboolconversion.cxx |2
compilerplugins/clang/nullptr.cxx | 19 +--
compilerplugins/clang/redundantcast.cxx|8 +--
compilerplugins/clang/salbool.cxx | 30 +--
compilerplugins/clang/store/constantfunction.cxx |2
compilerplugins/clang/store/rtlconstasciimacro.cxx |8 ---
compilerplugins/clang/stringconstant.cxx |7 +-
compilerplugins/clang/unreffun.cxx | 14 +
12 files changed, 29 insertions(+), 155 deletions(-)
New commits:
commit 1ce7176ba1b39f02ab45056023f8e7622f48cc74
Author: Stephan Bergmann
Date: Wed Jun 29 08:55:27 2016 +0200
Remove support for Clang < 3.3
Change-Id: I185852a738bac10dc6d331afccfcbc7ae1225cb1
diff --git a/compilerplugins/clang/checkconfigmacros.cxx
b/compilerplugins/clang/checkconfigmacros.cxx
index 5baea1e..01ffde6 100644
--- a/compilerplugins/clang/checkconfigmacros.cxx
+++ b/compilerplugins/clang/checkconfigmacros.cxx
@@ -34,13 +34,6 @@ class CheckConfigMacros
public:
explicit CheckConfigMacros( const InstantiationData& data );
virtual void run() override;
-#if CLANG_VERSION < 30300
-virtual void MacroDefined( const Token& macroToken, const MacroInfo*
info ) override;
-virtual void MacroUndefined( const Token& macroToken, const MacroInfo*
info ) override;
-virtual void Ifdef( SourceLocation location, const Token& macroToken )
override;
-virtual void Ifndef( SourceLocation location, const Token& macroToken
) override;
-virtual void Defined( const Token& macroToken ) override;
-#else
virtual void MacroDefined( const Token& macroToken, const
MacroDirective* info ) override;
#if CLANG_VERSION < 30700
virtual void MacroUndefined( const Token& macroToken, const
MacroDirective* info ) override;
@@ -58,7 +51,6 @@ class CheckConfigMacros
#else
virtual void Defined( const Token& macroToken, const MacroDefinition&
info, SourceRange Range ) override;
#endif
-#endif
enum { isPPCallback = true };
private:
void checkMacro( const Token& macroToken, SourceLocation location );
@@ -76,15 +68,9 @@ void CheckConfigMacros::run()
// nothing, only check preprocessor usage
}
-#if CLANG_VERSION < 30300
-void CheckConfigMacros::MacroDefined( const Token& macroToken, const
MacroInfo* info )
-{
-SourceLocation location = info->getDefinitionLoc();
-#else
void CheckConfigMacros::MacroDefined( const Token& macroToken, const
MacroDirective* info )
{
SourceLocation location = info->getLocation();
-#endif
const char* filename = compiler.getSourceManager().getPresumedLoc(
location ).getFilename();
if( filename != NULL
&& ( strncmp( filename, BUILDDIR "/config_host/", strlen( BUILDDIR
"/config_host/" )) == 0
@@ -95,9 +81,7 @@ void CheckConfigMacros::MacroDefined( const Token&
macroToken, const MacroDirect
}
}
-#if CLANG_VERSION < 30300
-void CheckConfigMacros::MacroUndefined( const Token& macroToken, const
MacroInfo* )
-#elif CLANG_VERSION < 30700
+#if CLANG_VERSION < 30700
void CheckConfigMacros::MacroUndefined( const Token& macroToken, const
MacroDirective* )
#else
void CheckConfigMacros::MacroUndefined( const Token& macroToken, const
MacroDefinition& )
@@ -106,9 +90,7 @@ void CheckConfigMacros::MacroUndefined( const Token&
macroToken, const MacroDefi
configMacros.erase( macroToken.getIdentifierInfo()->getName());
}
-#if CLANG_VERSION < 30300
-void CheckConfigMacros::Ifdef( SourceLocation location, const Token&
macroToken )
-#elif CLANG_VERSION < 30700
+#if CLANG_VERSION < 30700
void CheckConfigMacros::Ifdef( SourceLocation location, const Token&
macroToken, const MacroDirective* )
#else
void CheckConfigMacros::Ifdef( SourceLocation location, const Token&
macroToken, const MacroDefinition& )
@@ -117,9 +99,7 @@ void CheckConfigMacros::Ifdef( SourceLocation location,
const Token& macroToken,
checkMacro( macroToken, location );
}
-#if CLANG_VERSION < 30300
-void CheckConfigMacros::Ifndef( SourceLocation location, const Token&
macroToken )
-#elif CLANG_VERSION < 30700
+#if CLANG_VERSION < 30700
void CheckConfigMacros::Ifndef( SourceLocation location, const Token&
macroToken, const MacroDirective* )
#else
void CheckConfigMacros::Ifndef( SourceLocation location, const Token&
macroToken, const MacroDefinition& )
@@ -128,9 +108,7 @@ void CheckConfigMacros::Ifndef( SourceLocation location,
const Token& macroToken
checkMacro( macroToken, location );
}
-#if CLANG_VERSION < 30300
-void CheckConfigMacros::Defined( const Token& macroToken )
-#elif
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/staticmethods.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6439d93cbe64bacba1bcb858dd7cbb6a33fca60b
Author: Stephan Bergmann
Date: Wed Jun 29 08:54:33 2016 +0200
typo
Change-Id: I31053ae472f74eaf3a86159a273424174329d0bd
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index 98fca8a..8727026 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -217,7 +217,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
if ((fdc.Function("autoInstallFontLangSupport").Class("PrintFontManager")
.Namespace("psp").GlobalNamespace())
|| fdc.Function("AllocateFrame").Class("GtkSalFrame").GlobalNamespace()
-|| (fdc.Function("TriggerPaintEvent").Class("GtkSalFrame::")
+|| (fdc.Function("TriggerPaintEvent").Class("GtkSalFrame")
.GlobalNamespace()))
{
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/staticmethods.cxx | 102 +---
1 file changed, 68 insertions(+), 34 deletions(-)
New commits:
commit 94cba04b33c9be270ee2947f2456d453cf57
Author: Stephan Bergmann
Date: Wed Jun 29 07:31:26 2016 +0200
Further clean-up
Change-Id: Id07b37629eb2a0b6d33297bffcf86d41c5d6fbe2
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index c533242..98fca8a 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -107,20 +107,19 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
if (aFilename == SRCDIR "/include/svl/svdde.hxx") {
return true;
}
-std::string aParentName =
pCXXMethodDecl->getParent()->getQualifiedNameAsString();
+auto cdc = loplugin::DeclCheck(pCXXMethodDecl->getParent());
// special case having something to do with static initialisation
// sal/osl/all/utility.cxx
-if (aParentName == "osl::OGlobalTimer") {
+if (cdc.Class("OGlobalTimer").Namespace("osl").GlobalNamespace()) {
return true;
}
// leave the TopLeft() method alone for consistency with the other
"corner" methods
-if (aParentName == "BitmapInfoAccess") {
+if (cdc.Class("BitmapInfoAccess").GlobalNamespace()) {
return true;
}
-auto dc = loplugin::DeclCheck(pCXXMethodDecl->getParent());
// in this case, the code is taking the address of the member function
// shell/source/unix/sysshell/recently_used_file_handler.cxx
-if (dc.Struct("recently_used_item").AnonymousNamespace().GlobalNamespace())
+if
(cdc.Struct("recently_used_item").AnonymousNamespace().GlobalNamespace())
{
return true;
}
@@ -139,53 +138,88 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
return true;
}
// classes that have static data and some kind of weird reference-counting
trick in its constructor
-if (aParentName == "LinguOptions" || aParentName ==
"svtools::EditableExtendedColorConfig"
-|| aParentName == "svtools::ExtendedColorConfig" || aParentName ==
"SvtMiscOptions"
-|| aParentName == "SvtAccessibilityOptions" || aParentName ==
"svtools::ColorConfig"
-|| aParentName == "SvtOptionsDrawinglayer" || aParentName ==
"SvtMenuOptions"
-|| aParentName == "SvtToolPanelOptions" || aParentName ==
"SvtSlideSorterBarOptions"
-|| aParentName == "connectivity::SharedResources"
-|| aParentName == "svxform::OParseContextClient"
-|| aParentName == "frm::OLimitedFormats" )
+if (cdc.Class("LinguOptions").GlobalNamespace()
+|| (cdc.Class("EditableExtendedColorConfig").Namespace("svtools")
+.GlobalNamespace())
+|| (cdc.Class("ExtendedColorConfig").Namespace("svtools")
+.GlobalNamespace())
+|| cdc.Class("SvtMiscOptions").GlobalNamespace()
+|| cdc.Class("SvtAccessibilityOptions").GlobalNamespace()
+|| cdc.Class("ColorConfig").Namespace("svtools").GlobalNamespace()
+|| cdc.Class("SvtOptionsDrawinglayer").GlobalNamespace()
+|| cdc.Class("SvtMenuOptions").GlobalNamespace()
+|| cdc.Class("SvtToolPanelOptions").GlobalNamespace()
+|| cdc.Class("SvtSlideSorterBarOptions").GlobalNamespace()
+|| (cdc.Class("SharedResources").Namespace("connectivity")
+.GlobalNamespace())
+|| (cdc.Class("OParseContextClient").Namespace("svxform")
+.GlobalNamespace())
+|| cdc.Class("OLimitedFormats").Namespace("frm").GlobalNamespace())
{
return true;
}
-std::string fqn = aParentName + "::" + pCXXMethodDecl->getNameAsString();
+auto fdc = loplugin::DeclCheck(pCXXMethodDecl);
// only empty on Linux, not on windows
-if (fqn == "OleEmbeddedObject::GetVisualRepresentationInNativeFormat_Impl"
-|| fqn == "OleEmbeddedObject::GetRidOfComponent"
-|| fqn == "connectivity::mozab::ProfileAccess::isProfileLocked"
-|| startsWith(fqn, "SbxDecimal::")
-|| fqn == "SbiDllMgr::Call" || fqn == "SbiDllMgr::FreeDll"
-|| fqn == "SfxApplication::InitializeDde" || fqn ==
"SfxApplication::RemoveDdeTopic"
-|| fqn == "ScannerManager::ReleaseData") {
+if ((fdc.Function("GetVisualRepresentationInNativeFormat_Impl")
+ .Class("OleEmbeddedObject").GlobalNamespace())
+|| (fdc.Function("GetRidOfComponent").Class("OleEmbeddedObject")
+.GlobalNamespace())
+|| (fdc.Function("isProfileLocked").Class("ProfileAccess")
+.Namespace("mozab").Namespace("connectivity").GlobalNamespace())
+|| cdc.Class("SbxDecimal").GlobalNamespace()
+|| fdc.Function("Call").Class("SbiDllMgr").GlobalNamespace()
+|| fdc.Function("FreeDll").Class("SbiDllMgr").GlobalNamespace()
+|| (fdc.Function("InitializeDde").Class("SfxApplication")
+
GSoC Week 5
Hi, In week 5 I finished integrating the new layout engine in the unx/ path. Integration in the windows code path is also almost complete. I continue to work on this in this week. Regards, Akash ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/templatedlg.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 58f578263022e9fda5c235f09f88ec02e15965a9
Author: Akshay Deep
Date: Wed Jun 29 08:09:35 2016 +0530
tdf#100660 - Starting document from a template crashes LibreOffice
Change-Id: Ida89fa8d35d1e22c706bc3703d2397b572bc01b5
Reviewed-on: https://gerrit.libreoffice.org/26752
Reviewed-by: Akshay Deep
Tested-by: Akshay Deep
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 1f97776..5973eb0 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -154,7 +154,8 @@ static bool cmpSelectionItems (const ThumbnailViewItem
*pItem1, const ThumbnailV
SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
: ModalDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"),
- maSelTemplates(cmpSelectionItems)
+ maSelTemplates(cmpSelectionItems),
+ mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) )
{
get(mpSearchFilter, "search_filter");
get(mpCBApp, "filter_application");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/node.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit f6c004800a73059eea5267f58bdac118e7a37656 Author: Takeshi Abe Date: Tue Jun 28 14:33:24 2016 +0900 starmath: SmBinDiagonalNode's 3rd child must be SmPolyLineNode Change-Id: If3b81de299eca8b398a65534d1b201bf38daf19f Reviewed-on: https://gerrit.libreoffice.org/26733 Tested-by: Jenkins Reviewed-by: Takeshi Abe diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 8300752..fa0c748 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -1144,12 +1144,13 @@ void SmBinDiagonalNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat) // Both arguments have to get into the SubNodes before the Operator so that clicking // within the GraphicWindow sets the FormulaCursor correctly (cf. SmRootNode) SmNode *pLeft = GetSubNode(0), - *pRight = GetSubNode(1); + *pRight = GetSubNode(1), + *pLine = GetSubNode(2); assert(pLeft); assert(pRight); +assert(pLine && pLine->GetType() == NPOLYLINE); -OSL_ENSURE(GetSubNode(2)->GetType() == NPOLYLINE, "Sm : wrong node type"); -SmPolyLineNode *pOper = static_cast(GetSubNode(2)); +SmPolyLineNode *pOper = static_cast(pLine); assert(pOper); //! some routines being called extract some info from the OutputDevice's ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit e3913df7fe9dc1941eb401a139abf17f7cf42007 Author: László Németh Date: Wed Jun 29 03:04:48 2016 +0200 empty commit (repeat) Change-Id: I155b146dc7013e7daa680da0f774fc19d95346ff commit 93dbbcf8c91015fa0b36b7920d94086e0a73fa55 Author: László Németh Date: Wed Jun 29 03:04:40 2016 +0200 empty commit (repeat) Change-Id: I76170788979709557248717f0f67624b85983499 commit e7d3e676612242387fd8c95e79f7e2ce027e1486 Author: László Németh Date: Wed Jun 29 03:03:42 2016 +0200 empty commit (base new doc) Change-Id: I289784e9fc54f29f4fc0c4c0861c337fd5bdbcf4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit dc90a715e52b27c5ae96e0bb3f2615f247aa5acc Author: László Németh Date: Tue Jun 28 23:13:01 2016 +0200 empty commit (repeat) Change-Id: I1cc0076e83b3ab6b5cb33a8aa34e7dae10e7bf90 commit 6ebc7c14451a057ebdc965fdd95ab145ffaee3d1 Author: László Németh Date: Tue Jun 28 23:12:53 2016 +0200 empty commit (repeat) Change-Id: I2c3359ce70d6a9669641484bd7248ee95b16ac8f commit 06ab1ca1c16b3f8fb8e22fb33c4ca7da9fbb3b19 Author: László Németh Date: Tue Jun 28 23:11:07 2016 +0200 empty commit (no proc. idle) Change-Id: I9785b06e2e36b3636e51115b28c1b87062a84167 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit ae51f416fa375ad86e1836c1ad03b5da2c551fe5
Author: Eike Rathke
Date: Tue Jun 28 23:10:18 2016 +0200
identify boolean element type at least for inline arrays (i#87219)
Since 23e5540a05e940cb4a591815e6b85a485b01fc32 we can use
GetDoubleOrStringFromMatrix() and check for SC_MATVAL_BOOLEAN.
Only if transported of course..
If not, then even a {FALSE,FALSE,FALSE,...} result is better than the
previous
{FALSE,TRUE,TRUE,...} for any array sequence where all TRUE results resulted
from the previous call to ISLOGICAL() ...
Change-Id: I879e0cbc6557e73ac24713267b5122f923500501
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 76f807d..5b18611 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1960,9 +1960,13 @@ void ScInterpreter::ScIsLogical()
}
break;
case svMatrix:
-// TODO: we don't have type information for arrays except
-// numerical/string.
-// Fall through
+{
+double fVal;
+svl::SharedString aStr;
+ScMatValType nMatValType = GetDoubleOrStringFromMatrix( fVal,
aStr);
+bRes = (nMatValType == SC_MATVAL_BOOLEAN);
+}
+break;
default:
PopError();
if ( !nGlobalError )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr4.cxx | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 23e5540a05e940cb4a591815e6b85a485b01fc32
Author: Eike Rathke
Date: Tue Jun 28 23:01:05 2016 +0200
do not override type SC_MATVAL_BOOLEAN with SC_MATVAL_VALUE
None of the callers checks for SC_MATVAL_VALUE but all use IsValueType()
instead, which includes SC_MATVAL_BOOLEAN, but we may want to explicitly
identify SC_MATVAL_BOOLEAN.
Change-Id: I6737eb2909c819b6c54f7e62cf8ebfc12af14fea
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 992b6cb..848bebb 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2301,22 +2301,17 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix(
SetError( errNoValue);
}
-if (nMatValType == SC_MATVAL_VALUE)
-rDouble = nMatVal.fVal;
-else if (nMatValType == SC_MATVAL_BOOLEAN)
-{
-rDouble = nMatVal.fVal;
-nMatValType = SC_MATVAL_VALUE;
-}
-else
-rString = nMatVal.GetString();
-
if (ScMatrix::IsValueType( nMatValType))
{
+rDouble = nMatVal.fVal;
sal_uInt16 nError = nMatVal.GetError();
if (nError)
SetError( nError);
}
+else
+{
+rString = nMatVal.GetString();
+}
return nMatValType;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sal/cpprt
compilerplugins/clang/staticmethods.cxx |5 -
sal/cpprt/operators_new_delete.cxx |4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 0d3f9667bbc7b1a22d33dc92a2028fc712495a8e
Author: Stephan Bergmann
Date: Tue Jun 28 22:38:57 2016 +0200
AllocatorTraits::size can be static after all
Change-Id: If9ce8a094af878497e980cdcfaf11604d613e5b8
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index 7eac313..c533242 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -117,12 +117,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
if (aParentName == "BitmapInfoAccess") {
return true;
}
-// can't change it because in debug mode it can't be static
-// sal/cpprt/operators_new_delete.cxx
auto dc = loplugin::DeclCheck(pCXXMethodDecl->getParent());
-if (dc.Struct("AllocatorTraits").AnonymousNamespace().GlobalNamespace()) {
-return true;
-}
// in this case, the code is taking the address of the member function
// shell/source/unix/sysshell/recently_used_file_handler.cxx
if (dc.Struct("recently_used_item").AnonymousNamespace().GlobalNamespace())
diff --git a/sal/cpprt/operators_new_delete.cxx
b/sal/cpprt/operators_new_delete.cxx
index 8cf69ff..40fdd33 100644
--- a/sal/cpprt/operators_new_delete.cxx
+++ b/sal/cpprt/operators_new_delete.cxx
@@ -40,7 +40,7 @@ struct AllocatorTraits
: m_signature (s)
{}
-std::size_t size (std::size_t n) const
+static std::size_t size (std::size_t n)
{
n = std::max(n, std::size_t(1));
#if OSL_DEBUG_LEVEL > 0
@@ -105,7 +105,7 @@ static void default_handler()
static void* allocate (
std::size_t n, AllocatorTraits const & rTraits)
{
-n = rTraits.size (n);
+n = AllocatorTraits::size (n);
for (;;)
{
void * p = rtl_allocateMemory (sal_Size(n));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/badstatics.cxx |2
compilerplugins/clang/check.cxx | 106 +++
compilerplugins/clang/check.hxx | 211 +++
compilerplugins/clang/fpcomparison.cxx | 54 +++--
compilerplugins/clang/getimplementationname.cxx |2
compilerplugins/clang/implicitboolconversion.cxx |2
compilerplugins/clang/passstuffbyref.cxx | 27 +-
compilerplugins/clang/refcounting.cxx| 10 -
compilerplugins/clang/salbool.cxx|2
compilerplugins/clang/staticmethods.cxx |2
compilerplugins/clang/stringconstant.cxx |2
compilerplugins/clang/typecheck.cxx | 96 --
compilerplugins/clang/typecheck.hxx | 162 -
compilerplugins/clang/weakobject.cxx |2
14 files changed, 381 insertions(+), 299 deletions(-)
New commits:
commit 0d3738a2580d72b778547bfcdf691fdeb0eccbdd
Author: Stephan Bergmann
Date: Tue Jun 28 18:54:31 2016 +0200
More Clang 3.4 "(anonymous namespace)" fixes
Change-Id: I7cb43f915565dadd611b90ee30373e472f97efb5
Reviewed-on: https://gerrit.libreoffice.org/26748
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/compilerplugins/clang/badstatics.cxx
b/compilerplugins/clang/badstatics.cxx
index aa50241..f316b4d 100644
--- a/compilerplugins/clang/badstatics.cxx
+++ b/compilerplugins/clang/badstatics.cxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "check.hxx"
#include "plugin.hxx"
-#include "typecheck.hxx"
namespace {
diff --git a/compilerplugins/clang/typecheck.cxx
b/compilerplugins/clang/check.cxx
similarity index 83%
rename from compilerplugins/clang/typecheck.cxx
rename to compilerplugins/clang/check.cxx
index c293b57..c66a902 100644
--- a/compilerplugins/clang/typecheck.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -7,8 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
+
+#include "check.hxx"
#include "compat.hxx"
-#include "typecheck.hxx"
namespace loplugin {
@@ -72,7 +74,15 @@ TypeCheck TypeCheck::NotSubstTemplateTypeParmType() const {
? *this : TypeCheck();
}
-TerminalCheck NamespaceCheck::GlobalNamespace() const {
+ContextCheck DeclCheck::Operator(clang::OverloadedOperatorKind op) const {
+assert(op != clang::OO_None);
+auto f = llvm::dyn_cast_or_null(decl_);
+return ContextCheck(
+f != nullptr && f->getOverloadedOperator() == op
+? f->getDeclContext() : nullptr);
+}
+
+TerminalCheck ContextCheck::GlobalNamespace() const {
return TerminalCheck(
context_ != nullptr
&& ((compat::isLookupContext(*context_)
@@ -80,14 +90,14 @@ TerminalCheck NamespaceCheck::GlobalNamespace() const {
->isTranslationUnit()));
}
-TerminalCheck NamespaceCheck::StdNamespace() const {
+TerminalCheck ContextCheck::StdNamespace() const {
return TerminalCheck(
context_ != nullptr && compat::isStdNamespace(*context_));
}
-NamespaceCheck NamespaceCheck::AnonymousNamespace() const {
+ContextCheck ContextCheck::AnonymousNamespace() const {
auto n = llvm::dyn_cast_or_null(context_);
-return NamespaceCheck(
+return ContextCheck(
n != nullptr && n->isAnonymousNamespace() ? n->getParent() : nullptr);
}
diff --git a/compilerplugins/clang/typecheck.hxx
b/compilerplugins/clang/check.hxx
similarity index 53%
rename from compilerplugins/clang/typecheck.hxx
rename to compilerplugins/clang/check.hxx
index b3417bf..8381aec 100644
--- a/compilerplugins/clang/typecheck.hxx
+++ b/compilerplugins/clang/check.hxx
@@ -7,23 +7,24 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_COMPILERPLUGINS_CLANG_TYPECHECK_HXX
-#define INCLUDED_COMPILERPLUGINS_CLANG_TYPECHECK_HXX
+#ifndef INCLUDED_COMPILERPLUGINS_CLANG_CHECK_HXX
+#define INCLUDED_COMPILERPLUGINS_CLANG_CHECK_HXX
#include
#include
#include
#include
+#include
namespace loplugin {
-class NamespaceCheck;
+class ContextCheck;
class TerminalCheck;
namespace detail {
-template NamespaceCheck checkRecordDecl(
+template ContextCheck checkRecordDecl(
clang::Decl const * decl, clang::TagTypeKind tag, char const (& id)[N]);
}
@@ -44,7 +45,7 @@ public:
TypeCheck LvalueReference() const;
-template inline NamespaceCheck Class(char const (& id)[N])
+template inline ContextCheck Class(char const (& id)[N])
const;
TypeCheck NotSubstTemplateTypeParmType() const;
@@ -55,50 +56,65 @@ private:
clang::QualType const type_;
};
-class NamespaceCheck {
+class DeclCheck {
+public:
+explicit DeclCheck(clang::Decl const * decl): decl_(decl) {}
+
+explicit operator bool() const { return decl_ != nullptr; }
+
+template inline ContextCheck Class(char const (& id)[N])
+const;
+
+template inline ContextCh
[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - 2 commits - sc/inc sc/qa sc/source
sc/inc/scabstdlg.hxx|3 +--
sc/qa/unit/screenshots/screenshots.cxx | 21 -
sc/source/ui/attrdlg/scdlgfact.cxx |5 ++---
sc/source/ui/attrdlg/scdlgfact.hxx |3 +--
sc/source/ui/inc/tabbgcolordlg.hxx |3 +--
sc/source/ui/miscdlgs/tabbgcolordlg.cxx |4 +---
sc/source/ui/view/tabvwshf.cxx |3 +--
7 files changed, 19 insertions(+), 23 deletions(-)
New commits:
commit 1f8de058819c68842a6518aaac6617e9aae2354b
Author: Katarina Behrens
Date: Tue Jun 28 22:29:52 2016 +0200
Don't crash on opening csv import dialog
Change-Id: I1ff56d79f7ff31317187cf077380481f1ef44366
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index ee12727..68d2814 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -96,6 +96,8 @@ private:
ScDocShellRef xDocSh;
ScTabViewShell* pViewShell;
ScAbstractDialogFactory* pFact;
+
+std::unique_ptr pStream;
};
ScScreenshotTest::ScScreenshotTest()
@@ -138,6 +140,9 @@ void ScScreenshotTest::initializeWithDoc(const char* pName)
pFact = ScAbstractDialogFactory::Create();
CPPUNIT_ASSERT_MESSAGE("Failed to create dialog factory", pFact);
+
+const OUString aCsv("some, strings, here, separated, by, commas");
+pStream.reset( new ScImportStringStream( aCsv) );
}
VclAbstractDialog* ScScreenshotTest::createDialogByID( sal_uInt32 nID )
@@ -240,13 +245,11 @@ VclAbstractDialog* ScScreenshotTest::createDialogByID(
sal_uInt32 nID )
break;
}
-//case 12:
-//{
-//const OUString aCsv("some, strings, here, separated, by,
commas");
-//ScImportStringStream aStream( aCsv );
-//pReturnDialog = pFact->CreateScImportAsciiDlg( OUString(),
&aStream, SC_PASTETEXT );
-//break;
-//}
+case 13:
+{
+pReturnDialog = pFact->CreateScImportAsciiDlg( OUString(),
pStream.get(), SC_PASTETEXT );
+break;
+}
//ScopedVclPtrInstance pDlg14(
pViewShell->GetDialogParent(), &rViewData );
//ScopedVclPtrInstance
pDlg16(pViewShell->GetDialogParent());
default:
@@ -290,7 +293,7 @@ void ScScreenshotTest::testOpeningModalDialogs()
{
initializeWithDoc("empty.ods");
-const sal_uInt32 nDialogs = 13;
+const sal_uInt32 nDialogs = 14;
for ( sal_uInt32 i = 0; i < nDialogs; i++ )
{
commit b6796754edac29aff54a95706cc216652f77d7b1
Author: Katarina Behrens
Date: Tue Jun 28 22:03:02 2016 +0200
This dialog doesn't even have a help button
so drop helpID argument from its ctor (not to mention the fact
that a help text with ID .uno:TabBgColor doesn't exist either)
Change-Id: I0624f0474334cc799d67f7f292e11194de5195fa
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 8c6c6c5..a7130ce 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -447,8 +447,7 @@ public:
virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window*
pParent,
const
OUString& rTitle, //Dialog Title
const
OUString& rTabBgColorNoColorText, //Label for no tab color
-const Color&
rDefaultColor, //Currently selected Color
-const OString&
) = 0;
+const Color&
rDefaultColor ) = 0; //Currently selected Color
virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( bool
bAscii = true,
const
ScImportOptions* pOptions = nullptr,
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index b17afc9..ee12727 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -216,7 +216,7 @@ VclAbstractDialog* ScScreenshotTest::createDialogByID(
sal_uInt32 nID )
{
pReturnDialog = pFact->CreateScTabBgColorDlg(
pViewShell->GetDialogParent(),
OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)),
-OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)),
Color(0xff00ff), ".uno:TabBgColor" );
+OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)),
Color(0xff00ff) );
break;
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index af6b1cd..9e2e3bd 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -878,10 +878,9 @@ AbstractScTabBgColorDlg *
ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg(
[Libreoffice-commits] core.git: svx/source vcl/source
svx/source/tbxctrls/tbcontrl.cxx | 25 -
vcl/source/window/floatwin.cxx |2 +-
2 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit 886637d355e77cd61d85279f145c06b07385fecd
Author: Caolán McNamara
Date: Tue Jun 28 21:26:09 2016 +0100
Resolves: tdf#100574 Crash when selecting and applying border style...
when a first torn off instance was opened just before the second one
and then the second one sends focus back to the first when its popped
down.
The second one listens to losing the focus and disposes itself which leads
to
dereferencing deleted stuff.
So add a reference count to the places these tear offs call popdown so its
still gets disposed but not deleted during the popdown and then protect
against
members being disposed with a enough checks to get back to safely
Change-Id: Id5f8eb4771df36305e308a2a9a5035018948f121
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3c8164c..55bcd10 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1381,6 +1381,8 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt
)
IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void)
{
+VclPtr xThis(this);
+
Color aColor = pColorSet->GetItemColor( pColorSet->GetSelectItemId() );
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch()
calls.
This instance may be deleted in the meantime (i.e. when a dialog is
opened
@@ -1412,6 +1414,8 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl,
SelectPaletteHdl, ListBox&, void)
IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void)
{
+VclPtr xThis(this);
+
Color aColor;
switch ( theSlotId )
{
@@ -1443,6 +1447,8 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl,
AutoColorClickHdl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void)
{
+VclPtr xThis(this);
+
if ( IsInPopupMode() )
EndPopupMode();
mrPaletteManager.PopupColorPicker(maCommand);
@@ -1685,6 +1691,8 @@ void SvxFrameWindow_Impl::DataChanged( const
DataChangedEvent& rDCEvt )
IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void)
{
+VclPtr xThis(this);
+
SvxBoxItem aBorderOuter( SID_ATTR_BORDER_OUTER );
SvxBoxInfoItem aBorderInner( SID_ATTR_BORDER_INNER );
SvxBorderLine theDefLine;
@@ -1784,10 +1792,13 @@ IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl,
ValueSet*, void)
aBorderInner.QueryValue( a );
aArgs[1].Value = a;
-/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch()
call.
-This instance may be deleted in the meantime (i.e. when a dialog is
opened
-while in Dispatch()), accessing members will crash in this case. */
-aFrameSet->SetNoSelection();
+if (aFrameSet)
+{
+/* #i33380# Moved the following line above the Dispatch() call.
+ This instance may be deleted in the meantime (i.e. when a dialog is
opened
+ while in Dispatch()), accessing members will crash in this case. */
+aFrameSet->SetNoSelection();
+}
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >(
GetFrame()->getController(), UNO_QUERY ),
".uno:SetBorderStyle",
@@ -1973,6 +1984,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId,
const Reference< XFrame
IMPL_LINK_NOARG_TYPED(SvxCurrencyList_Impl, SelectHdl, ListBox&, void)
{
+VclPtr xThis(this);
+
if ( IsInPopupMode() )
EndPopupMode();
@@ -1987,6 +2000,8 @@ IMPL_LINK_NOARG_TYPED(SvxCurrencyList_Impl, SelectHdl,
ListBox&, void)
IMPL_LINK_NOARG_TYPED(SvxLineWindow_Impl, SelectHdl, ListBox&, void)
{
+VclPtr xThis(this);
+
SvxLineItem aLineItem( SID_FRAME_LINESTYLE );
SvxBorderStyle nStyle = SvxBorderStyle(
m_aLineStyleLb->GetSelectEntryStyle() );
@@ -3140,4 +3155,4 @@ void SvxCurrencyToolBoxControl::GetCurrencySymbols(
std::vector& rList
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 2362f13..38d9a91 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -811,7 +811,7 @@ void FloatingWindow::ImplEndPopupMode(
FloatWinPopupEndFlags nFlags, const VclPt
SetTitleType( mnOldTitle );
// set ToolBox again to normal
-if ( mpImplData->mpBox )
+if (mpImplData && mpImplData->mpBox)
{
mpImplData->mpBox->ImplFloatControl( false, this );
mpImplData->mpBox = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-co
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Output.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 4dcba01d97b72db35885c505e647425059740a4c Author: Michael Stahl Date: Tue Jun 28 22:10:06 2016 +0200 gbuild: recognize newfangled screen TERM=screen.xterm-256color Seems to have changed from Fedora 23, where it was just "screen", to 24. Change-Id: I9078c337093d12d62e9afe10b1f02aaf346d4b43 diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk index 18f39ab..92a277c 100644 --- a/solenv/gbuild/Output.mk +++ b/solenv/gbuild/Output.mk @@ -62,6 +62,7 @@ KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm x KNOWN_TERM+=$(patsubst %,%-color,$(KNOWN_TERM)) KNOWN_TERM+=$(patsubst %-color,%-256color,$(KNOWN_TERM)) KNOWN_TERM+=$(patsubst %-color,%+256color,$(KNOWN_TERM)) +KNOWN_TERM+=$(patsubst %,screen.%,$(KNOWN_TERM)) ifneq ($(strip $(gb_COLOR)),) ifneq ($(filter $(TERM),$(KNOWN_TERM)),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: XFastParser - next steps ...
Hi Michael, Thanks for your mail. On Tue, 2016-06-28 at 20:53 +0200, Michael Stahl wrote: > > Then (I guess) we could pass namespace prefixed names through for the > > unknown attributes so eg. "office:foo" - and still have the information > > we need to properly resolve them. > > uhm... how many bad comparisons like "if (attribute == "office:foo") exist? Apparently enough of them to stop libreoffice even starting if we don't pass through namespace names un-modified ;-) > a quick git grep finds only a handful, mostly in base code - wouldn't it > be easier to just fix those? Would be great; but I'm wary of pulling too much un-related string into the GSOC project; Mohammed had a number of other cases I think where this caused grief. A quick poke around shows: $ git grep '"toolbar:' $ git grep '"menu:' Are rather suggestive of problems; though no idea what parser they use. Ideally we'd move everyone to the XFastParser - it's faster ;-) in due-course, but again - I'd rather get some of the threaded parsing XFastParser wins for ODF - than drain this swap as part of the project. Volunteers welcome to hunt & kill broken NS handling though ! ATB, Michael. -- michael.me...@collabora.com <><, GM Collabora Productivity Skype: mmeeks, Google Hangout: mejme...@gmail.com (M) +44 7795 666 147 - timezone usually UK / Europe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk extras/Package_palettes.mk extras/source include/svx scp2/source sc/sdi sc/source sd/sdi sd/source svx/Li
cui/Library_cui.mk|2 cui/UIConfig_cui.mk |2 cui/source/inc/cuires.hrc |2 cui/source/inc/cuitabarea.hxx | 41 cui/source/tabpages/strings.src |8 cui/source/tabpages/tabarea.cxx | 51 - cui/source/tabpages/tpbitmap.cxx | 979 -- cui/source/tabpages/tppattern.cxx | 876 +++ cui/uiconfig/ui/areadialog.ui |4 cui/uiconfig/ui/bitmaptabpage.ui | 347 --- cui/uiconfig/ui/patterntabpage.ui | 334 +++ extras/Package_palettes.mk|1 extras/source/glade/libreoffice-catalog.xml.in| 11 extras/source/palettes/standard.sob |binary extras/source/palettes/standard.sop |binary include/svx/dialogs.hrc |3 include/svx/dlgctrl.hxx | 19 include/svx/drawitem.hxx | 24 include/svx/sidebar/AreaPropertyPanelBase.hxx |2 include/svx/svdmodel.hxx |1 include/svx/svxids.hrc| 39 include/svx/xtable.hxx| 26 sc/sdi/drawsh.sdi |1 sc/source/ui/docshell/docsh2.cxx |1 scp2/source/ooo/registryitem_ooo.scp |7 sd/sdi/_drvwsh.sdi|4 sd/source/ui/dlg/dlgpage.cxx |4 sd/source/ui/dlg/prltempl.cxx |2 sd/source/ui/dlg/tabtempl.cxx |2 sd/source/ui/docshell/docshell.cxx|1 sd/source/ui/inc/dlgpage.hxx |1 sd/source/ui/inc/prltempl.hxx |1 sd/source/ui/inc/tabtempl.hxx |1 sd/source/ui/sidebar/SlideBackground.cxx | 156 ++- sd/source/ui/sidebar/SlideBackground.hxx |1 svx/Library_svxcore.mk|1 svx/sdi/svx.sdi | 16 svx/sdi/svxitems.sdi |1 svx/source/dialog/dlgctrl.cxx | 155 +++ svx/source/dialog/hdft.cxx|3 svx/source/dialog/sdstring.src| 10 svx/source/items/drawitem.cxx | 42 svx/source/sidebar/area/AreaPropertyPanel.cxx |2 svx/source/sidebar/area/AreaPropertyPanel.hxx |1 svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 567 +++- svx/source/xoutdev/xattrbmp.cxx |5 svx/source/xoutdev/xtabbtmp.cxx | 33 svx/source/xoutdev/xtable.cxx |6 svx/source/xoutdev/xtabptrn.cxx | 92 ++ svx/uiconfig/ui/sidebararea.ui| 170 +-- sw/sdi/_frmsh.sdi |6 sw/sdi/drawsh.sdi |5 sw/source/core/draw/drawdoc.cxx |1 sw/source/ui/chrdlg/pardlg.cxx|2 sw/source/ui/frmdlg/frmdlg.cxx|2 sw/source/uibase/app/docshdrw.cxx |1 sw/source/uibase/app/docst.cxx|1 sw/source/uibase/app/docstyle.cxx |3 sw/source/uibase/shells/frmsh.cxx |2 sw/source/uibase/shells/grfsh.cxx |3 sw/source/uibase/shells/textsh.cxx|2 sw/source/uibase/shells/textsh1.cxx |4 62 files changed, 2302 insertions(+), 1788 deletions(-) New commits: commit 76585ae33f3ca75c05c0ccbf6a621b6e2d42bc00 Author: Rishabh Kumar Date: Tue Jun 7 16:58:20 2016 +0530 Convert Bitmap tab to Pattern tab Change-Id: I5cf02f1889090539f7adb826483c91a1ef3c3925 Reviewed-on: https://gerrit.libreoffice.org/26015 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 7bb181d..c81ef962 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -197,13 +197,13 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/tabpages/textanim \ cui/source/tabpages/textattr \ cui/source/tabpages/tparea \ -cui/source/tabpages/tpbitmap \ cui/source/tabpages/tpcolor \ cui/source/tabpages/tpgradnt \ cui/source/tabpages/tphatch \ cui/source/tabpages/tpline \ cui/source/tabpages/tplnedef \ cui/source/tabpages/tplneend \ +cui/source/tabpages/tppattern \ cui/source/tabpages/tpshadow \ cui/source/tabpages/tptrans \ cui/source/tabpages/transfrm \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index b0f72cb..60c8d18 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -27,7 +27,6 @@ $(eva
[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/Library_sd.mk |1
sd/UIConfig_simpress.mk|1
sd/source/ui/animations/CustomAnimationBox.cxx | 81 ++
sd/source/ui/animations/CustomAnimationPane.cxx| 60 +
sd/source/ui/animations/CustomAnimationPane.hxx|4
sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui | 409 +
sd/uiconfig/simpress/ui/notebookbar.ui | 34 -
7 files changed, 569 insertions(+), 21 deletions(-)
New commits:
commit 6af8c9ef2de39b933274c96fd661d219b2bed8a3
Author: Szymon KÅos
Date: Tue Jun 28 16:09:16 2016 +0200
GSoC notebookbar: added animation tab for Impress
Change-Id: Iff9d0269f0f8ce0e0a311c1bbcaf5f749c305348
Reviewed-on: https://gerrit.libreoffice.org/26744
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index eab6571..72ea43e 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -175,6 +175,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/accessibility/AccessibleViewForwarder \
sd/source/ui/accessibility/SdShapeTypes \
sd/source/ui/animations/CategoryListBox \
+ sd/source/ui/animations/CustomAnimationBox \
sd/source/ui/animations/CustomAnimationDialog \
sd/source/ui/animations/CustomAnimationList \
sd/source/ui/animations/CustomAnimationPane \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index ef79c95..a5351dc 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -104,6 +104,7 @@ $(eval $(call
gb_UIConfig_add_toolbarfiles,modules/simpress,\
$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/customanimationspanel \
+ sd/uiconfig/simpress/ui/customanimationspanelhorizontal \
sd/uiconfig/simpress/ui/customanimationproperties \
sd/uiconfig/simpress/ui/customanimationeffecttab \
sd/uiconfig/simpress/ui/customanimationtimingtab \
diff --git a/sd/source/ui/animations/CustomAnimationBox.cxx
b/sd/source/ui/animations/CustomAnimationBox.cxx
new file mode 100644
index 000..d37de23
--- /dev/null
+++ b/sd/source/ui/animations/CustomAnimationBox.cxx
@@ -0,0 +1,81 @@
+/* -*- 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 "ViewShellBase.hxx"
+#include
+#include "CustomAnimationPane.hxx"
+#include
+#include
+
+namespace sd
+{
+
+class CustomAnimationBox : public VclVBox
+{
+VclPtr m_pPane;
+bool m_bIsInitialized;
+
+public:
+CustomAnimationBox(vcl::Window* pParent);
+~CustomAnimationBox() override;
+
+virtual void dispose() override;
+virtual void StateChanged(StateChangedType nStateChange) override;
+};
+
+VCL_BUILDER_FACTORY(CustomAnimationBox);
+
+CustomAnimationBox::CustomAnimationBox(vcl::Window* pParent)
+: VclVBox(pParent)
+, m_bIsInitialized(false)
+{
+}
+
+CustomAnimationBox::~CustomAnimationBox()
+{
+disposeOnce();
+}
+
+void CustomAnimationBox::dispose()
+{
+m_pPane.disposeAndClear();
+VclVBox::dispose();
+}
+
+void CustomAnimationBox::StateChanged(StateChangedType nStateChange)
+{
+if(SfxViewFrame::Current() && !m_bIsInitialized)
+{
+ViewShellBase* pBase =
ViewShellBase::GetViewShellBase(SfxViewFrame::Current());
+
+if(pBase && pBase->GetDocShell())
+{
+css::uno::Reference xFrame;
+m_pPane = VclPtr::Create(this, *pBase,
xFrame, true);
+m_pPane->Show();
+m_pPane->SetSizePixel(GetSizePixel());
+m_bIsInitialized = true;
+}
+}
+VclVBox::StateChanged(nStateChange);
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index e8de52c..e328453 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -133,12 +133,36 @@ CustomAnimationPane::CustomAnimationPane( Window*
pParent, ViewShellBase& rBase,
mnCurvePathPos(
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/drawing/framework/XConfigurationController.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b7c62273bc4afc5032add706f6cc301532d02831 Author: David Tardon Date: Tue Jun 28 10:54:40 2016 +0200 fix assumed typo Change-Id: Ice084d8c0651b1b08e8e8cce6f4a6f1c09e8dd3e diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl index 80ebff9..3443156 100644 --- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl +++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl @@ -126,7 +126,7 @@ interface XResource; The ResourceId and ResourceObject members are not set. ResourceActivation is sent when a resource is activated, i.e. when a new object of a resource is created (or taken -from a cash). +from a cache). The ResourceId and ResourceObject members are set to the XResourceId and object reference of the activated resource. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - canvas/source vcl/headless vcl/inc
canvas/source/cairo/cairo_canvasbitmap.cxx |7 ++
vcl/headless/svpgdi.cxx| 30 ++---
vcl/inc/headless/svpgdi.hxx| 16 ++-
3 files changed, 37 insertions(+), 16 deletions(-)
New commits:
commit cff87aac4ec77957569377d690bc4aa8f7146e0d
Author: David Tardon
Date: Mon Jun 27 20:37:25 2016 +0200
update other places that read data from cairo image surface
Change-Id: Icb8761e5ff89e1c0e0e034a751fe9a50ad5ab90a
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx
b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 37c8902..86020ac 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -152,10 +152,17 @@ namespace cairocanvas
sal_uInt32 *pPix = reinterpret_cast(pSrc + nStride * y);
for( unsigned long x = 0; x < (unsigned long)
aSize.Width(); x++ )
{
+#if defined OSL_BIGENDIAN
+sal_uInt8 nB = (*pPix >> 24);
+sal_uInt8 nG = (*pPix >> 16) & 0xff;
+sal_uInt8 nR = (*pPix >> 8) & 0xff;
+sal_uInt8 nAlpha = *pPix & 0xff;
+#else
sal_uInt8 nAlpha = (*pPix >> 24);
sal_uInt8 nR = (*pPix >> 16) & 0xff;
sal_uInt8 nG = (*pPix >> 8) & 0xff;
sal_uInt8 nB = *pPix & 0xff;
+#endif
if( nAlpha != 0 && nAlpha != 255 )
{
// Cairo uses pre-multiplied alpha - we do
not => re-multiply
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 511a427..e9f761f 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1059,9 +1059,9 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
unsigned char *data = row + (rTR.mnSrcX * 4);
for (sal_Int32 x = rTR.mnSrcX; x < rTR.mnSrcX + rTR.mnSrcWidth; ++x)
{
-sal_uInt8 b = unpremultiply(data[0], data[3]);
-sal_uInt8 g = unpremultiply(data[1], data[3]);
-sal_uInt8 r = unpremultiply(data[2], data[3]);
+sal_uInt8 b = unpremultiply(data[SVP_CAIRO_BLUE],
data[SVP_CAIRO_ALPHA]);
+sal_uInt8 g = unpremultiply(data[SVP_CAIRO_GREEN],
data[SVP_CAIRO_ALPHA]);
+sal_uInt8 r = unpremultiply(data[SVP_CAIRO_RED],
data[SVP_CAIRO_ALPHA]);
if (r == 0 && g == 0 && b == 0)
{
data[0] = SALCOLOR_BLUE(nMaskColor);
@@ -1125,15 +1125,9 @@ SalColor SvpSalGraphics::getPixel( long nX, long nY )
unsigned char *surface_data = cairo_image_surface_get_data(m_pSurface);
unsigned char *row = surface_data + (nStride*nY);
unsigned char *data = row + (nX * 4);
-# if defined OSL_BIGENDIAN
-sal_uInt8 b = unpremultiply(data[3], data[0]);
-sal_uInt8 g = unpremultiply(data[2], data[0]);
-sal_uInt8 r = unpremultiply(data[1], data[0]);
-#else
-sal_uInt8 b = unpremultiply(data[0], data[3]);
-sal_uInt8 g = unpremultiply(data[1], data[3]);
-sal_uInt8 r = unpremultiply(data[2], data[3]);
-#endif
+sal_uInt8 b = unpremultiply(data[SVP_CAIRO_BLUE], data[SVP_CAIRO_ALPHA]);
+sal_uInt8 g = unpremultiply(data[SVP_CAIRO_GREEN], data[SVP_CAIRO_ALPHA]);
+sal_uInt8 r = unpremultiply(data[SVP_CAIRO_RED], data[SVP_CAIRO_ALPHA]);
return MAKE_SALCOLOR(r, g, b);
}
@@ -1342,15 +1336,15 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr,
bool bXorModeAllowed, cons
unsigned char *xor_data = xor_row + (nExtentsLeft * 4);
for (sal_Int32 x = nExtentsLeft; x < nExtentsRight; ++x)
{
-sal_uInt8 b = unpremultiply(true_data[0], true_data[3]) ^
- unpremultiply(xor_data[0], xor_data[3]);
-sal_uInt8 g = unpremultiply(true_data[1], true_data[3]) ^
- unpremultiply(xor_data[1], xor_data[3]);
-sal_uInt8 r = unpremultiply(true_data[2], true_data[3]) ^
- unpremultiply(xor_data[2], xor_data[3]);
-true_data[0] = premultiply(b, true_data[3]);
-true_data[1] = premultiply(g, true_data[3]);
-true_data[2] = premultiply(r, true_data[3]);
+sal_uInt8 b = unpremultiply(true_data[SVP_CAIRO_BLUE],
true_data[SVP_CAIRO_ALPHA]) ^
+ unpremultiply(xor_data[SVP_CAIRO_BLUE],
xor_data[SVP_CAIRO_ALPHA]);
+sal_uInt8 g = unpremultiply(true_data[SVP_CAIRO_GREEN],
true_data[SVP_CAIRO_ALPHA]) ^
+ unpremultiply(xor_data[SVP_CAIRO_GREEN],
xor_data[SVP_CAIRO_ALPHA]);
+sal_uInt8 r = unpremultiply(true_data[SVP_CAIRO_RED],
true_data[SVP_CAIRO_ALPHA]) ^
+
Re: XFastParser - next steps ...
On 28.06.2016 18:28, Michael Meeks wrote: > Hi Mohammed, > > Let me CC the dev list on the fag-end of this conversation; hopefully > it will get more interesting over time =) > > On Mon, 2016-06-27 at 22:01 +0530, Mohammed Abdul Azeem wrote: >> I'm looking into the code paths which misuses defined namespaces >> without resolving them. I will make test cases to cover them. > > Ah - right =) > >> Sure we can do this, but it would only account for element's namespace >> and not attributes namespaces. Also some of the implementations of >> XDocumentHandler expects namespace declaration( looking for "xmlns" ) >> and tries to resolve them, and I think this approach wouldn't cover >> all the namespace declaration. > > Ah ! fair enough - then (I guess) we need to implement a new > XFastNamespaceHandler which we can register with a setNamespaceHandler() > call on XFastParser - and which can be NULL for all the interesting > cases where we need to be truly fast =) > > Then (I guess) we could pass namespace prefixed names through for the > unknown attributes so eg. "office:foo" - and still have the information > we need to properly resolve them. uhm... how many bad comparisons like "if (attribute == "office:foo") exist? a quick git grep finds only a handful, mostly in base code - wouldn't it be easier to just fix those? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Firebird - status update
Hi, Currently I'm working on implementing auto increment columns for the Firebird sdbc driver. The related patch is here: https://gerrit.libreoffice.org/26643/ The idea is to use before insert triggers: http://www.firebirdfaq.org/faq29/ I name the trigger trg__. The name can be used to determine if a column is autoIncremented or not (see ResultSetMetadata.cxx:isAutoIncrement() ). To accomplish that the table name is extracted from the SQL statement (see changes in Utils.cxx). Meanwhile I made the Connection service implement the XTableAccess interface, because I thought It will be needed, but it turned out that it is unnecessary for autoincrement. The patch causes a "unexpected error" in the current state. The program crashes on a mutex: "MutexGuard aGuard(m_aMutex);" after opening a table. I'm about to solve that. Regards, Tamás Bunth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 5 commits - filter/source
filter/source/svg/presentation_engine.js | 1381 ++-
1 file changed, 1348 insertions(+), 33 deletions(-)
New commits:
commit d9294de84cbcba383cc4f585d510f72a53bafefb
Author: Marco Cecchetti
Date: Tue Jun 28 18:17:53 2016 +0200
bccu#1916 - svg-export - Removal of the SVG 1.1 path API in Chrome
On Chrome browser most of shape effects and slide transitions did not
work anymore: that was due to the fact that several animations exploit
the DOM api for handling path segments of the svg:path element.
Starting from version 48 such an api has been removed from Chrome:
https://bugs.chromium.org/p/chromium/issues/detail?id=539385 ;
Moreover Chrome does not yet provide an implementation for the new
svgpath api introduced in SVG 2.0 draft: so there is no native support
for handling path data directly.
The present patch adapts the JavaScript implementation of the old SVG
1.1 path api proposed here: https://github.com/progers/pathseg .
Change-Id: Ibcf3587b65f32cf4cd77d0f6e9c4a0837210fc76
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 7dd7d14..9de750a 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -674,6 +674,984 @@ function configureDetectionTools()
* @source http://svn.dojotoolkit.org/src/dojox/trunk/_base/sniff.js
*/
+/*
+ * @licstart
+ *
+ * The following is the license notice for the part of JavaScript code of this
+ * file included between the '@svgpathstart' and the '@svgpathend' notes.
+ */
+
+/* **
+ *
+ * Copyright 2015 The Chromium Authors. All rights reserved.
+ *
+ * The Chromium Authors can be found at
+ * http://src.chromium.org/svn/trunk/src/AUTHORS
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ /
+
+/*
+ * @licend
+ *
+ * The above is the license notice for the part of JavaScript code of this
+ * file included between the '@svgpathstart' and the '@svgpathend' notes.
+ */
+
+
+/*
+ * @svgpathstart
+ *
+ * The following code is a derivative work of some part of the SVGPathSeg API.
+ *
+ * This API is a drop-in replacement for the SVGPathSeg and SVGPathSegList
APIs that were removed from
+ * SVG2 (https://lists.w3.org/Archives/Public/www-svg/2015Jun/0044.html),
including the latest spec
+ * changes which were implemented in Firefox 43 and Chrome 46.
+ *
+ * @source https://github.com/progers/pathseg
+ */
+
+(function() { 'use strict';
+if (!('SVGPathSeg' in window)) {
+// Spec:
http://www.w3.org/TR/SVG11/single-page.html#paths-InterfaceSVGPathSeg
+window.SVGPathSeg = function(type, typeAsLetter, owningPathSegList) {
+this.pathSegType = type;
+this.pathSegTypeAsLetter = typeAsLetter;
+this._owningPathSegList = owningPathSegList;
+};
+
+SVGPathSeg.prototype.classname = 'SVGPathSeg';
+
+SVGPathSeg.PATHSEG_UNKNOWN = 0;
+SVGPathSeg.PATHSEG_CLOSEPATH = 1;
+SVGPathSeg.PATHSEG_MOVETO_ABS = 2;
+SVGPathSeg.PATHSEG_MOVETO_REL = 3;
+SVGPathSeg.PATHSEG_LINETO_ABS = 4;
+SVGPathSeg.PATHSEG_LINETO_REL = 5;
+SVGPathSeg.PATHSEG_CURVETO_CUBIC_ABS = 6;
+SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL = 7;
+SVGPathSeg.PAT
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit 1f6c670330357a26cb9f1336721931f196d23934 Author: László Németh Date: Tue Jun 28 19:32:55 2016 +0200 empty commit (repeat) Change-Id: I63ac726be54ce5198e54968bad45025d492bfe81 commit 273ae5a4bf7ecb4c0bb1948031842ece070f35c8 Author: László Németh Date: Tue Jun 28 19:32:47 2016 +0200 empty commit (repeat) Change-Id: I0f4bf0e4f22490874528d678b155fb1730dd2de2 commit cba4db196449d4cd63f87ad7853b0a98ebdba60e Author: László Németh Date: Tue Jun 28 19:31:34 2016 +0200 empty commit (empty profile) Change-Id: I7ade8def8fbd553a3a08534c49b0a1a0d3d9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/svx sc/source sd/qa sd/source svx/source sw/source
include/sfx2/objsh.hxx |6 +-
include/svx/svdmodel.hxx|4 +
sc/source/ui/docshell/docsh.cxx |8 ++
sd/qa/unit/data/odp/tdf99729-legacy.odp |binary
sd/qa/unit/data/odp/tdf99729-new.odp|binary
sd/qa/unit/import-tests.cxx | 76
sd/source/ui/docshell/docshel4.cxx |7 ++
svx/source/svdraw/svdmodel.cxx | 33 ++--
svx/source/svdraw/svdotextdecomposition.cxx | 18 +-
sw/source/uibase/app/docshini.cxx | 10 +++
10 files changed, 151 insertions(+), 11 deletions(-)
New commits:
commit 0cb200d000fad8ba31c7400e08cd031823f27308
Author: Mike Kaganski
Date: Tue Jun 28 19:13:22 2016 +1000
tdf#99729: fix text alignment (no autofit & no full width)
If TextBox contained text that is larger than the box, and
autofit was off, and autosize was off, and full width was off,
then text always aligned to box's left top corner, regardless of
text anchor setting.
Related problem (i103454) was fixed in 2009 by Armin Le Grand, but
only for full width text. This patch extends the scope of that fix
to correctly process other cases.
The fix introduces a new compatibility flag:
AnchoredTextOverflowLegacy
If it is true, then old behaviour is retained.
It is always false for new documents and imported documents.
When opening existing ODF documents, it's true by default, unless
it is explicitly set in settings.xml.
Unfortunately, I couldn't find a way to access the document model
from any of SfxBaseModel::load() or SfxObjectShell::DoLoad, where
it could enable setting the compatibility flag universally when
loading own format. Instead, I had to do it individually in each
of SfxObjectShell::Load() implementations.
Unit test is included.
Change-Id: Ifad79d546739daafff59fb6c7fb0dce51babc53d
Reviewed-on: https://gerrit.libreoffice.org/26737
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 6f0c244..6b694f9 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -217,8 +217,6 @@ private:
boolCloseInternal();
-SAL_DLLPRIVATE static bool IsOwnStorageFormat(const SfxMedium &);
-
SAL_DLLPRIVATE void UpdateTime_Impl(const css::uno::Reference<
css::document::XDocumentProperties> & i_xDocProps);
@@ -626,7 +624,9 @@ public:
virtual voidSetProtectionPassword( const OUString &rPassword );
virtual boolGetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 >
&rPasswordHash );
-SAL_DLLPRIVATE std::shared_ptr CreatePreviewMetaFile_Impl(
bool bFullContent ) const;
+static bool IsOwnStorageFormat(const SfxMedium &);
+
+SAL_DLLPRIVATE std::shared_ptr
CreatePreviewMetaFile_Impl(bool bFullContent) const;
SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index fa24d55..160af2d 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -543,6 +543,10 @@ public:
void SetAddExtLeading( bool bEnabled );
bool IsAddExtLeading() const { return mbAddExtLeading; }
+// tdf#99729 compatibility flag
+void SetAnchoredTextOverflowLegacy(bool bEnabled);
+bool IsAnchoredTextOverflowLegacy() const;
+
void ReformatAllTextObjects();
SdrOutliner* createOutliner( OutlinerMode nOutlinerMode );
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 79cb8c8..d700e16 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -557,6 +557,14 @@ bool ScDocShell::Load( SfxMedium& rMedium )
// -> initialize the others from options (before loading)
InitOptions(true);
+// If this is an ODF file being loaded, then by default, use legacy
processing
+// for tdf#99729 (if required, it will be overriden in
*::ReadUserDataSequence())
+if (IsOwnStorageFormat(rMedium))
+{
+if (aDocument.GetDrawLayer())
+aDocument.GetDrawLayer()->SetAnchoredTextOverflowLegacy(true);
+}
+
GetUndoManager()->Clear();
bool bRet = SfxObjectShell::Load( rMedium );
diff --git a/sd/qa/unit/data/odp/tdf99729-legacy.odp
b/sd/qa/unit/data/odp/tdf99729-legacy.odp
new file mode 100644
index 000..899b55c
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf99729-legacy.odp differ
diff --git a/sd/qa/unit/data/odp/tdf99729-new.odp
b/sd/qa/unit/data/odp/tdf99729-new.odp
new file mode 100644
index 000..1c5a9cd
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf99729-new.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 6e321f4..538fdd0 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -68,6 +68,9 @@
#include
#include
#include
+#
Re: XFastParser - next steps ...
Hi Mohammed, Let me CC the dev list on the fag-end of this conversation; hopefully it will get more interesting over time =) On Mon, 2016-06-27 at 22:01 +0530, Mohammed Abdul Azeem wrote: > I'm looking into the code paths which misuses defined namespaces > without resolving them. I will make test cases to cover them. Ah - right =) > Sure we can do this, but it would only account for element's namespace > and not attributes namespaces. Also some of the implementations of > XDocumentHandler expects namespace declaration( looking for "xmlns" ) > and tries to resolve them, and I think this approach wouldn't cover > all the namespace declaration. Ah ! fair enough - then (I guess) we need to implement a new XFastNamespaceHandler which we can register with a setNamespaceHandler() call on XFastParser - and which can be NULL for all the interesting cases where we need to be truly fast =) Then (I guess) we could pass namespace prefixed names through for the unknown attributes so eg. "office:foo" - and still have the information we need to properly resolve them. Failing that (I guess) - we could as you've done push xmlns: statements through in attributes - it would best match the css::xml::Attribute approach that expat_wrap used in the past - and would simplify things for us. In this case - I'd want to see: a) comprehensive test cases, with assertions for all code-paths. b) never creating these or slowing code-paths where the XFastParser is being used and tokenizing correctly and really needs to be fast. I fear that b) is not met by the previous patch. Thoughts ? =) ATB, Michael. -- michael.me...@collabora.com <><, GM Collabora Productivity Skype: mmeeks, Google Hangout: mejme...@gmail.com (M) +44 7795 666 147 - timezone usually UK / Europe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/staticmethods.cxx |9 +++--
compilerplugins/clang/typecheck.cxx |6 +++
compilerplugins/clang/typecheck.hxx | 57 +++-
3 files changed, 61 insertions(+), 11 deletions(-)
New commits:
commit c1ab6613ae7b45f2d90aafd6c6a829a471ceca55
Author: Stephan Bergmann
Date: Tue Jun 28 17:48:22 2016 +0200
More adaption to Clang 3.4
...where NmaedDecl::getQualifiedNameAsString (which is expensive and bad,
anyway) apparently returns something other than "(anonymous namespace)"
Change-Id: I05ef96665c48f8f596dd0d317388e91a75b8307b
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index be014fd..9108e02 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -9,8 +9,9 @@
#include "clang/AST/Attr.h"
-#include "plugin.hxx"
#include "compat.hxx"
+#include "plugin.hxx"
+#include "typecheck.hxx"
/*
Look for member functions that can be static
@@ -118,12 +119,14 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
}
// can't change it because in debug mode it can't be static
// sal/cpprt/operators_new_delete.cxx
-if (aParentName == "(anonymous namespace)::AllocatorTraits") {
+auto dc = loplugin::DeclCheck(pCXXMethodDecl->getParent());
+if (dc.Struct("AllocatorTraits").AnonymousNamespace().GlobalNamespace()) {
return true;
}
// in this case, the code is taking the address of the member function
// shell/source/unix/sysshell/recently_used_file_handler.cxx
-if (aParentName == "(anonymous namespace)::recently_used_item") {
+if (dc.Struct("recently_used_item").AnonymousNamespace().GlobalNamespace())
+{
return true;
}
// the unotools and svl config code stuff is doing weird stuff with a
reference-counted statically allocated pImpl class
diff --git a/compilerplugins/clang/typecheck.cxx
b/compilerplugins/clang/typecheck.cxx
index d7bccfd..c293b57 100644
--- a/compilerplugins/clang/typecheck.cxx
+++ b/compilerplugins/clang/typecheck.cxx
@@ -85,6 +85,12 @@ TerminalCheck NamespaceCheck::StdNamespace() const {
context_ != nullptr && compat::isStdNamespace(*context_));
}
+NamespaceCheck NamespaceCheck::AnonymousNamespace() const {
+auto n = llvm::dyn_cast_or_null(context_);
+return NamespaceCheck(
+n != nullptr && n->isAnonymousNamespace() ? n->getParent() : nullptr);
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/typecheck.hxx
b/compilerplugins/clang/typecheck.hxx
index 9862890..b3417bf 100644
--- a/compilerplugins/clang/typecheck.hxx
+++ b/compilerplugins/clang/typecheck.hxx
@@ -21,6 +21,13 @@ namespace loplugin {
class NamespaceCheck;
class TerminalCheck;
+namespace detail {
+
+template NamespaceCheck checkRecordDecl(
+clang::Decl const * decl, clang::TagTypeKind tag, char const (& id)[N]);
+
+}
+
class TypeCheck {
public:
explicit TypeCheck(clang::QualType type): type_(type) {}
@@ -59,8 +66,12 @@ public:
TerminalCheck StdNamespace() const;
+NamespaceCheck AnonymousNamespace() const;
+
private:
-friend class TypeCheck;
+friend TypeCheck;
+template friend NamespaceCheck detail::checkRecordDecl(
+clang::Decl const * decl, clang::TagTypeKind tag, char const (&
id)[N]);
explicit NamespaceCheck(clang::DeclContext const * context = nullptr):
context_(context) {}
@@ -68,6 +79,19 @@ private:
clang::DeclContext const * const context_;
};
+class DeclCheck {
+public:
+explicit DeclCheck(clang::Decl const * decl): decl_(decl) {}
+
+explicit operator bool() const { return decl_ != nullptr; }
+
+template inline NamespaceCheck Struct(char const (& id)[N])
+const;
+
+private:
+clang::Decl const * const decl_;
+};
+
class TerminalCheck {
public:
explicit operator bool() const { return satisfied_; }
@@ -81,19 +105,30 @@ private:
bool const satisfied_;
};
+namespace detail {
+
+template NamespaceCheck checkRecordDecl(
+clang::Decl const * decl, clang::TagTypeKind tag, char const (& id)[N])
+{
+auto r = llvm::dyn_cast_or_null(decl);
+if (r != nullptr && r->getTagKind() == tag) {
+auto const i = r->getIdentifier();
+if (i != nullptr && i->isStr(id)) {
+return NamespaceCheck(r->getDeclContext());
+}
+}
+return NamespaceCheck();
+}
+
+}
+
template NamespaceCheck TypeCheck::Class(char const (& id)[N])
const
{
if (!type_.isNull()) {
auto const t = type_->getAs();
if (t != nullptr) {
-auto const d = t->getDecl();
-if (d->isClass()) {
-auto const i = d->getIdentifier();
-if (i != nullptr && i->isStr(id)) {
-return NamespaceCheck(d->getDeclContext());
-}
-}
+return d
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/frmload.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 429f4e294e87e1172a925f164ad9e3ef125019a3
Author: Mike Kaganski
Date: Mon Jun 27 23:44:34 2016 +1000
Don't call a function when its result is already stored in variable
const bExternalModel was already set to xModel.is(), and xModel
hasn't been modified since then.
Change-Id: I8cc6e6776e633287cc755b0489458cadbf1ae664
Reviewed-on: https://gerrit.libreoffice.org/26716
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index da63bd9..4077e9d 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -668,7 +668,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const
Sequence< PropertyValue >& rA
::comphelper::NamedValueCollection aViewCreationArgs(
impl_extractViewCreationArgs( aDescriptor ) );
// no model passed from outside? => create one from scratch
-if ( !xModel.is() )
+if ( !bExternalModel )
{
bool bInternalFilter =
aDescriptor.getOrDefault("FilterProvider", OUString()).isEmpty();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/financial.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e227b6516295c6954d24a8eb67d2f0c0475c32e9
Author: Winfried Donkers
Date: Wed Jun 22 17:38:42 2016 +0200
tdf#100523 Add constraints for AMORDEGRC function.
Function returned different results than Excel does because of missing
constraints.
Change-Id: Iea8424a8429e0c48a19fe2818ca4be26c90afd32
Reviewed-on: https://gerrit.libreoffice.org/26571
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/scaddins/source/analysis/financial.cxx
b/scaddins/source/analysis/financial.cxx
index c51f4e9..8ad0ebb 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -27,7 +27,8 @@ double SAL_CALL AnalysisAddIn::getAmordegrc( const
css::uno::Reference< css::bea
double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
double fPer, double fRate, const css::uno::Any& rOB ) throw(
css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception
)
{
-if( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost )
+if( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost ||
+fCost <= 0.0 || fRestVal < 0 || fPer < 0 )
throw css::lang::IllegalArgumentException();
double fRet = GetAmordegrc( GetNullDate( xOpt ), fCost, nDate, nFirstPer,
fRestVal, fPer, fRate, getDateMode( xOpt, rOB ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/financial.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 67188d0e552c9dc50905f7f693d2bb24751a11c5
Author: Winfried Donkers
Date: Wed Jun 22 17:42:22 2016 +0200
tdf#100528 Add constraints for AMORLINC function
Function returned different results than Excel does because of missing
constraints.
Added constraints are all defined in ODFF1.2 for AMORLINC.
Change-Id: Icd5f9de9cf252e6864e3aa9b47346f6f75669c92
Reviewed-on: https://gerrit.libreoffice.org/26572
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/scaddins/source/analysis/financial.cxx
b/scaddins/source/analysis/financial.cxx
index 8ad0ebb..052f8b5 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -40,7 +40,8 @@ double SAL_CALL AnalysisAddIn::getAmorlinc( const
css::uno::Reference< css::bean
double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
double fPer, double fRate, const css::uno::Any& rOB ) throw(
css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception
)
{
-if( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost )
+if ( nDate > nFirstPer || fRate <= 0.0 || fRestVal > fCost ||
+ fCost <= 0.0 || fRestVal < 0 || fPer < 0 )
throw css::lang::IllegalArgumentException();
double fRet = GetAmorlinc( GetNullDate( xOpt ), fCost, nDate, nFirstPer,
fRestVal, fPer, fRate, getDateMode( xOpt, rOB ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source vcl/source
sd/source/ui/inc/unoprnms.hxx |1 +
sd/source/ui/unoidl/unopage.cxx| 15 ---
vcl/source/filter/ipdf/pdfread.cxx |5 ++---
3 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 0ffe9eb48a78bccf3d01a0effd5f2715174d38ff
Author: Miklos Vajna
Date: Tue Jun 28 15:52:59 2016 +0200
sd draw page: add PreviewMetafile UNO property
This allows an unnecessary GDIMetaFile -> WMF -> GDIMetaFile roundtrip,
and also avoids the odd black border at the bottom / right of the
preview metafile in the PDF import-as-graphic filter.
Change-Id: I7e3e782bbe0cf56def352e23b60864bb7773b607
Reviewed-on: https://gerrit.libreoffice.org/26743
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sd/source/ui/inc/unoprnms.hxx b/sd/source/ui/inc/unoprnms.hxx
index d0af59c..3dd438f 100644
--- a/sd/source/ui/inc/unoprnms.hxx
+++ b/sd/source/ui/inc/unoprnms.hxx
@@ -36,6 +36,7 @@
#define UNO_NAME_PAGE_WIDTH "Width"
#define UNO_NAME_PAGE_PREVIEW "Preview"
#define UNO_NAME_PAGE_PREVIEWBITMAP "PreviewBitmap"
+#define UNO_NAME_PAGE_PREVIEWMETAFILE "PreviewMetafile"
#define UNO_NAME_PAGE_VISIBLE "Visible"
#define UNO_NAME_OBJ_BOOKMARK "Bookmark"
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index cd550d8..4ca21d0 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -97,7 +97,7 @@ enum WID_PAGE
WID_PAGE_PAGENUMBERVISIBLE, WID_PAGE_DATETIMEVISIBLE,
WID_PAGE_DATETIMEFIXED,
WID_PAGE_DATETIMETEXT, WID_PAGE_DATETIMEFORMAT, WID_TRANSITION_TYPE,
WID_TRANSITION_SUBTYPE,
WID_TRANSITION_DIRECTION, WID_TRANSITION_FADE_COLOR,
WID_TRANSITION_DURATION, WID_LOOP_SOUND,
-WID_NAVORDER
+WID_NAVORDER, WID_PAGE_PREVIEWMETAFILE
};
static sal_Char const sEmptyPageName[sizeof("page")] = "page";
@@ -125,6 +125,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool
bImpress, PageKind eP
{ OUString(UNO_NAME_PAGE_WIDTH),WID_PAGE_WIDTH,
::cppu::UnoType::get(),0, 0},
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW,
cppu::UnoType>::get(),
css::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP),WID_PAGE_PREVIEWBITMAP,
cppu::UnoType>::get(),
css::beans::PropertyAttribute::READONLY, 0},
+{ OUString(UNO_NAME_PAGE_PREVIEWMETAFILE), WID_PAGE_PREVIEWMETAFILE,
cppu::UnoType>::get(),
css::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE,
cppu::UnoType::get(),0, 0},
{ OUString(UNO_NAME_OBJ_SOUNDFILE), WID_PAGE_SOUNDFILE,
cppu::UnoType::get(), 0, 0},
{ OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS,
cppu::UnoType::get(),0, 0},
@@ -200,6 +201,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool
bImpress, PageKind eP
{ OUString(UNO_NAME_PAGE_WIDTH),WID_PAGE_WIDTH,
::cppu::UnoType::get(),0, 0},
\
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW,
cppu::UnoType>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP),WID_PAGE_PREVIEWBITMAP,
cppu::UnoType>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
+{ OUString(UNO_NAME_PAGE_PREVIEWMETAFILE), WID_PAGE_PREVIEWMETAFILE,
cppu::UnoType>::get(),
css::beans::PropertyAttribute::READONLY, 0},\
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS,
cppu::UnoType::get(), 0, 0},
\
{ OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK,
::cppu::UnoType::get(), 0, 0},
\
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK,
cppu::UnoType::get(),
beans::PropertyAttribute::READONLY, 0},
\
@@ -1017,7 +1019,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const
OUString& PropertyName )
const SfxItemPropertySimpleEntry* pEntry =
mpPropSet->getPropertyMapEntry(PropertyName);
-switch( pEntry ? pEntry->nWID : -1 )
+sal_Int16 nEntry = pEntry ? pEntry->nWID : -1;
+switch (nEntry)
{
case WID_NAVORDER:
aAny = getNavigationOrder();
@@ -1100,6 +1103,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const
OUString& PropertyName )
getBackground( aAny );
break;
case WID_PAGE_PREVIEW :
+case WID_PAGE_PREVIEWMETAFILE :
{
SdDrawDocument* pDoc =
static_cast(GetPage()->GetModel());
if ( pDoc )
@@ -1126,7 +1130,12 @@ Any SAL_CALL SdGenericDrawPage::get
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/iferror.fods | 2399 1 file changed, 2399 insertions(+) New commits: commit 36936d5a8c2e6fc32dcc65d860bdfdafd2fbb766 Author: ZdenÄk Crhonek Date: Tue Jun 28 15:39:24 2016 +0200 add IFERROR test case Change-Id: I0d9d27715ed987b6cdcc88ac6ce83d184e90 Reviewed-on: https://gerrit.libreoffice.org/26742 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/iferror.fods b/sc/qa/unit/data/functions/fods/iferror.fods new file mode 100644 index 000..666b1f7 --- /dev/null +++ b/sc/qa/unit/data/functions/fods/iferror.fods @@ -0,0 +1,2399 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/c8a94cae37029b037507ce86d149ba56ca341f11 + + + 0 + 0 + 34591 + 14613 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + 4 + 18 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 100 + 60 + true + + + Sheet2 + 1241 + 0 + 100 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + en + US + + + + + + true + true + 3 + 1 + true + 1 + true + qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + +$ + + + + +$( + + ) + + +$- + + + + + + + + + + + + £ + + + + - + £ + + + + + £ + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + £ + + + + + - + £ + + + + + + + + + ( + + ) + + + + + + + + ( + + ) + + +
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx | 21 +
compilerplugins/clang/faileddyncast.cxx |1 +
compilerplugins/clang/implicitboolconversion.cxx |8 ++--
compilerplugins/clang/passstuffbyref.cxx |2 +-
compilerplugins/clang/privatebase.cxx|8
compilerplugins/clang/refcounting.cxx|2 +-
compilerplugins/clang/singlevalfields.cxx|6 +++---
compilerplugins/clang/staticmethods.cxx |2 ++
compilerplugins/clang/typecheck.cxx |3 ++-
compilerplugins/clang/unuseddefaultparams.cxx|2 ++
compilerplugins/clang/unusedmethods.cxx |5 -
compilerplugins/clang/vclwidgets.cxx |8 +---
compilerplugins/clang/weakobject.cxx |5 +++--
13 files changed, 55 insertions(+), 18 deletions(-)
New commits:
commit 9308f353186fb39a02eddfc281fc72ac1026e0b6
Author: Stephan Bergmann
Date: Tue Jun 28 16:25:55 2016 +0200
Adapt to Clang 3.4 (in preparation of a buildbot on CentOS 7)
Change-Id: Ie2859f03b31c57deb7fd0deba3285f782e33b239
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index e1b4d8e..2f73b7f 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -323,6 +323,27 @@ inline auto getAsTagDecl(clang::Type const& t) ->
clang::TagDecl *
#endif
}
+inline bool isStdNamespace(clang::DeclContext const & context) {
+#if CLANG_VERSION >= 30500
+return context.isStdNamespace();
+#else
+// cf. lib/AST/DeclBase.cpp:
+if (!context.isNamespace()) {
+return false;
+}
+const clang::NamespaceDecl *ND = clang::cast(
+&context);
+if (ND->isInline()) {
+return isStdNamespace(*ND->getParent());
+}
+if (!context.getParent()->getRedeclContext()->isTranslationUnit()) {
+return false;
+}
+const clang::IdentifierInfo *II = ND->getIdentifier();
+return II && II->isStr("std");
+#endif
+}
+
}
#endif
diff --git a/compilerplugins/clang/faileddyncast.cxx
b/compilerplugins/clang/faileddyncast.cxx
index 6fef227..9be28f0 100644
--- a/compilerplugins/clang/faileddyncast.cxx
+++ b/compilerplugins/clang/faileddyncast.cxx
@@ -9,6 +9,7 @@
#include
+#include "clang/AST/Attr.h"
#include "clang/AST/CXXInheritance.h"
#include "plugin.hxx"
diff --git a/compilerplugins/clang/implicitboolconversion.cxx
b/compilerplugins/clang/implicitboolconversion.cxx
index 1e4c5e2..79dc8fb 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -21,7 +21,9 @@
#if CLANG_VERSION < 30700
-template<> struct std::iterator_traits {
+namespace std {
+
+template<> struct iterator_traits {
typedef std::ptrdiff_t difference_type;
typedef Expr * value_type;
typedef Expr const ** pointer;
@@ -29,7 +31,7 @@ template<> struct std::iterator_traits {
typedef std::random_access_iterator_tag iterator_category;
};
-template<> struct std::iterator_traits {
+template<> struct iterator_traits {
typedef std::ptrdiff_t difference_type;
typedef Expr const * value_type;
typedef Expr const ** pointer;
@@ -37,6 +39,8 @@ template<> struct std::iterator_traits {
typedef std::random_access_iterator_tag iterator_category;
};
+}
+
#endif
namespace {
diff --git a/compilerplugins/clang/passstuffbyref.cxx
b/compilerplugins/clang/passstuffbyref.cxx
index 8c9814e..b2f5ce6 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -231,7 +231,7 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl *
functionDecl, const C
return;
}
-const QualType type =
functionDecl->getReturnType().getDesugaredType(compiler.getASTContext());
+const QualType type =
compat::getReturnType(*functionDecl).getDesugaredType(compiler.getASTContext());
if (type->isReferenceType() || type->isIntegralOrEnumerationType() ||
type->isPointerType()
|| type->isTemplateTypeParmType() || type->isDependentType() ||
type->isBuiltinType()
|| type->isScalarType())
diff --git a/compilerplugins/clang/privatebase.cxx
b/compilerplugins/clang/privatebase.cxx
index 8084ee3..d2a125d 100644
--- a/compilerplugins/clang/privatebase.cxx
+++ b/compilerplugins/clang/privatebase.cxx
@@ -34,14 +34,14 @@ bool PrivateBase::VisitCXXRecordDecl(CXXRecordDecl const *
decl) {
{
return true;
}
-for (auto const & i: decl->bases()) {
-if (i.getAccessSpecifierAsWritten() == AS_none) {
+for (auto i = decl->bases_begin(); i != decl->bases_end(); ++i) {
+if (i->getAccessSpecifierAsWritten() == AS_none) {
report(
DiagnosticsEngine::Warning,
"base class is private by default; explicitly give an access"
" specifier",
-i.getLocStart())
-<< i.getSourceRange();
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - svx/source
svx/source/svdraw/svdmrkv.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 99a1a635e391a2c531d9694dd7101ca0422a7be6 Author: Andras Timar Date: Tue Jun 28 15:44:17 2016 +0200 add missing include Change-Id: I3d56ccf967c18ae02f4c176e4898df058771c87d diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f10bc9e..ef258e6 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -52,6 +52,7 @@ #include #include +#include using namespace com::sun::star; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - 2 commits - sc/qa sc/source
sc/qa/unit/screenshots/screenshots.cxx | 307 -
sc/source/ui/attrdlg/scdlgfact.hxx | 12 +
2 files changed, 199 insertions(+), 120 deletions(-)
New commits:
commit f5198e15b2744dcb94c841b9926c10fb2d2167f2
Author: Katarina Behrens
Date: Tue Jun 28 15:39:54 2016 +0200
Actually save screenshots of sc dialogs
Change-Id: If563f5b0fd5b28589bfbe4cf91061951acd14ebf
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 4937474..b17afc9 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -20,9 +20,11 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -43,8 +45,23 @@ using namespace css;
#if !defined(WNT) && !defined(MACOSX)
static const char* DATA_DIRECTORY = "/sc/qa/unit/screenshots/data/";
+static const char* SCREENSHOT_DIRECTORY = "/workdir/screenshots/";
#endif
+namespace {
+void splitHelpId( OString& rHelpId, OUString& rDirname, OUString
&rBasename )
+{
+sal_Int32 nIndex = rHelpId.lastIndexOf( '/' );
+
+if( nIndex > 0 )
+rDirname = OStringToOUString( rHelpId.copy( 0, nIndex ),
RTL_TEXTENCODING_UTF8 );
+
+if( rHelpId.getLength() > nIndex+1 )
+rBasename= OStringToOUString( rHelpId.copy( nIndex+1 ),
RTL_TEXTENCODING_UTF8 );
+}
+}
+
+
class ScScreenshotTest : public test::BootstrapFixture, public
unotest::MacrosTest, public XmlTestTools
{
public:
@@ -53,24 +70,32 @@ public:
virtual void tearDown() SAL_OVERRIDE;
#if !defined(WNT) && !defined(MACOSX)
-void testOpeningSomeDialog();
+void testOpeningModalDialogs();
//void testOpeningModelessDialogs();
#endif
CPPUNIT_TEST_SUITE(ScScreenshotTest);
#if !defined(WNT) && !defined(MACOSX)
-CPPUNIT_TEST(testOpeningSomeDialog);
+CPPUNIT_TEST(testOpeningModalDialogs);
//CPPUNIT_TEST(testOpeningModelessDialogs);
#endif
CPPUNIT_TEST_SUITE_END();
private:
#if !defined(WNT) && !defined(MACOSX)
-ScModelObj* createDoc(const char* pName);
+void initializeWithDoc(const char* pName);
+
+VclAbstractDialog* createDialogByID( sal_uInt32 nID);
+void dumpDialogToPath( VclAbstractDialog& rDialog );
+void saveScreenshot( VclAbstractDialog& rDialog );
#endif
uno::Reference mxComponent;
+SfxObjectShell* pFoundShell;
+ScDocShellRef xDocSh;
+ScTabViewShell* pViewShell;
+ScAbstractDialogFactory* pFact;
};
ScScreenshotTest::ScScreenshotTest()
@@ -82,6 +107,9 @@ void ScScreenshotTest::setUp()
test::BootstrapFixture::setUp();
mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+
+osl::FileBase::RC err = osl::Directory::create(
m_directories.getURLFromSrc( SCREENSHOT_DIRECTORY ) );
+CPPUNIT_ASSERT_MESSAGE( "Failed to create screenshot directory", (err ==
osl::FileBase::E_None || err == osl::FileBase::E_EXIST) );
}
void ScScreenshotTest::tearDown()
@@ -93,142 +121,183 @@ void ScScreenshotTest::tearDown()
}
#if !defined(WNT) && !defined(MACOSX)
-ScModelObj* ScScreenshotTest::createDoc(const char* pName)
+void ScScreenshotTest::initializeWithDoc(const char* pName)
{
if (mxComponent.is())
mxComponent->dispose();
mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ OUString::createFromAscii(pName), "com.sun.star.sheet.SpreadsheetDocument");
-ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
-CPPUNIT_ASSERT(pModelObj);
-return pModelObj;
-}
-
-void ScScreenshotTest::testOpeningSomeDialog()
-{
-ScModelObj* pModelObj = createDoc("empty.ods");
-ScDocument* pDoc = pModelObj->GetDocument();
-
-// display insert sheet dialog
-//uno::Sequence aArgs;
-//comphelper::dispatchCommand(".uno:Insert", aArgs);
-SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(mxComponent);
+pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent);
CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
-ScDocShellRef xDocSh = dynamic_cast(pFoundShell);
+xDocSh = dynamic_cast(pFoundShell);
CPPUNIT_ASSERT(xDocSh != nullptr);
-ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
+pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell != nullptr);
-ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-CPPUNIT_ASSERT( pFact != nullptr );
-
-ScViewData& rViewData = pViewShell->GetViewData();
-SCTAB nTabSelCount = rViewData.GetMarkData().GetSelectCount();
-std::unique_ptr pDlg(
pFact->CreateScInsertTableDlg(
- pViewShell->GetDialogParent(), rViewData, nTabSelCount, false));
-CPPUNIT_ASSERT( pDlg != nullptr );
-
-pDlg->Execute();
-
-std::unique_ptr pDlg2(
pFact->CreateScDeleteCellDlg(
- pViewShell->GetDialogParent
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit dad381d2c42475bd274dc5b7cae7956d221ff77c Author: László Németh Date: Tue Jun 28 15:32:46 2016 +0200 empty commit (repeat) Change-Id: I452de46da3c27c3274f4084e4ba990fb07252ab0 commit 9eceafb9f17ac8d1421d81d52c878ac9ce9220fc Author: László Németh Date: Tue Jun 28 15:32:38 2016 +0200 empty commit (repeat) Change-Id: I08c11744b2794aafb8b0aeaa5bb0c00a42b6f70f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 1aafc64b4d3ca2a01057209f047b136297c7842b
Author: Noel Grandin
Date: Tue Jun 28 15:28:18 2016 +0200
loplugin compat with clang 3.4
Change-Id: I264fe688519b8b2173d5cccd8a453847a7fb89d9
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 7a87944..e1b4d8e 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -128,20 +128,35 @@ inline clang::QualType getReturnType(clang::FunctionDecl
const & decl) {
#endif
}
+
#if CLANG_VERSION >= 30900
inline clang::ArrayRef parameters(
clang::FunctionDecl const & decl)
{
return decl.parameters();
}
-#else
+#elif CLANG_VERSION >= 30500
inline clang::FunctionDecl::param_const_range parameters(
clang::FunctionDecl const & decl)
{
return decl.params();
}
+#else
+struct FunctionDeclParamsWrapper
+{
+clang::FunctionDecl const & decl;
+FunctionDeclParamsWrapper(clang::FunctionDecl const & _decl) : decl(_decl)
{}
+clang::FunctionDecl::param_const_iterator begin() const { return
decl.param_begin(); }
+clang::FunctionDecl::param_const_iterator end() const { return
decl.param_end(); }
+};
+inline FunctionDeclParamsWrapper parameters(
+clang::FunctionDecl const & decl)
+{
+return FunctionDeclParamsWrapper(decl);
+}
#endif
+
inline clang::QualType getReturnType(clang::FunctionProtoType const & type) {
#if CLANG_VERSION >= 30500
return type.getReturnType();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 4d7adf1cd38daffa947f0041ddcce00d0aef1d3c Author: László Németh Date: Tue Jun 28 15:31:33 2016 +0200 empty commit (proc. idle start) Change-Id: Iac0b70ff72f048e473345ec3637bca796fcd45a0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column2.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f948dce856d51704e1962553198015dbebb6e527
Author: Tor Lillqvist
Date: Mon Jun 27 17:26:44 2016 +0300
tdf#75387: Don't case-fold strings for formula group calculations
There should be no need for it as far as I see. Possibly it made some
sense back when we thought we could use OpenCL for operators and
functions that are supposed to ignore the case of strings they
handle. But we hopefully should never try to use OpenCL for string
data nowadays anyway. And actually, the case-folding ended up
affecting strings handled by the so-called software interpreter. For
the tdf#75387, the sample sheet worked fine when OpenCL was enabled.
Change-Id: I1c170ebf09551fea0964f394cdb3c65079672257
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index eccb7dc..7565a1a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2337,7 +2337,7 @@ bool appendToBlock(
rCxt.ensureStrArray(rColArray, nArrayLen);
for (; itData != itDataEnd; ++itData, ++nPos)
-(*rColArray.mpStrArray)[nPos] =
itData->getDataIgnoreCase();
+(*rColArray.mpStrArray)[nPos] = itData->getData();
}
break;
case sc::element_type_edittext:
@@ -2349,7 +2349,7 @@ bool appendToBlock(
for (; itData != itDataEnd; ++itData, ++nPos)
{
OUString aStr = ScEditUtil::GetString(**itData, pDoc);
-(*rColArray.mpStrArray)[nPos] =
rPool.intern(aStr).getDataIgnoreCase();
+(*rColArray.mpStrArray)[nPos] =
rPool.intern(aStr).getData();
}
}
break;
@@ -2450,7 +2450,7 @@ void copyFirstStringBlock(
sc::string_block::iterator itEnd = it;
std::advance(itEnd, nLen);
for (; it != itEnd; ++it, ++itArray)
-*itArray = it->getDataIgnoreCase();
+*itArray = it->getData();
}
break;
case sc::element_type_edittext:
@@ -2464,7 +2464,7 @@ void copyFirstStringBlock(
{
EditTextObject* pText = *it;
OUString aStr = ScEditUtil::GetString(*pText, &rDoc);
-*itArray = rPool.intern(aStr).getDataIgnoreCase();
+*itArray = rPool.intern(aStr).getData();
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source
include/svx/svdmodel.hxx |2 +-
sc/source/ui/inc/viewdata.hxx|3 ++-
sc/source/ui/view/prevwsh.cxx|4 ++--
sc/source/ui/view/viewdata.cxx |8
sd/source/ui/view/drviews5.cxx |2 +-
svx/source/svdraw/svdmodel.cxx |3 ++-
sw/source/uibase/uiview/view.cxx |2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit c9f05625a7d34bed2229d59466420cd56f904c41
Author: Mike Kaganski
Date: Tue Jun 28 21:23:31 2016 +1000
Revert c7b9b9204ce2b3c1e0dbc0d79e4e01d27ad2ac7e
Also make changes to make loplugin:staticmethods happy
Change-Id: Ia55d063c0fa5a1d9392e09f23ebb1266f46745b9
Reviewed-on: https://gerrit.libreoffice.org/26740
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 1c8f3cf..fa24d55 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -552,7 +552,7 @@ public:
// Used as a fallback in *::ReadUserDataSequence() to process common
properties
void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue);
-static void WriteUserDataSequence(css::uno::Sequence <
css::beans::PropertyValue >& rValues, bool bBrowse = false);
+void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue
>& rValues, bool bBrowse = false);
/** returns the numbering type that is used to format page fields in
drawing shapes */
virtual SvxNumType GetPageNumType() const;
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 789bdf2..6657e83 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -144,7 +144,8 @@ private:
ScViewDataTable();
voidWriteUserDataSequence(
-css::uno::Sequence &
rSettings ) const;
+css::uno::Sequence &
rSettings,
+const ScViewData& rViewData, SCTAB nTab ) const;
voidReadUserDataSequence(
const css::uno::Sequence &
rSettings,
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 10af8bb..a2a36f8 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -949,7 +949,7 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence <
beans::PropertyValue
}
// Common SdrModel processing
-SdrModel::WriteUserDataSequence(rSeq);
+GetDocument().GetDrawLayer()->WriteUserDataSequence(rSeq);
}
void ScPreviewShell::ReadUserDataSequence(const uno::Sequence <
beans::PropertyValue >& rSeq)
@@ -977,7 +977,7 @@ void ScPreviewShell::ReadUserDataSequence(const
uno::Sequence < beans::PropertyV
}
// Fallback to common SdrModel processing
else
GetDocument().GetDrawLayer()->ReadUserDataSequenceValue(pSeq);
-}
+}
}
}
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 37234a8..d188643 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -112,7 +112,7 @@ ScViewDataTable::~ScViewDataTable()
{
}
-void ScViewDataTable::WriteUserDataSequence(uno::Sequence
& rSettings) const
+void ScViewDataTable::WriteUserDataSequence(uno::Sequence
& rSettings, const ScViewData& rViewData, SCTAB /*nTab*/)
const
{
rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT);
beans::PropertyValue* pSettings = rSettings.getArray();
@@ -161,7 +161,7 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence
}
// Common SdrModel processing
-SdrModel::WriteUserDataSequence(rSettings);
+rViewData.GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings);
}
void ScViewDataTable::ReadUserDataSequence(const uno::Sequence
& aSettings, ScViewData& rViewData, SCTAB nTab, bool&
rHasZoom )
@@ -2655,7 +2655,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence
& rSe
if (maTabData[nTab])
{
uno::Sequence aTableViewSettings;
-maTabData[nTab]->WriteUserDataSequence(aTableViewSettings);
+maTabData[nTab]->WriteUserDataSequence(aTableViewSettings,
*this, nTab);
OUString sTabName;
GetDocument()->GetName( nTab, sTabName );
try
@@ -2735,7 +2735,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence
& rSe
}
// Common SdrModel processing
-SdrModel::WriteUserDataSequence(rSettings);
+GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings);
}
void ScViewData::ReadUserDataSequence(const uno::Sequence
& rSettings)
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3aeb12c..b4e3319 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -454,7 +454,7 @@ void DrawViewShell::WriteUserDataSequence (
css::uno::Sequence < css::beans::Pro
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/plugin.cxx | 27
compilerplugins/clang/plugin.hxx |1
compilerplugins/clang/singlevalfields.cxx | 33 ++
compilerplugins/clang/unusedfields.cxx|9 +++-
compilerplugins/clang/unusedmethods.cxx | 33 ++
5 files changed, 42 insertions(+), 61 deletions(-)
New commits:
commit 442dd6a153385d7c2826eabe0737d4d53332f392
Author: Noel Grandin
Date: Tue Jun 28 14:52:54 2016 +0200
loplugin: move parentFunctionDecl() into common code
Change-Id: Ia10a76a98a63c6ea3b516d9146281f672b213ab3
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 04dcceb..af618de 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -75,6 +75,33 @@ Stmt* Plugin::parentStmt( Stmt* stmt )
return const_cast< Stmt* >( parents[ stmt ] );
}
+static const Decl* getDeclContext(ASTContext& context, const Stmt* stmt)
+{
+auto it = context.getParents(*stmt).begin();
+
+if (it == context.getParents(*stmt).end())
+ return nullptr;
+
+const Decl *aDecl = it->get();
+if (aDecl)
+ return aDecl;
+
+const Stmt *aStmt = it->get();
+if (aStmt)
+return getDeclContext(context, aStmt);
+
+return nullptr;
+}
+
+const FunctionDecl* Plugin::parentFunctionDecl( const Stmt* stmt )
+{
+const Decl *decl = getDeclContext(compiler.getASTContext(), stmt);
+if (decl)
+return static_cast(decl->getNonClosureContext());
+
+return nullptr;
+}
+
bool Plugin::isInUnoIncludeFile(SourceLocation spellingLocation) const {
StringRef name {
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index c630a3e..6b9f682 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -69,6 +69,7 @@ class Plugin
*/
const Stmt* parentStmt( const Stmt* stmt );
Stmt* parentStmt( Stmt* stmt );
+const FunctionDecl* parentFunctionDecl( const Stmt* stmt );
/**
Checks if the location is inside an UNO file, more specifically, if
it forms part of the URE stable interface,
which is not allowed to be changed.
diff --git a/compilerplugins/clang/singlevalfields.cxx
b/compilerplugins/clang/singlevalfields.cxx
index 534ed6e..79866fa 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -155,33 +155,6 @@ bool SingleValFields::VisitCXXConstructorDecl( const
CXXConstructorDecl* decl )
return true;
}
-const Decl* get_DeclContext_from_Stmt(ASTContext& context, const Stmt& stmt)
-{
- auto it = context.getParents(stmt).begin();
-
- if (it == context.getParents(stmt).end())
- return nullptr;
-
- const Decl *aDecl = it->get();
- if (aDecl)
- return aDecl;
-
- const Stmt *aStmt = it->get();
- if (aStmt)
- return get_DeclContext_from_Stmt(context, *aStmt);
-
- return nullptr;
-}
-
-const FunctionDecl* SingleValFields::get_top_FunctionDecl_from_Stmt(const
Stmt& stmt)
-{
- const Decl *decl = get_DeclContext_from_Stmt(compiler.getASTContext(), stmt);
- if (decl)
- return static_cast(decl->getNonClosureContext());
-
- return nullptr;
-}
-
/**
* Check for calls to methods where a pointer to something is cast to a
pointer to void.
* At which case it could have anything written to it.
@@ -269,8 +242,8 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr*
memberExpr )
if (ignoreLocation(memberExpr) || !isInterestingType(fieldDecl->getType()))
return true;
-const FunctionDecl* parentFunctionDecl =
get_top_FunctionDecl_from_Stmt(*memberExpr);
-const CXXMethodDecl* methodDecl =
dyn_cast_or_null(parentFunctionDecl);
+const FunctionDecl* parentFunction = parentFunctionDecl(memberExpr);
+const CXXMethodDecl* methodDecl =
dyn_cast_or_null(parentFunction);
if (methodDecl && (methodDecl->isCopyAssignmentOperator() ||
methodDecl->isMoveAssignmentOperator()))
return true;
@@ -285,7 +258,7 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr*
memberExpr )
if (parent && isa(parent)) {
const Stmt* parent2 = parentStmt(parent);
if (parent2 && isa(parent2)) {
-QualType qt =
parentFunctionDecl->getReturnType().getDesugaredType(compiler.getASTContext());
+QualType qt =
parentFunction->getReturnType().getDesugaredType(compiler.getASTContext());
if (!qt.isConstQualified() && qt->isReferenceType()) {
assignValue = "?";
bPotentiallyAssignedTo = true;
diff --git a/compilerplugins/clang/unusedfields.cxx
b/compilerplugins/clang/unusedfields.cxx
index 8174511..03bd3db 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -210,8 +210,15 @@ bool UnusedFields::VisitMemberExpr( const MemberExpr*
memberExpr
[Libreoffice-commits] core.git: canvas/source editeng/source extensions/source
canvas/source/directx/dx_config.cxx |6
editeng/source/misc/acorrcfg.cxx | 273 +++
extensions/source/bibliography/bibconfig.cxx | 26 --
3 files changed, 125 insertions(+), 180 deletions(-)
New commits:
commit e3e79246cb7dd28a8b3511cefd0c41cf19b3e7de
Author: Stephan Bergmann
Date: Tue Jun 28 14:50:49 2016 +0200
Simplify some PutProperties calls
Change-Id: Idf91592e6cf34b5591f221c3c5bdc937bbe46014
diff --git a/canvas/source/directx/dx_config.cxx
b/canvas/source/directx/dx_config.cxx
index 2ab26c1..edd097e 100644
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -95,8 +95,6 @@ namespace dxcanvas
try
{
-uno::Sequence< OUString > aName { "DeviceBlacklist" };
-
uno::Sequence< sal_Int32 > aValues(
sizeof(DeviceInfo)/sizeof(sal_Int32)*maValues.size() );
sal_Int32* pValues = aValues.getArray();
@@ -113,9 +111,7 @@ namespace dxcanvas
*pValues++ = rInfo.nDriverBuildId;
}
-uno::Sequence< uno::Any > aValue(1);
-aValue[0] <<= aValues;
-PutProperties( aName, aValue );
+PutProperties({"DeviceBlacklist"}, {css::uno::Any(aValues)});
}
catch( const uno::Exception& )
{
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index ac800ee..a07187d 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -238,73 +238,39 @@ SvxBaseAutoCorrCfg::~SvxBaseAutoCorrCfg()
void SvxBaseAutoCorrCfg::ImplCommit()
{
-Sequence aNames( GetPropertyNames() );
-
-Sequence aValues(aNames.getLength());
-Any* pValues = aValues.getArray();
-
const long nFlags = rParent.pAutoCorrect->GetFlags();
-for(int nProp = 0; nProp < aNames.getLength(); nProp++)
-{
-switch(nProp)
-{
-case 0:
-pValues[nProp] <<= ((nFlags & SaveWordCplSttLst) != 0);
-break;//"Exceptions/TwoCapitalsAtStart",
-case 1:
-pValues[nProp] <<= ((nFlags & SaveWordWrdSttLst) != 0);
-break;//"Exceptions/CapitalAtStartSentence",
-case 2:
-pValues[nProp] <<= ((nFlags & Autocorrect) != 0);
-break;//"UseReplacementTable",
-case 3:
-pValues[nProp] <<= ((nFlags & CapitalStartWord) != 0);
-break;//"TwoCapitalsAtStart",
-case 4:
-pValues[nProp] <<= ((nFlags & CapitalStartSentence) != 0);
-break;//"CapitalAtStartSentence",
-case 5:
-pValues[nProp] <<= ((nFlags & ChgWeightUnderl) != 0);
-break;//"ChangeUnderlineWeight",
-case 6:
-pValues[nProp] <<= ((nFlags & SetINetAttr) != 0);
-break;//"SetInetAttribute",
-case 7:
-pValues[nProp] <<= ((nFlags & ChgOrdinalNumber) != 0);
-break;//"ChangeOrdinalNumber",
-case 8:
-pValues[nProp] <<= ((nFlags & AddNonBrkSpace) != 0);
-break;//"AddNonBreakingSpace"
-case 9:
-pValues[nProp] <<= ((nFlags & ChgToEnEmDash) != 0);
-break;//"ChangeDash",
-case 10:
-pValues[nProp] <<= ((nFlags & IgnoreDoubleSpace) != 0);
-break;//"RemoveDoubleSpaces",
-case 11:
-pValues[nProp] <<= ((nFlags & ChgSglQuotes) != 0);
-break;//"ReplaceSingleQuote",
-case 12:
-pValues[nProp] <<=
(sal_Int32)rParent.pAutoCorrect->GetStartSingleQuote();
-break;//"SingleQuoteAtStart",
-case 13:
-pValues[nProp] <<= (sal_Int32)
rParent.pAutoCorrect->GetEndSingleQuote();
-break;//"SingleQuoteAtEnd",
-case 14:
-pValues[nProp] <<= ((nFlags & ChgQuotes) != 0);
-break;//"ReplaceDoubleQuote",
-case 15:
-pValues[nProp] <<= (sal_Int32)
rParent.pAutoCorrect->GetStartDoubleQuote();
-break;//"DoubleQuoteAtStart",
-case 16:
-pValues[nProp] <<= (sal_Int32)
rParent.pAutoCorrect->GetEndDoubleQuote();
-break;//"DoubleQuoteAtEnd"
-case 17:
-pValues[nProp] <<= ((nFlags & CorrectCapsLock) != 0);
-break;//"CorrectAccidentalCapsLock"
-}
-}
-PutProperties(aNames, aValues);
+PutProperties(
+GetPropertyNames(),
+{css::uno::Any((nFlags & SaveWordCplSttLst) != 0),
+// "Exceptions/TwoCapitalsAtStart"
+ css::uno::Any((nFlags & SaveWordWrdSttLst) != 0),
+// "Exceptions/CapitalAtStartSentence"
+ css::uno::Any((nFlags & Autocorrect) != 0), // "UseReplacementTable"
+ css::uno::Any((nFlags & CapitalStartWord) != 0),
+// "TwoCapitalsAtStart"
+ c
[Libreoffice-commits] core.git: vcl/inc vcl/osx
vcl/inc/osx/salmenu.h |4 ++--
vcl/osx/salmenu.cxx |1 -
vcl/osx/salnsmenu.mm |2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit c63ae748b301db1f4996b43f6faf4bb317c37467
Author: Stephan Bergmann
Date: Tue Jun 28 14:48:29 2016 +0200
Adapt OS-X--only code to aa0d0536a444fb26d9e570bd6bf6c1bdc3596cf3
..."tdf#97527 - vcl: reference-count Menu"
Change-Id: I47457205ae99025d2ca13965dcf2fac79962124a
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index ad1b29e..f4407f3 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -88,7 +88,7 @@ public:
boolmbMenuBar; // true - Menubar, false - Menu
NSMenu* mpMenu; // The Carbon reference to
this menu
-Menu* mpVCLMenu; // the corresponding vcl Menu
object
+VclPtrmpVCLMenu; // the corresponding vcl Menu
object
const AquaSalFrame* mpFrame;// the frame to dispatch the
menu events to
AquaSalMenu*mpParentSalMenu;// the parent menu that
contains us (and perhaps has a frame)
@@ -103,7 +103,7 @@ public:
virtual ~AquaSalMenuItem();
sal_uInt16 mnId; // Item ID
-Menu* mpVCLMenu;// VCL Menu into which this
MenuItem is inserted
+VclPtrmpVCLMenu;// VCL Menu into which this
MenuItem is inserted
AquaSalMenu*mpParentMenu; // The menu in which this menu
item is inserted
AquaSalMenu*mpSubMenu;// Sub menu of this item (if
defined)
NSMenuItem* mpMenuItem; // The NSMenuItem
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index b9d8e69..3c2a476 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -257,7 +257,6 @@ void AquaSalInstance::DestroyMenuItem( SalMenuItem*
pSalMenuItem )
AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
mbMenuBar( bMenuBar ),
mpMenu( nil ),
-mpVCLMenu( nullptr ),
mpFrame( nullptr ),
mpParentSalMenu( nullptr )
{
diff --git a/vcl/osx/salnsmenu.mm b/vcl/osx/salnsmenu.mm
index b30792d..cd22b78 100644
--- a/vcl/osx/salnsmenu.mm
+++ b/vcl/osx/salnsmenu.mm
@@ -125,7 +125,7 @@
// if an item from submenu was selected. the corresponding Window does
not exist because
// we use native popup menus, so we have to set the selected menuitem
directly
// incidentally this of course works for top level popup menus, too
-PopupMenu * pPopupMenu = dynamic_cast(mpMenuItem->mpVCLMenu);
+PopupMenu * pPopupMenu = dynamic_cast(mpMenuItem->mpVCLMenu.get());
if( pPopupMenu )
{
// FIXME: revise this ugly code
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/objsh.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit ea6536a42b73c9205c9c69ddc5fecb9ed83c440e Author: Stephan Bergmann Date: Tue Jun 28 14:27:46 2016 +0200 IsOwnStorageFormat can apparently be a private helper function Change-Id: I5b36d48749faaab7c1280b5d086bf0d65a313469 diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 76ce626..6f0c244 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -216,7 +216,9 @@ private: boolmbAvoidRecentDocs; ///< Avoid adding to the recent documents list, if not necessary. boolCloseInternal(); -private: + +SAL_DLLPRIVATE static bool IsOwnStorageFormat(const SfxMedium &); + SAL_DLLPRIVATE void UpdateTime_Impl(const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps); @@ -626,8 +628,6 @@ public: SAL_DLLPRIVATE std::shared_ptr CreatePreviewMetaFile_Impl( bool bFullContent ) const; -static bool IsOwnStorageFormat(const SfxMedium &); - SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const; SAL_DLLPRIVATE bool ConnectTmpStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage, SfxMedium* pMedium ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Review of Sidebar & It's functionality - Weekly Report #5
Hi, Another week of GSoC is now over, and this is what I've done over the past week: 1. Writer Page Tab: All panels have been merged to master (including Styles Panel which was under review), and is no longer in experimental status. 'None' Margin Preset was added to the Format Panel. Everyone is encouraged to test it out and report bugs if any. 2. Added Bitmap Import functionality to the Area Content Panel (merged) - https://gerrit.libreoffice.org/26527 3. Working on Shapes Deck. Discussion over the layout of the new Shapes Tab was going on, so no code committed as of now. TO-DO 1. Finish up the Basic Shapes content panel, in Shapes Deck. 2. Clear out the layout details for the 'more' panel in Shapes Deck, and start working on it. Regards, Susobhan Ghosh IRC: susobhang70 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/ViewShellBase.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 876348f5acdaa109e0f878786345e1e12fce19a1
Author: Szymon KÅos
Date: Tue Jun 28 12:51:39 2016 +0200
GSoC kill notebookbar after the real impress close
Change-Id: I641ebdd7610289a872dd0c8de9b297e5e6ba0b45
Before: notebookbar was closed even if exit was canceled by user
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 2df5ad5..a5cda27 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -270,6 +270,8 @@ ViewShellBase::ViewShellBase (
*/
ViewShellBase::~ViewShellBase()
{
+sfx2::SfxNotebookBar::CloseMethod(GetFrame()->GetBindings());
+
rtl::Reference xSlideShow(SlideShow::GetSlideShow(*this));
if (xSlideShow.is() && xSlideShow->dependsOn(this))
SlideShow::Stop(*this);
@@ -770,8 +772,6 @@ bool ViewShellBase::PrepareClose (bool bUI)
if (bResult)
{
-sfx2::SfxNotebookBar::CloseMethod(GetFrame()->GetBindings());
-
mpImpl->mbIsClosing = true;
// Forward call to main sub shell.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang forms/source include/package include/sot include/svtools include/tools include/ucbhelper include/vcl include/xmloff linguistic/source package/sour
compilerplugins/clang/singlevalfields.cxx| 89 + compilerplugins/clang/singlevalfields.py |7 + forms/source/xforms/xformsevent.cxx |2 forms/source/xforms/xformsevent.hxx |2 include/package/Inflater.hxx |2 include/sot/object.hxx |3 include/svtools/tabbar.hxx |1 include/tools/b3dtrans.hxx |8 - include/ucbhelper/resultsetmetadata.hxx |6 include/vcl/pdfwriter.hxx|2 include/xmloff/XMLTextMasterPageContext.hxx |4 linguistic/source/convdicxml.hxx |2 linguistic/source/defs.hxx |8 - package/source/zipapi/Inflater.cxx |1 package/source/zipapi/XUnbufferedStream.cxx |2 package/source/zipapi/XUnbufferedStream.hxx |2 rsc/inc/rscdef.hxx |1 rsc/inc/rsclex.hxx |3 rsc/source/tools/rscdef.cxx |1 sd/source/ui/dlg/tabtempl.cxx|2 sd/source/ui/inc/tabtempl.hxx|2 sdext/source/presenter/PresenterSlideShowView.cxx|5 sdext/source/presenter/PresenterSlideShowView.hxx|1 sfx2/source/appl/workwin.cxx |2 sfx2/source/inc/workwin.hxx |4 slideshow/source/engine/shapes/drawinglayeranimation.cxx | 12 - sot/source/base/object.cxx |1 sot/source/sdstor/stgole.cxx |3 sot/source/sdstor/stgole.hxx |1 sot/source/sdstor/storage.cxx| 17 -- starmath/source/mathtype.cxx |2 starmath/source/mathtype.hxx |4 svl/source/misc/inethist.cxx |4 svl/source/numbers/zforfind.cxx | 18 -- svl/source/numbers/zforfind.hxx |1 svtools/source/control/tabbar.cxx|5 svtools/source/graphic/descriptor.cxx|6 svtools/source/graphic/descriptor.hxx|1 toolkit/source/helper/formpdfexport.cxx |3 tools/source/generic/b3dtrans.cxx| 99 +++ tools/source/generic/config.cxx |2 ucb/source/ucp/file/filrset.cxx |3 ucb/source/ucp/file/filrset.hxx |1 ucb/source/ucp/ftp/ftpresultsetbase.cxx |3 ucb/source/ucp/ftp/ftpresultsetbase.hxx |1 ucbhelper/source/provider/resultsetmetadata.cxx |8 - unotools/source/config/moduleoptions.cxx | 27 uui/source/masterpasscrtdlg.cxx |3 uui/source/masterpasscrtdlg.hxx |1 vbahelper/source/vbahelper/vbafillformat.cxx |1 vbahelper/source/vbahelper/vbafillformat.hxx |1 vcl/source/gdi/pdfwriter_impl.cxx|3 vcl/source/window/btndlg.cxx |2 xmloff/source/text/XMLTextMasterPageContext.cxx | 12 - 54 files changed, 142 insertions(+), 265 deletions(-) New commits: commit 48a8d6d8434908690bc2a51d27f1051bd550c9b0 Author: Noel Grandin Date: Mon Jun 27 15:08:50 2016 +0200 loplugin:singlevalfields in various Change-Id: Ia0d8f463a4dba9ec63aa0159441e3e607dd3bf5e Reviewed-on: https://gerrit.libreoffice.org/26738 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/singlevalfields.cxx b/compilerplugins/clang/singlevalfields.cxx index 04d1046..534ed6e 100644 --- a/compilerplugins/clang/singlevalfields.cxx +++ b/compilerplugins/clang/singlevalfields.cxx @@ -31,7 +31,8 @@ The process goes something like this: Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around to get it to work :-) -@TODO we don't spot fields that have been zero-initialised via calloc or rtl_allocateZeroMemory +@TODO we don't spot fields that have been zero-initialised via calloc or rtl_allocateZeroMemory or memset +@TODO calls to lambdas (see FIXME near CXXOperatorCallExpr) */ @@ -96,12 +97,15 @@ public: bool VisitFieldDecl( const FieldDecl* ); bool VisitMemberExpr( const MemberExpr* ); bool VisitCXXConstructorDecl( const CXXConstructorDecl* ); +bool VisitImplicitCastExpr( const ImplicitCastExpr* ); +//bool VisitUnaryExprOrTypeTraitExpr( const UnaryExprOrType
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - reportdesign/source
reportdesign/source/ui/dlg/CondFormat.cxx |5 -
reportdesign/source/ui/dlg/Condition.cxx |1 +
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 7cb1840b41fcb1cf0ec60a0ceecfd1cbf6e44ae7
Author: Caolán McNamara
Date: Wed Jun 22 12:22:20 2016 +0100
Resolves: tdf#100303 Report crashes on close of conditional formatting
dialog
Condition multiply inherits so the Builder::disposeBuilder call was missed
and prenotify occurs during ::dispose when there is no
m_pConditionPlayground
anymore, so m_pConditionPlayground == 0 where pPlaygroundCandidate is 0
passes, so a random widget gets cast to somethings its not, hence the bad
cast exception
Change-Id: I6d081dd55df1a68ab893294858e1ab0054d5e049
(cherry picked from commit 547e4b3a80708600edbc3f5669b4428877b5a951)
Reviewed-on: https://gerrit.libreoffice.org/26569
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx
b/reportdesign/source/ui/dlg/CondFormat.cxx
index 175a740..8351806 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -500,7 +500,10 @@ namespace rptui
}
case MouseNotifyEvent::GETFOCUS:
{
-if ( m_bDeletingCondition )
+if (m_bDeletingCondition)
+break;
+
+if (!m_pConditionPlayground) //e.g. during dispose
break;
const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() );
diff --git a/reportdesign/source/ui/dlg/Condition.cxx
b/reportdesign/source/ui/dlg/Condition.cxx
index d5477f1..43c8b7b 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -329,6 +329,7 @@ void Condition::dispose()
m_pAddCondition.clear();
m_pRemoveCondition.clear();
m_pColorFloat.disposeAndClear();
+disposeBuilder();
VclHBox::dispose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source svtools/source
sd/source/ui/view/drviews2.cxx |6 +++---
svtools/source/graphic/grfcache.cxx |8
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit f7d6f3e4e3fda3cd4936880918e2831246634a3e
Author: Miklos Vajna
Date: Tue Jun 28 11:15:19 2016 +0200
svtools: survive swapout/in of graphic with embedded pdf
Use case is to insert a pdf file in Impress, then choose Save from the
context menu of the image. On one hand, for some reason only bitmap
images can be saved, so add an exception for the graphic-with-pdf case.
SVG is not affected, as it counts as bitmap with its PNG replacement
image, it seems.
On the other hand, copying the GraphicObject around triggers
swapout/swapin of the graphic, and there the original pdf data was lost,
fix that.
Change-Id: I8b4b67cd951e39b0250a101766f487ddb1088cab
Reviewed-on: https://gerrit.libreoffice.org/26739
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index b603583..bec691d 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -926,10 +926,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 )
{
-SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
-if( pObj && dynamic_cast< const SdrGrafObj *>( pObj ) !=
nullptr && static_cast(pObj)->GetGraphicType() ==
GraphicType::Bitmap )
+const SdrGrafObj* pObj = dynamic_cast(rMarkList.GetMark(0)->GetMarkedSdrObj());
+if (pObj && (pObj->GetGraphicType() == GraphicType::Bitmap ||
pObj->GetGraphicObject().GetGraphic().getPdfData().hasElements()))
{
-GraphicObject aGraphicObject( static_cast(
pObj )->GetGraphicObject() );
+GraphicObject aGraphicObject(pObj->GetGraphicObject());
{
GraphicHelper::ExportGraphic(
aGraphicObject.GetGraphic(), "" );
}
diff --git a/svtools/source/graphic/grfcache.cxx
b/svtools/source/graphic/grfcache.cxx
index fa3f9bf..43f4d07 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -34,6 +34,8 @@
#define MAX_BMP_EXTENT 4096
+using namespace com::sun::star;
+
static const char aHexData[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
'9', 'A', 'B', 'C', 'D', 'E', 'F' };
class GraphicID
@@ -155,6 +157,7 @@ private:
// SvgData support
SvgDataPtr maSvgData;
+uno::Sequence maPdfData;
boolImplInit( const GraphicObject& rObj );
voidImplFillSubstitute( Graphic& rSubstitute );
@@ -247,6 +250,8 @@ bool GraphicCacheEntry::ImplInit( const GraphicObject& rObj
)
case GraphicType::GdiMetafile:
{
mpMtf = new GDIMetaFile( rGraphic.GetGDIMetaFile() );
+if (rGraphic.getPdfData().hasElements())
+maPdfData = rGraphic.getPdfData();
}
break;
@@ -293,6 +298,8 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic&
rSubstitute )
else if( mpMtf )
{
rSubstitute = *mpMtf;
+if (maPdfData.hasElements())
+rSubstitute.setPdfData(maPdfData);
}
else
{
@@ -379,6 +386,7 @@ void GraphicCacheEntry::GraphicObjectWasSwappedOut( const
GraphicObject& /*rObj*
// #119176# also reset SvgData
maSvgData.reset();
+maPdfData = uno::Sequence();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/generic/fract.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit b5dfe9b95fa0f995542c151d8e1b79a03e91c626
Author: Tor Lillqvist
Date: Tue Jun 28 13:40:25 2016 +0300
Drop overflow warning that was produced repeatedly on Windows
I see hundreds of the "'operator *=' detected overflow" warnings on
Windows doing perfectly normal things. The call site for those
explicitly checks anyway for an invalid (overflowed) result.
(Sure, there might be other call sites where the warning possibly had
some degree of usefulness because an overflowed result is not checked
for. I am willing to take the risk.)
Change-Id: Ie88ad11d159ee7aa505c22633a7e2cda1246ff31
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 12530c7..78069a5 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -182,7 +182,6 @@ Fraction& Fraction::operator *= ( const Fraction& rVal )
if ( HasOverflowValue() )
{
mpImpl->valid = false;
-SAL_WARN( "tools.fraction", "'operator *=' detected overflow" );
}
return *this;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Quick update about crash reporting and some open issues
Le 28/06/2016 à 11:55, Markus Mohrhard a écrit : > Hey, > > > > No, it is not supported on OSX and at least from my side there are no > plans to fix that any time soon. > OK, thanks, just wanted to check :-) Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source
include/svx/svdmodel.hxx |2 +-
sc/source/ui/inc/viewdata.hxx|3 +--
sc/source/ui/view/prevwsh.cxx|2 +-
sc/source/ui/view/viewdata.cxx |8
sd/source/ui/view/drviews5.cxx |2 +-
svx/source/svdraw/svdmodel.cxx |2 +-
sw/source/uibase/uiview/view.cxx |2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit c7b9b9204ce2b3c1e0dbc0d79e4e01d27ad2ac7e
Author: Stephan Bergmann
Date: Tue Jun 28 11:56:40 2016 +0200
loplugin:staticmethods
Change-Id: I6e5a1c33eeb5eb139f12d4a9d696c53ad65a3af7
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index e8de6d0..1c8f3cf 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -551,7 +551,7 @@ public:
bool IsWriter() const { return !bMyPool; }
// Used as a fallback in *::ReadUserDataSequence() to process common
properties
-static void ReadUserDataSequenceValue(const css::beans::PropertyValue
*pValue);
+void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue);
static void WriteUserDataSequence(css::uno::Sequence <
css::beans::PropertyValue >& rValues, bool bBrowse = false);
/** returns the numbering type that is used to format page fields in
drawing shapes */
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 6657e83..789bdf2 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -144,8 +144,7 @@ private:
ScViewDataTable();
voidWriteUserDataSequence(
-css::uno::Sequence &
rSettings,
-const ScViewData& rViewData, SCTAB nTab ) const;
+css::uno::Sequence &
rSettings ) const;
voidReadUserDataSequence(
const css::uno::Sequence &
rSettings,
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index b363f7c6..10af8bb 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -949,7 +949,7 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence <
beans::PropertyValue
}
// Common SdrModel processing
-GetDocument().GetDrawLayer()->WriteUserDataSequence(rSeq);
+SdrModel::WriteUserDataSequence(rSeq);
}
void ScPreviewShell::ReadUserDataSequence(const uno::Sequence <
beans::PropertyValue >& rSeq)
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index d188643..37234a8 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -112,7 +112,7 @@ ScViewDataTable::~ScViewDataTable()
{
}
-void ScViewDataTable::WriteUserDataSequence(uno::Sequence
& rSettings, const ScViewData& rViewData, SCTAB /*nTab*/)
const
+void ScViewDataTable::WriteUserDataSequence(uno::Sequence
& rSettings) const
{
rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT);
beans::PropertyValue* pSettings = rSettings.getArray();
@@ -161,7 +161,7 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence
}
// Common SdrModel processing
-rViewData.GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings);
+SdrModel::WriteUserDataSequence(rSettings);
}
void ScViewDataTable::ReadUserDataSequence(const uno::Sequence
& aSettings, ScViewData& rViewData, SCTAB nTab, bool&
rHasZoom )
@@ -2655,7 +2655,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence
& rSe
if (maTabData[nTab])
{
uno::Sequence aTableViewSettings;
-maTabData[nTab]->WriteUserDataSequence(aTableViewSettings,
*this, nTab);
+maTabData[nTab]->WriteUserDataSequence(aTableViewSettings);
OUString sTabName;
GetDocument()->GetName( nTab, sTabName );
try
@@ -2735,7 +2735,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence
& rSe
}
// Common SdrModel processing
-GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings);
+SdrModel::WriteUserDataSequence(rSettings);
}
void ScViewData::ReadUserDataSequence(const uno::Sequence
& rSettings)
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index b4e3319..3aeb12c 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -454,7 +454,7 @@ void DrawViewShell::WriteUserDataSequence (
css::uno::Sequence < css::beans::Pro
rSequence[nIndex].Value <<= mbZoomOnPage;
// Common SdrModel processing
-GetDocSh()->GetDoc()->WriteUserDataSequence(rSequence, bBrowse);
+SdrModel::WriteUserDataSequence(rSequence, bBrowse);
}
void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& rSequence, bool bBrowse )
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bc0af3a..0b051f6 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1927,7 +1927,7 @@ SvxNum
Re: Quick update about crash reporting and some open issues
Hey, On Tue, Jun 28, 2016 at 11:42 AM, Alexander Thurgood < alex.thurg...@gmail.com> wrote: > Le 27/06/2016 à 06:00, Markus Mohrhard a écrit : > > Hi Markus, > > > so here is a quick update about the crash reporting and a few questions > > about open issues. It would be good if people who are going to use the > > service to have a quick look through the items and tell me their opinion > > about the open items. > > > > > Does this also work on OSX and if so, is it activated automatically, or > is there an option to tick in th UI to do so ? > > No, it is not supported on OSX and at least from my side there are no plans to fix that any time soon. Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Quick update about crash reporting and some open issues
Le 27/06/2016 à 06:00, Markus Mohrhard a écrit : Hi Markus, > so here is a quick update about the crash reporting and a few questions > about open issues. It would be good if people who are going to use the > service to have a quick look through the items and tell me their opinion > about the open items. > Does this also work on OSX and if so, is it activated automatically, or is there an option to tick in th UI to do so ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit 287daa660571fc2fac583c33eb3e48b637d651f3 Author: László Németh Date: Tue Jun 28 11:40:06 2016 +0200 empty commit (repeat) Change-Id: Idf1d5186d4a6ff7bd6a12aad21a3f50b7680d39c commit 68809a2338b00940f925070c1f1c69b6ac6f8b49 Author: László Németh Date: Tue Jun 28 11:39:58 2016 +0200 empty commit (repeat) Change-Id: I313a20a1210319c48f986b6ccc0cefd5a13c520e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 42af233e5130a711466e72516e82457f6e1c741b Author: László Németh Date: Tue Jun 28 11:37:19 2016 +0200 empty commit (process idle window) Change-Id: I90cb062d7441cf33e00e9cbd9bd9ae30ae27c7dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/SlideTransitionBox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09353c627822d61fbffd6038224d0da72f768710 Author: Stephan Bergmann Date: Tue Jun 28 11:36:45 2016 +0200 loplugin:override Change-Id: I5307c3ca3ebef72a08055e9389bc53e760d4178c diff --git a/sd/source/ui/animations/SlideTransitionBox.cxx b/sd/source/ui/animations/SlideTransitionBox.cxx index 29c3d4f..7a70010 100644 --- a/sd/source/ui/animations/SlideTransitionBox.cxx +++ b/sd/source/ui/animations/SlideTransitionBox.cxx @@ -34,7 +34,7 @@ class SlideTransitionBox : public VclVBox public: SlideTransitionBox(vcl::Window* pParent); -~SlideTransitionBox(); +~SlideTransitionBox() override; virtual void dispose() override; virtual void StateChanged(StateChangedType nStateChange) override; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/frame/status/LeftRightMarginScale.idl | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 16452737613c9f1b6d8dff7e0b2726460543df21 Author: Szymon KÅos Date: Tue Jun 28 10:56:01 2016 +0200 LeftRightMarginScale: updated comments Change-Id: I1b35845ee273723b617334daa39854079a8e6992 diff --git a/offapi/com/sun/star/frame/status/LeftRightMarginScale.idl b/offapi/com/sun/star/frame/status/LeftRightMarginScale.idl index b5f66e2..ab37568 100644 --- a/offapi/com/sun/star/frame/status/LeftRightMarginScale.idl +++ b/offapi/com/sun/star/frame/status/LeftRightMarginScale.idl @@ -45,24 +45,24 @@ struct LeftRightMarginScale long Right; - /** specifies a first line indent relative to TextLeft. + /** specifies a first line indent relative to TextLeft in 1/100th mm. */ long FirstLine; -/** specifies a scale value for the left margin. +/** specifies a scale value for the left margin in percent. */ -short ScaleLeft; +long ScaleLeft; -/** specifies a scale value for the right margin. +/** specifies a scale value for the right margin in percent. */ -short ScaleRight; +long ScaleRight; -/** specifies a scale value for the first line margin. +/** specifies a scale value for the first line margin in percent. */ -short ScaleFirstLine; +long ScaleFirstLine; /** specifies if the automatic calculation of the first line indent occurs. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC Week 5 Report
Hello, Last week, I completed most of the remaining tasks for my GSoC project and send a few more unrelated patches. This week, I'm going to work with my mentor, Samuel Mehrbrodt, on emoji toolbar control in LibreOffice using Unicode character sequences. https://bugs.documentfoundation.org/show_bug.cgi?id=100100 Regards, Akshay ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx
include/svx/svdmodel.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7e49e303f800d1508643daa5a00e7f1603e6b73b
Author: Noel Grandin
Date: Tue Jun 28 10:44:11 2016 +0200
loplugin:staticmethods
Change-Id: I597015df5c12040b1b2a108bcfbe2831fee6ec23
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index fa24d55..e8de6d0 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -551,8 +551,8 @@ public:
bool IsWriter() const { return !bMyPool; }
// Used as a fallback in *::ReadUserDataSequence() to process common
properties
-void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue);
-void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue
>& rValues, bool bBrowse = false);
+static void ReadUserDataSequenceValue(const css::beans::PropertyValue
*pValue);
+static void WriteUserDataSequence(css::uno::Sequence <
css::beans::PropertyValue >& rValues, bool bBrowse = false);
/** returns the numbering type that is used to format page fields in
drawing shapes */
virtual SvxNumType GetPageNumType() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/nativealpha' - vcl/source
vcl/source/bitmap/BitmapProcessor.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 06fbf1c42be1e58abe9e705f72e0716e4d20c192 Author: Tomaž Vajngerl Date: Tue Jun 28 16:39:57 2016 +0800 BitmapProcessor: support 32-bit bitmap in createLightImage Change-Id: If28c715f9737f34b9d71c1342cae88fcc69231dd diff --git a/vcl/source/bitmap/BitmapProcessor.cxx b/vcl/source/bitmap/BitmapProcessor.cxx index ea32705..0b27a05 100644 --- a/vcl/source/bitmap/BitmapProcessor.cxx +++ b/vcl/source/bitmap/BitmapProcessor.cxx @@ -17,7 +17,9 @@ BitmapEx BitmapProcessor::createLightImage(const BitmapEx& rBitmapEx) const Size aSize(rBitmapEx.GetSizePixel()); Bitmap aBitmap(rBitmapEx.GetBitmap()); -Bitmap aDarkBitmap(aSize, 24); +int nBitcount = aBitmap.GetBitCount() == 32 ? 32 : 24; + +Bitmap aDarkBitmap(aSize, nBitcount); BitmapReadAccess* pRead(aBitmap.AcquireReadAccess()); BitmapWriteAccess* pWrite(aDarkBitmap.AcquireWriteAccess()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source sw/source
svx/source/src/errtxt.src |2 +-
sw/source/ui/app/error.src |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5263b653b360e140c94eefe6d1f758aacc07ca78
Author: Tor Lillqvist
Date: Tue Jun 28 11:41:38 2016 +0300
Drop the dash from "Read-Error"
Change-Id: I12c058bbb01df9c2aad794b5d500ab7ed0502d81
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
index addbe5e..ab00f1b 100644
--- a/svx/source/src/errtxt.src
+++ b/svx/source/src/errtxt.src
@@ -124,7 +124,7 @@ Resource RID_ERRHDL
};
String ERRCODE_CLASS_READ
{
-Text [ en-US ] = "Read-Error" ;
+Text [ en-US ] = "Read Error" ;
};
String ERRCODE_CLASS_WRITE
{
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index cc5266d..67e4e8d 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -26,7 +26,7 @@
String STR_COMCORE_READERROR
{
-Text [ en-US ] = "Read-Error" ;
+Text [ en-US ] = "Read Error" ;
};
String STR_COMCORE_CANT_SHOW
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/dlg_CreationWizard.cxx |4 --
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |8
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |7 +--
chart2/source/controller/inc/ChartController.hxx|1
chart2/source/controller/inc/ObjectHierarchy.hxx|1
chart2/source/controller/inc/dlg_CreationWizard.hxx |4 --
chart2/source/controller/inc/dlg_ObjectProperties.hxx |1
chart2/source/controller/main/ChartController.cxx | 17 +
chart2/source/controller/main/ObjectHierarchy.cxx | 19 --
chart2/source/view/axes/VAxisProperties.cxx |1
chart2/source/view/axes/VAxisProperties.hxx |1
chart2/source/view/axes/VCartesianAxis.cxx | 22
chart2/source/view/charttypes/BubbleChart.cxx |8 +---
chart2/source/view/charttypes/BubbleChart.hxx |1
chart2/source/view/inc/3DChartObjects.hxx |1
chart2/source/view/main/3DChartObjects.cxx |3 -
16 files changed, 18 insertions(+), 81 deletions(-)
New commits:
commit 0f17e343306fd457c542067c09242ddd04ca39e9
Author: Noel Grandin
Date: Mon Jun 27 15:10:26 2016 +0200
loplugin:singlevalfields in chart2
Change-Id: I8b8bf093736a191c90d765dce82b00e15bb398d6
Reviewed-on: https://gerrit.libreoffice.org/26708
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 9098048..cbf741b 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -52,9 +52,7 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const
uno::Reference< fram
)
, m_xChartModel(xChartModel,uno::UNO_QUERY)
, m_xCC( xContext )
-, m_bIsClosable(true)
, m_pTemplateProvider(nullptr)
-, m_nFirstState(STATE_FIRST)
, m_nLastState(STATE_LAST)
, m_aTimerTriggeredControllerLock( xChartModel )
, m_bCanTravel( true )
@@ -150,7 +148,7 @@ svt::WizardTypes::WizardState
CreationWizard::determineNextState( WizardState nC
void CreationWizard::enterState(WizardState nState)
{
m_aTimerTriggeredControllerLock.startTimer();
-enableButtons( WizardButtonFlags::PREVIOUS, bool( nState > m_nFirstState )
);
+enableButtons( WizardButtonFlags::PREVIOUS, bool( nState > STATE_FIRST ) );
enableButtons( WizardButtonFlags::NEXT, bool( nState < m_nLastState ) );
if( isStateEnabled( nState ))
svt::RoadmapWizard::enterState(nState);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 807fe68..0795c31 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -161,14 +161,6 @@ uno::Sequence< sal_Int8 > SAL_CALL
CreationWizardUnoDlg::getImplementationId() t
// XTerminateListener
void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject&
/*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException,
std::exception)
{
-SolarMutexGuard aSolarGuard;
-
-// we will never give a veto here
-if( m_pDialog && !m_pDialog->isClosable() )
-{
-m_pDialog->ToTop();
-throw frame::TerminationVetoException();
-}
}
void SAL_CALL CreationWizardUnoDlg::notifyTermination( const
lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception)
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 40ee6a2..8974352 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -327,7 +327,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
: SfxTabDialog(pParent, "AttributeDialog",
"modules/schart/ui/attributedialog.ui", pAttr)
, eObjectType(pDialogParameter->getObjectType())
, nDlgType(nNoArrowNoShadowDlg)
-, nPageType(0)
, m_pParameter( pDialogParameter )
, m_pViewElementListProvider( pViewElementListProvider )
, m_pNumberFormatter(nullptr)
@@ -504,7 +503,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId,
SfxTabPage &rPage)
aSet.Put
(SvxColorListItem(m_pViewElementListProvider->GetColorTable(),SID_COLOR_TABLE));
aSet.Put
(SvxDashListItem(m_pViewElementListProvider->GetDashList(),SID_DASH_LIST));
aSet.Put
(SvxLineEndListItem(m_pViewElementListProvider->GetLineEndList(),SID_LINEEND_LIST));
-aSet.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
+
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdmodel.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit db11f792018f6905733323a4979c6a5e697807ca
Author: Stephan Bergmann
Date: Tue Jun 28 10:24:54 2016 +0200
loplugin:unreffun
Change-Id: I7a5a00e3a85cf0705d5e4e2fca2184e991f56b7a
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index f537e07..bc0af3a 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1930,12 +1930,6 @@ void SdrModel::ReadUserDataSequenceValue(const
css::beans::PropertyValue* /*pVal
// TODO: Read common model-level values
}
-template
-inline void addPair(std::vector< std::pair< OUString, Any > >& aUserData,
const OUString& name, const T val)
-{
-aUserData.push_back(std::pair< OUString, Any >(name,
css::uno::makeAny(val)));
-}
-
void SdrModel::WriteUserDataSequence(css::uno::Sequence <
css::beans::PropertyValue >& rValues, bool /*bBrowse*/)
{
std::vector< std::pair< OUString, Any > > aUserData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa svx/source
sd/qa/unit/data/odp/embedded-pdf.odp |binary
sd/qa/unit/export-tests.cxx | 14 ++
svx/source/svdraw/svdograf.cxx |3 +++
3 files changed, 17 insertions(+)
New commits:
commit 1632d6380cb905c3d3c022079e703abf7ce14f5e
Author: Miklos Vajna
Date: Tue Jun 28 09:08:51 2016 +0200
ODP export: add embedded pdf support
This is basically the draw shape equivalent of
SwGrfNode::GetReplacementGrfObj(), that already had explicit code for
PDF purposes.
Change-Id: I00a619082f59a3e377d45c3a59615cadae295586
Reviewed-on: https://gerrit.libreoffice.org/26724
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sd/qa/unit/data/odp/embedded-pdf.odp
b/sd/qa/unit/data/odp/embedded-pdf.odp
new file mode 100644
index 000..87aec5a
Binary files /dev/null and b/sd/qa/unit/data/odp/embedded-pdf.odp differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 0dd47e5..a2c3be2 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -157,6 +157,7 @@ public:
void testTdf80224();
void testTdf92527();
void testTdf99224();
+void testEmbeddedPdf();
CPPUNIT_TEST_SUITE(SdExportTest);
CPPUNIT_TEST(testFdo90607);
@@ -212,6 +213,7 @@ public:
CPPUNIT_TEST(testExtFileField);
CPPUNIT_TEST(testAuthorField);
CPPUNIT_TEST(testTdf99224);
+CPPUNIT_TEST(testEmbeddedPdf);
CPPUNIT_TEST_SUITE_END();
@@ -1722,6 +1724,18 @@ void SdExportTest::testTdf99224()
xShell->DoClose();
}
+void SdExportTest::testEmbeddedPdf()
+{
+sd::DrawDocShellRef xShell =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/embedded-pdf.odp"),
ODP);
+xShell = saveAndReload(xShell, ODP);
+uno::Reference xPage = getPage(0, xShell);
+uno::Reference xShape(xPage->getByIndex(0),
uno::UNO_QUERY);
+OUString aReplacementGraphicURL;
+xShape->getPropertyValue("ReplacementGraphicURL") >>=
aReplacementGraphicURL;
+CPPUNIT_ASSERT(!aReplacementGraphicURL.isEmpty());
+xShell->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 93a662b..2dc6371 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -443,6 +443,9 @@ const GraphicObject*
SdrGrafObj::GetReplacementGraphicObject() const
{
const_cast< SdrGrafObj* >(this)->mpReplacementGraphic = new
GraphicObject(rSvgDataPtr->getReplacement());
}
+else if (pGraphic->GetGraphic().getPdfData().hasElements())
+// Replacement graphic for metafile + PDF is just the metafile.
+const_cast(this)->mpReplacementGraphic = new
GraphicObject(pGraphic->GetGraphic().GetGDIMetaFile());
}
return mpReplacementGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/objsh.hxx |2 +-
sfx2/source/doc/objstor.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 979c4a4140d6b86a4219b3daf1c3fbd9f8730459
Author: Stephan Bergmann
Date: Tue Jun 28 10:20:14 2016 +0200
loplugin:staticmethods
Change-Id: I3f94a493822b8f6f83473578cd133a54ecc6be30
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 1047542..76ce626 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -626,7 +626,7 @@ public:
SAL_DLLPRIVATE std::shared_ptr CreatePreviewMetaFile_Impl(
bool bFullContent ) const;
-bool IsOwnStorageFormat(const SfxMedium &) const;
+static bool IsOwnStorageFormat(const SfxMedium &);
SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 894900e..9b25e14 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -972,7 +972,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium*
pMedium, SfxObjectShell* pDo
}
-bool SfxObjectShell::IsOwnStorageFormat(const SfxMedium &rMedium) const
+bool SfxObjectShell::IsOwnStorageFormat(const SfxMedium &rMedium)
{
return !rMedium.GetFilter() || // Embedded
( rMedium.GetFilter()->IsOwnFormat() &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/syswin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ff177bf17d547b0c116a9ca486af3d4724056f3e
Author: Stephan Bergmann
Date: Tue Jun 28 10:13:17 2016 +0200
loplugin:stringconstant
Change-Id: I590e5f6e6752902caf3da0d5d1924d59b10c421c
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index ca0f47f..54f40ac 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -942,7 +942,7 @@ void SystemWindow::SetNotebookBar(const OUString&
rUIXMLDescription, const css::
void SystemWindow::CloseNotebookBar()
{
static_cast(mpWindowImpl->mpBorderWindow.get())->CloseNotebookBar();
-maNotebookBarUIFile = "";
+maNotebookBarUIFile.clear();
}
VclPtr SystemWindow::GetNotebookBar() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian
loolwsd/debian/control |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f18532d16c01cc1e7f7c65a3aae5df110db77f69
Author: Andras Timar
Date: Tue Jun 28 10:10:23 2016 +0200
loolwsd: remove libmysqlclient18 from deb package dependencies
(cherry picked from commit cdf14cea3e3765cb94896ba3efa1678a4d0d4f6c)
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 08b784c..ef91505 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.2
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0,
libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2,
libdbus-glib-1-2, cpio, collaboraoffice
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, libodbc1,
libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio,
collaboraoffice
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/debian
loolwsd/debian/control |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cdf14cea3e3765cb94896ba3efa1678a4d0d4f6c
Author: Andras Timar
Date: Tue Jun 28 10:10:23 2016 +0200
loolwsd: remove libmysqlclient18 from deb package dependencies
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 08b784c..ef91505 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.2
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0,
libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2,
libdbus-glib-1-2, cpio, collaboraoffice
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, libodbc1,
libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio,
collaboraoffice
Description: LibreOffice On-Line WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl sfx2/source vcl/source
include/vcl/builder.hxx|4 +-
include/vcl/notebookbar.hxx| 20 +++-
sfx2/source/notebookbar/SfxNotebookBar.cxx |4 +-
vcl/source/control/contexttabctrl.cxx |2 -
vcl/source/control/notebookbar.cxx | 46 +
5 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 4ae3f434ad3006285f1766c187f9e7a99edc170b
Author: Noel Grandin
Date: Tue Jun 28 10:02:06 2016 +0200
loplugin:refcounting on NotebookBar
extending two different ref-counted base classes is a no-no
Change-Id: Iabbf98c0cba73a1b1643b4275d15af7608b2e827
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 353d818..13ff420 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -351,8 +351,8 @@ private:
voidhandleChild(vcl::Window *pParent, xmlreader::XmlReader
&reader);
VclPtr handleObject(vcl::Window *pParent,
xmlreader::XmlReader &reader);
voidhandlePacking(vcl::Window *pCurrent, vcl::Window *pParent,
xmlreader::XmlReader &reader);
-std::vectorhandleStyle(xmlreader::XmlReader
&reader);
-vcl::EnumContext::ContextgetContext(xmlreader::XmlReader &reader);
+static std::vector
handleStyle(xmlreader::XmlReader &reader);
+static vcl::EnumContext::Context getContext(xmlreader::XmlReader &reader);
voidapplyPackingProperty(vcl::Window *pCurrent, vcl::Window
*pParent, xmlreader::XmlReader &reader);
voidcollectProperty(xmlreader::XmlReader &reader, const OString
&rID, stringmap &rVec);
static void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap
&rMap);
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 37fa7ee..128bf8f 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -13,13 +13,13 @@
#include
#include
#include
-#include
#include
+#include
/// This implements Widget Layout-based notebook-like menu bar.
-class NotebookBar : public Control, public VclBuilderContainer,
-public css::ui::XContextChangeEventListener
+class NotebookBar : public Control, public VclBuilderContainer
{
+friend class NotebookBarContextChangeEventListener;
public:
NotebookBar(Window* pParent, const OString& rID, const OUString&
rUIXMLDescription, const css::uno::Reference &rFrame);
virtual ~NotebookBar();
@@ -30,21 +30,13 @@ public:
virtual void StateChanged(StateChangedType nType) override;
-// XContextChangeEventListener
-virtual void SAL_CALL notifyContextChangeEvent(const
css::ui::ContextChangeEventObject& rEvent)
-throw (css::uno::RuntimeException, std::exception) override;
-
-virtual ::css::uno::Any SAL_CALL queryInterface(const ::css::uno::Type&
aType)
-throw (::css::uno::RuntimeException, ::std::exception) override;
-virtual void SAL_CALL acquire() throw () override;
-virtual void SAL_CALL release() throw () override;
-virtual void SAL_CALL disposing(const ::css::lang::EventObject&)
-throw (::css::uno::RuntimeException, ::std::exception) override;
-
+const css::uno::Reference&
getContextChangeEventListener() const { return m_pEventListener; }
private:
+css::uno::Reference m_pEventListener;
VclPtr m_pTabControl;
};
+
#endif // INCLUDED_VCL_NOTEBOOKBAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 8652df7..c68b486 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -73,7 +73,7 @@ void SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
if(xFrame.is() && xMultiplexer.is())
{
xMultiplexer->addContextChangeEventListener(
-pSysWindow->GetNotebookBar().get(),
+
pSysWindow->GetNotebookBar()->getContextChangeEventListener(),
xFrame->getController());
}
}
@@ -91,7 +91,7 @@ void SfxNotebookBar::RemoveListeners(SystemWindow* pSysWindow)
if (pSysWindow->GetNotebookBar() && xMultiplexer.is())
{
xMultiplexer->removeAllContextChangeEventListeners(
- pSysWindow->GetNotebookBar().get());
+
pSysWindow->GetNotebookBar()->getContextChangeEventListener());
}
}
diff --git a/vcl/source/control/contexttabctrl.cxx
b/vcl/source/control/contexttabctrl.cxx
index 29e43ad..5fa526a 100644
--- a/vcl/source/control/contexttabctrl.cxx
+++ b/vcl/source/control/contexttabctrl.cxx
@@ -39,7 +39,7 @@ void ContextTabControl::SetContext( vcl::EnumContext::Context
eContext )
TabPage* pPage = static_cast(GetChild(nChild));
if (pPage->HasContext(eContext) ||
pPage->HasContext(vcl::EnumContext::Context::Context_Any))
-
Re: Build failure while experimenting with LTO
On 06/28/2016 12:00 AM, Davide Italiano wrote: but the problem is still there :( BTW, I think this is related to clang because I'm able to reproduce without LTO: $ ./autogen.sh CC=~/work/llvm/build-release/bin/clang CXX=~/work/llvm/build-release/bin/clang++ --enable-dbgutil --without-java --without-help --without-myspell-dicts [build EPK] fonts_carlito [build EPK] fonts_dejavu [build EPK] fonts_gentium [build EPK] fonts_liberation [build EPK] fonts_liberation_narrow [build EPK] fonts_libertineg [build EPK] fonts_opensans [build EPK] fonts_ptserif [build EPK] fonts_sourcecode [build EPK] fonts_sourcesans [build UPK] a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz [build MOD] poppler /home/davide/lto_experiments/libreoffice/external/redland/ExternalPackage_raptor.mk:21: *** file /home/davide/lto_experiments/libreoffice/workdir/UnpackedTarball/raptor/src/.libs/libraptor2-lo.so.0.0.0 does not exist in the tarball. Stop. Did you "make clean" before trying without lto? What's the result of "make redland.clean && make redland", does it create that workdir/UnpackedTarball/raptor/src/.libs/libraptor2-lo.so.0.0.0? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source include/sfx2 include/vcl sd/Library_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk sfx2/source vcl/inc vcl/source
extras/source/glade/libreoffice-catalog.xml.in |3
include/sfx2/notebookbar/SfxNotebookBar.hxx|2
include/vcl/syswin.hxx |1
sd/Library_sd.mk |1
sd/UIConfig_simpress.mk|1
sd/source/ui/animations/SlideTransitionBox.cxx | 83
sd/source/ui/animations/SlideTransitionPane.cxx| 43 +-
sd/source/ui/animations/SlideTransitionPane.hxx| 146 ---
sd/source/ui/inc/SlideTransitionPane.hxx | 155 +++
sd/source/ui/view/ViewShellBase.cxx|4
sd/uiconfig/simpress/ui/notebookbar.ui | 34 +
sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui | 263 +
sfx2/source/notebookbar/SfxNotebookBar.cxx |7
vcl/inc/brdwin.hxx |1
vcl/source/window/brdwin.cxx |8
vcl/source/window/syswin.cxx |6
16 files changed, 603 insertions(+), 155 deletions(-)
New commits:
commit c4e0d6596da5ef2aa040b9974aac987c6a93bb6d
Author: Szymon KÅos
Date: Thu Jun 2 15:43:45 2016 +0200
notebookbar: added slide transition tab
- created VclVBox control which creates SlideTransitionPane
- SlideTransitionPane extended with second constructor
which loads ui in horizontal mode
- introduced CloseMethod for NotebookBar to kill widgets in right order
Change-Id: Ic3ba35cb7734aa744a4804c5b670fed7c1bec204
Reviewed-on: https://gerrit.libreoffice.org/25844
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 3b322ae..4dd4593 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -807,5 +807,8 @@
+
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 1b79c78..e68d3f1 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -21,6 +21,8 @@ namespace sfx2 {
class SFX2_DLLPUBLIC SfxNotebookBar
{
public:
+static void CloseMethod(SfxBindings& rBindings);
+
/// Function to be called from the sdi's ExecMethod.
static void ExecMethod(SfxBindings& rBindings);
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 4c525e7..3ea4dcb 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -242,6 +242,7 @@ public:
voidSetMenuBarMode( MenuBarMode nMode );
voidSetNotebookBar(const OUString& rUIXMLDescription, const
css::uno::Reference& rFrame);
+voidCloseNotebookBar();
VclPtr GetNotebookBar() const;
TaskPaneList* GetTaskPaneList();
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index ae04336..eab6571 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -180,6 +180,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/animations/CustomAnimationPane \
sd/source/ui/animations/STLPropertySet \
sd/source/ui/animations/SlideTransitionPane \
+ sd/source/ui/animations/SlideTransitionBox \
sd/source/ui/animations/motionpathtag \
sd/source/ui/annotations/annotationmanager \
sd/source/ui/annotations/annotationtag \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 0309c75..ef79c95 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -130,6 +130,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/sidebarslidebackground \
sd/uiconfig/simpress/ui/slidedesigndialog \
sd/uiconfig/simpress/ui/slidetransitionspanel \
+ sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal \
sd/uiconfig/simpress/ui/tabledesignpanel \
sd/uiconfig/simpress/ui/templatedialog \
))
diff --git a/sd/source/ui/animations/SlideTransitionBox.cxx
b/sd/source/ui/animations/SlideTransitionBox.cxx
new file mode 100644
index 000..29c3d4f
--- /dev/null
+++ b/sd/source/ui/animations/SlideTransitionBox.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
+ *
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/uibase/sidebar/PageFormatPanel.cxx | 34 ---
sw/source/uibase/sidebar/PageMarginUtils.hxx | 21
sw/uiconfig/swriter/ui/pageformatpanel.ui|1
3 files changed, 43 insertions(+), 13 deletions(-)
New commits:
commit be40d4e7102d79d1e3aac5771869585cd1545379
Author: Susobhan Ghosh
Date: Sat Jun 25 20:27:32 2016 +0530
tdf#83830: Add None as Margin Preset in Format Panel
Change-Id: I2ca37fc34bd71d18029f7e43f918143c14d9c85b
Reviewed-on: https://gerrit.libreoffice.org/26657
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 5bf359d..c61e304 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -244,24 +244,27 @@ IMPL_LINK_NOARG_TYPED(PageFormatPanel,
PaperModifyMarginHdl, ListBox&, void)
switch ( mpMarginSelectBox->GetSelectEntryPos() )
{
case 0:
-SetNarrow(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+SetNone(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
case 1:
-SetModerate(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+SetNarrow(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
case 2:
-SetNormal075(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+SetModerate(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
case 3:
-SetNormal100(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+SetNormal075(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
case 4:
-SetNormal125(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+SetNormal100(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
case 5:
-SetWide(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+SetNormal125(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
case 6:
+SetWide(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
+break;
+case 7:
SetMirrored(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored);
break;
default:
@@ -335,41 +338,46 @@ void PageFormatPanel::UpdateMarginBox()
mnPageBottomMargin = mpPageULMarginItem->GetLower();
bool bMirrored = (mpPageItem->GetPageUsage() == SVX_PAGE_MIRROR);
-if( IsNarrow(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
+if( IsNone(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
{
mpMarginSelectBox->SelectEntryPos(0);
mpMarginSelectBox->RemoveEntry(aCustomEntry);
}
-else if( IsModerate(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
+else if( IsNarrow(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
{
mpMarginSelectBox->SelectEntryPos(1);
mpMarginSelectBox->RemoveEntry(aCustomEntry);
}
-else if( IsNormal075(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
+else if( IsModerate(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
{
mpMarginSelectBox->SelectEntryPos(2);
mpMarginSelectBox->RemoveEntry(aCustomEntry);
}
-else if( IsNormal100(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
+else if( IsNormal075(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
{
mpMarginSelectBox->SelectEntryPos(3);
mpMarginSelectBox->RemoveEntry(aCustomEntry);
}
-else if( IsNormal125(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
+else if( IsNormal100(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
{
mpMarginSelectBox->SelectEntryPos(4);
mpMarginSelectBox->RemoveEntry(aCustomEntry);
}
-else if( IsWide(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored) )
+else if( IsNormal125(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin,
mnPageBottomMargin, bMirrored)
[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/qa sc/source
sc/qa/unit/screenshots/screenshots.cxx | 28
sc/source/ui/inc/protectiondlg.hxx |4 +++-
sc/source/ui/inc/sharedocdlg.hxx |2 +-
3 files changed, 32 insertions(+), 2 deletions(-)
New commits:
commit 6f2ac328f72479eba5c715071d6efc33fdb6889f
Author: Katarina Behrens
Date: Mon Jun 27 23:11:34 2016 +0200
Open more sc modal dialogs, part 2
Change-Id: Ia5a1bbc00acff10405aa5205b9fd5a930deb5fc9
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 9af18fe..4937474 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -27,13 +27,17 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
#include
+#include
#include
#include
+#include
using namespace css;
@@ -201,6 +205,30 @@ void ScScreenshotTest::testOpeningSomeDialog()
CPPUNIT_ASSERT( pDlg12 != nullptr );
pDlg12->Execute();
+
+const OUString aCsv("some, strings, here, separated, by, commas");
+ScImportStringStream aStream( aCsv );
+std::unique_ptr pDlg13(
pFact->CreateScImportAsciiDlg(
+ OUString(), &aStream, SC_PASTETEXT ));
+CPPUNIT_ASSERT( pDlg13 != nullptr );
+
+pDlg13->Execute();
+
+ScopedVclPtrInstance pDlg14(
pViewShell->GetDialogParent(), &rViewData );
+CPPUNIT_ASSERT( pDlg14 != nullptr );
+
+pDlg14->Execute();
+
+std::unique_ptr pDlg15(
pFact->CreateScMoveTableDlg(
+ pViewShell->GetDialogParent(), aDefaultSheetName));
+CPPUNIT_ASSERT( pDlg15 != nullptr );
+
+pDlg15->Execute();
+
+ScopedVclPtrInstance
pDlg16(pViewShell->GetDialogParent());
+CPPUNIT_ASSERT( pDlg16 != nullptr );
+
+pDlg16->Execute();
}
#endif
diff --git a/sc/source/ui/inc/protectiondlg.hxx
b/sc/source/ui/inc/protectiondlg.hxx
index 6833117b..b2c1a47 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -27,6 +27,8 @@
#include
#include
+#include "scdllapi.h"
+
namespace vcl { class Window; }
class ScTableProtection;
@@ -34,7 +36,7 @@ class ScTableProtectionDlg : public ModalDialog
{
public:
ScTableProtectionDlg() = delete;
-explicit ScTableProtectionDlg(vcl::Window* pParent);
+explicit SC_DLLPUBLIC ScTableProtectionDlg(vcl::Window* pParent);
virtual ~ScTableProtectionDlg();
virtual void dispose() override;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 01a195a..838f3ac 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -47,7 +47,7 @@ private:
DECL_LINK_TYPED( ToggleHandle, CheckBox&, void );
public:
-ScShareDocumentDlg( vcl::Window* pParent, ScViewData*
pViewData );
+ SC_DLLPUBLIC ScShareDocumentDlg( vcl::Window* pParent, ScViewData*
pViewData );
virtual ~ScShareDocumentDlg();
virtual voiddispose() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: [API CHANGE] notebookbar: paragraph spacing controls
On 06/27/2016 07:04 PM, Szymon Kłos wrote: Dnia 2016-06-27, pon o godzinie 15:00 +0200, Stephan Bergmann pisze: On 06/27/2016 02:47 PM, Szymon Kłos wrote: + */ +long FirstLine; + + +/** specifies a scale value for the left margin. as a percentage value? why have both fixed values and scaling for these margins? also, I wouldn't bother with 'short' and just use 'long' for all these values Yes, as a percentage value. SvxLRSpaceItem stores both fixed values and scaling so I added this fields too. Looks a bit odd to me, but I'm anything but a domain expert here, so don't have any idea whether that's good or bad design. Just remember that the entities in the API should make sense from a client's perspective, not necessarily reflect whatever existing implementation design. Should I change these short types to long and add missing metrics to the description? That's what I'd do, yes. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 20 +++-
1 file changed, 3 insertions(+), 17 deletions(-)
New commits:
commit 0f9666134e58d5b03189636335b3a1f407b968b5
Author: Justin Luth
Date: Mon Jun 27 17:03:26 2016 +0300
remove stylename dependency on testunit n750255
The bugtest was to check whether a column break pushed text to
pages 2 and 3, not to check the name of the style.
Better to do a simple layout test in this case.
Change-Id: I97fd6bfdb382d0acda20f6f7aae7068db3394a53
Reviewed-on: https://gerrit.libreoffice.org/26718
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cdac7d0..4a50eac 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -432,24 +432,10 @@ DECLARE_OOXMLIMPORT_TEST(testN750255, "n750255.docx")
/*
Column break without columns on the page is a page break, so check those
paragraphs
-are on page 2 (page style 'Converted1') and page 3 (page style 'Converted2')
-enum = ThisComponent.Text.createEnumeration
-enum.nextElement
-para1 = enum.nextElement
-xray para1.String
-xray para1.PageStyleName
-para2 = enum.nextElement
-xray para2.String
-xray para2.PageStyleName
+are on page 2 and page 3
*/
-// get the 2nd and 3rd paragraph
-uno::Reference paragraph1(getParagraph( 2, "one" ));
-uno::Reference paragraph2(getParagraph( 3, "two" ));
-OUString pageStyle1 = getProperty< OUString >( paragraph1, "PageStyleName"
);
-OUString pageStyle2 = getProperty< OUString >( paragraph2, "PageStyleName"
);
-CPPUNIT_ASSERT_EQUAL( OUString( "Converted1" ), pageStyle1 );
-CPPUNIT_ASSERT_EQUAL( OUString( "Converted2" ), pageStyle2 );
-
+CPPUNIT_ASSERT_EQUAL( OUString("one"),
parseDump("/root/page[2]/body/txt/text()") );
+CPPUNIT_ASSERT_EQUAL( OUString("two"),
parseDump("/root/page[3]/body/txt/text()") );
}
DECLARE_OOXMLIMPORT_TEST(testN652364, "n652364.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/stringconstant.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 1a6f599e9883eb2c2f51788ebc1de3465e0c31cd
Author: Stephan Bergmann
Date: Tue Jun 28 09:06:46 2016 +0200
loplugin:stringconstant: Don't warn about "OUString(OSL_THIS_FUNC)"
Change-Id: Id5f021bd798cb94b7246faed539304dae04b4700
diff --git a/compilerplugins/clang/stringconstant.cxx
b/compilerplugins/clang/stringconstant.cxx
index c68d58f..3b16d82 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -775,6 +775,21 @@ bool
StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
return true;
}
}
+auto loc = expr->getArg(0)->getLocStart();
+while (compiler.getSourceManager()
+ .isMacroArgExpansion(loc))
+{
+loc = compiler.getSourceManager()
+.getImmediateMacroCallerLoc(loc);
+}
+if (compat::isMacroBodyExpansion(compiler, loc)
+&& (Lexer::getImmediateMacroName(
+loc, compiler.getSourceManager(),
+compiler.getLangOpts())
+== "OSL_THIS_FUNC"))
+{
+return true;
+}
report(
DiagnosticsEngine::Warning,
("elide construction of " + qname + " with
"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source
include/svx/svdmodel.hxx |4
sc/source/ui/view/prevwsh.cxx|7 ++-
sc/source/ui/view/viewdata.cxx | 13 -
sd/source/ui/view/drviews5.cxx |5 +
svx/source/svdraw/svdmodel.cxx | 29 +
sw/source/uibase/uiview/view.cxx |5 +
6 files changed, 61 insertions(+), 2 deletions(-)
New commits:
commit 3f9acf02b0a45deb258c96b638c6fddd9af31ff9
Author: Mike Kaganski
Date: Tue Jun 28 00:30:29 2016 +1000
tdf#99729 prerequisite: model-level user data r/w
This commit introduces a system for reading/writing common
model-level user data (like compatibility flags from settings.xml).
It is designed to reduce code duplication in cases where an option
is applicable to any type of document.
Change-Id: Id4e31df14f49cbb673f4a6df943ccec6d98eb9aa
Reviewed-on: https://gerrit.libreoffice.org/26719
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 3f617c2..fa24d55 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -550,6 +550,10 @@ public:
bool IsWriter() const { return !bMyPool; }
+// Used as a fallback in *::ReadUserDataSequence() to process common
properties
+void ReadUserDataSequenceValue(const css::beans::PropertyValue *pValue);
+void WriteUserDataSequence(css::uno::Sequence < css::beans::PropertyValue
>& rValues, bool bBrowse = false);
+
/** returns the numbering type that is used to format page fields in
drawing shapes */
virtual SvxNumType GetPageNumType() const;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 885273f..b363f7c6 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -947,6 +947,9 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence <
beans::PropertyValue
pSeq[2].Name = "PageNumber";
pSeq[2].Value <<= pPreview->GetPageNo();
}
+
+// Common SdrModel processing
+GetDocument().GetDrawLayer()->WriteUserDataSequence(rSeq);
}
void ScPreviewShell::ReadUserDataSequence(const uno::Sequence <
beans::PropertyValue >& rSeq)
@@ -972,7 +975,9 @@ void ScPreviewShell::ReadUserDataSequence(const
uno::Sequence < beans::PropertyV
if (pSeq->Value >>= nTemp)
pPreview->SetPageNo(nTemp);
}
-}
+// Fallback to common SdrModel processing
+else
GetDocument().GetDrawLayer()->ReadUserDataSequenceValue(pSeq);
+}
}
}
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7ef5dbc..d188643 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -112,7 +112,7 @@ ScViewDataTable::~ScViewDataTable()
{
}
-void ScViewDataTable::WriteUserDataSequence(uno::Sequence
& rSettings, const ScViewData& /*rViewData*/, SCTAB
/*nTab*/) const
+void ScViewDataTable::WriteUserDataSequence(uno::Sequence
& rSettings, const ScViewData& rViewData, SCTAB /*nTab*/)
const
{
rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT);
beans::PropertyValue* pSettings = rSettings.getArray();
@@ -159,6 +159,9 @@ void ScViewDataTable::WriteUserDataSequence(uno::Sequence
pSettings[SC_TABLE_SHOWGRID].Name = SC_UNO_SHOWGRID;
pSettings[SC_TABLE_SHOWGRID].Value <<= bShowGrid;
}
+
+// Common SdrModel processing
+rViewData.GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings);
}
void ScViewDataTable::ReadUserDataSequence(const uno::Sequence
& aSettings, ScViewData& rViewData, SCTAB nTab, bool&
rHasZoom )
@@ -288,6 +291,8 @@ void ScViewDataTable::ReadUserDataSequence(const
uno::Sequence SetTabBgColor(nTab,
Color(static_cast(nColor)));
}
}
+// Fallback to common SdrModel processing
+else
rViewData.GetDocument()->GetDrawLayer()->ReadUserDataSequenceValue(&aSettings[i]);
}
if (eHSplitMode == SC_SPLIT_FIX)
nFixPosX = SanitizeCol( static_cast( bHasHSplitInTwips ?
nTempPosHTw : nTempPosH ));
@@ -2728,6 +2733,9 @@ void ScViewData::WriteUserDataSequence(uno::Sequence
& rSe
pSettings[SC_RASTERSYNC].Value <<= aGridOpt.GetSynchronize();
}
}
+
+// Common SdrModel processing
+GetDocument()->GetDrawLayer()->WriteUserDataSequence(rSettings);
}
void ScViewData::ReadUserDataSequence(const uno::Sequence
& rSettings)
@@ -2881,6 +2889,9 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence
aGridOpt.SetFieldDivisionY( static_cast (
ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
else if ( sName == SC_UNO_RASTERSYNC )
aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny(
rSettings[i].Value ) );
+// Fallback to common SdrModel processing
+else
GetDocument()->GetDrawLayer()->ReadUserDataSequenceValu
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/objsh.hxx |2 +-
sfx2/source/doc/objcont.cxx |2 +-
sfx2/source/doc/objserv.cxx |6 +++---
sfx2/source/doc/objstor.cxx | 10 +-
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit d37e39081328e94b7106c8f3ca1dbc629ecb9a80
Author: Mike Kaganski
Date: Tue Jun 28 12:37:11 2016 +1000
tdf#99729 related: make SfxObjectShell::IsOwnStorageFormat acccessible
This patch removes SAL_DLLPRIVATE attribute and renames
SfxObjectShell::IsOwnStorageFormat_impl() to
SfxObjectShell::IsOwnStorageFormat() to allow unsing in derived
classes in other modules.
Change-Id: I24650ad4624adc117d08b0e747c05ff050b4046d
Reviewed-on: https://gerrit.libreoffice.org/26732
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index c1b879a..1047542 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -626,7 +626,7 @@ public:
SAL_DLLPRIVATE std::shared_ptr CreatePreviewMetaFile_Impl(
bool bFullContent ) const;
-SAL_DLLPRIVATE bool IsOwnStorageFormat_Impl(const SfxMedium &) const;
+bool IsOwnStorageFormat(const SfxMedium &) const;
SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 5192e9e..ea1ea37 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -514,7 +514,7 @@ bool SfxObjectShell::IsHelpDocument() const
void SfxObjectShell::ResetFromTemplate( const OUString& rTemplateName, const
OUString& rFileName )
{
// only care about reseting this data for openoffice formats otherwise
-if ( IsOwnStorageFormat_Impl( *GetMedium()) )
+if ( IsOwnStorageFormat( *GetMedium()) )
{
uno::Reference
xDocProps(getDocProperties());
xDocProps->setTemplateURL( OUString() );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 836b6ff..a58785e 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -426,7 +426,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
return;
}
-if ( !IsOwnStorageFormat_Impl( *GetMedium() ) )
+if ( !IsOwnStorageFormat( *GetMedium() ) )
return;
ScopedVclPtrInstance< SfxVersionDialog > pDlg( pFrame,
IsSaveVersionOnClose() );
@@ -993,7 +993,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
}
if ( !pFrame || !pDoc->HasName() ||
-!IsOwnStorageFormat_Impl( *pDoc->GetMedium() ) )
+!IsOwnStorageFormat( *pDoc->GetMedium() ) )
rSet.DisableItem( nWhich );
break;
}
@@ -1291,7 +1291,7 @@ uno::Sequence< security::DocumentSignatureInformation >
SfxObjectShell::ImplAnal
uno::Reference< security::XDocumentDigitalSignatures > xLocSigner =
xSigner;
bool bSupportsSigning = GetMedium() && GetMedium()->GetFilter() &&
GetMedium()->GetFilter()->GetSupportsSigning();
-if (GetMedium() && !GetMedium()->GetName().isEmpty() &&
(IsOwnStorageFormat_Impl(*GetMedium()) || bSupportsSigning) &&
GetMedium()->GetStorage().is())
+if (GetMedium() && !GetMedium()->GetName().isEmpty() &&
(IsOwnStorageFormat(*GetMedium()) || bSupportsSigning) &&
GetMedium()->GetStorage().is())
{
try
{
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index f19d863..894900e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -659,7 +659,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
pImpl->bModelInitialized = false;
//TODO/LATER: make a clear strategy how to handle "UsesStorage" etc.
-bool bOwnStorageFormat = IsOwnStorageFormat_Impl( *pMedium );
+bool bOwnStorageFormat = IsOwnStorageFormat( *pMedium );
bool bHasStorage = IsPackageStorageFormat_Impl( *pMedium );
if ( pMedium->GetFilter() )
{
@@ -835,7 +835,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
)
FinishedLoading( SfxLoadedFlags::MAINDOCUMENT );
-if( IsOwnStorageFormat_Impl(*pMed) && pMed->GetFilter() )
+if( IsOwnStorageFormat(*pMed) && pMed->GetFilter() )
{
}
Broadcast( SfxSimpleHint(SFX_HINT_NAMECHANGED) );
@@ -972,7 +972,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium*
pMedium, SfxObjectShell* pDo
}
-bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const
+bool SfxObjectShell::IsOwnStorageFormat(const SfxMedium &rMedium) const
{
return !rMedium.GetFilter() || // Embedded
( rMedium.GetFilter()->IsOwnFormat() &&
@@ -1119,8 +1119,8 @@ bool SfxObjectShell::SaveTo_Impl
bool bStorageBasedSource = IsPackageStorageFormat_Impl( *pMedium );
bool bStorageBasedTarget = IsPackageStorageFormat_Impl( rMedium );
-
