[Libreoffice-commits] core.git: include/basegfx sax/inc shell/inc shell/source stoc/source

[Noel Grandin]

 include/basegfx/color/bcolor.hxx  |   31 --
 include/basegfx/matrix/b2dhommatrixtools.hxx  |1 
 include/basegfx/pixel/bpixel.hxx  |5 -
 include/basegfx/range/b1drange.hxx|   22 
 include/basegfx/range/b2ibox.hxx  |   57 
 include/basegfx/range/b2irange.hxx|   43 -
 include/basegfx/range/b3drange.hxx|   65 --
 include/basegfx/tuple/b2i64tuple.hxx  |   14 ---
 include/basegfx/tuple/b3ituple.hxx|   18 ---
 include/basegfx/vector/b3dvector.hxx  |   26 -
 sax/inc/xml2utf.hxx   |4 
 shell/inc/internal/i_xml_parser_event_handler.hxx |7 -
 shell/source/unix/sysshell/recently_used_file_handler.cxx |7 -
 stoc/source/corereflection/base.hxx   |6 -
 stoc/source/javavm/javavm.hxx |3 
 15 files changed, 309 deletions(-)

New commits:
commit 04c0b70c9bbd7c8d6e30a95c5693d283c992fd98
Author: Noel Grandin 
Date:   Mon Jul 6 10:06:45 2015 +0300

loplugin:unusedmethods sax,shell,stoc,basegfx

Change-Id: I8f3871fd4e82b6850718b6f2a8757f3043d00017

diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 2bdd420..4358e05 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -131,15 +131,6 @@ namespace basegfx
 return *this;
 }
 
-// blend to another color using luminance
-void blend(const BColor& rColor)
-{
-const double fLuminance(luminance());
-mfX = rColor.getRed() * fLuminance;
-mfY = rColor.getGreen() * fLuminance;
-mfZ = rColor.getBlue() * fLuminance;
-}
-
 // luminance
 double luminance() const
 {
@@ -164,16 +155,6 @@ namespace basegfx
 return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB);
 }
 
-double getMinimumDistance(const BColor& rColor) const
-{
-const double fDistR(getDistanceRed(rColor));
-const double fDistG(getDistanceGreen(rColor));
-const double fDistB(getDistanceBlue(rColor));
-
-double fRetval(fDistR < fDistG ? fDistR : fDistG);
-return (fRetval < fDistB ? fRetval : fDistB);
-}
-
 double getMaximumDistance(const BColor& rColor) const
 {
 const double fDistR(getDistanceRed(rColor));
@@ -206,18 +187,6 @@ namespace basegfx
 return static_cast( 
::basegfx::B3DTuple::getEmptyTuple() );
 }
 
-com::sun::star::uno::Sequence< double > colorToDoubleSequence(const 
com::sun::star::uno::Reference< com::sun::star::rendering::XGraphicDevice >& 
/*xGraphicDevice*/) const
-{
-com::sun::star::uno::Sequence< double > aRet(4);
-double* pRet = aRet.getArray();
-
-pRet[0] = mfX;
-pRet[1] = mfY;
-pRet[2] = mfZ;
-pRet[3] = 1.0;
-
-return aRet;
-}
 };
 } // end of namespace basegfx
 
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx 
b/include/basegfx/matrix/b2dhommatrixtools.hxx
index b2aef89..41a17ec 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -218,7 +218,6 @@ namespace basegfx
 const B2DVector& getScale() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
maScale; }
 const B2DVector& getTranslate() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
maTranslate; }
 double getRotate() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
mfRotate; }
-double getShearX() const { const_cast< 
B2DHomMatrixBufferedOnDemandDecompose* >(this)->impCheckDecompose(); return 
mfShearX; }
 };
 } // end of namespace tools
 
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index cf5c7a3..fda6a79 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -95,21 +95,16 @@ namespace basegfx
 sal_uInt8 getGreen() const { return maPixelUnion.maRGBO.mnG; }
 sal_uInt8 getBlue() const { return maPixelUnion.maRGBO.mnB; }
 sal_uInt8 getOpacity() const { return maPixelUnion.maRGBO.mnO; }
-sal_uInt32 getRedGreenBlueOpacity() const { return 
maPixelUnion.maCombinedRGBO.mnValue; }
 
 // data access write
 void setRed(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnR = nNew; }
 void setGreen(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnG = nNew; }
 void setBlue(sal_uInt8 nNew) { maPixelUnion.maRGBO.mnB = nNew; }
 void setOpacity

[Libreoffice-commits] core.git: 3 commits - oox/source sw/qa sw/source writerfilter/source

[Miklos Vajna]

 oox/source/export/preset-definitions-to-shape-types.pl |2 -
 sw/qa/extras/rtfimport/data/tdf92481.rtf   |6 
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 
 sw/source/filter/ww8/docxsdrexport.cxx |   24 
 writerfilter/source/dmapper/SettingsTable.cxx  |   25 +++--
 writerfilter/source/ooxml/model.xml|4 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 ++
 7 files changed, 55 insertions(+), 15 deletions(-)

New commits:
commit 0afd9dbc08ee2e55e0845dd33ece10ff9375bfa7
Author: Miklos Vajna 
Date:   Mon Jul 6 09:15:22 2015 +0200

sw: fix newly introduced style inconsistencies in docxsdrexport

Change-Id: I9b9f198aa6da2f6734194207b4c4bdec3ee1d4c0

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index b59de52..8244171 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1473,14 +1473,14 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* 
pParentFrame, int nAnchorId, bo
 
 //first, loop through ALL of the chained textboxes to identify a unique ID 
for each chain, and sequence number for each textbox in that chain.
 std::map::iterator 
linkedTextboxesIter;
-if( !m_pImpl->m_rExport.m_bLinkedTextboxesHelperInitialized )
+if (!m_pImpl->m_rExport.m_bLinkedTextboxesHelperInitialized)
 {
 sal_Int32 nSeq=0;
 linkedTextboxesIter = 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.begin();
-while ( linkedTextboxesIter != 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end() )
+while (linkedTextboxesIter != 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end())
 {
 //find the start of a textbox chain: has no PREVIOUS link, but 
does have NEXT link
-if ( linkedTextboxesIter->second.sPrevChain.isEmpty() && 
!linkedTextboxesIter->second.sNextChain.isEmpty() )
+if (linkedTextboxesIter->second.sPrevChain.isEmpty() && 
!linkedTextboxesIter->second.sNextChain.isEmpty())
 {
 //assign this chain a unique ID and start a new sequence
 nSeq = 0;
@@ -1492,18 +1492,18 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* 
pParentFrame, int nAnchorId, bo
 //follow the chain and assign the same id, and incremental 
sequence numbers.
 std::map::iterator  followChainIter;
 followChainIter = 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.find(linkedTextboxesIter->second.sNextChain);
-while ( followChainIter != 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end() )
+while (followChainIter != 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end())
 {
 //verify that the NEXT textbox also points to me as the 
PREVIOUS.
 // A broken link indicates a leftover remnant that can be 
ignored.
-if( followChainIter->second.sPrevChain != 
sCheckForBrokenChains )
+if (followChainIter->second.sPrevChain != 
sCheckForBrokenChains)
 break;
 
 followChainIter->second.nId = 
m_pImpl->m_rExport.m_nLinkedTextboxesChainId;
 followChainIter->second.nSeq = ++nSeq;
 
 //empty next chain indicates the end of the linked chain.
-if ( followChainIter->second.sNextChain.isEmpty() )
+if (followChainIter->second.sNextChain.isEmpty())
 break;
 
 sCheckForBrokenChains = followChainIter->first;
@@ -1520,19 +1520,19 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* 
pParentFrame, int nAnchorId, bo
 bool isTxbxLinked = false ;
 
 OUString sLinkChainName;
-if ( xPropSetInfo.is() )
+if (xPropSetInfo.is())
 {
-if ( xPropSetInfo->hasPropertyByName("LinkDisplayName") )
+if (xPropSetInfo->hasPropertyByName("LinkDisplayName"))
 xPropertySet->getPropertyValue("LinkDisplayName") >>= 
sLinkChainName;
-else if ( xPropSetInfo->hasPropertyByName("ChainName") )
+else if (xPropSetInfo->hasPropertyByName("ChainName"))
 xPropertySet->getPropertyValue("ChainName") >>= sLinkChainName;
 }
 
 // second, check if THIS textbox is linked and then decide whether to 
write the tag txbx or linkedTxbx
 linkedTextboxesIter = 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.find(sLinkChainName);
-if ( linkedTextboxesIter != 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end() )
+if (linkedTextboxesIter != 
m_pImpl->m_rExport.m_aLinkedTextboxesHelper.end())
 {
-if( (linkedTextboxesIter->second.nId !=0) && 
(linkedTextboxesIter->second.nSeq != 0) )
+if ((linkedTextboxesIter->second.nId !=0) && 
(linkedTextboxesIter->second.nSeq != 0))
 {
 //not the first in the chain, so write the tag as

[Libreoffice-commits] core.git: compilerplugins/clang

[Noel Grandin]

 compilerplugins/clang/unusedmethods.cxx   |  198 ++
 compilerplugins/clang/unusedmethods.py|   77 ++
 compilerplugins/clang/unusedmethodsremove.cxx |  145 +++
 3 files changed, 420 insertions(+)

New commits:
commit 52099a7ad3cafc206b71723fd41950203005e9eb
Author: Noel Grandin 
Date:   Thu Jul 2 09:18:31 2015 +0200

new loplugin: unusedmethods

Change-Id: I72574e354aadf357d6d8181a514efb4783e79e28

diff --git a/compilerplugins/clang/unusedmethods.cxx 
b/compilerplugins/clang/unusedmethods.cxx
new file mode 100644
index 000..e45ee7f
--- /dev/null
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -0,0 +1,198 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include "plugin.hxx"
+#include "compat.hxx"
+
+/**
+Dump a list of calls to methods, and a list of method definitions.
+Then we will post-process the 2 lists and find the set of unused methods.
+
+Be warned that it produces around 3G of log file.
+
+The process goes something like this:
+  $ make check
+  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unusedmethods' check > 
log.txt
+  $ grep -P '(call:)|(definition:)' log.txt | sort -u > log2.txt
+  $ ./compilerplugins/clang/unusedmethods.py log2.txt > result.txt
+
+and then
+  $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir 
COMPILER_PLUGIN_TOOL='unusedmethodsremove' $dir; done
+to auto-remove the method declarations
+
+Note that the actual process may involve a fair amount of undoing, hand 
editing, and general messing around
+to get it to work :-)
+
+TODO ignore calls from a method to itself, so we can eliminate unused 
recursive methods
+TODO deal with calls to superclass/member constructors from other 
constructors, so
+ we can find unused constructors
+TODO need to handle places where the code takes the address of a method, that 
needs to count
+ as a use-site.
+TODO deal with free functions and static methods
+TODO track instantiations of template class constructor methods
+*/
+
+namespace {
+
+class UnusedMethods:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit UnusedMethods(InstantiationData const & data): Plugin(data) {}
+
+virtual void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitCallExpr(CallExpr* );
+bool VisitCXXMethodDecl( const CXXMethodDecl* decl );
+bool VisitDeclRefExpr( const DeclRefExpr* );
+bool TraverseCXXMethodDecl(CXXMethodDecl * decl) { return 
RecursiveASTVisitor::TraverseCXXMethodDecl(decl); }
+};
+
+static std::string niceName(const CXXMethodDecl* functionDecl)
+{
+std::string s =
+compat::getReturnType(*functionDecl).getCanonicalType().getAsString()
++ " " + functionDecl->getParent()->getQualifiedNameAsString()
++ "::" + functionDecl->getNameAsString()
++ "(";
+bool bFirst = true;
+for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
+if (bFirst)
+bFirst = false;
+else
+s += ",";
+s += pParmVarDecl->getType().getCanonicalType().getAsString();
+}
+s += ")";
+if (functionDecl->isConst()) {
+s += " const";
+}
+return s;
+}
+
+// try to limit the volumninous output a little
+static std::set alreadySeenCallSet;
+
+static void logCallToRootMethods(const CXXMethodDecl* decl)
+{
+// For virtual/overriding methods, we need to pretend we called the root 
method(s),
+// so that they get marked as used.
+bool bPrinted = false;
+for(CXXMethodDecl::method_iterator it = decl->begin_overridden_methods();
+it != decl->end_overridden_methods(); ++it)
+{
+logCallToRootMethods(*it);
+bPrinted = true;
+}
+if (!bPrinted)
+{
+std::string s = niceName(decl);
+if (alreadySeenCallSet.insert(s).second)
+cout << "call:\t" << niceName(decl) << endl;
+}
+}
+
+static bool startsWith(const std::string& s, const char* other)
+{
+return s.compare(0, strlen(other), other) == 0;
+}
+
+static bool isStandardStuff(const std::string& s)
+{
+// ignore UNO interface definitions, cannot change those
+return startsWith(s, "com::sun::star::")
+  // ignore stuff in the C++ stdlib and boost
+  || startsWith(s, "std::") || startsWith(s, "boost::") || 
startsWith(s, "class boost::") || startsWith(s, "__gnu_debug::")
+  // can't change our rtl layer
+  || startsWith(s, "rtl::")
+  // ignore anonymous namespace stuff, it is compilation-unit-local 
and the compiler will detect any
+  // unused code there

Re: [GSoC] Improve user experience with CMIS – Weekly report #6

[Cedric Bosdonnat]

On Fri, 2015-07-03 at 20:00 +0200, Szymon Kłos wrote:
> My work this week:
> * I integrated my dialog with FileDialogHelper. Now RemoteFilesDialog
> could be executed using the same command like normal file picker,
> filters are added depending on context.
> * bug 84190 - user wasn't able to change password after failed
> authorization.
> * bug 83089 - Cannot select location in properties dialogue
> * I added support of opening multiple files
> * some small improvements
> 
> Now I'm working on async operations. In this dialog it could be useful
> to cancel current action, because sometimes opening remote directory is
> very slow (connection to the cmis.alfresco.com/cmisatom takes > 30s,
> which is default timeout in async mode). User should have possibility to
> stop this process, for example after selecting any service by mistake
> without waiting. Timeout also shouldn't be too short, because it may be
> insufficient (like 30s for alfresco example).
> 
> To do:
> * async operations

To get full async support you'll need to implement async API functions
in libcmis, which may be quite a big project. This could be something to
keep for the end of GSoC if you have some time left for it: better get
the dialog working and be slow rather than having nothing ready at the
end of the term.

--
Cedric

> * implement support of context bits
> * open/save remote buttons on toolbars
> 
> Regards,
> Szymon
> 


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basic/source

[Takeshi Abe]

 basic/source/basmgr/basmgr.cxx  |   16 
 basic/source/basmgr/vbahelper.cxx   |4 ++--
 basic/source/classes/errobject.cxx  |4 ++--
 basic/source/classes/eventatt.cxx   |4 ++--
 basic/source/classes/sb.cxx |4 ++--
 basic/source/classes/sbunoobj.cxx   |9 -
 basic/source/classes/sbxmod.cxx |7 +++
 basic/source/inc/namecont.hxx   |9 -
 basic/source/inc/propacc.hxx|9 -
 basic/source/runtime/comenumwrapper.hxx |4 ++--
 10 files changed, 33 insertions(+), 37 deletions(-)

New commits:
commit 7640e244db0565b1cb3909a7e243a2accd86e5c9
Author: Takeshi Abe 
Date:   Thu Jul 2 17:14:33 2015 +0900

tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, in basic.

Change-Id: I13c5644bd6b9e964e42a98bee9c3019d959efb36
Reviewed-on: https://gerrit.libreoffice.org/16719
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 0544625..da8681a 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -66,18 +66,18 @@
 #include 
 #include 
 
-#include 
+#include 
 
 using com::sun::star::uno::Reference;
 using namespace com::sun::star;
 using namespace com::sun::star::script;
 using namespace cppu;
 
-typedef WeakImplHelper1< container::XNameContainer > NameContainerHelper;
-typedef WeakImplHelper1< script::XStarBasicModuleInfo > ModuleInfoHelper;
-typedef WeakImplHelper1< script::XStarBasicDialogInfo > DialogInfoHelper;
-typedef WeakImplHelper1< script::XStarBasicLibraryInfo > LibraryInfoHelper;
-typedef WeakImplHelper1< script::XStarBasicAccess > StarBasicAccessHelper;
+typedef WeakImplHelper< container::XNameContainer > NameContainerHelper;
+typedef WeakImplHelper< script::XStarBasicModuleInfo > ModuleInfoHelper;
+typedef WeakImplHelper< script::XStarBasicDialogInfo > DialogInfoHelper;
+typedef WeakImplHelper< script::XStarBasicLibraryInfo > LibraryInfoHelper;
+typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper;
 
 // Version 1
 //sal_uInt32nEndPos
@@ -139,7 +139,7 @@ BasicManagerImpl::~BasicManagerImpl()
 // BasMgrContainerListenerImpl
 
 
-typedef ::cppu::WeakImplHelper1< container::XContainerListener > 
ContainerListenerHelper;
+typedef ::cppu::WeakImplHelper< container::XContainerListener > 
ContainerListenerHelper;
 
 class BasMgrContainerListenerImpl: public ContainerListenerHelper
 {
@@ -2242,7 +2242,7 @@ void LibraryContainer_Impl::removeByName( const OUString& 
Name )
 
 
 
-typedef WeakImplHelper1< script::XStarBasicAccess > StarBasicAccessHelper;
+typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper;
 
 
 class StarBasicAccess_Impl : public StarBasicAccessHelper
diff --git a/basic/source/basmgr/vbahelper.cxx 
b/basic/source/basmgr/vbahelper.cxx
index c61b0e9..09e07de 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 namespace basic {
@@ -52,7 +52,7 @@ uno::Reference< frame::XModuleManager2 > 
lclCreateModuleManager()
 
 /** Implementation of an enumeration of all open documents of the same type.
  */
-class DocumentsEnumeration : public ::cppu::WeakImplHelper1< 
container::XEnumeration >
+class DocumentsEnumeration : public ::cppu::WeakImplHelper< 
container::XEnumeration >
 {
 public:
 explicit DocumentsEnumeration( const uno::Reference< frame::XModel >& 
rxModel );
diff --git a/basic/source/classes/errobject.cxx 
b/basic/source/classes/errobject.cxx
index 163336b..b1b2bf1 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -19,7 +19,7 @@
 
 #include "errobject.hxx"
 
-#include 
+#include 
 #include 
 #include "sbintern.hxx"
 #include "runtime.hxx"
@@ -27,7 +27,7 @@
 using namespace ::com::sun::star;
 using namespace ::ooo;
 
-typedef ::cppu::WeakImplHelper2< vba::XErrObject, script::XDefaultProperty > 
ErrObjectImpl_BASE;
+typedef ::cppu::WeakImplHelper< vba::XErrObject, script::XDefaultProperty > 
ErrObjectImpl_BASE;
 
 class ErrObject : public ErrObjectImpl_BASE
 {
diff --git a/basic/source/classes/eventatt.cxx 
b/basic/source/classes/eventatt.cxx
index 0f79fdd..bbf1b9b 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -58,7 +58,7 @@
 #include 
 #include 
 
-#include 
+#include 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::script;
@@ -136,7 +136,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent, 
Any* pRet, const Refere
 }
 
 
-class BasicScriptListener_Impl : public WeakImplHelper1< XScriptListener >
+class BasicScriptListener_Impl : public WeakImplHelper< XScriptListener >
 {
 StarBASICRef maBasicRef;
 Reference< frame::XModel > m_xModel;
diff --git a/basic/source/classes/sb.

[Libreoffice-commits] core.git: basctl/inc basctl/source

[Takeshi Abe]

 basctl/inc/pch/precompiled_basctl.hxx   |2 +-
 basctl/source/basicide/basicrenderable.cxx  |4 ++--
 basctl/source/basicide/basicrenderable.hxx  |4 ++--
 basctl/source/basicide/baside2b.cxx |4 ++--
 basctl/source/basicide/basidesh.cxx |3 ++-
 basctl/source/basicide/doceventnotifier.cxx |6 +++---
 basctl/source/basicide/moduldl2.cxx |5 +++--
 basctl/source/inc/dlgedclip.hxx |4 ++--
 basctl/source/inc/dlgedlist.hxx |6 +++---
 9 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit c73e3bb925a2c08c9aea0e8e7a7e3502b68c044e
Author: Takeshi Abe 
Date:   Thu Jul 2 15:29:29 2015 +0900

tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, in basctl.

Change-Id: I52da577a6f6298eb89b0cc8c8ff243ecd341e9b3
Reviewed-on: https://gerrit.libreoffice.org/16718
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/basctl/inc/pch/precompiled_basctl.hxx 
b/basctl/inc/pch/precompiled_basctl.hxx
index f81441cd..ec4fc38 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -103,7 +103,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 7281417..61b7d2f 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 
 namespace basctl
@@ -34,7 +34,7 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
 Renderable::Renderable (BaseWindow* pWin)
-: cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >( maMutex 
)
+: cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >( maMutex )
 , mpWindow( pWin )
 {
 ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST )  );
diff --git a/basctl/source/basicide/basicrenderable.hxx 
b/basctl/source/basicide/basicrenderable.hxx
index e48ffec..dba38c8 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
 
 #include 
-#include 
+#include 
 
 #include 
 
@@ -30,7 +30,7 @@ namespace basctl
 class BaseWindow;
 
 class Renderable :
-public cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >,
+public cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >,
 public vcl::PrinterOptionsHelper
 {
 VclPtr  mpWindow;
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index c54043d..c218398 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -43,7 +43,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 
@@ -176,7 +176,7 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, 
OUString& rVar, OUString&
 
 
 class EditorWindow::ChangesListener:
-public cppu::WeakImplHelper1< beans::XPropertiesChangeListener >
+public cppu::WeakImplHelper< beans::XPropertiesChangeListener >
 {
 public:
 explicit ChangesListener(EditorWindow & editor): editor_(editor) {}
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 7958911..742e48c 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace basctl
 {
@@ -62,7 +63,7 @@ namespace basctl
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1< container::XContainerListener > 
ContainerListenerBASE;
+typedef ::cppu::WeakImplHelper< container::XContainerListener > 
ContainerListenerBASE;
 
 class ContainerListenerImpl : public ContainerListenerBASE
 {
diff --git a/basctl/source/basicide/doceventnotifier.cxx 
b/basctl/source/basicide/doceventnotifier.cxx
index 03ba5c1..a37a028 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -29,7 +29,7 @@
 #include 
 
 
-#include 
+#include 
 #include 
 
 namespace basctl
@@ -51,8 +51,8 @@ namespace basctl
 
 // DocumentEventNotifier::Impl
 
-typedef ::cppu::WeakComponentImplHelper1<   XDocumentEventListener
->   
DocumentEventNotifier_Impl_Base;
+typedef ::cppu::WeakComponentImplHelper<   XDocumentEventListener
+   >   DocumentEventNotifier_Impl_Base;
 
 enum ListenerAction
 {
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 5f57528..8069443 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -54,6 +54,7 @@
 #include 
 
 #include 
+#include 
 
 
 namespace basctl
@@ -65,7 +66,7 @@ using

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   |target:4.5.0|target:4.5.0 target:5.1.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #4 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=c73e3bb925a2c08c9aea0e8e7a7e3502b68c044e

tdf#88206 replace cppu::WeakImplHelper* etc.

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #3 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=7640e244db0565b1cb3909a7e243a2accd86e5c9

tdf#88206 replace cppu::WeakImplHelper* etc.

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: avmedia/source

[Takeshi Abe]

 avmedia/source/gstreamer/gstcommon.hxx   |2 --
 avmedia/source/gstreamer/gstframegrabber.hxx |6 +++---
 avmedia/source/gstreamer/gstmanager.hxx  |6 +++---
 avmedia/source/gstreamer/gstplayer.hxx   |6 +++---
 avmedia/source/gstreamer/gstwindow.hxx   |5 +++--
 avmedia/source/macavf/framegrabber.hxx   |5 +++--
 avmedia/source/macavf/macavfcommon.hxx   |2 --
 avmedia/source/macavf/manager.hxx|5 +++--
 avmedia/source/macavf/player.hxx |5 +++--
 avmedia/source/macavf/window.hxx |5 +++--
 avmedia/source/opengl/oglframegrabber.hxx|6 +++---
 avmedia/source/opengl/oglmanager.hxx |6 +++---
 avmedia/source/opengl/oglplayer.hxx  |6 +++---
 avmedia/source/opengl/oglwindow.hxx  |6 +++---
 avmedia/source/quicktime/framegrabber.hxx|5 +++--
 avmedia/source/quicktime/manager.hxx |5 +++--
 avmedia/source/quicktime/player.hxx  |6 +++---
 avmedia/source/quicktime/quicktimecommon.hxx |2 --
 avmedia/source/quicktime/window.hxx  |5 +++--
 avmedia/source/viewer/mediaevent_impl.hxx|   10 +-
 avmedia/source/vlc/vlccommon.hxx |2 --
 avmedia/source/vlc/vlcframegrabber.hxx   |6 +++---
 avmedia/source/vlc/vlcmanager.hxx|5 +++--
 avmedia/source/vlc/vlcplayer.hxx |7 +++
 avmedia/source/vlc/vlcwindow.hxx |5 +++--
 avmedia/source/win/framegrabber.hxx  |6 +++---
 avmedia/source/win/manager.hxx   |6 +++---
 avmedia/source/win/player.hxx|6 +++---
 avmedia/source/win/wincommon.hxx |2 --
 avmedia/source/win/window.hxx|5 +++--
 30 files changed, 77 insertions(+), 77 deletions(-)

New commits:
commit 623c2b92b90ffce8ece14cbbd2da7067e2759e99
Author: Takeshi Abe 
Date:   Wed Jul 1 17:07:31 2015 +0900

tdf#88206 Change uses of cppu::WeakImplHelper* etc.

to the variadic variants, in avmedia.

Change-Id: I7fe65771ea5e0d30c7906d0d33acdcbe9e8aa3ff
Reviewed-on: https://gerrit.libreoffice.org/16647
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/avmedia/source/gstreamer/gstcommon.hxx 
b/avmedia/source/gstreamer/gstcommon.hxx
index 20ae748..2b9a773 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -25,8 +25,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx 
b/avmedia/source/gstreamer/gstframegrabber.hxx
index 6c849c8..1704d4a 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -22,7 +22,7 @@
 
 #include "gstplayer.hxx"
 #include 
-#include 
+#include 
 #include 
 
 namespace avmedia { namespace gstreamer {
@@ -31,8 +31,8 @@ namespace avmedia { namespace gstreamer {
 // - FrameGrabber -
 
 
-typedef ::cppu::WeakImplHelper2< ::com::sun::star::media::XFrameGrabber,
- ::com::sun::star::lang::XServiceInfo > 
FrameGrabber_BASE;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::media::XFrameGrabber,
+::com::sun::star::lang::XServiceInfo > 
FrameGrabber_BASE;
 
 class FrameGrabber : public FrameGrabber_BASE, private boost::noncopyable
 {
diff --git a/avmedia/source/gstreamer/gstmanager.hxx 
b/avmedia/source/gstreamer/gstmanager.hxx
index 65af873..be7bedb 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX
 
 #include "gstcommon.hxx"
-
+#include 
 #include "com/sun/star/media/XManager.hpp"
 
 
@@ -30,8 +30,8 @@
 
 namespace avmedia { namespace gstreamer {
 
-class Manager : public ::cppu::WeakImplHelper2 < 
::com::sun::star::media::XManager,
- 
::com::sun::star::lang::XServiceInfo >
+class Manager : public ::cppu::WeakImplHelper< 
::com::sun::star::media::XManager,
+   
::com::sun::star::lang::XServiceInfo >
 {
 public:
 
diff --git a/avmedia/source/gstreamer/gstplayer.hxx 
b/avmedia/source/gstreamer/gstplayer.hxx
index c5fc4f6..6d18616 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -24,7 +24,7 @@
 #include "gstcommon.hxx"
 
 #include "com/sun/star/media/XPlayer.hpp"
-#include 
+#include 
 #include 
 
 typedef struct _GstVideoOverlay GstVideoOverlay;
@@ -35,8 +35,8 @@ namespace avmedia { namespace gstreamer {
 // - Player -
 
 
-typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer,
-  ::com::sun::star::lang::XServiceInfo 
> GstPlayer_BASE;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::media::XPlayer,
+ ::com::sun::star::lang:

[Libreoffice-commits] core.git: animations/source

[Takeshi Abe]

 animations/source/animcore/animcore.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 15c0fba5c2adb72dfaaf2dfeb0fc5c0dbdfa6e26
Author: Takeshi Abe 
Date:   Wed Jul 1 16:35:04 2015 +0900

tdf#88206: replace cppu::WeakImplHelper1 with cppu::WeakImplHelper

in animations.

Change-Id: I7d776ddb81e0943bf2ea5895ea26631db76546ac
Reviewed-on: https://gerrit.libreoffice.org/16645
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index cd67ed0..2d23c2b 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 #include 
@@ -351,7 +351,7 @@ private:
 
 
 
-class TimeContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
+class TimeContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
 {
 public:
 explicit TimeContainerEnumeration( const ChildList_t &rChildren );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #5 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=623c2b92b90ffce8ece14cbbd2da7067e2759e99

tdf#88206 Change uses of cppu::WeakImplHelper* etc.

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #6 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=15c0fba5c2adb72dfaaf2dfeb0fc5c0dbdfa6e26

tdf#88206: replace cppu::WeakImplHelper1 with cppu::WeakImplHelper

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: accessibility/inc accessibility/source

[Takeshi Abe]

 accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx   
|5 +++--
 accessibility/inc/accessibility/extended/AccessibleGridControl.hxx 
|3 ++-
 accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx   
|1 -
 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx 
|1 -
 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx 
|1 -
 accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx   
|7 +++
 accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
|1 -
 accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
|4 
 accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx 
|4 
 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
|3 ++-
 accessibility/source/helper/acc_factory.cxx
|1 -
 11 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 00daf98eddf2f2b27136282de1f3b47d4677b087
Author: Takeshi Abe 
Date:   Wed Jul 1 14:42:39 2015 +0900

tdf#88206: replace cppu::WeakImplHelper* and cppu::WeakComponentImplHelper*

with variadic variants, and drop unused #includes, in accessibility.

Change-Id: Iddbe0f7932108319a5105448a74c570265d601ce
Reviewed-on: https://gerrit.libreoffice.org/16639
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx 
b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index faef86e..2800887 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -22,6 +22,7 @@
 #define 
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -192,8 +193,8 @@ private:
 The instance holds its XAccessibleContext with a hard reference, while
 the contxt holds this instance weak.
 */
-typedef ::cppu::WeakImplHelper1 <   
::com::sun::star::accessibility::XAccessible
->   AccessibleBrowseBoxAccess_Base;
+typedef ::cppu::WeakImplHelper<   ::com::sun::star::accessibility::XAccessible
+  >   AccessibleBrowseBoxAccess_Base;
 
 class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base
 ,public ::svt::IAccessibleBrowseBox
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx 
b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index db50af9..f3caab6 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -180,7 +181,7 @@ private:
 The instance holds its XAccessibleContext with a hard reference, while
 the contxt holds this instance weak.
 */
-typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessible 
> AccessibleGridControlAccess_Base;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible > 
AccessibleGridControlAccess_Base;
 
 class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base
 ,public ::svt::table::IAccessibleTableControl
diff --git 
a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx 
b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
index 32f5837..ef935a3 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -20,7 +20,6 @@
 #ifndef 
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECK_HXX
 #define 
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECK_HXX
 
-#include 
 #include 
 
 #include 
diff --git 
a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx 
b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
index 262c7c3..b5cb2c3 100644
--- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -20,7 +20,6 @@
 #ifndef 
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBAR_HXX
 #define 
INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBAR_HXX
 
-#include 
 #include 
 
 #include 
diff --git 
a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
 
b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
index b488011..04e0125 100644
--- 
a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
+++ 
b/accessibility/inc/acces

[Bug 88206] Change uses of cppu::WeakImplHelper* and cppu::ImplInheritanceHelper* to use variadic variants instead

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=88206

--- Comment #7 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=00daf98eddf2f2b27136282de1f3b47d4677b087

tdf#88206: replace cppu::WeakImplHelper* and cppu::WeakComponentImplHelper*

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: export-validation/setup.sh

[Miklos Vajna]

 export-validation/setup.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c22b9485efbe049700b9c6d891e0b1ca89ed95b
Author: Miklos Vajna 
Date:   Mon Jul 6 09:50:35 2015 +0200

export-validation: point to TDF officeotron in setup.sh

Change-Id: Iacf6cea1c1d8d820b8a32d844d229f38df491fdf

diff --git a/export-validation/setup.sh b/export-validation/setup.sh
index d7fe6a5..33921a1 100755
--- a/export-validation/setup.sh
+++ b/export-validation/setup.sh
@@ -73,7 +73,7 @@ chmod +x odfvalidator
 
 cd "$workdir"
 if [ ! -d officeotron ]; then
-svn co http://officeotron.googlecode.com/svn/trunk officeotron
+git clone git://gerrit.libreoffice.org/officeotron officeotron
 fi
 cd officeotron
 if [ ! -e dist/officeotron-*.jar ]; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: RTF support: \nofpages

[Miklos Vajna]

Hi,

On Sat, Jul 04, 2015 at 07:28:56AM -0700, tracey002  wrote:
> Should I be able to _RTF format_ the page count (*_{\info{\nofpages}}_*) 
> in a footer using LibreOffice?

No, \info should only appear at the begining of the document to store
the document statistics.

> *_\nofpages_* appears to have been documented since _RTF Version 1.0 in 
> 1987_
> _*NUMPAGES*_ appears to have been documented since _RTF Version in 1.9 2008_

NUMPAGES is the only way to describe LO's PageCount field.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/vcl vcl/source

[Tor Lillqvist]

 include/vcl/cursor.hxx   |2 +-
 vcl/source/window/cursor.cxx |9 -
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 166ee1186c46bdedae14c87bd122d56301f30d48
Author: Tor Lillqvist 
Date:   Mon Jul 6 11:03:04 2015 +0300

ImplRestore() can be private

It is only called from other member functions.

Also, all the calls are inside conditionals that check mpData &&
mpData->mbCurVisible already, so no need to check anew in the function. Use 
an
assert() instead.

Change-Id: Ibcde0aa43877b64b9b0ae5117cbda1fb44ee023d

diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index 3a1127e..baf04d2 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -55,7 +55,6 @@ private:
 
 public:
 SAL_DLLPRIVATE void ImplDraw();
-SAL_DLLPRIVATE void ImplRestore();
 DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
 SAL_DLLPRIVATE void ImplShow( bool bDrawDirect = true );
 SAL_DLLPRIVATE void ImplHide( bool bStopTimer );
@@ -101,6 +100,7 @@ public:
 { return !(Cursor::operator==( rCursor )); }
 
 private:
+void ImplRestore();
 void ImplDoShow( bool bDrawDirect, bool bRestore );
 bool ImplDoHide( bool bStop );
 };
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index b665be7..0d893ca 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -141,11 +141,10 @@ void vcl::Cursor::ImplDraw()
 
 void vcl::Cursor::ImplRestore()
 {
-if ( mpData && mpData->mbCurVisible )
-{
-ImplCursorInvert( mpData );
-mpData->mbCurVisible = false;
-}
+assert( mpData && mpData->mbCurVisible );
+
+ImplCursorInvert( mpData );
+mpData->mbCurVisible = false;
 }
 
 void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Univerbation

[Richard Wordingham]

What mechanisms does ODF have to indicate that a sequence of word
characters constitutes a word?

Having such a mechanism is useful for spell-checking Thai and other
languages where the boundaries between words are not marked.  At
present, one can cancel spurious boundaries by inserting U+2060 WORD
JOINER.  Words formed thus can be entered in personal spelling
dictionaries.  This is the only mechanism I am aware of.  However, it is
currently intended (announcement to private Unicore list only) to
modify the Unicode Standard for Version 8.00 this month to state that
U+2060 should not have have any effect on determining word boundaries;
its function will merely be to suppress line breaks.

I view this as a kick in the teeth of users of languages such as Thai,
but so far I am the only one to have responded.  The only work around
I can see is to add a word joining character (e.g U+2065) to Unicode
and hope that LibreOffice supports U+2060 as a word-joining character
until the new character becomes available.

Richard.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: problems faced with latest source code Build (5.0.0.1 apha)

[Stephan Bergmann]

On 07/03/2015 10:19 AM, Rachna Goel wrote:

after succeful build, I am installing deb package from directory

workdir/installtion/libreoffice/deb/install/LibreOffice_5.1.0.0.alpha1_Linux_x86_deb\DEBS


I guess that you didn't install any "system integration" package (the 
relevant deb is in a subdir of the above, IIRC), so clicking on a LO 
icon in your system's dashboard opens another LO version provided by 
your system.


Either install that system integration package or start LO via full path 
to .../program/soffice from a shell.  (For that, you don't even need to 
install LO; building LO already leaves you with a working installation 
in the instdir/ tree.)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: errors encountered after launching libo

[Stephan Bergmann]

On 07/03/2015 11:38 AM, rachnag wrote:

** (soffice:12945): CRITICAL **: GdkPixbuf* bitmapToPixbuf(SalBitmap*,
SalBitmap*): assertion 'pBitmap->mnBitCount == 24' failed

** (soffice:12945): CRITICAL **: GdkPixbuf* bitmapToPixbuf(SalBitmap*,
SalBitmap*): assertion 'pBitmap->mnBitCount == 24' failed

(soffice:12945): Gtk-CRITICAL **: gtk_style_context_set_path: assertion
'priv->widget == NULL' failed

** (soffice:12957): CRITICAL **: GdkPixbuf* bitmapToPixbuf(SalBitmap*,
SalBitmap*): assertion 'pBitmap->mnBitCount == 24' failed

** (soffice:12957): CRITICAL **: GdkPixbuf* bitmapToPixbuf(SalBitmap*,
SalBitmap*): assertion 'pBitmap->mnBitCount == 24' failed

(soffice:12957): Gtk-CRITICAL **: gtk_style_context_set_path: assertion
'priv->widget == NULL' failed

** (soffice:12957): CRITICAL **: GdkPixbuf* bitmapToPixbuf(SalBitmap*,
SalBitmap*): assertion 'pBitmap->mnBitCount == 24' failed

** (soffice:12957): CRITICAL **: GdkPixbuf* bitmapToPixbuf(SalBitmap*,
SalBitmap*): assertion 'pBitmap->mnBitCount == 24' failed


I see those too with recent builds; presumably harmless


after this program crashes.


see 
 
for a start

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svl/source

[Caolán McNamara]

 svl/source/numbers/zforscan.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 592ee0308a36518137ab8ed965f28de4600909da
Author: Caolán McNamara 
Date:   Mon Jul 6 09:20:53 2015 +0100

a malformed string here can force an out of bounds indexOf

Change-Id: Ic4d922bd27b7f119a7f8b95bbb4d4ed9e89fe51d

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ba94239..b539782 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -889,7 +889,7 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const 
OUString& rString)
 // Do we have some sort of currency?
 OUString sString = pFormatter->GetCharClass()->uppercase(rString);
 sal_Int32 nCPos = 0;
-while (nCPos >= 0)
+while (nCPos >= 0 && nCPos < sString.getLength())
 {
 nCPos = sString.indexOf(GetCurString(),nCPos);
 if (nCPos >= 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - sw/source

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |   18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 55a968fa728f8ea968e9142aefde678780223eb2
Author: Miklos Vajna 
Date:   Fri Jul 3 17:52:44 2015 +0200

SwViewShell::ImplEndAction: avoid direct PaintDesktop()

With double-buffering enabled and typing quickly, one saw blinks in the
text sometimes. The reason was that PaintDesktop() painted directly
outside SwViewShell::Paint().

The problem is more visible with VCL_DOUBLEBUFFERING_AVOID_PAINT=1,
loading a simple document + pressing a key draw an unexpected white
rectangle.

Given that InvalidateWindows() already calls PaintDesktop() inside
Paint() implicitly (via SwViewShell::Paint()), fix the problem by just
avoiding the DLPrePaint2() + PaintDesktop() + DLPostPaint2() calls.

Change-Id: Ib8ce26a0bdd526bf85d362f0e865dd61d29f6d11
(cherry picked from commit c9175a1bd3249ad573ae6827bf19963a3ebe2fbc)

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 3642d1e..9b96a58 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -405,20 +405,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 }
 if ( bPaint )
 {
-// #i75172# begin DrawingLayer paint
-// need to do begin/end DrawingLayer preparation for 
each single rectangle of the
-// repaint region. I already tried to prepare only 
once for the whole Region. This
-// seems to work (and does technically) but fails with 
transparent objects. Since the
-// region given to BeginDarwLayers() defines the clip 
region for DrawingLayer paint,
-// transparent objects in the single rectangles will 
indeed be painted multiple times.
-DLPrePaint2(vcl::Region(aRect.SVRect()));
-
-if ( bPaintsFromSystem )
-PaintDesktop(*GetOut(), aRect);
-
pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
-
-// #i75172# end DrawingLayer paint
-DLPostPaint2(true);
+InvalidateWindows(aRect.SVRect());
 }
 
 lcl_PaintTransparentFormControls(*this, aRect); // i#107365
commit fc3de7d134c2832b7f940e81d16042d171b402fc
Author: Miklos Vajna 
Date:   Fri Jul 3 11:52:17 2015 +0200

SwViewShell::DLPrePaint2: fix missing clipping for the non-buffered case

With this, if the sw window is small enough that the page shadow is
supposed to be under the sidebar, we no longer paint the shadow over the
sidebar.

In the non-double-buffered case the output is a window, so
SdrPaintWindow::PreparePreRenderDevice() does its own buffering, and
clipping is taken care of when that buffer is copied to the window in
SdrPreRenderDevice::OutputPreRenderDevice().

This wasn't a problem before, as either the output was a non-screen
device or UI elements were painted (like the sidebar), but never both at
the same time.

Change-Id: Ic02c814fc4deeea86c245c74bd69656533d9f835
(cherry picked from commit 978033d5ed9f93f2d5d9a1ba44acf6b37bc13bfe)

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 6e0a150..3642d1e 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -203,6 +203,9 @@ void SwViewShell::DLPrePaint2(const vcl::Region& rRegion)
 mpBufferedOut = mpOut;
 mpOut = &(mpTargetPaintWindow->GetTargetOutputDevice());
 }
+else
+// In case mpOut is used without buffering, need to set clipping.
+mpOut->SetClipRegion(rRegion);
 
 // remember original paint MapMode for wrapped FlyFrame paints
 maPrePostMapMode = mpOut->GetMapMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Michael Meeks]

 vcl/source/window/window.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ffc7299718376fa684decb0af20e24758fd734d
Author: Michael Meeks 
Date:   Fri Jul 3 15:50:38 2015 +0100

tdf#92392 - tolerate Window::SetText post dispose.

Change-Id: I458f8e8665373d3e5ab9ed20e39783f4d34ca128
Reviewed-on: https://gerrit.libreoffice.org/16752
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 372ea7d..8afd412 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3184,7 +3184,7 @@ void Window::SetCursor( vcl::Cursor* pCursor )
 
 void Window::SetText( const OUString& rStr )
 {
-if (rStr == mpWindowImpl->maText)
+if (!mpWindowImpl || rStr == mpWindowImpl->maText)
 return;
 
 OUString oldTitle( mpWindowImpl->maText );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - vcl/source

[Caolán McNamara]

 vcl/source/control/ilstbox.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 3d10947eb35a1bdd9475e1e02739075c4a4ab644
Author: Caolán McNamara 
Date:   Thu Jul 2 16:21:26 2015 +0100

Resolves: tdf#92467 crashes with empty history list on pressing down

regression from some 16->32 bit listbox limit changing

Change-Id: I045eeef935afed4154fe11bfd11916c2d6a722e9
(cherry picked from commit c51d5706205cd0282c07d778ffac5f265c3eaf5f)
(cherry picked from commit a8ddd3b0280baa1b770f439fbbca9ff073faa16b)
Reviewed-on: https://gerrit.libreoffice.org/16699
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index e6e4c59..4fa8c7e 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1619,8 +1619,9 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& 
rKEvt )
 )
 {
 DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti, 
"ImplListBox: Selecting same Entry" );
-if( nSelect >= mpEntryList->GetEntryCount() )
-nSelect = mpEntryList->GetEntryCount()-1;
+sal_Int32 nCount = mpEntryList->GetEntryCount();
+if (nSelect >= nCount)
+nSelect = nCount ? nCount-1 : LISTBOX_ENTRY_NOTFOUND;
 bool bCurPosChange = (mnCurrentPos != nSelect);
 mnCurrentPos = nSelect;
 if(SelectEntries( nSelect, eLET, bShift, bCtrl, bCurPosChange))
@@ -1680,8 +1681,9 @@ void ImplListBoxWindow::SelectEntry( 
::vcl::StringEntryIdentifier _entry )
 
 // normalize
 OSL_ENSURE( nSelect < mpEntryList->GetEntryCount(), 
"ImplListBoxWindow::SelectEntry: how that?" );
-if( nSelect >= mpEntryList->GetEntryCount() )
-nSelect = mpEntryList->GetEntryCount()-1;
+sal_Int32 nCount = mpEntryList->GetEntryCount();
+if (nSelect >= nCount)
+nSelect = nCount ? nCount-1 : LISTBOX_ENTRY_NOTFOUND;
 
 // make visible
 ShowProminentEntry( nSelect );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: helpauthoring/description.xml

[Stephan Bergmann]

 helpauthoring/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f645351f7bd4e76b2b7aa47baf03e76c2487378d
Author: Stephan Bergmann 
Date:   Mon Jul 6 10:55:13 2015 +0200

Fix invalid version

diff --git a/helpauthoring/description.xml b/helpauthoring/description.xml
index ec7082d..9e6e9be 100644
--- a/helpauthoring/description.xml
+++ b/helpauthoring/description.xml
@@ -21,7 +21,7 @@
 
 
 
-
+
 
 Help authoring extension tool
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: update officeotron

[Stephan Bergmann]

On 07/05/2015 07:41 PM, Markus Mohrhard wrote:

please update officeotron to the latest master version in
https://gerrit.libreoffice.org/gitweb?p=officeotron.git;a=summary


I apparently downloaded officeotron sources from an SVN repo at 
.  Is that dead?

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basebmp/source include/basebmp include/tools unoxml/source

[Noel Grandin]

 basebmp/source/bitmapdevice.cxx  |7 ---
 include/basebmp/bitmapdevice.hxx |1 -
 include/tools/inetmime.hxx   |   14 --
 include/tools/inetmsg.hxx|   10 --
 unoxml/source/dom/saxbuilder.hxx |2 --
 5 files changed, 34 deletions(-)

New commits:
commit c760932fae3c2763a8b573511a5ad1e0f2b75ca7
Author: Noel Grandin 
Date:   Thu Jul 2 15:55:46 2015 +0200

loplugin:unusedmethods basebmp

Change-Id: I9e89fea4e94a91edbbe355780c2a12d6e6cb6e4a
Reviewed-on: https://gerrit.libreoffice.org/16728
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index c31cd57..41a32fe 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -412,13 +412,6 @@ namespace
 return boost::dynamic_pointer_cast( bmp );
 }
 
-virtual bool isCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) 
const SAL_OVERRIDE
-{
-// TODO(P1): dynamic_cast usually called twice for
-// compatible formats
-return getCompatibleAlphaMask( bmp ).get() != NULL;
-}
-
 virtual void clear_i( Color   fillColor,
   const basegfx::B2IBox&  rBounds ) SAL_OVERRIDE
 {
diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 5953741..7668f9c 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -567,7 +567,6 @@ protected:
 private:
 BASEBMP_DLLPRIVATE virtual bool isCompatibleBitmap( const 
BitmapDeviceSharedPtr& bmp ) const = 0;
 BASEBMP_DLLPRIVATE virtual bool isCompatibleClipMask( const 
BitmapDeviceSharedPtr& bmp ) const = 0;
-BASEBMP_DLLPRIVATE virtual bool isCompatibleAlphaMask( const 
BitmapDeviceSharedPtr& bmp ) const = 0;
 
 BASEBMP_DLLPRIVATE virtual void clear_i( Color  fillColor,
  const basegfx::B2IBox& rBounds ) 
= 0;
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index b791060..570 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -717,14 +717,6 @@ public:
 
 /** Write a sequence of octets.
 
-@param pBegin  Points to the start of the sequence, must not be null.
-
-@param pEnd  Points past the end of the sequence, must be >= pBegin.
- */
-inline void write(const sal_Char * pBegin, const sal_Char * pEnd);
-
-/** Write a sequence of octets.
-
 @descr  The supplied sequence of Unicode characters is interpreted as
 a sequence of octets.  It is an error if any of the elements of the
 sequence has a numerical value greater than 255.
@@ -789,12 +781,6 @@ public:
 static inline INetMIMEOutputSink & endl(INetMIMEOutputSink & rSink);
 };
 
-inline void INetMIMEOutputSink::write(const sal_Char * pBegin,
-  const sal_Char * pEnd)
-{
-writeSequence(pBegin, pEnd);
-m_nColumn += pEnd - pBegin;
-}
 
 inline void INetMIMEOutputSink::write(const sal_Unicode * pBegin,
   const sal_Unicode * pEnd)
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 3bca8fa..c064a0d 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -159,16 +159,6 @@ class TOOLS_DLLPUBLIC INetMIMEMessage
 void CopyImp(const INetMIMEMessage& rMsg);
 void SetHeaderParsed() { bHeaderParsed = true; }
 
-OUString GetHeaderName_Impl (
-sal_uIntPtr nIndex, rtl_TextEncoding eEncoding) const
-{
-if ( nIndex < m_aHeaderList.size() ) {
-return OStringToOUString(m_aHeaderList[ nIndex ]->GetName(), 
eEncoding);
-} else {
-return OUString();
-}
-}
-
 OUString GetHeaderValue_Impl (
 sal_uIntPtr nIndex, INetMIME::HeaderFieldType eType) const
 {
diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx
index ce8ce13..f15295c 100644
--- a/unoxml/source/dom/saxbuilder.hxx
+++ b/unoxml/source/dom/saxbuilder.hxx
@@ -61,8 +61,6 @@ namespace DOM
 NodeStack m_aNodeStack;
 NSStack m_aNSStack;
 
-OUString resolvePrefix(const OUString& aPrefix);
-
 css::uno::Reference< css::xml::dom::XDocument > m_aDocument;
 css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
 css::uno::Reference< css::xml::sax::XLocator > m_aLocator;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: update officeotron

[Markus Mohrhard]

On Mon, Jul 6, 2015 at 11:07 AM, Stephan Bergmann 
wrote:

> On 07/05/2015 07:41 PM, Markus Mohrhard wrote:
>
>> please update officeotron to the latest master version in
>> https://gerrit.libreoffice.org/gitweb?p=officeotron.git;a=summary
>>
>
> I apparently downloaded officeotron sources from an SVN repo at <
> http://officeotron.googlecode.com/svn/trunk>.  Is that dead?
> ___
>


googlecode is more or less dead. The project has been exported to github
but the developer does not react anymore to my mails (he did shortly after
he met Miklos at a conference).

As I want to finally push the patch that is waiting in gerrit for months
now I decided to use the gerrit mirror now directly.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: errors encountered after launching libo

[julien2412]

Hello,

In addition to what Stephan indicated, do you reproduce this too if you do
this before:
"export SAL_VCL_PLUGIN=gtk"
?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/errors-encountered-after-launching-libo-tp4153704p4153745.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Remote call horror show

[Stephan Bergmann]

On 07/06/2015 02:41 AM, Matthew J. Francis wrote:

Having said all that, the time to run the test in question is still too
high, and the ultimate solution may well be to merge what I'm doing into
unotest and take advantage of the speed gain of running the whole thing
in-process.


Regardless of any apparent performance advantages of avoiding remote 
communication, any improvements to the introspection and invocation 
services are highly welcome, as they also benefit in-process scripting 
with PyUNO and BASIC.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Miklos Vajna]

 vcl/source/window/window.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 158654894091db2689ddf83d2bb2104e9a408f29
Author: Miklos Vajna 
Date:   Mon Jul 6 11:17:06 2015 +0200

Revert "vcl::Window::SupportsDoubleBuffering: respect 
VCL_DOUBLEBUFFERING_FORCE_ENABLE"

This reverts commit 7df3879d3f6222b840724ae748bdf8bf6a7af9f1. It's not
necessary since commit f16d82ea8f1d2815faa978a4481c6b3c9c8705f8 (make it
possible to force enable double buffering for all widgets, 2015-06-03).

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1fe9b38..8ecf0f4 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3936,8 +3936,7 @@ vcl::RenderSettings& Window::GetRenderSettings()
 
 bool Window::SupportsDoubleBuffering() const
 {
-static bool bDoubleBuffering = getenv("VCL_DOUBLEBUFFERING_FORCE_ENABLE");
-return mpWindowImpl->mbDoubleBuffering || bDoubleBuffering;
+return mpWindowImpl->mbDoubleBuffering;
 }
 
 void Window::SetDoubleBuffering(bool bDoubleBuffering)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/core/undo/unattr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29fbe4bb7c28184721fa718393b2454437076940
Author: Stephan Bergmann 
Date:   Mon Jul 6 11:52:21 2015 +0200

-fsanitize=vptr: unnecessary, wrong downcast

is e.g. an SwDrawFrameFormat instead of an SwFlyFrameFormat during
CppunitTest_sw_uiwriter

Change-Id: I97511cf516f76b12e04da61ce6fd51f61ef83241

diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 9283ae2..2ba9bb34 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -395,7 +395,7 @@ void SwUndoFormatAttr::SaveFlyAnchor( bool bSvDrwPt )
 bool SwUndoFormatAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
 {
 SwDoc *const pDoc = & rContext.GetDoc();
-SwFlyFrameFormat* pFrameFormat = static_cast(m_pFormat);
+SwFrameFormat* pFrameFormat = static_cast(m_pFormat);
 const SwFormatAnchor& rAnchor =
 static_cast( m_pOldSet->Get( RES_ANCHOR, false 
) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf90611.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   10 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |4 
 5 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 519b34300f73b1e08f6194d6ba49d4fc010cf186
Author: Miklos Vajna 
Date:   Mon Jul 6 09:23:40 2015 +0200

tdf#90611 DOCX import: fix missing paragraph style on footnotes

One one hand, a problem since commit
330b860205c7ba69dd6603f65324d0f89ad9cd5f (fdo#68787 DOCX import: handle
when w:separator is missing for footnotes, 2013-09-04) was that the type
attribute from  resulted in two
ooxml:CT_FtnEdn_type tokens, ignoring too many paragraph ends for
footnotes, which resulted in missing paragraph style on footnotes.

On the other hand, fixing the first problem showed that it wasn't
correct that commit 9389cf78e304a5a99bcf1745b9388e14ac36281a (cp#118
RTF import: empty para at the end of footnote text got lost, 2013-11-15)
unconditionally removed the RemoveLastParagraph() call in
DomainMapper_Impl::PopFootOrEndnote(). It turns out that RTF and DOCX
have different semantics here, the footnote is always within a 
pair in DOCX, while in RTF a \par at the end of a
footnote means an empty paragraph. Fix that by conditionally restoring
the removed RemoveLastParagraph() call.

Change-Id: I33020ac761c94addfec8164a17863565e4453b07

diff --git a/sw/qa/extras/ooxmlimport/data/tdf90611.docx 
b/sw/qa/extras/ooxmlimport/data/tdf90611.docx
new file mode 100644
index 000..ac54fee
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf90611.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a1a2dfc..afc1f02 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2724,6 +2724,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf87460, "tdf87460.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(1), xEndnotes->getCount());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf90611, "tdf90611.docx")
+{
+uno::Reference xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFootnotes(xFootnotesSupplier->getFootnotes(), uno::UNO_QUERY);
+uno::Reference xFootnoteText;
+xFootnotes->getByIndex(0) >>= xFootnoteText;
+// This was 11.
+CPPUNIT_ASSERT_EQUAL(10.f, getProperty(getParagraphOfText(1, 
xFootnoteText), "CharHeight"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8c28cd3..becde28 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -992,7 +992,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 case NS_ooxml::LN_CT_FtnEdn_type:
 // This is the "separator" footnote, ignore its linebreak.
 if (static_cast(nIntValue) == 
NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
-m_pImpl->m_bIgnoreNextPara = true;
+m_pImpl->SeenFootOrEndnoteSeparator();
 break;
 case NS_ooxml::LN_CT_DataBinding_prefixMappings:
 m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, 
"ooxml:CT_DataBinding_prefixMappings", sStringValue);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3354057..f8ae16d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -208,6 +208,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bInHeaderFooterImport( false ),
 m_bDiscardHeaderFooter( false ),
 m_bInFootOrEndnote(false),
+m_bSeenFootOrEndnoteSeparator(false),
 m_bLineNumberingSet( false ),
 m_bIsInFootnoteProperties( false ),
 m_bIsCustomFtnMark( false ),
@@ -1747,6 +1748,9 @@ void DomainMapper_Impl::PushAnnotation()
 
 void DomainMapper_Impl::PopFootOrEndnote()
 {
+if (!IsRTFImport())
+RemoveLastParagraph();
+
 // In case the foot or endnote did not contain a tab.
 m_bIgnoreNextTab = false;
 
@@ -1759,9 +1763,18 @@ void DomainMapper_Impl::PopFootOrEndnote()
 return;
 }
 m_aRedlines.pop();
+m_bSeenFootOrEndnoteSeparator = false;
 m_bInFootOrEndnote = false;
 }
 
+void DomainMapper_Impl::SeenFootOrEndnoteSeparator()
+{
+if (!m_bSeenFootOrEndnoteSeparator)
+{
+m_bSeenFootOrEndnoteSeparator = true;
+m_bIgnoreNextPara = true;
+}
+}
 
 void DomainMapper_Impl::PopAnnotation()
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 7d1aaf7..b2b24b4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.h

Re: [Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

I would just not go down the troubled road of attempting to support 
whatever platform-specific file pathname notation in an interface 
supposedly designed to take URLs (i.e., stop calling 
osl::FileBase::getFileURLFromSystemPath on aURL), and then---if there is 
indeed demand to support relative URLs in your interface---use 
rtl::Uri::convertRelToAbs for reliable conversion, instead of resorting 
to guesswork like indexOf("://").


On 07/03/2015 06:18 PM, Jan Holesovsky wrote:

commit e83cb37cf7546e8bc46d0d49b487dcd352b67093
Author: Jan Holesovsky 
Date:   Fri Jul 3 18:14:31 2015 +0200

 LOK: Don't try to absolutize URL's.

 Based on a patch by Henry Castro.

 Change-Id: Ia7aca20feb8f6095adf7dfe510ed78b1e9882740

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ee47cd8..3a0ce67 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -161,13 +161,18 @@ static OUString getUString(const char* pString)
  return OStringToOUString(sString, RTL_TEXTENCODING_UTF8);
  }

-// Try to convert a relative URL to an absolute one
+/// Try to convert a relative URL to an absolute one, unless it already looks 
like an URL.
  static OUString getAbsoluteURL(const char* pURL)
  {
-OUString aURL( getUString( pURL ) );
+OUString aURL(getUString(pURL));
+
+// return unchanged if it likely is an URL already
+if (aURL.indexOf("://") > 0)
+return aURL;
+
  OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;

-// FIXME: this would appear to kill non-file URLs.
+// convert relative paths to absolute ones
  osl_getProcessWorkingDir(&sWorkingDir.pData);
  osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
  osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, 
sAbsoluteDocUrl);
@@ -343,7 +348,7 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,

  SolarMutexGuard aGuard;

-OUString aURL = getAbsoluteURL(pURL);
+OUString aURL(getAbsoluteURL(pURL));

  pLib->maLastExceptionMsg.clear();

@@ -409,7 +414,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
  LibLODocument_Impl* pDocument = static_cast(pThis);

  OUString sFormat = getUString(pFormat);
-OUString aURL = getAbsoluteURL(sUrl);
+OUString aURL(getAbsoluteURL(sUrl));

  try
  {

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svl/source

[Caolán McNamara]

 svl/source/numbers/zforscan.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7c3579484c842c6de2aa46453926d2e30a1d120
Author: Caolán McNamara 
Date:   Mon Jul 6 09:20:53 2015 +0100

a malformed string here can force an out of bounds indexOf

Change-Id: Ic4d922bd27b7f119a7f8b95bbb4d4ed9e89fe51d
(cherry picked from commit 592ee0308a36518137ab8ed965f28de4600909da)
Reviewed-on: https://gerrit.libreoffice.org/16787
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ba94239..b539782 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -889,7 +889,7 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const 
OUString& rString)
 // Do we have some sort of currency?
 OUString sString = pFormatter->GetCharClass()->uppercase(rString);
 sal_Int32 nCPos = 0;
-while (nCPos >= 0)
+while (nCPos >= 0 && nCPos < sString.getLength())
 {
 nCPos = sString.indexOf(GetCurString(),nCPos);
 if (nCPos >= 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Maxim Monastirsky]

 sc/source/ui/cctrl/tbinsert.cxx |2 +-
 sc/source/ui/inc/tbinsert.hxx   |4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 979d93f5f4d3a0a2961da7c0529d948cae5c4ae1
Author: Maxim Monastirsky 
Date:   Sun Jul 5 10:25:14 2015 +0300

This one should override SfxToolBoxControl::Select

We don't have there Select(bool) since
c3a89936abc7967ebe8916ca83cb38f6837f9aa1.

(cherry picked from commit 4604a6a7cd66907fc29e01aacf2146f17fa19d34)
(cherry picked from commit bc3c7f2557a1871fb1e41fc9cac4426a6b208901)

Conflicts:
sc/source/ui/cctrl/tbinsert.cxx

Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16772
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 8b3469a..2df6456 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -98,7 +98,7 @@ SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
 return nLastSlotId ? SfxPopupWindowType::ONTIMEOUT : 
SfxPopupWindowType::ONCLICK;
 }
 
-void ScTbxInsertCtrl::Select( bool /* bMod1 */ )
+void ScTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ )
 {
 SfxViewShell*   pCurSh( SfxViewShell::Current() );
 SfxDispatcher*  pDispatch( 0 );
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index dda7018..cfaf4ae 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -25,9 +25,7 @@
 class ScTbxInsertCtrl : public SfxToolBoxControl
 {
 sal_uInt16  nLastSlotId;
-
-using SfxToolBoxControl::Select;
-voidSelect( bool bMod1 = false );
+virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
 
 public:
 SFX_DECL_TOOLBOX_CONTROL();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Maxim Monastirsky]

 sc/source/ui/cctrl/tbinsert.cxx |2 +-
 sc/source/ui/inc/tbinsert.hxx   |4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 0e78a51b0e7b023bcdc51fdbff7816ed4ba5d0f8
Author: Maxim Monastirsky 
Date:   Sun Jul 5 10:25:14 2015 +0300

This one should override SfxToolBoxControl::Select

We don't have there Select(bool) since
c3a89936abc7967ebe8916ca83cb38f6837f9aa1.

(cherry picked from commit 4604a6a7cd66907fc29e01aacf2146f17fa19d34)
(cherry picked from commit bc3c7f2557a1871fb1e41fc9cac4426a6b208901)

Conflicts:
sc/source/ui/cctrl/tbinsert.cxx
sc/source/ui/inc/tbinsert.hxx

Change-Id: Id496725d82289d1be004bdc36195877c12f336b0
Reviewed-on: https://gerrit.libreoffice.org/16773
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 4030b74..e5f77d8 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -98,7 +98,7 @@ SfxPopupWindowType ScTbxInsertCtrl::GetPopupWindowType() const
 return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
 }
 
-void ScTbxInsertCtrl::Select( bool /* bMod1 */ )
+void ScTbxInsertCtrl::Select( sal_uInt16 /*nSelectModifier*/ )
 {
 SfxViewShell*   pCurSh( SfxViewShell::Current() );
 SfxDispatcher*  pDispatch( 0 );
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index 01b1d46..4238305 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -25,9 +25,7 @@
 class ScTbxInsertCtrl : public SfxToolBoxControl
 {
 sal_uInt16  nLastSlotId;
-
-using SfxToolBoxControl::Select;
-virtual voidSelect( bool bMod1 = false );
+virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
 
 public:
 SFX_DECL_TOOLBOX_CONTROL();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/layout/layact.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e47db97d2ced9178456eebaece8158dce406
Author: Miklos Vajna 
Date:   Mon Jul 6 12:01:02 2015 +0200

SwLayAction::FormatLayout: avoid direct DrawRect()

Regression from commit 1d9e837698baab795efee6cc8b0e289528d5cac6 (Use
GetBoundRect() instead of Frm() in layout., 2011-04-29), this causes
problems for double-buffered rendering and also seems to be pointless,
as just above we already added the rectangle to the repaint area.

Change-Id: I3dc67143e8332ab941a683414ee318dbef13de88

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index c87def2..a0c057b 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1335,9 +1335,6 @@ bool SwLayAction::FormatLayout( OutputDevice 
*pRenderContext, SwLayoutFrm *pLay,
 if(aSpaceToPrevPage.Height() > 0 && 
aSpaceToPrevPage.Width() > 0)
 pImp->GetShell()->AddPaintRect( aSpaceToPrevPage );
 
-if (pSh)
-pRenderContext->DrawRect( aSpaceToPrevPage.SVRect() );
-
 // left
 aSpaceToPrevPage = aPageRect;
 aSpaceToPrevPage.Left( aSpaceToPrevPage.Left() - 
nHalfDocBorder );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/unotools unotools/source

[Noel Grandin]

 include/unotools/calendarwrapper.hxx |3 -
 include/unotools/charclass.hxx   |2 
 include/unotools/configitem.hxx  |1 
 include/unotools/confignode.hxx  |   11 ---
 include/unotools/fontcvt.hxx |8 --
 include/unotools/lingucfg.hxx|3 -
 include/unotools/localedatawrapper.hxx   |   14 -
 include/unotools/numberformatcodewrapper.hxx |3 -
 include/unotools/pathoptions.hxx |1 
 include/unotools/syslocaleoptions.hxx|9 ---
 include/unotools/textsearch.hxx  |   14 -
 include/unotools/transliterationwrapper.hxx  |4 -
 unotools/source/misc/fontcvt.cxx |   75 ---
 unotools/source/ucbhelper/ucblockbytes.cxx   |1 
 unotools/source/ucbhelper/ucblockbytes.hxx   |   17 --
 15 files changed, 1 insertion(+), 165 deletions(-)

New commits:
commit 871a41cfd043e1c7391ca0b8b3c5e60bd799025c
Author: Noel Grandin 
Date:   Fri Jul 3 09:21:43 2015 +0200

loplugin:unusedmethods unotools

Change-Id: Ieb73b50471263212285b9c3883c082477c1ad656
Reviewed-on: https://gerrit.libreoffice.org/16729
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/unotools/calendarwrapper.hxx 
b/include/unotools/calendarwrapper.hxx
index 68ee61c..ceffdea 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -105,9 +105,6 @@ public:
 inline  voidsetGregorianDateTime( const DateTime& 
rDateTime )
 { setLocalDateTime( rDateTime - 
aEpochStart ); }
 
-/// get the DateTime as a local (!) Gregorian DateTime
-inline  DateTimegetGregorianDateTime() const
-{ return aEpochStart + getLocalDateTime(); 
}
 };
 
 #endif
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 06ec048..af4994e 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -208,10 +208,8 @@ public:
 bool isDigit( const OUString& rStr, sal_Int32 nPos ) const;
 bool isAlphaNumeric( const OUString& rStr, sal_Int32 nPos ) const;
 bool isLetterNumeric( const OUString& rStr, sal_Int32 nPos ) const;
-bool isAlpha( const OUString& rStr ) const;
 bool isLetter( const OUString& rStr ) const;
 bool isNumeric( const OUString& rStr ) const;
-bool isAlphaNumeric( const OUString& rStr ) const;
 bool isLetterNumeric( const OUString& rStr ) const;
 
 private:
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 16a6f84..9d5e4ba 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -147,7 +147,6 @@ namespace utl
 @see EnableNotification
 */
 voidDisableNotification();
-boolIsInternalNotification()const {return 
IsInValueChange();}
 
 //returns all members of a node in a specific format
 com::sun::star::uno::Sequence< OUString >
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 0624221..8abd1e6 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -110,11 +110,6 @@ namespace utl
 */
 OConfigurationNode  createNode(const OUString& _rName) const throw();
 
-OConfigurationNode  createNode( const sal_Char* _pAsciiName ) const
-{
-return createNode( OUString::createFromAscii( _pAsciiName ) );
-}
-
 /** remove an existent child nod
 
 If the object represents a set node, this method may be used to 
delete an existent child. For non-set-nodes,
@@ -122,11 +117,6 @@ namespace utl
 */
 boolremoveNode(const OUString& _rName) const throw();
 
-boolremoveNode( const sal_Char* _pAsciiName ) const
-{
-return removeNode( OUString::createFromAscii( _pAsciiName ) );
-}
-
 /** retrieves the content of a descendant
 
 the returned value may contain anything from an interface (if 
_rPath refers to inner node of
@@ -186,7 +176,6 @@ namespace utl
 
 /// checks whether or not a descendent (no matter if direct or 
indirect) with the given name exists
 bool hasByHierarchicalName( const OUString& _rName ) const throw();
-bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { 
return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); }
 
 /// check if the objects represents a valid configuration node
 bool isValid() const { return m_xHierarchyAccess.is(); }
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 6e51a9a..567be3b 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -55,14 +55,6 @@ public:
 //want to convert a string, you don't want to

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Michael Meeks]

 sc/source/ui/inc/anyrefdg.hxx  |1 +
 sc/source/ui/miscdlgs/anyrefdg.cxx |   10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit f7367996e8ba6474bad7be2238cc7ab79178f264
Author: Michael Meeks 
Date:   Fri Jul 3 16:37:06 2015 +0100

tdf#92392 - Dispose ScFormulaReferenceHelper properly.

Release the accelerator, and cleanup global references.

Change-Id: Id9931527f1b6d89067bc1e520e521ccfa6e28197
Reviewed-on: https://gerrit.libreoffice.org/16740
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/16751
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 5f717ff..395dcaf 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -74,6 +74,7 @@ class ScFormulaReferenceHelper
 public:
 ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings);
 ~ScFormulaReferenceHelper();
+void dispose();
 
 voidShowSimpleReference(const OUString& rStr);
 voidShowFormulaReference(const OUString& rStr);
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index aab5194..6208048 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -65,17 +65,24 @@ 
ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi
 
 ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
 {
+dispose();
+}
+
+void ScFormulaReferenceHelper::dispose()
+{
 if (bAccInserted)
 Application::RemoveAccel( pAccel.get() );
+bAccInserted = false;
 
 // common cleanup for ScAnyRefDlg and ScFormulaDlg is done here
-
 HideReference();
 enableInput( true );
 
 ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
 if ( pInputHdl )
 pInputHdl->ResetDelayTimer();   // stop the timer for disabling the 
input line
+
+pAccel.reset();
 }
 
 void ScFormulaReferenceHelper::enableInput( bool bEnable )
@@ -831,6 +838,7 @@ void ScRefHandler::disposeRefHandler()
 m_rWindow.clear();
 pActiveWin.clear();
 LeaveRefMode();
+m_aHelper.dispose();
 }
 
 bool ScRefHandler::LeaveRefMode()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Michael Stahl]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8f99f254bd3c1e05b40103be999bf83fc22fc35
Author: Michael Stahl 
Date:   Mon Jul 6 13:08:58 2015 +0200

configure: require libexttextcat 3.4.1

... following commit cc96b2738b608782edffb4cc368d45255f31377b

Change-Id: I152875b6f72ff972d004f6df11325ce89f43ad9d

diff --git a/configure.ac b/configure.ac
index 0325a2f..d061912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9594,7 +9594,7 @@ AC_SUBST(SYSTEM_LPSOLVE)
 dnl ===
 dnl Checking for libexttextcat
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libexttextcat],[LIBEXTTEXTCAT],[libexttextcat >= 
3.1.1])
+libo_CHECK_SYSTEM_MODULE([libexttextcat],[LIBEXTTEXTCAT],[libexttextcat >= 
3.4.1])
 if test "$with_system_libexttextcat" = "yes"; then
 SYSTEM_LIBEXTTEXTCAT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir 
libexttextcat`
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: tools/source

[Caolán McNamara]

 tools/source/zcodec/zcodec.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5aff134960b046a05f6255d10fd6d8ec72a3ff41
Author: Caolán McNamara 
Date:   Mon Jul 6 11:13:10 2015 +0100

only inflate if status from InitDecompress is good

Change-Id: Ief207205b3f05dd0ed92a2d1d30e265cbdb914e3

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index ed21965..d6b9169 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -153,7 +153,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
 UpdateCRC( mpInBuf, nInToRead );
 
 }
-err = inflate( PZSTREAM, Z_NO_FLUSH );
+err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : -1;
 if ( err < 0 )
 {
 mbStatus = false;
@@ -220,7 +220,7 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, 
sal_uIntPtr nSize )
 UpdateCRC( mpInBuf, nInToRead );
 
 }
-err = inflate( PZSTREAM, Z_NO_FLUSH );
+err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : -1;
 if ( err < 0 )
 {
 // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.
@@ -273,7 +273,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* 
pData, sal_uIntPtr nSize
 UpdateCRC( mpInBuf, nInToRead );
 
 }
-err = inflate( PZSTREAM, Z_NO_FLUSH );
+err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : -1;
 if ( err < 0 )
 {
 // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cppcanvas/source

[Caolán McNamara]

 cppcanvas/source/mtfrenderer/emfplus.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e387d1f5aca7966a18d3b408ed804e9e175374b
Author: Caolán McNamara 
Date:   Sun Jul 5 20:24:50 2015 +0100

this SAL_INFO uses brush which might be NULL

Change-Id: Id69b55b266fe62934b53fc765030cfd044d0c74a
(cherry picked from commit 4a121d402f2a66d30cd01ed1b890284d8d4f465a)
Reviewed-on: https://gerrit.libreoffice.org/16777
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 701cfa3..b8480b8 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1288,7 +1288,7 @@ namespace cppcanvas
 rState.isFillColorSet = true;
 // extract UseBrush
 EMFPBrush* brush = static_cast( aObjects 
[brushIndexOrColor & 0xff] );
-SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << 
brushIndexOrColor << " (type: " << brush->GetType () << ")");
+SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << 
brushIndexOrColor << " (type: " << (brush ? brush->GetType() : -1) << ")");
 
 // give up in case something wrong happened
 if( !brush )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 2 commits - include/svtools svtools/source

[Szymon Kłos]

 include/svtools/RemoteFilesDialog.hxx|3 +
 svtools/source/dialogs/RemoteFilesDialog.cxx |   77 ++-
 2 files changed, 79 insertions(+), 1 deletion(-)

New commits:
commit 97a716119e121005c2a6ca5d73e0bc075802ae78
Author: Szymon Kłos 
Date:   Mon Jul 6 12:27:18 2015 +0200

RemoteFilesDialog: check if file/path exists

Change-Id: I72bcb9f14d4515e7a48d2330bf9757b7a7ca1438

diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 25b9835..03c7bcf 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -763,7 +763,58 @@ IMPL_LINK ( RemoteFilesDialog, SelectBreadcrumbHdl, 
Breadcrumb*, pPtr )
 
 IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
 {
-EndDialog( RET_OK );
+// check if file/path exists
+
+OUString sCurrentPath = m_pFileView->GetViewURL();
+OUString sSelectedItem = m_pFileView->GetCurrentURL();
+OUString sName = m_pName_ed->GetText();
+
+bool bFileDlg = ( m_eType == REMOTEDLG_TYPE_FILEDLG );
+bool bSelected = ( m_pFileView->GetSelectionCount() > 0 );
+
+if( !bSelected )
+{
+m_sPath = sCurrentPath + "/" + INetURLObject::encode( sName, 
INetURLObject::PART_FPATH, INetURLObject::ENCODE_ALL );
+}
+else
+{
+if( m_eType == REMOTEDLG_TYPE_PATHDLG )
+m_sPath = sCurrentPath;
+else
+m_sPath = sSelectedItem;
+}
+
+bool bExists = false;
+
+Reference< XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
+Reference< XInteractionHandler > xInteractionHandler(
+InteractionHandler::createWithParent( xContext, 0 ), 
UNO_QUERY_THROW );
+Reference< XCommandEnvironment > xEnv = new 
::ucbhelper::CommandEnvironment(
+xInteractionHandler, Reference< XProgressHandler >() );
+::ucbhelper::Content m_aContent( m_sPath, xEnv, xContext );
+
+try
+{
+if( bFileDlg )
+bExists = m_aContent.isDocument();
+else
+bExists = m_aContent.isFolder();
+}
+catch( const Exception& )
+{
+bExists = false;
+}
+
+if ( !bExists )
+{
+// TODO
+
+return 0;
+}
+
+if( bExists )
+EndDialog( RET_OK );
+
 return 1;
 }
 
@@ -881,6 +932,9 @@ std::vector RemoteFilesDialog::GetPathList() const
 pEntry = m_pFileView->NextSelected( pEntry );
 }
 
+if( aList.size() == 0 && !m_sPath.isEmpty() )
+aList.push_back( m_sPath );
+
 return aList;
 }
 
commit c894a3fbbc0fdbbf44d2398a01e6cb5d8b221765
Author: Szymon Kłos 
Date:   Mon Jul 6 10:20:00 2015 +0200

RemoteFilesDialog: handlers for file name editing

Change-Id: I623beb2c9d8e4ed81a9c492a046bfffbd317cff6

diff --git a/include/svtools/RemoteFilesDialog.hxx 
b/include/svtools/RemoteFilesDialog.hxx
index 44236d7..1e9afcb 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/include/svtools/RemoteFilesDialog.hxx
@@ -160,6 +160,9 @@ private:
 DECL_LINK( DoubleClickHdl, void * );
 DECL_LINK( SelectHdl, void * );
 
+DECL_LINK( FileNameGetFocusHdl, void * );
+DECL_LINK( FileNameModifyHdl, void * );
+
 DECL_LINK( SplitHdl, void * );
 
 DECL_LINK( SelectFilterHdl, void * );
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 3c728cd..25b9835 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -317,6 +317,9 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, 
WinBits nBits )
 m_pContainer->Show();
 m_pContainer->Enable( false );
 
+m_pName_ed->SetGetFocusHdl( LINK( this, RemoteFilesDialog, 
FileNameGetFocusHdl ) );
+m_pName_ed->SetModifyHdl( LINK( this, RemoteFilesDialog, FileNameModifyHdl 
) );
+
 m_pAddService_btn->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 m_pAddService_btn->SetClickHdl( LINK( this, RemoteFilesDialog, 
AddServiceHdl ) );
 m_pAddService_btn->SetSelectHdl( LINK( this, RemoteFilesDialog, 
EditServiceMenuHdl ) );
@@ -679,6 +682,24 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl )
 return 1;
 }
 
+IMPL_LINK_NOARG( RemoteFilesDialog, FileNameGetFocusHdl )
+{
+m_pFileView->SetNoSelection();
+return 1;
+}
+
+IMPL_LINK_NOARG( RemoteFilesDialog, FileNameModifyHdl )
+{
+m_pFileView->SetNoSelection();
+
+if( !m_pName_ed->GetText().isEmpty() )
+m_pOpen_btn->Enable( true );
+else
+m_pOpen_btn->Enable( false );
+
+return 1;
+}
+
 IMPL_LINK_NOARG ( RemoteFilesDialog, SplitHdl )
 {
 sal_Int32 nSplitPos = m_pSplitter->GetSplitPosPixel();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sot sot/source

[Noel Grandin]

 include/sot/factory.hxx  |6 --
 include/sot/object.hxx   |2 
 include/sot/stg.hxx  |   24 -
 include/sot/storage.hxx  |5 -
 include/sot/storinfo.hxx |1 
 sot/source/base/object.cxx   |4 -
 sot/source/sdstor/stg.cxx|  104 ---
 sot/source/sdstor/stgcache.hxx   |1 
 sot/source/sdstor/stgdir.hxx |3 -
 sot/source/sdstor/stgelem.hxx|4 -
 sot/source/sdstor/stgstrms.cxx   |   19 ---
 sot/source/sdstor/stgstrms.hxx   |7 --
 sot/source/sdstor/storage.cxx|   10 ---
 sot/source/sdstor/ucbstorage.cxx |   66 
 14 files changed, 2 insertions(+), 254 deletions(-)

New commits:
commit c4379aacbe9d5732dadf02c2d4306266e162ffc6
Author: Noel Grandin 
Date:   Fri Jul 3 15:24:09 2015 +0200

loplugin:unusedmethods sot

Change-Id: I14e8bb3e4e38ade1044ce1c50c9676a65152724c
Reviewed-on: https://gerrit.libreoffice.org/16733
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx
index b5f5ff6..7314e3a 100644
--- a/include/sot/factory.hxx
+++ b/include/sot/factory.hxx
@@ -59,12 +59,6 @@ public:
 voidPutSuperClass( const SotFactory * );
 
 boolIs( const SotFactory * pSuperClass ) const;
-const SotFactory *  GetSuper( sal_uInt16 nPos ) const
-{
-return nPos < nSuperCount ?
- pSuperClasses[ nPos ]
- : NULL;
-}
 
 private:
 SotFactory( const SotFactory & ) SAL_DELETED_FUNCTION;
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 8c20856..41077fe 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -35,7 +35,6 @@ friend class SotFactory;
 
 protected:
 virtual ~SotObject();
-voidSetExtern() { bOwner = false; }
 virtual boolClose();
 public:
 SotObject();
@@ -46,7 +45,6 @@ private:
 public:
 static void *  CreateInstance( SotObject ** = NULL );
 static SotFactory *ClassFactory();
-virtual const SotFactory * GetSvFactory() const;
 virtual void * Cast( const SotFactory * );
 
 boolOwner() const { return bOwner; }
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 5f4ba36..bfb5702 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -55,7 +55,6 @@ protected:
 virtual ~StorageBase();
 public:
 TYPEINFO();
-virtual const SvStream* GetSvStream() const = 0;
 virtual boolValidate( bool=false ) const = 0;
 virtual boolValidateMode( StreamMode ) const = 0;
 voidResetError() const;
@@ -80,7 +79,6 @@ public:
 virtual sal_uLong   GetSize() const = 0;
 virtual boolCopyTo( BaseStorageStream * pDestStm ) = 0;
 virtual boolCommit() = 0;
-virtual boolRevert() = 0;
 virtual boolEquals( const BaseStorageStream& rStream ) const = 0;
 };
 
@@ -98,13 +96,9 @@ public:
 virtual voidSetClass( const SvGlobalName & rClass,
   SotClipboardFormatId 
nOriginalClipFormat,
   const OUString & rUserTypeName ) = 0;
-virtual voidSetConvertClass( const SvGlobalName & 
rConvertClass,
- SotClipboardFormatId 
nOriginalClipFormat,
- const OUString & 
rUserTypeName ) = 0;
 virtual SvGlobalNameGetClassName() = 0;
 virtual SotClipboardFormatId GetFormat() = 0;
 virtual OUStringGetUserName() = 0;
-virtual boolShouldConvert() = 0;
 virtual voidFillInfoList( SvStorageInfoList* ) const = 0;
 virtual boolCopyTo( BaseStorage* pDestStg ) const = 0;
 virtual boolCommit() = 0;
@@ -127,7 +121,6 @@ public:
 virtual boolRemove( const OUString & rEleName ) = 0;
 virtual boolRename( const OUString & rEleName, const 
OUString & rNewName ) = 0;
 virtual boolCopyTo( const OUString & rEleName, BaseStorage 
* pDest, const OUString & rNewName ) = 0;
-virtual boolMoveTo( const OUString & rEleName, BaseStorage 
* pDest, const OUString & rNewName ) = 0;
 virtual boolValidateFAT() = 0;
 virtual boolEquals( const BaseStorage& rStream ) const = 0;
 };
@@ -164,10 +157,8 @@ public:
 virtual sal_uLong   GetSize() const SAL_OVERRIDE;
 virtual boolCopyTo( BaseStorageStream * pDestStm ) SAL_OVERRIDE;
 virtual boolCommit() SAL_OVERRIDE;
-virtual boolR

[Libreoffice-commits] core.git: hwpfilter/source i18npool/source

[Noel Grandin]

 hwpfilter/source/formula.h|1 
 hwpfilter/source/hbox.cxx |   17 -
 hwpfilter/source/hbox.h   |8 --
 hwpfilter/source/hinfo.h  |2 -
 hwpfilter/source/hpara.h  |   11 
 hwpfilter/source/hwpfile.h|2 -
 hwpfilter/source/mzstring.h   |3 --
 i18npool/source/search/levdis.hxx |   47 --
 8 files changed, 91 deletions(-)

New commits:
commit 593206bda7ae6b522a5f29aef25445722aedeb4c
Author: Noel Grandin 
Date:   Fri Jul 3 15:56:19 2015 +0200

loplugin:unusedmethods hwpfilter,i18npool

Change-Id: Ied85d93019d0f6c01c14045758b405f2ac316676
Reviewed-on: https://gerrit.libreoffice.org/16783
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h
index ebdb1ac..22c53f6 100644
--- a/hwpfilter/source/formula.h
+++ b/hwpfilter/source/formula.h
@@ -68,7 +68,6 @@ private:
  void makeSubSup(Node *res);
  void makeFraction(Node *res);
  void makeDecoration(Node *res);
- void makeFunction(Node *res);
  void makeRoot(Node *res);
  void makeAccent(Node *res);
  void makeParenth(Node *res);
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index ddcd815..4ef9cbf 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -71,11 +71,6 @@ hchar_string HBox::GetString()
 }
 
 
-hunit HBox::Height(CharShape *csty)
-{
-return( csty->size );
-}
-
 // skip block
 SkipData::SkipData(hchar hch)
 : HBox(hch)
@@ -378,12 +373,6 @@ TxtBox::~TxtBox()
 }
 
 
-hunit TxtBox::Height(CharShape * csty)
-{
-return (style.anchor_type == CHAR_ANCHOR) ? box_ys : csty->size;
-}
-
-
 // picture(11)
 
 Picture::Picture()
@@ -422,12 +411,6 @@ int Picture::Type()
 }
 
 
-hunit Picture::Height(CharShape * sty)
-{
-return (style.anchor_type == CHAR_ANCHOR) ? box_ys : sty->size;
-}
-
-
 // line(14)
 // hidden(15)
 Hidden::~Hidden()
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 7499bd2..4ceeb27 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -54,10 +54,6 @@ struct HBox
  */
 int   WSize();
 /**
- * @returns The Height of HBox object as hunit value.
- */
-virtual hunit Height(CharShape *csty);
-/**
  * Read properties from HIODevice object like stream, file, memory.
  *
  * @param hwpf HWPFile Object having all information for a hwp file.
@@ -391,8 +387,6 @@ struct TxtBox: public FBox
 int Type(){ return type;  }
 
 virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE;
-
-virtual hunit  Height(CharShape *csty) SAL_OVERRIDE;
 };
 
 #define ALLOWED_GAP 5
@@ -662,8 +656,6 @@ struct Picture: public FBox
 
 int   Type();
 virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE;
-
-virtual hunit  Height (CharShape *sty) SAL_OVERRIDE;
 };
 
 // line (14)
diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h
index 00bc604..0452f42 100644
--- a/hwpfilter/source/hinfo.h
+++ b/hwpfilter/source/hinfo.h
@@ -206,8 +206,6 @@ class DLLEXPORT HWPInfo
 ~HWPInfo(void);
 
 bool Read(HWPFile &hwpf);
-bool Write(CTextOut &txtf);
-bool Write(CHTMLOut &html);
 
 };
 
diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h
index 94bd327..7a6c5e3 100644
--- a/hwpfilter/source/hpara.h
+++ b/hwpfilter/source/hpara.h
@@ -117,8 +117,6 @@ class DLLEXPORT HWPPara
 ~HWPPara(void);
 
 bool  Read(HWPFile &hwpf, unsigned char flag = 0);
-int   Write(CTextOut &txtf);
-int   Write(CHTMLOut &html);
 
 void  SetNext(HWPPara *n) { _next = n; };
 
@@ -133,17 +131,12 @@ class DLLEXPORT HWPPara
 ParaShape& GetParaShape(void) { return pshape;}
 
 /**
- * Returns previous paragraph.
- */
-HWPPara *Prev(void);
-/**
  * Returns next paragraph.
  */
 HWPPara *Next(void) { return _next;}
 
 int HomePos(int line) const;
 int EndPos(int line) const;
-int LineLen(int line) const;
 
 private:
 HBox *readHBox(HWPFile &);
@@ -165,10 +158,6 @@ inline int HWPPara::EndPos(int line) const
 }
 
 
-inline int HWPPara::LineLen(int line) const
-{
-return EndPos(line) - HomePos(line);
-}
 #endif // INCLUDED_HWPFILTER_SOURCE_HPARA_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index b28c2a4..f044b5d 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -228,12 +228,10 @@ class DLLEXPORT HWPFile
 HWPFont& GetHWPFont(void) { return _hwpFont; }
 HWPStyle& GetHWPStyle(void) { return _hwpStyle; }
 HWPPara *GetFirstPara(void) { return plist.front(); }
-HWPPara *GetLastPara(void) { return plist.back(); }
 
 EmPicture *GetEmPicture(Picture *pic);
 EmPicture *GetEmPictureByName(char * name);
 HyperText *GetHyperText();
-FBox *GetBoxHead (void) { 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Bjoern Michaelsen]

 sw/source/ui/dbui/mailmergewizard.cxx  |1 
 sw/source/uibase/dbui/mmconfigitem.cxx |   70 +++--
 sw/source/uibase/inc/mmconfigitem.hxx  |6 +-
 3 files changed, 30 insertions(+), 47 deletions(-)

New commits:
commit faf32bcd27b4a1e53cccb03de51a691152a75c6d
Author: Bjoern Michaelsen 
Date:   Sat Jul 4 23:22:53 2015 +0200

tdf#90377: fix exclude recipient in mail merge

- first, actually use the selection in MergeNew()
- secoond, bring back GetSelection() for that
- third, throw away lots of the old (dead) code that mostly just
  stumbled over itself
  - e.g. ExcludeRecord() wouldnt work on the last element due to a
off-by-one error

Change-Id: I07d07e086b748b393f2ada7cb22fdb2ce285ad65
Reviewed-on: https://gerrit.libreoffice.org/16762
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/ui/dbui/mailmergewizard.cxx 
b/sw/source/ui/dbui/mailmergewizard.cxx
index 341bede..04bd7f8 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -276,6 +276,7 @@ void SwMailMergeWizard::CreateTargetDocument()
 aDescriptor[ svx::daCursor ]  <<= m_rConfigItem.GetResultSet();
 aDescriptor[ svx::daCommand ] <<= 
m_rConfigItem.GetCurrentDBData().sCommand;
 aDescriptor[ svx::daCommandType ] <<= 
m_rConfigItem.GetCurrentDBData().nCommandType;
+aDescriptor[ svx::daSelection ]   <<= m_rConfigItem.GetSelection();
 
 SwMergeDescriptor aMergeDesc( DBMGR_MERGE_SHELL, 
GetSwView()->GetWrtShell(),
 aDescriptor);
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx 
b/sw/source/uibase/dbui/mmconfigitem.cxx
index cec51c7..85f6735 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1021,57 +1024,34 @@ sal_Int32 SwMailMergeConfigItem::GetResultSetPosition() 
const
 return m_pImpl->nResultSetCursorPos;
 }
 
-bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
-{
-bool bRet = false;
-if(nRecord > 0 && nRecord < m_aSelection.getLength())
-{
-sal_Int32 nTemp = 0;
-m_aSelection[nRecord - 1] >>= nTemp;
-bRet = nTemp < 1;
-}
-return bRet;
-}
+bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord) const
+{ return m_aExcludedRecords.find(nRecord) != m_aExcludedRecords.end(); }
 
 void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
 {
-//nRecord is based on 1
-//the selection array contains Anys for all records
-//excluded records  contain a '-1'
-if(!m_aSelection.getLength() || nRecord > m_aSelection.getLength())
-{
-if(bExclude)
-{
-//if no selection array is available we need to create one 
containing the
-//entries for all available records
-if(!m_pImpl->xResultSet.is())
-GetResultSet();
-if(m_pImpl->xResultSet.is())
-{
-m_pImpl->xResultSet->last();
-sal_Int32 nEnd = m_pImpl->xResultSet->getRow();
-sal_Int32 nStart = m_aSelection.getLength();
-m_aSelection.realloc(nEnd);
-Any* pSelection = m_aSelection.getArray();
-for(sal_Int32 nIndex = nStart; nIndex < nEnd; ++nIndex)
-{
-if((nRecord - 1) != nIndex)
-pSelection[nIndex] <<= nIndex + 1;
-else
-pSelection[nIndex] <<= (sal_Int32) -1;
-}
-}
-}
-}
+if(bExclude)
+m_aExcludedRecords.insert(nRecord);
 else
-{
-if(nRecord > 0 && m_aSelection.getLength() > nRecord)
-{
-m_aSelection[nRecord - 1] <<= bExclude ? -1 : nRecord;
-}
-}
+m_aExcludedRecords.erase(nRecord);
 }
 
+uno::Sequence SwMailMergeConfigItem::GetSelection() const
+{
+if(!m_pImpl->xResultSet.is())
+GetResultSet();
+if(!m_pImpl->xResultSet.is())
+return {};
+m_pImpl->xResultSet->last();
+sal_Int32 nResultSetSize = m_pImpl->xResultSet->getRow()+1;
+std::vector vResult;
+vResult.reserve(nResultSetSize);
+for(sal_Int32 nIdx=1; nIdx(nIdx));
+return comphelper::containerToSequence(vResult);
+}
+
+
 const uno::Sequence< OUString>&
 SwMailMergeConfigItem::GetSavedDocuments() const
 {
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx 
b/sw/source/uibase/inc/mmconfigitem.hxx
index 7b4115e..07f216c 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "swdllapi.h"
 #include "sharedconnect

[Libreoffice-commits] core.git: framework/source include/svl svl/source sw/inc sw/source

[Noel Grandin]

 framework/source/fwe/helper/undomanagerhelper.cxx |   15 --
 include/svl/adrparse.hxx  |6 -
 include/svl/ctypeitm.hxx  |1 
 include/svl/currencytable.hxx |1 
 include/svl/custritm.hxx  |3 
 include/svl/filerec.hxx   |  131 --
 include/svl/flagitem.hxx  |1 
 include/svl/inethist.hxx  |8 -
 include/svl/int64item.hxx |1 
 include/svl/itemiter.hxx  |6 -
 include/svl/itempool.hxx  |1 
 include/svl/listener.hxx  |1 
 include/svl/macitem.hxx   |8 -
 include/svl/ondemand.hxx  |   36 --
 include/svl/poolitem.hxx  |2 
 include/svl/rectitem.hxx  |4 
 include/svl/rngitem.hxx   |5 
 include/svl/srchitem.hxx  |3 
 include/svl/style.hxx |   15 --
 include/svl/stylepool.hxx |5 
 include/svl/szitem.hxx|5 
 include/svl/undo.hxx  |1 
 include/svl/visitem.hxx   |2 
 include/svl/zforlist.hxx  |4 
 include/svl/zformat.hxx   |   20 ---
 svl/source/filerec/filerec.cxx|   32 -
 svl/source/inc/passwordcontainer.hxx  |2 
 svl/source/items/ctypeitm.cxx |   10 -
 svl/source/items/custritm.cxx |   11 -
 svl/source/items/int64item.cxx|5 
 svl/source/items/poolitem.cxx |6 -
 svl/source/items/style.cxx|   18 ---
 svl/source/items/stylepool.cxx|   15 --
 svl/source/notify/listener.cxx|5 
 svl/source/numbers/currencytable.cxx  |5 
 svl/source/numbers/zforscan.hxx   |1 
 sw/inc/docstyle.hxx   |3 
 sw/source/uibase/app/docstyle.cxx |   99 
 38 files changed, 3 insertions(+), 494 deletions(-)

New commits:
commit 032c0ec6b18718dc2bde580ced9781048a2fdbb9
Author: Noel Grandin 
Date:   Mon Jul 6 09:11:44 2015 +0200

loplugin:unusedmethods svl

Change-Id: Ic136cce6abef44291b7236a6d709f0eee391f311
Reviewed-on: https://gerrit.libreoffice.org/16784
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx 
b/framework/source/fwe/helper/undomanagerhelper.cxx
index 8b0c9c5..c9b68c7 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -246,7 +246,6 @@ namespace framework
 virtual void resetAll() SAL_OVERRIDE;
 virtual void listActionEntered( const OUString& i_comment ) 
SAL_OVERRIDE;
 virtual void listActionLeft( const OUString& i_comment ) SAL_OVERRIDE;
-virtual void listActionLeftAndMerged() SAL_OVERRIDE;
 virtual void listActionCancelled() SAL_OVERRIDE;
 virtual void undoManagerDying() SAL_OVERRIDE;
 
@@ -840,20 +839,6 @@ namespace framework
 notify( i_comment, &XUndoManagerListener::leftContext );
 }
 
-void UndoManagerHelper_Impl::listActionLeftAndMerged()
-{
-#if OSL_DEBUG_LEVEL > 0
-const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
-m_aContextAPIFlags.pop();
-OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, 
"UndoManagerHelper_Impl::listActionLeftAndMerged: API and non-API contexts 
interwoven!" );
-#endif
-
-if ( m_bAPIActionRunning )
-return;
-
-notify( &XUndoManagerListener::leftHiddenContext );
-}
-
 void UndoManagerHelper_Impl::listActionCancelled()
 {
 #if OSL_DEBUG_LEVEL > 0
diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx
index e6c08e8..b4e4f1b 100644
--- a/include/svl/adrparse.hxx
+++ b/include/svl/adrparse.hxx
@@ -65,12 +65,6 @@ public:
 return nIndex == 0 ? m_aFirst.m_aAddrSpec :
  m_aRest[ nIndex - 1 ]->m_aAddrSpec;
 }
-
-const OUString& GetRealName(sal_Int32 nIndex) const
-{
-return nIndex == 0 ? m_aFirst.m_aRealName :
- m_aRest[ nIndex - 1 ]->m_aRealName;
-}
 };
 
 #endif // INCLUDED_SVL_ADRPARSE_HXX
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index abb9000..11a4e97 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -50,7 +50,6 @@ public:
 void SetValue( const OUString& rNewVal );
 
 using SfxPoolItem::Compare;
-virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& 
r

[Libreoffice-commits] core.git: include/com

[Stephan Bergmann]

 include/com/sun/star/uno/Reference.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8468436bf65b05ab77c3414e6cd5d532c6aea1d6
Author: Stephan Bergmann 
Date:   Mon Jul 6 15:24:44 2015 +0200

Workaround seems no longer necessary for MSVC 2013

...but C2514 is still there

Change-Id: I818fed066b0ddaf5c30e6057285151d8a575c373

diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index 91db7f5..a4bdf7c 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -181,7 +181,7 @@ private:
 
 struct S { char c[2]; };
 
-#if defined _MSC_VER
+#if defined _MSC_VER && _MSC_VER < 1800
 static char f(T2 *, long);
 static S f(T1 * const &, int);
 #else
@@ -190,8 +190,8 @@ private:
 #endif
 
 struct H {
-H(); // avoid C2514 "class has no constructors" from MSVC 2008
-#if defined _MSC_VER
+H(); // avoid C2514 "class has no constructors" from MSVC
+#if defined _MSC_VER && _MSC_VER < 1800
 operator T1 * const & () const;
 #else
 operator T1 * () const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ba1293dd49f425bf63e3bd5cadfc9646eefb840c
Author: Christian Lohmaier 
Date:   Mon Jul 6 15:26:03 2015 +0200

enable update to 4.4.4

diff --git a/check.php b/check.php
index 062f5e5..acf2e2b 100644
--- a/check.php
+++ b/check.php
@@ -347,6 +347,11 @@ $build_hash_to_version = array(
 # 4.4.3
 'b2f347f2ac68821efc00b6f1793cda90af748118' => '4.4.3.1',
 '88805f81e9fe61362df02b9941de8e38a9b5fd16' => '4.4.3.2', # Final
+# 4.4.4
+'0396d3e8a6d28185695c6422dbdf78aa24ba67d1' => '4.4.4.1',
+'24c5f9979e61fde7b098af60756a4890e5713390' => '4.4.4.1', # buildfix1
+'f784c932ccfd756d01b70b6bb5e09ff62e1b3285' => '4.4.4.2',
+'2c39ebcf046445232b798108aa8a7e7d89552ea8' => '4.4.4.3', # Final
 );
 
 # Descriptions of the target versions
@@ -366,11 +371,11 @@ $update_map = array(
   'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.3.7',
   'substitute'  => true ),
 
-'latest' => array('gitid'   => 
'88805f81e9fe61362df02b9941de8e38a9b5fd16',
-  'id'  => 'LibreOffice 4.4.3',
-  'version' => '4.4.3',
+'latest' => array('gitid'   => 
'2c39ebcf046445232b798108aa8a7e7d89552ea8',
+  'id'  => 'LibreOffice 4.4.4',
+  'version' => '4.4.4',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.4.3',
+  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-fresh/?type=&lang=&version=4.4.4',
   'substitute'  => true ),
 );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx |   35 +--
 1 file changed, 25 insertions(+), 10 deletions(-)

New commits:
commit b183507ee293d8bcafa9c1c5b2844b7a83fea17b
Author: Jan Holesovsky 
Date:   Mon Jul 6 15:16:56 2015 +0200

LOK: Cleanup absolutizing of URLs.

Thanks to Stephan Bergmann.

Change-Id: I22aa3bb827db28bce3eabebb9b8c514663fad860

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3a0ce67..63fe90b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -26,8 +26,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -165,19 +166,21 @@ static OUString getUString(const char* pString)
 static OUString getAbsoluteURL(const char* pURL)
 {
 OUString aURL(getUString(pURL));
-
-// return unchanged if it likely is an URL already
-if (aURL.indexOf("://") > 0)
+if (aURL.isEmpty())
 return aURL;
 
-OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
-
 // convert relative paths to absolute ones
-osl_getProcessWorkingDir(&sWorkingDir.pData);
-osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
-osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, 
sAbsoluteDocUrl);
+OUString aWorkingDir;
+osl_getProcessWorkingDir(&aWorkingDir.pData);
+
+try {
+return rtl::Uri::convertRelToAbs(aWorkingDir + "/", aURL);
+}
+catch (const rtl::MalformedUriException &)
+{
+}
 
-return sAbsoluteDocUrl;
+return OUString();
 }
 
 extern "C"
@@ -349,6 +352,12 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 SolarMutexGuard aGuard;
 
 OUString aURL(getAbsoluteURL(pURL));
+if (aURL.isEmpty())
+{
+pLib->maLastExceptionMsg = "Filename to load was not provided.";
+SAL_INFO("lok", "URL for load is empty");
+return NULL;
+}
 
 pLib->maLastExceptionMsg.clear();
 
@@ -415,6 +424,12 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
 
 OUString sFormat = getUString(pFormat);
 OUString aURL(getAbsoluteURL(sUrl));
+if (aURL.isEmpty())
+{
+gImpl->maLastExceptionMsg = "Filename to save to was not provided.";
+SAL_INFO("lok", "URL for save is empty");
+return false;
+}
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice 4.x copyright date is 2014

[Andrew Pitonyak]

Latest release of LO 4.x

Help > About

Shows the a copyright date of 2014.

I just installed the latest release candidate (2) and it has a 2015 
copyright, so this probably only matters if there is another release of 
4.x for some reason. I thought that the latest 4.x release was 2015.


Andrew Pitonyak





___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: desktop/source

[Jan Holesovsky]

Hi Stephan,

Stephan Bergmann píše v Po 06. 07. 2015 v 12:06 +0200:

> I would just not go down the troubled road of attempting to support 
> whatever platform-specific file pathname notation in an interface 
> supposedly designed to take URLs (i.e., stop calling 
> osl::FileBase::getFileURLFromSystemPath on aURL), and then---if there is 
> indeed demand to support relative URLs in your interface---use 
> rtl::Uri::convertRelToAbs for reliable conversion, instead of resorting 
> to guesswork like indexOf("://").

Thanks for the hint! :-)  Pushed, 5.0 cherry-pick request here:

https://gerrit.libreoffice.org/16795 

All the best,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/opengl/OpenGLContext.cxx |   50 ++--
 1 file changed, 25 insertions(+), 25 deletions(-)

New commits:
commit e03244c94d83ca5fdd6f3ed62ce7ece4afd51b53
Author: Tor Lillqvist 
Date:   Mon Jul 6 17:31:41 2015 +0300

Fix Funky Capitalisation Of Comments

Change-Id: I2846824d402d029cde8d214f8112047243c79c54

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 3a51c93..0d0a157 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -232,33 +232,33 @@ bool WGLisExtensionSupported(const char *extension)
 const size_t extlen = strlen(extension);
 const char *supported = NULL;
 
-// Try To Use wglGetExtensionStringARB On Current DC, If Possible
+// Try to use wglGetExtensionStringARB on current DC, if possible
 PROC wglGetExtString = wglGetProcAddress("wglGetExtensionsStringARB");
 
 if (wglGetExtString)
 supported = 
((char*(__stdcall*)(HDC))wglGetExtString)(wglGetCurrentDC());
-// If That Failed, Try Standard Opengl Extensions String
+// If that failed, try standard OpenGL extensions string
 if (supported == NULL)
 supported = (char*)glGetString(GL_EXTENSIONS);
-// If That Failed Too, Must Be No Extensions Supported
+// If that failed too, must be no extensions supported
 if (supported == NULL)
 return false;
 
-// Begin Examination At Start Of String, Increment By 1 On False Match
+// Begin examination at start of string, increment by 1 on false match
 for (const char* p = supported; ; p++)
 {
-// Advance p Up To The Next Possible Match
+// Advance p up to the next possible match
 p = strstr(p, extension);
 
 if (p == NULL)
 return 0; // No Match
 
-// Make Sure That Match Is At The Start Of The String Or That
-// The Previous Char Is A Space, Or Else We Could Accidentally
-// Match "wglFunkywglExtension" With "wglExtension"
+// Make sure that match is at the start of the string or that
+// the previous char is a space, or else we could accidentally
+// match "wglFunkywglExtension" with "wglExtension"
 
-// Also, Make Sure That The Following Character Is Space Or NULL
-// Or Else "wglExtensionTwo" Might Match "wglExtension"
+// Also, make sure that the following character is space or null
+// or else "wglExtensionTwo" might match "wglExtension"
 if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]==' 
'))
 return 1; // Match
 }
@@ -269,37 +269,37 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, 
int& rPixelFormat,
 {
 HWND hWnd = NULL;
 GLWindow glWin;
-//create a temp window to check whether support multi-sample, if support, 
get the format
+// Create a temp window to check whether support multi-sample, if support, 
get the format
 if (InitTempWindow(&hWnd, 1, 1, pfd, glWin) < 0)
 {
 SAL_WARN("vcl.opengl", "Can't create temp window to test");
 return false;
 }
 
-// See If The String Exists In WGL!
+// See if the string exists in WGL
 if (!WGLisExtensionSupported("WGL_ARB_multisample"))
 {
-SAL_WARN("vcl.opengl", "Device doesn't support multi sample");
+SAL_WARN("vcl.opengl", "Device doesn't support multisample");
 return false;
 }
-// Get Our Pixel Format
+// Get our pixel format
 PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB = 
(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB");
 if (!wglChoosePixelFormatARB)
 {
 return false;
 }
-// Get Our Current Device Context
+// Get our current device context
 HDC hDC = GetDC(hWnd);
 
 int pixelFormat;
 int valid;
 UINTnumFormats;
 float   fAttributes[] = {0,0};
-// These Attributes Are The Bits We Want To Test For In Our Sample
-// Everything Is Pretty Standard, The Only One We Want To
-// Really Focus On Is The SAMPLE BUFFERS ARB And WGL SAMPLES
-// These Two Are Going To Do The Main Testing For Whether Or Not
-// We Support Multisampling On This Hardware.
+// These attributes are the bits we want to test for in our sample.
+// Everything is pretty standard, the only one we want to
+// really focus on is the WGL_SAMPLE_BUFFERS_ARB and WGL_SAMPLES_ARB.
+// These two are going to do the main testing for whether or not
+// we support multisampling on this hardware.
 int iAttributes[] =
 {
 WGL_DOUBLE_BUFFER_ARB,GL_TRUE,
@@ -325,9 +325,9 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, int& 
rPixelFormat,
 
 bool bArbMultisampleSupported = true;
 
-// First We Check To See If We Can Get A Pixel Format For 4 Samples
+// First we check to see if we can get a pixel format for 4 samples
 valid = wglChoosePixelFormatARB(hDC, iAtt

[Libreoffice-commits] core.git: sd/source sw/source

[Marek Doležel]

 sd/source/ui/dlg/SpellDialogChildWindow.cxx  |   16 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |4 
 2 files changed, 20 deletions(-)

New commits:
commit ae20b8147307de84318598be72977abc3f7bdda9
Author: Marek Doležel 
Date:   Mon Jul 6 15:54:43 2015 +0200

tdf79312: disable auto-close spelling dialog for sw, sd

Change-Id: Ib7ea6624ac6b112779b0e64b08805538b8d6afff
Reviewed-on: https://gerrit.libreoffice.org/16796
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx 
b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index e52e3db..574ba97 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -19,9 +19,6 @@
 
 #include "SpellDialogChildWindow.hxx"
 #include 
-#include 
-#include 
-#include 
 
 namespace sd{
 
@@ -77,19 +74,6 @@ svx::SpellPortions 
SpellDialogChildWindow::GetNextWrongSentence( bool /*bRecheck
 ProvideOutliner();
 aResult = mpSdOutliner->GetNextSpellSentence();
 }
-
-// Close the spell check dialog when there are no more sentences to
-// check.
-if (aResult.empty())
-{
-SfxBoolItem aItem (SID_SPELL_DIALOG, false);
-GetBindings().GetDispatcher()->Execute(
-SID_SPELL_DIALOG,
-SfxCallMode::ASYNCHRON,
-&aItem,
-0L);
-}
-
 return aResult;
 }
 
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx 
b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index e29cb22..b6b157d 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -426,13 +426,9 @@ The code below would only be part of the solution.
 // take care that the now valid selection is stored
 LoseFocus();
 }
-
-// close the spelling dialog
-GetBindings().GetDispatcher()->Execute(FN_SPELL_GRAMMAR_DIALOG, 
SfxCallMode::ASYNCHRON);
 }
 }
 return aRet;
-
 }
 
 void SwSpellDialogChildWindow::ApplyChangedSentence(const svx::SpellPortions& 
rChanged, bool bRecheck)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/source

[Maxim Monastirsky]

 framework/source/uielement/toolbarmanager.cxx |   28 +++---
 1 file changed, 21 insertions(+), 7 deletions(-)

New commits:
commit dd69bde36a4ee4636933a80c0291486593a37670
Author: Maxim Monastirsky 
Date:   Mon Jul 6 02:50:08 2015 +0300

ToolBarManager: Let XSubToolbarController update itself

The doc for XSubToolbarController::updateImage says:

"gets called to notify a controller that it should set an image
which represents the current selected function.

Only the controller instance is able to set the correct image
for the current function. A toolbar implementation will ask
sub-toolbar controllers to update their image whenever it has
to update the images of all its buttons." However, it didn't
work that way until now.

Steps to reproduce:

1. Open one of the custom shapes dropdowns, and choose a shape
   other than the default. Note that the button is now updated
   with the last selection.

2. Change the icon theme. Note that the button shows now the
   default shape, despite the fact that a future activation
   of that button, will still draw the last used shape.

Change-Id: I9345c9faa17dc82a5f590b242b60751ce5d8e648
Reviewed-on: https://gerrit.libreoffice.org/16781
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index fbb1301..ac02170 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -331,13 +331,27 @@ void ToolBarManager::RefreshImages()
 
 if ( nId > 0 )
 {
-OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages 
);
-// Try also to query for add-on images before giving up and use an
-// empty image.
-if ( !aImage )
-aImage = QueryAddonsImage( aCommandURL, bBigImages );
-m_pToolBar->SetItemImage( nId, aImage );
+ToolBarControllerMap::const_iterator pIter = 
m_aControllerMap.find( nId );
+if ( pIter != m_aControllerMap.end() )
+{
+Reference< XSubToolbarController > xController( pIter->second, 
UNO_QUERY );
+if ( xController.is() && xController->opensSubToolbar() )
+{
+// The button should show the last function that was 
selected from the
+// dropdown. The controller should know better than us 
what it was.
+xController->updateImage();
+}
+else
+{
+OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
+Image aImage = GetImageFromURL( m_xFrame, aCommandURL, 
bBigImages );
+// Try also to query for add-on images before giving up 
and use an
+// empty image.
+if ( !aImage )
+aImage = QueryAddonsImage( aCommandURL, bBigImages );
+m_pToolBar->SetItemImage( nId, aImage );
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/qa

[Stephan Bergmann]

 sal/qa/rtl/uri/rtl_testuri.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 89cc8445f7f76b55e209b8c0c5407b0e592b1117
Author: Stephan Bergmann 
Date:   Mon Jul 6 16:57:03 2015 +0200

Clarify treatment of double slashes in rtl::Uri::convertRelToAbs

Change-Id: I71d0ded04b35472f14e4764a47212c73ac500814

diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index e92afe5..191bf5d 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -330,7 +330,11 @@ void Test::test_Uri() {
 { "http://a/b/..";, "../c", "http://a/c"; },
 { "http://a/./b/";, ".././.././../c", "http://a/c"; },
 { "http://a";, "b", "http://a/b"; },
-{ "", "http://a/b/../c";, "http://a/c"; } };
+{ "", "http://a/b/../c";, "http://a/c"; },
+
+{ "http://a/b/c";, "d", "http://a/b/d"; },
+{ "http://a/b/c/";, "d", "http://a/b/c/d"; },
+{ "http://a/b/c//";, "d", "http://a/b/c//d"; } };
 for (std::size_t i = 0; i < sizeof aRelToAbsTest / sizeof (RelToAbsTest); 
++i)
 {
 rtl::OUString aAbs;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/source

[Maxim Monastirsky]

 framework/source/uielement/toolbarmanager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1745af7d0a4157ce370d5ef2243f766bd28b6155
Author: Maxim Monastirsky 
Date:   Mon Jul 6 17:54:43 2015 +0300

Set button size before updating the images

So that the sub-toolbar controller will pick the
right image size.

Change-Id: I70b642ac84377b461a001ef11f551a5e1448c0f1

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index ac02170..a6c0efd 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -325,6 +325,8 @@ void ToolBarManager::RefreshImages()
 SolarMutexGuard g;
 
 bool  bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
+m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : 
TOOLBOX_BUTTONSIZE_SMALL );
+
 for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
 {
 sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
@@ -355,7 +357,6 @@ void ToolBarManager::RefreshImages()
 }
 }
 
-m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE : 
TOOLBOX_BUTTONSIZE_SMALL );
 ::Size aSize = m_pToolBar->CalcWindowSizePixel();
 m_pToolBar->SetOutputSizePixel( aSize );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source

[Benjamin Ni]

 sc/inc/simpleformulacalc.hxx  |1 +
 sc/qa/unit/ucalc.cxx  |6 ++
 sc/source/core/data/simpleformulacalc.cxx |5 +
 sc/source/ui/formdlg/formula.cxx  |2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 6a01844a9f504c40758daa570724f1983ab1be79
Author: Benjamin Ni 
Date:   Mon Jul 6 17:35:27 2015 +0200

tdf#92547 - incorrect input values shown in formula wizard

Change-Id: I55dd98b1613376c8e1c83af8ffdc66a58e022cb1

diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index b701468..340c9d8 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -41,6 +41,7 @@ public:
 
 void Calculate();
 bool IsValue();
+bool IsMatrix();
 sal_uInt16 GetErrCode();
 double GetValue();
 svl::SharedString GetString();
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 190f522..7c8171c 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6483,6 +6483,12 @@ void Test::testFormulaWizardSubformula()
 if ( aFCell.GetErrCode() == 0 )
 CPPUNIT_ASSERT_EQUAL( OUString("{1, #DIV/0!, #NAME!}"), 
aFCell.GetString().getString() );
 
+m_pDoc->SetString(ScAddress(0,1,0), "=NA()");   // B0
+m_pDoc->SetString(ScAddress(1,1,0), "2");   // B1
+m_pDoc->SetString(ScAddress(2,1,0), "=1+2");// B2
+if ( aFCell.GetErrCode() == 0 )
+CPPUNIT_ASSERT_EQUAL(OUString("{#N/A, 2, 3}"), 
aFCell.GetString().getString());
+
 m_pDoc->DeleteTab(0);
 }
 
diff --git a/sc/source/core/data/simpleformulacalc.cxx 
b/sc/source/core/data/simpleformulacalc.cxx
index 5a08e68..d359667 100644
--- a/sc/source/core/data/simpleformulacalc.cxx
+++ b/sc/source/core/data/simpleformulacalc.cxx
@@ -70,6 +70,11 @@ bool ScSimpleFormulaCalculator::IsValue()
 return maResult.IsValue();
 }
 
+bool ScSimpleFormulaCalculator::IsMatrix()
+{
+return bIsMatrix;
+}
+
 sal_uInt16 ScSimpleFormulaCalculator::GetErrCode()
 {
 Calculate();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 23023b5..4160619 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -330,7 +330,7 @@ bool ScFormulaDlg::calculateValue( const OUString& rStrExp, 
OUString& rStrResult
 }
 
 sal_uInt16 nErrCode = pFCell->GetErrCode();
-if ( nErrCode == 0 )
+if ( nErrCode == 0 || pFCell->IsMatrix() )
 {
 SvNumberFormatter& aFormatter = *(pDoc->GetFormatTable());
 Color* pColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 3 commits - framework/inc framework/source icon-themes/breeze icon-themes/tango officecfg/registry sc/uiconfig sw/uic

[Szymon Kłos]

 framework/inc/classes/resource.hrc  |1 
 framework/source/classes/resource.src   |5 ++
 framework/source/uielement/recentfilesmenucontroller.cxx|   20 
++
 icon-themes/breeze/links.txt|2 +
 icon-themes/tango/links.txt |2 +
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu   |8 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 
 sc/uiconfig/scalc/toolbar/standardbar.xml   |1 
 sw/uiconfig/swriter/toolbar/standardbar.xml |1 
 9 files changed, 48 insertions(+)

New commits:
commit eb77e83ecd94e7809240848ef1c5ab7a9f8ce761
Author: Szymon Kłos 
Date:   Mon Jul 6 17:42:29 2015 +0200

open remote button in sc toolbar

Change-Id: I3ad382e246cf16270bc78d57726107fe72b0fac3

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 433c723..d2076ff 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1809,6 +1809,14 @@
   1
 
   
+  
+
+  ~Open Remote File...
+
+
+  1
+
+  
   
 
   Formula to Value
diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml 
b/sc/uiconfig/scalc/toolbar/standardbar.xml
index 40c45b3..1402b8b 100644
--- a/sc/uiconfig/scalc/toolbar/standardbar.xml
+++ b/sc/uiconfig/scalc/toolbar/standardbar.xml
@@ -22,6 +22,7 @@
  
  
  
+ 
  
  
  
commit 34ae168f34e94904152792f7b70878f26f7078ab
Author: Szymon Kłos 
Date:   Mon Jul 6 17:14:55 2015 +0200

open remote button in sw standard toolbar

Change-Id: I7e702da5d4ecc8c32d91e86bd209ec4b7d4f4431

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index c0c797b..a659bb9 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1,8 +1,10 @@
 # Open
 cmd/lc_openfromwriter.png cmd/lc_open.png
 cmd/lc_openfromcalc.png cmd/lc_open.png
+cmd/lc_openremote.png cmd/lc_open.png
 cmd/sc_openfromwriter.png cmd/sc_open.png
 cmd/sc_openfromcalc.png cmd/sc_open.png
+cmd/sc_openremote.png cmd/sc_open.png
 
 # Hyperlink
 cmd/lc_hyperlinkdialog.png cmd/lc_inserthyperlink.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 4272e6a..2810c97 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -270,8 +270,10 @@ cmd/sc_nextpage.png cmd/sc_navigateforward.png
 res/sc06300.png cmd/sc_navigateforward.png
 cmd/lc_openfromwriter.png cmd/lc_open.png
 cmd/lc_openfromcalc.png cmd/lc_open.png
+cmd/lc_openremote.png cmd/lc_open.png
 cmd/sc_openfromwriter.png cmd/sc_open.png
 cmd/sc_openfromcalc.png cmd/sc_open.png
+cmd/sc_openremote.png cmd/sc_open.png
 sc/imglst/lc26048.png cmd/lc_autosum.png
 sc/imglst/sc26048.png cmd/sc_autosum.png
 cmd/lc_fontcolor.png cmd/lc_color.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 40ddf82..a02bc72 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2275,6 +2275,14 @@
   1
 
   
+  
+
+  ~Open Remote File...
+
+
+  1
+
+  
 
 
   
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 4910fb8..d94a44b 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -22,6 +22,7 @@
  
  
  
+ 
  
  
  
commit 2de5bc24e05ffcb202c02ba3c72f852e0415cce4
Author: Szymon Kłos 
Date:   Mon Jul 6 16:01:26 2015 +0200

open remote entry in the open drop down menu

Change-Id: Idebc8a926c6653c476c2507606d4a89b22e2eaaf

diff --git a/framework/inc/classes/resource.hrc 
b/framework/inc/classes/resource.hrc
index 8d23371..6620c99 100644
--- a/framework/inc/classes/resource.hrc
+++ b/framework/inc/classes/resource.hrc
@@ -50,6 +50,7 @@
 #define STR_CLEAR_RECENT_FILES  (RID_STR_START+23)
 #define STR_CLEAR_RECENT_FILES_HELP (RID_STR_START+24)
 #define STR_LANGSTATUS_HINT (RID_STR_START+25)
+#define STR_OPEN_REMOTE (RID_STR_START+26)
 
 #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION(RID_MENU_START+0)
 
diff --git a/framework/source/classes/resource.src 
b/framework/source/classes/resource.src
index c54eaa3..0ef53ae 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -114,6 +114,11 @@ String STR_CLEAR_RECENT_FILES_HELP
 Text [ en-US ] = "Clears

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/core/view/viewsh.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b26c1796d0a05f47cfb01d79ee4f69344efbbb2
Author: Miklos Vajna 
Date:   Mon Jul 6 17:49:35 2015 +0200

tdf#92577 sw rendercontext: paint transparent from controls conditionally

Regression from commit beb4aa21d61f0d66392d596be86fb57b4b167239
(SwViewShell::ImplEndAction: avoid direct paint, 2015-06-29), the
problem was that the lcl_PaintTransparentFormControls() call performs
direct paint, so it should be called only in case we don't do an async
paint via invalidate.

As expected, this call is no longer needed for the original i#107365
bug document in case SwViewShell::Paint() will be called by the main
loop shortly.

Change-Id: Ia27c551ed838d610f972f20abbb4ae9f0e1241b6

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b8ed713..950bcac 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -407,8 +407,8 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
 {
 InvalidateWindows(aRect.SVRect());
 }
-
-lcl_PaintTransparentFormControls(*this, aRect); // i#107365
+else
+lcl_PaintTransparentFormControls(*this, aRect); // 
i#107365
 }
 
 pVout.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC15] Chained Text Boxes - Report Week 6

[Matteo Campanelli]

Hi,
this week we made progress on saving text format while transferring text.
Now we have the expected behavior. Still there are a few issues arising in
editing mode.

Even more importantly the code was rebased on master and modified
accordingly.

I developed some ideas on how to have some reasonable cursor motion
behavior in linked text boxes and I'm going to try them out this week.

Cheers,
Matteo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/filter/excel/xestring.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3004221e47918eb08cfa98ba43a23a0b25412cd5
Author: Markus Mohrhard 
Date:   Sat Apr 18 02:07:58 2015 +0200

preserve whitespaces here, tdf#88137, tdf#89254

Change-Id: Ieabb075b1e324792726a6c67949fbf3e7127615d
Reviewed-on: https://gerrit.libreoffice.org/15375
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/filter/excel/xestring.cxx 
b/sc/source/filter/excel/xestring.cxx
index 3388048..1404e18 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -413,7 +413,8 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const
 
 if( !IsWriteFormats() )
 {
-rWorksheet->startElement( XML_t, FSEND );
+rWorksheet->startElement( XML_t,
+FSNS(XML_xml, XML_space), "preserve", FSEND );
 rWorksheet->writeEscaped( XclXmlUtils::ToOUString( *this ) );
 rWorksheet->endElement( XML_t );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 133b8446a7054505f77e5ad37d959802db7b1122
Author: matteocam 
Date:   Mon Jul 6 12:52:04 2015 -0400

Move cursor at end of editing space after chaining

Change-Id: Idca4d59e8361992aa4574d7833c45bd5ba25f7cc

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 0f4a273..92fd231 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -489,6 +489,20 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 if( pTextObj )
 {
 pTextObj->onChainingEvent();
+
+/* Cursor motion stuff */
+OutlinerView* pOLV = GetTextEditOutlinerView();
+
+// Find last Para
+const sal_Int32 nParaCount = 
pTextEditOutliner->GetParagraphCount();
+const sal_Int32 nLastParaIndex = nParaCount > 1 ? nParaCount - 1 : 
0;
+Paragraph* pLastPara = pTextEditOutliner->GetParagraph( 
nLastParaIndex);
+const sal_Int32 nLenLastPara = 
pTextEditOutliner->GetText(pLastPara).getLength();
+// End of editing space
+ESelection aSel = 
ESelection(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
+
+pOLV->SetSelection(aSel);
+
 }
 }
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit c97795e6edf9613292b7ccef0283582dd4cbe8a9
Author: matteocam 
Date:   Mon Jul 6 13:04:09 2015 -0400

Go to previous position

Change-Id: Iaa4954ee8a0a99ccdce70653ba5d84ef2acf1c79

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 92fd231..c775ab1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -488,20 +488,28 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( 
mxTextEditObj.get() );
 if( pTextObj )
 {
+OutlinerView* pOLV = GetTextEditOutlinerView();
+assert(pOLV);
+// Save previous selection pos
+ESelection aPreChainingSel(pOLV->GetSelection());
+
+// trigger actual chaining
 pTextObj->onChainingEvent();
 
 /* Cursor motion stuff */
-OutlinerView* pOLV = GetTextEditOutlinerView();
+
 
 // Find last Para
+/*
 const sal_Int32 nParaCount = 
pTextEditOutliner->GetParagraphCount();
 const sal_Int32 nLastParaIndex = nParaCount > 1 ? nParaCount - 1 : 
0;
 Paragraph* pLastPara = pTextEditOutliner->GetParagraph( 
nLastParaIndex);
 const sal_Int32 nLenLastPara = 
pTextEditOutliner->GetText(pLastPara).getLength();
-// End of editing space
-ESelection aSel = 
ESelection(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
+// Selection at end of editing area
+ESelection 
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
+*/
 
-pOLV->SetSelection(aSel);
+pOLV->SetSelection(aPreChainingSel);
 
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/unusedmethodsremove.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e93b4d20d88ab70489e4daad5e8640b34d06b28f
Author: Stephan Bergmann 
Date:   Mon Jul 6 19:24:27 2015 +0200

No MAP_POPULATE on Mac OS X

Change-Id: I6a0b8bbeec94fe19b609542550f9cce783daef20

diff --git a/compilerplugins/clang/unusedmethodsremove.cxx 
b/compilerplugins/clang/unusedmethodsremove.cxx
index 9087733..01b71b1 100644
--- a/compilerplugins/clang/unusedmethodsremove.cxx
+++ b/compilerplugins/clang/unusedmethodsremove.cxx
@@ -59,7 +59,7 @@ UnusedMethodsRemove::UnusedMethodsRemove(InstantiationData 
const & data): Rewrit
 mmapFD = open(sInputFile, O_RDONLY, 0);
 assert(mmapFD != -1);
 //Execute mmap
-mmappedData = static_cast(mmap(NULL, mmapFilesize, PROT_READ, 
MAP_PRIVATE | MAP_POPULATE, mmapFD, 0));
+mmappedData = static_cast(mmap(NULL, mmapFilesize, PROT_READ, 
MAP_PRIVATE, mmapFD, 0));
 assert(mmappedData != NULL);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp loolwsd/LOOLWSD.cpp loolwsd/loolwsd-systemplate-setup loolwsd/Makefile.am

[Jan Holesovsky]

 loolwsd/LOOLSession.cpp   |   23 +++
 loolwsd/LOOLWSD.cpp   |1 +
 loolwsd/Makefile.am   |2 +-
 loolwsd/loolwsd-systemplate-setup |2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 767d6a0a32281ee1cdefce15728e4bb6089ac497
Author: Jan Holesovsky 
Date:   Mon Jul 6 19:35:50 2015 +0200

Create /dev/*random in the chroot so that ssl works.

Also add the missing library to the systemplate.

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 14feb33..812d27f 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -414,6 +414,29 @@ void MasterProcessSession::preSpawn()
 linkOrCopy(LOOLWSD::sysTemplate, jail);
 linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
+#ifdef __linux
+// Create the urandom and random devices
+File(Path(jail, "/dev")).createDirectory();
+if (mknod((jail.toString() + "/dev/random").c_str(),
+S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | 
S_IWOTH,
+makedev(1, 8)) != 0)
+{
+Application::instance().logger().error(Util::logPrefix() +
+"mknod(" + jail.toString() + "/dev/random) failed: " +
+strerror(errno));
+
+}
+if (mknod((jail.toString() + "/dev/urandom").c_str(),
+S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | 
S_IWOTH,
+makedev(1, 9)) != 0)
+{
+Application::instance().logger().error(Util::logPrefix() +
+"mknod(" + jail.toString() + "/dev/urandom) failed: " +
+strerror(errno));
+
+}
+#endif
+
 _pendingPreSpawnedChildren.insert(childId);
 
 Process::Args args;
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f654612..6856429 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -683,6 +683,7 @@ int LOOLWSD::childMain()
 
 #ifdef __linux
 dropCapability(CAP_FOWNER);
+dropCapability(CAP_MKNOD);
 #endif
 // We use the same option set for both parent and child loolwsd,
 // so must check options required in the child (but not in the
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index c3c5011..352bd1a 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -27,7 +27,7 @@ clean-cache:
 all-local: loolwsd
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
if test `uname -s` = Linux; then \
-   sudo @SETCAP@ cap_fowner,cap_sys_chroot=ep loolwsd; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolwsd; \
else \
sudo chown root loolwsd && sudo chmod u+s loolwsd; \
fi; \
diff --git a/loolwsd/loolwsd-systemplate-setup 
b/loolwsd/loolwsd-systemplate-setup
index 7e310fb..6cd6fca 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -31,6 +31,8 @@ cd / || exit 1
 usr/share/liblangtag \
 -type f
 
+   find lib/libnss_* lib64/libnss_* -type l
+
# Go through the LO shared objects and check what system libraries
# they link to.
find $INSTDIR -name '*.so' -o -name '*.so.[0-9]*' |
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 86 commits - accessibility/inc accessibility/source android/Bootstrap animations/source avmedia/source basctl/inc basctl/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit a9fb6fadc82698a6ab1551aed5ae0ef3e526af73
Author: Pranav Kant 
Date:   Mon Jul 6 22:01:30 2015 +0530

lokdocview: [WIP] Call open_document in another thread

This is to keep the widget responsive during heavy LOK calls
being made in the background.

Change-Id: I81acaffc75ca7deddd6cc2de6abae22d009d40cd

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 962f9d9..d536e4a 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -46,7 +46,14 @@ GtkWidget* lok_doc_view_new  
  (const gchar*
 GError 
**error);
 
 gboolean   lok_doc_view_open_document  
(LOKDocView* pDocView,
-const 
gchar* pPath);
+const 
gchar* pPath,
+
GCancellable* cancellable,
+
GAsyncReadyCallback callback,
+gpointer 
userdata);
+
+gboolean   lok_doc_view_open_document_finish   
(LOKDocView* pDocView,
+
GAsyncResult* res,
+GError** 
error);
 
 /// Gets the document the viewer displays.
 LibreOfficeKitDocument*lok_doc_view_get_document   
(LOKDocView* pDocView);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index ec70a88..fed62c4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -41,6 +41,7 @@ std::map g_aCommandNameToolItems;
 bool g_bToolItemBroadcast = true;
 static GtkWidget* pVBox;
 static GtkComboBoxText* pPartSelector;
+static GtkWidget* pPartModeComboBox;
 /// Should the part selector avoid calling lok::Document::setPart()?
 static bool g_bPartSelectorBroadcast = true;
 GtkWidget* pFindbar;
@@ -291,6 +292,7 @@ static void signalSearch(LOKDocView* /*pLOKDocView*/, char* 
/*pPayload*/, gpoint
 gtk_label_set_text(GTK_LABEL(pFindbarLabel), "Search key not found");
 }
 
+
 static void signalPart(LOKDocView* /*pLOKDocView*/, int nPart, gpointer 
/*pData*/)
 {
 g_bPartSelectorBroadcast = false;
@@ -380,6 +382,45 @@ static void changePartMode( GtkWidget* pSelector, gpointer 
/* pItem */ )
 }
 }
 
+
+static void loadStarted(LOKDocView* pDocView, gpointer pData)
+{
+g_info ("load started");
+}
+
+static void loadFinished(LOKDocView* pDocView, gboolean status, gpointer pData)
+{
+g_info ("load finished");
+
+populatePartSelector();
+populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
+// Connect these signals after populating the selectors, to avoid 
re-rendering on setting the default part/partmode.
+g_signal_connect(G_OBJECT(pPartModeComboBox), "changed", 
G_CALLBACK(changePartMode), 0);
+g_signal_connect(G_OBJECT(pPartSelector), "changed", 
G_CALLBACK(changePart), 0);
+
+GList *focusChain = NULL;
+focusChain = g_list_append( focusChain, pDocView );
+gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
+}
+
+static void open_document_cb (GObject* source_object, GAsyncResult* res, 
gpointer userdata)
+{
+LOKDocView* pDocView = LOK_DOC_VIEW (source_object);
+GError* error = NULL;
+
+gboolean result = lok_doc_view_open_document_finish(pDocView, res, &error);
+if (result){
+g_info ("open_document results to true");
+}else
+g_info ("open document results to false");
+
+if (error != NULL)
+{
+g_warning ("Error occurred while opening the document : %s", 
error->message);
+g_error_free (error);
+}
+}
+
 int main( int argc, char* argv[] )
 {
 if( argc < 3 ||
@@ -435,7 +476,7 @@ int main( int argc, char* argv[] )
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator2, -1);
 
 GtkToolItem* pPartModeSelectorToolItem = gtk_tool_item_new();
-GtkWidget* pPartModeComboBox = gtk_combo_box_text_new();
+pPartModeComboBox = gtk_combo_box_text_new();
 gtk_container_add( GTK_CONTAINER(pPartModeSelectorToolItem), 
pPartModeComboBox );
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartModeSelectorToolItem, -1 );
 
@@ -530,6 +571,9 @@ int main( int argc, char* argv[] )
 g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
 g_signal_connect(pDocView, "hyperlink-clicked", 
G_CALLBACK(signalHyperlink), NULL);
 
+g_signal_connect(pDocView, "load-started", G_CALLBACK(loadStarted), NULL);
+g_signal_connect(pD

[GSoC'15] Integrate LO with GNOME - WR#6

[Pranav Kant]

The most important commit this week is the WIP push to make LOK call
(open_document) in a separate thread, along with other bugfixes.

This included adding two more signals to the widget viz. load-started,
load-finished to add support for asynchronously loading the document.
This would greatly enhance the responsiveness of the widget, and not
freeze the UI while loading any document.

In next few weeks, I would improve this and add more LOK calls in
separate threads.

-- 
Regards,
Pranav Kant
http://pranavk.me
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit bc4cc289ad04b6a80f6558c9577950395e8141c6
Author: matteocam 
Date:   Mon Jul 6 14:47:18 2015 -0400

Set empty chaining link after edit ends. Error msg for OutlView.

Change-Id: I693f7a884274de0f98a26b3e4d197501877289af

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c775ab1..34e12d2 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -486,10 +486,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 if(pTextEditOutliner )
 {
 SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( 
mxTextEditObj.get() );
-if( pTextObj )
+OutlinerView* pOLV = GetTextEditOutlinerView();
+if( pTextObj && pOLV)
 {
-OutlinerView* pOLV = GetTextEditOutlinerView();
-assert(pOLV);
 // Save previous selection pos
 ESelection aPreChainingSel(pOLV->GetSelection());
 
@@ -511,6 +510,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 
 pOLV->SetSelection(aPreChainingSel);
 
+} else {
+// XXX
+fprintf(stderr, "[OnChaining] No Edit Outliner View\n");
 }
 }
 return 0;
@@ -947,6 +949,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 pTEOutliner->SetBeginPasteOrDropHdl(Link<>());
 pTEOutliner->SetEndPasteOrDropHdl(Link<>());
 
+pTEOutliner->SetChainingEventHdl(Link<>());
+
 const bool bUndo = IsUndoEnabled();
 if( bUndo )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - include/LibreOfficeKit libreofficekit/qa libreofficekit/source

[Pranav Kant]

 include/LibreOfficeKit/LibreOfficeKitGtk.h  |2 
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   44 +---
 libreofficekit/source/gtk/lokdocview.cxx|   41 ++
 3 files changed, 17 insertions(+), 70 deletions(-)

New commits:
commit af3ff4f4b4db6a2f540fbc95040ac5ab145d3adb
Author: Pranav Kant 
Date:   Tue Jul 7 00:30:41 2015 +0530

lokdocview: [WIP] Superfluous signals

Callback always gets invoked after the load finishes. So, lets
use that.

Change-Id: Ifa221684c7e6f286fe3434119ae5f21e2e02ea37

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index d536e4a..ec28348 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -45,7 +45,7 @@ GtkWidget* lok_doc_view_new   
 (const gchar*
 
GCancellable *cancellable,
 GError 
**error);
 
-gboolean   lok_doc_view_open_document  
(LOKDocView* pDocView,
+void   lok_doc_view_open_document  
(LOKDocView* pDocView,
 const 
gchar* pPath,
 
GCancellable* cancellable,
 
GAsyncReadyCallback callback,
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index fed62c4..af3ba41 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -382,15 +382,17 @@ static void changePartMode( GtkWidget* pSelector, 
gpointer /* pItem */ )
 }
 }
 
-
-static void loadStarted(LOKDocView* pDocView, gpointer pData)
+static void openDocumentCallback (GObject* source_object, GAsyncResult* res, 
gpointer /*userdata*/)
 {
-g_info ("load started");
-}
+LOKDocView* pDocView1 = LOK_DOC_VIEW (source_object);
+GError* error = NULL;
+GList *focusChain = NULL;
 
-static void loadFinished(LOKDocView* pDocView, gboolean status, gpointer pData)
-{
-g_info ("load finished");
+if (!lok_doc_view_open_document_finish(pDocView1, res, &error))
+{
+g_warning ("Error occurred while opening the document : %s", 
error->message);
+g_error_free (error);
+}
 
 populatePartSelector();
 populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
@@ -398,29 +400,10 @@ static void loadFinished(LOKDocView* pDocView, gboolean 
status, gpointer pData)
 g_signal_connect(G_OBJECT(pPartModeComboBox), "changed", 
G_CALLBACK(changePartMode), 0);
 g_signal_connect(G_OBJECT(pPartSelector), "changed", 
G_CALLBACK(changePart), 0);
 
-GList *focusChain = NULL;
-focusChain = g_list_append( focusChain, pDocView );
+focusChain = g_list_append( focusChain, pDocView1 );
 gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
 }
 
-static void open_document_cb (GObject* source_object, GAsyncResult* res, 
gpointer userdata)
-{
-LOKDocView* pDocView = LOK_DOC_VIEW (source_object);
-GError* error = NULL;
-
-gboolean result = lok_doc_view_open_document_finish(pDocView, res, &error);
-if (result){
-g_info ("open_document results to true");
-}else
-g_info ("open document results to false");
-
-if (error != NULL)
-{
-g_warning ("Error occurred while opening the document : %s", 
error->message);
-g_error_free (error);
-}
-}
-
 int main( int argc, char* argv[] )
 {
 if( argc < 3 ||
@@ -571,9 +554,6 @@ int main( int argc, char* argv[] )
 g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
 g_signal_connect(pDocView, "hyperlink-clicked", 
G_CALLBACK(signalHyperlink), NULL);
 
-g_signal_connect(pDocView, "load-started", G_CALLBACK(loadStarted), NULL);
-g_signal_connect(pDocView, "load-finished", G_CALLBACK(loadFinished), 
NULL);
-
 // Scrolled window for DocView
 pScrolledWindow = gtk_scrolled_window_new(0, 0);
 gtk_widget_set_hexpand (pScrolledWindow, TRUE);
@@ -586,9 +566,7 @@ int main( int argc, char* argv[] )
 // Hide the findbar by default.
 gtk_widget_hide(pFindbar);
 
-int bOpened = lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2], 
NULL, open_document_cb, pDocView );
-if (!bOpened)
-g_error("main: lok_doc_view_open_document() failed");
+lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2], NULL, 
openDocumentCallback, pDocView );
 
 gtk_main();
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index f9b332c..7e11d06 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreoffi

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - include/LibreOfficeKit libreofficekit/qa libreofficekit/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit fc5c6e10757c7bf05e4f95bc190713ba2c4e43f7
Author: Pranav Kant 
Date:   Tue Jul 7 00:30:41 2015 +0530

lokdocview: [WIP] Superfluous signals

Callback always gets invoked after the load finishes. So, lets
use that.

Change-Id: Ifa221684c7e6f286fe3434119ae5f21e2e02ea37

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index d536e4a..ec28348 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -45,7 +45,7 @@ GtkWidget* lok_doc_view_new   
 (const gchar*
 
GCancellable *cancellable,
 GError 
**error);
 
-gboolean   lok_doc_view_open_document  
(LOKDocView* pDocView,
+void   lok_doc_view_open_document  
(LOKDocView* pDocView,
 const 
gchar* pPath,
 
GCancellable* cancellable,
 
GAsyncReadyCallback callback,
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index fed62c4..af3ba41 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -382,15 +382,17 @@ static void changePartMode( GtkWidget* pSelector, 
gpointer /* pItem */ )
 }
 }
 
-
-static void loadStarted(LOKDocView* pDocView, gpointer pData)
+static void openDocumentCallback (GObject* source_object, GAsyncResult* res, 
gpointer /*userdata*/)
 {
-g_info ("load started");
-}
+LOKDocView* pDocView1 = LOK_DOC_VIEW (source_object);
+GError* error = NULL;
+GList *focusChain = NULL;
 
-static void loadFinished(LOKDocView* pDocView, gboolean status, gpointer pData)
-{
-g_info ("load finished");
+if (!lok_doc_view_open_document_finish(pDocView1, res, &error))
+{
+g_warning ("Error occurred while opening the document : %s", 
error->message);
+g_error_free (error);
+}
 
 populatePartSelector();
 populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
@@ -398,29 +400,10 @@ static void loadFinished(LOKDocView* pDocView, gboolean 
status, gpointer pData)
 g_signal_connect(G_OBJECT(pPartModeComboBox), "changed", 
G_CALLBACK(changePartMode), 0);
 g_signal_connect(G_OBJECT(pPartSelector), "changed", 
G_CALLBACK(changePart), 0);
 
-GList *focusChain = NULL;
-focusChain = g_list_append( focusChain, pDocView );
+focusChain = g_list_append( focusChain, pDocView1 );
 gtk_container_set_focus_chain ( GTK_CONTAINER (pVBox), focusChain );
 }
 
-static void open_document_cb (GObject* source_object, GAsyncResult* res, 
gpointer userdata)
-{
-LOKDocView* pDocView = LOK_DOC_VIEW (source_object);
-GError* error = NULL;
-
-gboolean result = lok_doc_view_open_document_finish(pDocView, res, &error);
-if (result){
-g_info ("open_document results to true");
-}else
-g_info ("open document results to false");
-
-if (error != NULL)
-{
-g_warning ("Error occurred while opening the document : %s", 
error->message);
-g_error_free (error);
-}
-}
-
 int main( int argc, char* argv[] )
 {
 if( argc < 3 ||
@@ -571,9 +554,6 @@ int main( int argc, char* argv[] )
 g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
 g_signal_connect(pDocView, "hyperlink-clicked", 
G_CALLBACK(signalHyperlink), NULL);
 
-g_signal_connect(pDocView, "load-started", G_CALLBACK(loadStarted), NULL);
-g_signal_connect(pDocView, "load-finished", G_CALLBACK(loadFinished), 
NULL);
-
 // Scrolled window for DocView
 pScrolledWindow = gtk_scrolled_window_new(0, 0);
 gtk_widget_set_hexpand (pScrolledWindow, TRUE);
@@ -586,9 +566,7 @@ int main( int argc, char* argv[] )
 // Hide the findbar by default.
 gtk_widget_hide(pFindbar);
 
-int bOpened = lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2], 
NULL, open_document_cb, pDocView );
-if (!bOpened)
-g_error("main: lok_doc_view_open_document() failed");
+lok_doc_view_open_document( LOK_DOC_VIEW(pDocView), argv[2], NULL, 
openDocumentCallback, pDocView );
 
 gtk_main();
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index f9b332c..64aeb89 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -337,19 +337,23 @@ static gboolean
 globalCallback (gpointer pData)
 {
 CallbackData* pCallback = static_cast(pData);
+LOKDocViewPrivate* priv = 
static_cast(lok_doc_view_get_instance_private 
(pCallba

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 146c0beb1faf6694518aa3b86b7c2d3324734bcd
Author: matteocam 
Date:   Mon Jul 6 15:05:35 2015 -0400

Moving to next box in SdrBeginTextEdit

Change-Id: I6dc83a8f2f6a19e5cfa4af083e68b8a6a453d02a

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 34e12d2..74a14e1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -808,6 +808,15 @@ bool SdrObjEditView::SdrBeginTextEdit(
 }
 }
 
+// FIXME(matteocam)
+// XXX: Trying to get to the next text obj directly
+if (pTextObj->IsChainable()) {
+SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
+SdrEndTextEdit();
+SdrBeginTextEdit(pNextLink);
+}
+
+
 return true; // ran fine, let TextEdit run now
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/source

[Maxim Monastirsky]

 include/svx/tbcontrl.hxx   |4 
 include/svx/tbxcolorupdate.hxx |2 +-
 svx/source/tbxctrls/tbcontrl.cxx   |   21 +
 svx/source/tbxctrls/tbxcolorupdate.cxx |5 +++--
 4 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 064481201341d92af2ec1387bb53a9c4b480217f
Author: Maxim Monastirsky 
Date:   Mon Jul 6 22:35:15 2015 +0300

tdf#83541 Redraw the last used color after theme change

That's not what XSubToolbarController was originally designed for,
probably, but it has more in common than otherwise. A split button
offers a dropdown with some functions, and the main part of that
button updates with the last selection, to easily re-apply it.

This is based on the change made in commit
dd69bde36a4ee4636933a80c0291486593a37670, so that updateImage
method is called once an icon refreshing is requested.

Change-Id: I6bd15638665f917ed7060886cd7835cdcd1a34f9

diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 1759f56..9e589ac 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -243,6 +243,10 @@ public:
   const SfxPoolItem* pState) SAL_OVERRIDE;
 virtual VclPtr CreatePopupWindow() SAL_OVERRIDE;
 virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
+
+// XSubToolbarController
+virtual sal_Bool SAL_CALL opensSubToolbar() throw 
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+virtual void SAL_CALL updateImage() throw (css::uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
 };
 
 class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 1a649e4..d356f88 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -49,7 +49,7 @@ namespace svx
ToolBox* ptrTbx);
 ~ToolboxButtonColorUpdater();
 
-voidUpdate( const Color& rColor );
+voidUpdate( const Color& rColor, bool bForceUpdate = false );
 
 private:
 sal_uInt16  mnBtnId;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e226896..65337b3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2775,6 +2776,26 @@ void SvxColorToolBoxControl::Select(sal_uInt16 
/*nSelectModifier*/)
 Dispatch( aCommand, aArgs );
 }
 
+sal_Bool SvxColorToolBoxControl::opensSubToolbar()
+throw (css::uno::RuntimeException, std::exception)
+{
+// For a split button (i.e. bSidebarType == false), we mark this 
controller as
+// a sub-toolbar controller, so we get notified (through updateImage 
method) on
+// button image changes, and could redraw the last used color on top of it.
+return !bSidebarType;
+}
+
+void SvxColorToolBoxControl::updateImage()
+throw (css::uno::RuntimeException, std::exception)
+{
+Image aImage = GetImage( m_xFrame, m_aCommandURL, hasBigImages() );
+if ( !!aImage )
+{
+GetToolBox().SetItemImage( GetId(), aImage );
+m_xBtnUpdater->Update( mPaletteManager.GetLastColor(), true );
+}
+}
+
 SfxToolBoxControl* SvxColorToolBoxControl::CreateImpl( sal_uInt16 nSlotId, 
sal_uInt16 nId, ToolBox &rTbx )
 {
 return new SvxColorToolBoxControl( nSlotId, nId, rTbx );
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx 
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 4784040..282589d 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -76,7 +76,7 @@ namespace svx
 ToolboxButtonColorUpdater::~ToolboxButtonColorUpdater()
 {}
 
-void ToolboxButtonColorUpdater::Update(const Color& rColor)
+void ToolboxButtonColorUpdater::Update(const Color& rColor, bool 
bForceUpdate)
 {
 Image aImage(mpTbx->GetItemImageOriginal(mnBtnId));
 Size aItemSize(mpTbx->GetItemContentSize(mnBtnId));
@@ -93,7 +93,8 @@ namespace svx
 // is COL_BLACK, then (maCurColor != aColor) becomes 'false', 
therefore we take
 // explicit care of COL_BLACK from the last argument in the condition 
so that the
 // Update() does its routine job appropriately !
-if ((maCurColor != aColor) || bSizeChanged || bDisplayModeChanged || 
(aColor == COL_BLACK))
+if ((maCurColor != aColor) || (aColor == COL_BLACK) ||
+bSizeChanged || bDisplayModeChanged || bForceUpdate )
 {
 // create an empty bitmap, and copy the original bitmap inside
 // (so that it grows in case the original bitmap was smaller)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source

[Julien Nabet]

 canvas/source/vcl/spritecanvashelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36a77b748a0b1d35ce72b2e14d1daa158d5f7c4b
Author: Julien Nabet 
Date:   Sun Jul 5 11:53:39 2015 +0200

tdf#91574: SLIDESHOW: crash when second monitor connected

0  0x2aaab1f6a803 in VirtualDevice::InnerImplSetOutputSizePixel(Size 
const&, bool, boost::shared_array const&, bool) (this=0x0, 
rNewSize=Size = {...}, bErase=true, pBuffer=..., bTopDown=false) at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:293
1  0x2aaab1f6ae54 in VirtualDevice::ImplSetOutputSizePixel(Size const&, 
bool, boost::shared_array const&, bool) (this=0x0, rNewSize=Size 
= {...}, bErase=true, pBuffer=..., bTopDown=false) at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:396
2  0x2aaab1f6b1af in VirtualDevice::SetOutputSizePixel(Size const&, 
bool) (this=0x0, rNewSize=Size = {...}, bErase=true)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:444
3  0x2aaae650e30f in vclcanvas::SpriteCanvasHelper::updateScreen(bool, 
bool&) (this=0x69daf50, bUpdateAll=true, io_bSurfaceDirty=@0x69dafe0: true)
at 
/home/julien/compile-libreoffice/libreoffice/canvas/source/vcl/spritecanvashelper.cxx:316

So initialize maVDev

Change-Id: I4a79ba6e8f13c4a2bed3127742a9a9c928e133cd
Reviewed-on: https://gerrit.libreoffice.org/16770
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 095dae6..e6fa3e7f7 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -177,7 +177,7 @@ namespace vclcanvas
 SpriteCanvasHelper::SpriteCanvasHelper() :
 mpRedrawManager( NULL ),
 mpOwningSpriteCanvas( NULL ),
-maVDev(),
+maVDev(VclPtr::Create()),
 maLastUpdate(),
 mbShowFrameInfo( false ),
 mbShowSpriteBounds( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - canvas/source

[Julien Nabet]

 canvas/source/vcl/spritecanvashelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 135c3c567aeda1db3d81858cdad401b1df1d2504
Author: Julien Nabet 
Date:   Sun Jul 5 11:53:39 2015 +0200

tdf#91574: SLIDESHOW: crash when second monitor connected

0  0x2aaab1f6a803 in VirtualDevice::InnerImplSetOutputSizePixel(Size 
const&, bool, boost::shared_array const&, bool) (this=0x0, 
rNewSize=Size = {...}, bErase=true, pBuffer=..., bTopDown=false) at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:293
1  0x2aaab1f6ae54 in VirtualDevice::ImplSetOutputSizePixel(Size const&, 
bool, boost::shared_array const&, bool) (this=0x0, rNewSize=Size 
= {...}, bErase=true, pBuffer=..., bTopDown=false) at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:396
2  0x2aaab1f6b1af in VirtualDevice::SetOutputSizePixel(Size const&, 
bool) (this=0x0, rNewSize=Size = {...}, bErase=true)
at 
/home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:444
3  0x2aaae650e30f in vclcanvas::SpriteCanvasHelper::updateScreen(bool, 
bool&) (this=0x69daf50, bUpdateAll=true, io_bSurfaceDirty=@0x69dafe0: true)
at 
/home/julien/compile-libreoffice/libreoffice/canvas/source/vcl/spritecanvashelper.cxx:316

So initialize maVDev

Change-Id: I4a79ba6e8f13c4a2bed3127742a9a9c928e133cd
Reviewed-on: https://gerrit.libreoffice.org/16770
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Signed-off-by: Michael Meeks 

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 095dae6..e6fa3e7f7 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -177,7 +177,7 @@ namespace vclcanvas
 SpriteCanvasHelper::SpriteCanvasHelper() :
 mpRedrawManager( NULL ),
 mpOwningSpriteCanvas( NULL ),
-maVDev(),
+maVDev(VclPtr::Create()),
 maLastUpdate(),
 mbShowFrameInfo( false ),
 mbShowSpriteBounds( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

[matteocam]

 include/svx/svdedxv.hxx |2 +-
 include/svx/textchain.hxx   |   11 +++
 svx/source/svdraw/svdedxv.cxx   |   31 +++
 svx/source/svdraw/textchain.cxx |   13 +
 4 files changed, 44 insertions(+), 13 deletions(-)

New commits:
commit 5d5b0c29b59557ace847ffd34a1aa15220c806cd
Author: matteocam 
Date:   Mon Jul 6 15:57:03 2015 -0400

Adds CursorChainEvent and related code in SdrObjEditView

Change-Id: Ife00e7cd5c67ec127961ef7c89f8cf6b3a87f5a5

diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 67945b58b..010032e 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -125,7 +125,7 @@ protected:
 void ImpMacroUp(const Point& rUpPos);
 void ImpMacroDown(const Point& rDownPos);
 
-   DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* );
+DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* );
 DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos* );
 
 protected:
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 8032747..730489b 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -32,6 +32,12 @@ namespace rtl {
 typedef rtl::OUString ChainLinkId;
 typedef std::map< ChainLinkId, ImpChainLinkProperties *> LinkPropertiesMap;
 
+enum class CursorChainingEvent
+{
+TO_NEXT_LINK,
+TO_PREV_LINK,
+UNCHANGED
+};
 
 class ImpChainLinkProperties
 {
@@ -40,7 +46,9 @@ class ImpChainLinkProperties
 
 ImpChainLinkProperties();
 
+// NOTE: Remember to set default value in contructor when adding field
 bool bNilChainingEvent;
+CursorChainingEvent aCursorEvent; // XXX: replace with enum instead of 
bool?
 };
 
 
@@ -54,6 +62,9 @@ class TextChain {
 bool IsLinkInChain(SdrTextObj *) const;
 SdrTextObj *GetNextLink(SdrTextObj *) const;
 
+CursorChainingEvent GetCursorEvent(SdrTextObj *);
+void SetCursorEvent(SdrTextObj *, CursorChainingEvent);
+
 ChainLinkId GetId(SdrTextObj *) const;
 ImpChainLinkProperties *GetLinkProperties(SdrTextObj *);
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 74a14e1..bc5bfb0 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -51,6 +51,7 @@
 #include "svx/svdstr.hrc"
 #include "svdglob.hxx"
 #include "svx/globl3d.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -495,8 +496,24 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 // trigger actual chaining
 pTextObj->onChainingEvent();
 
+// XXX: this logic could be put in a separate approppriate class
 /* Cursor motion stuff */
+CursorChainingEvent aCursorEvent = 
pTextObj->GetTextChain()->GetCursorEvent(pTextObj);
+SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 
+switch (aCursorEvent) {
+
+case CursorChainingEvent::UNCHANGED:
+pOLV->SetSelection(aPreChainingSel);
+break;
+case CursorChainingEvent::TO_NEXT_LINK:
+SdrEndTextEdit();
+SdrBeginTextEdit(pNextLink);
+break;
+case CursorChainingEvent::TO_PREV_LINK:
+// XXX: To be handled
+break;
+}
 
 // Find last Para
 /*
@@ -508,8 +525,6 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 ESelection 
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
 */
 
-pOLV->SetSelection(aPreChainingSel);
-
 } else {
 // XXX
 fprintf(stderr, "[OnChaining] No Edit Outliner View\n");
@@ -758,7 +773,8 @@ bool SdrObjEditView::SdrBeginTextEdit(
 
 pTextEditOutlinerView->ShowCursor();
 
pTextEditOutliner->SetStatusEventHdl(LINK(this,SdrObjEditView,ImpOutlinerStatusEventHdl));
-
pTextEditOutliner->SetChainingEventHdl(LINK(this,SdrObjEditView,ImpChainingEventHdl)
 );
+if (pTextObj->IsChainable())
+
pTextEditOutliner->SetChainingEventHdl(LINK(this,SdrObjEditView,ImpChainingEventHdl)
 );
 
 #ifdef DBG_UTIL
 if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
@@ -808,15 +824,6 @@ bool SdrObjEditView::SdrBeginTextEdit(
 }
 }
 
-// FIXME(matteocam)
-// XXX: Trying to get to the next text obj directly
-if (pTextObj->IsChainable()) {
-SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
-SdrEndTextEdit();
-SdrBeginTextEdit(pNextLink);
-}
-
-
 return true; // ran fine, let TextEdit run now
 }
 else
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 09911f4..37bca69 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -25,6 +25,7 @@ ImpChainLinkProperties::ImpChainLinkProperties()
 

[Libreoffice-commits] core.git: sw/qa

[Varun]

 sw/qa/extras/uiwriter/uiwriter.cxx |   36 
 1 file changed, 36 insertions(+)

New commits:
commit c12c1b15eaa2310b1e04d0585c009e7c9bf45793
Author: Varun 
Date:   Mon Jul 6 19:49:11 2015 +0530

Added Test for tdf#81995 check outline numbering

Change-Id: I0a35a010d3edc8caea30e16813c937f1fa4d3ac8
Reviewed-on: https://gerrit.libreoffice.org/16797
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 980184d..8bbf6eb 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include "com/sun/star/text/XDefaultNumberingProvider.hpp"
 
 #include 
 #include 
@@ -98,6 +99,7 @@ public:
 void testTdf90003();
 void testTdf51741();
 void testdelofTableRedlines();
+void testTdf81995();
 void testExportToPicture();
 void testTdf69282();
 void testTdf69282WithMirror();
@@ -149,6 +151,7 @@ public:
 CPPUNIT_TEST(testTdf90003);
 CPPUNIT_TEST(testTdf51741);
 CPPUNIT_TEST(testdelofTableRedlines);
+CPPUNIT_TEST(testTdf81995);
 CPPUNIT_TEST(testExportToPicture);
 CPPUNIT_TEST(testTdf69282);
 CPPUNIT_TEST(testTdf69282WithMirror);
@@ -1003,6 +1006,39 @@ void SwUiWriterTest::testdelofTableRedlines()
 CPPUNIT_ASSERT(redtbl.IsEmpty());
 }
 
+void SwUiWriterTest::testTdf81995()
+{
+uno::Reference 
xDefNum(m_xSFactory->createInstance("com.sun.star.text.DefaultNumberingProvider"),
 uno::UNO_QUERY);
+com::sun::star::lang::Locale alocale;
+alocale.Language = OUString("en");
+alocale.Country = OUString("US");
+uno::Sequence> 
aIndexAccess(xDefNum->getDefaultOutlineNumberings(alocale));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aIndexAccess.getLength());
+for(int i=0;igetCount());
+for(int j=0;jgetCount();j++)
+{
+uno::Sequence aProps;
+aIndexAccess[i]->getByIndex(j) >>= aProps;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(12), aProps.getLength());
+for(int k=0;khttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Marek Dolezel license statement

[Marek Doležel]

Hello,

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

Best regards,
Marek Dolezel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cppcanvas/source

[Caolán McNamara]

 cppcanvas/source/mtfrenderer/emfplus.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21b15296d9fb2a5c47c890cb7423aaa49b22131b
Author: Caolán McNamara 
Date:   Sun Jul 5 20:24:50 2015 +0100

this SAL_INFO uses brush which might be NULL

Change-Id: Id69b55b266fe62934b53fc765030cfd044d0c74a
(cherry picked from commit 4a121d402f2a66d30cd01ed1b890284d8d4f465a)
Reviewed-on: https://gerrit.libreoffice.org/16778
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f58ec95..c99d819 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1289,7 +1289,7 @@ namespace cppcanvas
 rState.isFillColorSet = true;
 // extract UseBrush
 EMFPBrush* brush = static_cast( aObjects 
[brushIndexOrColor & 0xff] );
-SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << 
brushIndexOrColor << " (type: " << brush->GetType () << ")");
+SAL_INFO("cppcanvas.emf", "EMF+\tbrush fill slot: " << 
brushIndexOrColor << " (type: " << (brush ? brush->GetType() : -1) << ")");
 
 // give up in case something wrong happened
 if( !brush )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

[matteocam]

 include/svx/textchainflow.hxx   |3 +++
 svx/source/svdraw/textchainflow.cxx |   20 
 2 files changed, 23 insertions(+)

New commits:
commit bbe782455d41af44bb42f39b7f0a2ffc73af1fb5
Author: matteocam 
Date:   Mon Jul 6 16:35:38 2015 -0400

Update cursor event

Change-Id: Iad5429e73e8a5fdf3ffd6c88759cbcaf772a5a31

diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index 5489bb1..aa17f1e 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -76,6 +76,9 @@ class TextChainFlow {
 
 //  -- Private Members --
 private:
+
+void impUpdateCursorEvent(SdrOutliner *, bool);
+
 SdrTextObj *mpTargetLink;
 SdrTextObj *mpNextLink;
 
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 1e63cc7..74f15a1 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -73,6 +73,8 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 
 bool bIsPageOverflow = pFlowOutl->IsPageOverflow();
 
+impUpdateCursorEvent(pFlowOutl, bIsPageOverflow);
+
 if (pParamOutl != NULL)
 {
 pFlowOutl->SetUpdateMode(bOldUpdateMode); // XXX: Plausibly should be 
the prev. state
@@ -90,6 +92,24 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner 
*pFlowOutl, SdrOutliner *p
 
 }
 
+void TextChainFlow::impUpdateCursorEvent(SdrOutliner *pFlowOutl, bool 
bIsOverflow)
+{
+// XXX: Current implementation might create problems with UF-
+//  In fact UF causes a
+
+
+if (bIsOverflow) {
+bool bCursorOut = true; // XXX: Should have real check
+if (bCursorOut) {
+GetTextChain()->SetCursorEvent(GetLinkTarget(),
+ CursorChainingEvent::TO_NEXT_LINK);
+}
+} else {
+GetTextChain()->SetCursorEvent(GetLinkTarget(),
+ CursorChainingEvent::UNCHANGED);
+}
+}
+
 void TextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
 {
 impCheckForFlowEvents(pFlowOutl, NULL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Reuse Mozilla's rolling update mechanism for LibreOffice - Weekly Report 6

[Nathan Yee]

This is the week 6 progress report of the GSoC bug "Reuse Mozilla's rolling
update mechanism for LibreOffice".

Last week:
- successfully ported Mozilla's mar creation and updater executables to a
Linux LibreOffice build

Goals for this week:
- port to a Windows LibreOffice build

-- 
Nathan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx  |   14 +-
 svx/source/svdraw/svdotext.cxx |7 ---
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 7f44515aa8ac339757d6fdf3d1ce6fc15849d940
Author: matteocam 
Date:   Mon Jul 6 16:49:12 2015 -0400

Fixed function name

Change-Id: I3187547ac920725e448d9053893c857dbd17d427

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 61c1593..cc16d53 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -490,13 +490,14 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 OutlinerView* pOLV = GetTextEditOutlinerView();
 if( pTextObj && pOLV)
 {
+TextChain *pTextChain = pTextObj->GetTextChain();
 // This is true during an underflow-caused overflow (with 
pEdtOutl->SetText())
-if (GetTextChain()->GetNilChainingEvent(pTextObj)) {
+if (pTextChain->GetNilChainingEvent(pTextObj)) {
 return 0;
 }
 
 // We prevent to trigger further handling of overflow/underflow 
for pTextObj
-GetTextChain()->SetNilChainingEvent(pTextObj, true);
+pTextChain->SetNilChainingEvent(pTextObj, true);
 
 // Save previous selection pos
 ESelection aPreChainingSel(pOLV->GetSelection());
@@ -507,7 +508,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 // XXX: this logic could be put in a separate approppriate class
 /* Cursor motion stuff */
 
-CursorChainingEvent aCursorEvent = 
pTextObj->GetTextChain()->GetCursorEvent(pTextObj);
+CursorChainingEvent aCursorEvent = 
pTextChain->GetCursorEvent(pTextObj);
 SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 
 switch (aCursorEvent) {
@@ -534,8 +535,8 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 ESelection 
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
 */
 
-// XXX: Must be called
-GetTextChain()->SetNilChainingEvent(pTextObj, false);
+// NOTE: Must be called. Don't let the function return if you set 
it to true and not reset it
+pTextChain->SetNilChainingEvent(pTextObj, false);
 } else {
 // XXX
 fprintf(stderr, "[OnChaining] No Edit Outliner View\n");
commit f0618282407e22d2486da761af7a8d033babcfdd
Author: matteocam 
Date:   Mon Jul 6 16:47:24 2015 -0400

NilChainingEvents handled in SdrObjEditView

Change-Id: I30dd131b849c3a8a97d5a75a61fc013b3d17b89e

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index bc5bfb0..61c1593 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -490,6 +490,14 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 OutlinerView* pOLV = GetTextEditOutlinerView();
 if( pTextObj && pOLV)
 {
+// This is true during an underflow-caused overflow (with 
pEdtOutl->SetText())
+if (GetTextChain()->GetNilChainingEvent(pTextObj)) {
+return 0;
+}
+
+// We prevent to trigger further handling of overflow/underflow 
for pTextObj
+GetTextChain()->SetNilChainingEvent(pTextObj, true);
+
 // Save previous selection pos
 ESelection aPreChainingSel(pOLV->GetSelection());
 
@@ -498,6 +506,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 
 // XXX: this logic could be put in a separate approppriate class
 /* Cursor motion stuff */
+
 CursorChainingEvent aCursorEvent = 
pTextObj->GetTextChain()->GetCursorEvent(pTextObj);
 SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 
@@ -525,6 +534,8 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 ESelection 
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
 */
 
+// XXX: Must be called
+GetTextChain()->SetNilChainingEvent(pTextObj, false);
 } else {
 // XXX
 fprintf(stderr, "[OnChaining] No Edit Outliner View\n");
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 3455c97..531e41c 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1992,12 +1992,6 @@ void SdrTextObj::onChainingEvent()
 if (!pEdtOutl)
 return;
 
-// This is true during an underflow-caused overflow (with 
pEdtOutl->SetText())
-if (GetTextChain()->GetNilChainingEvent(this)) {
-
-return;
-}
-
 // Outliner for text transfer
 SdrOutliner &aDrawOutliner = ImpGetDrawOutliner();
 
@@ -2027,7 +2021,6 @@ void SdrTextObj::onChainingEvent()
 
 }
 }
-GetTextChain()->SetNilChainingEvent(this, false);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freede

Macro to load and run ppt for impress

[Jerry Geis]

I made this macro long time ago, it used to work.
It does not seem to work with 4.X
It simply loads a PPT, and displays it and loops for Impress

can someone help me get it working again. I think it seg faults.

Thanks

I run it by:
export HOME=/home/silentm; export USER=silentm; export DISPLAY=:0.0;
soffice --nolockcheck --nologo --norestore
 "macro:///Standard.Module1.Load(file:tmp/Clarian.ppt)"


Jerry




http://openoffice.org/2000/script";
script:name="Module1" script:language="StarBasic">REM  *  BASIC  *

Sub Load(arg as String)

'register a global event listener, because
'we have to wait until loading has finished
oGlob = CreateUnoService("com.sun.star.frame.GlobalEventBroadcaster")
oListener =
CreateUnoListener("EvList_","com.sun.star.document.XEventListener")
oGlob.addEventListener(oListener)
boFinished = false

'hide the document while loading so that we do not see the loading window
Dim aProps(2) as new com.sun.star.beans.PropertyValue
Dim oDoc as Object
aProps(0).Name  = "Hidden"
aProps(0).Value = true
aProps(1).Name  = "ReadOnly"
aProps(1).Value = true
url = arg
oDoc = StarDesktop.loadComponentFromURL(url, "_default", 0, aProps)

'wait until loading has finished
while (not boFinished)
wait(5)
wend

oGlob.removeEventListener(oListener)

'loading is done, set the presentation parameters
oDoc.Presentation.Pause = 0
'show the window now as presentation cannot be started
'(segmentation faults) if it is not
oDoc.CurrentController.Frame.ContainerWindow.Visible = true
oDoc.CurrentController.Frame.ContainerWindow.setVisible(false)
'start the presentation
oDoc.Presentation.Start

End Sub

Sub EvList_notifyEvent( o as object )
if o.EventName = "OnLoadFinished" then
if url = o.Source.Location then
boFinished = true
endif
endif

End Sub

Sub EvList_disposing()
End Sub


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit ca45dff10b9ffa6b0272af09c56139fcefa08344
Author: matteocam 
Date:   Mon Jul 6 16:58:19 2015 -0400

NilChainingEvents handled in SdrObjEditView

Change-Id: Ifc52c165b84d12d4b5f677bbfc3f94084678bda1

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 531e41c..0a33fa4 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1998,8 +1998,6 @@ void SdrTextObj::onChainingEvent()
 EditingTextChainFlow aTxtChainFlow(this);
 aTxtChainFlow.CheckForFlowEvents(pEdtOutl);
 
-// We prevent to trigger further handling of overflow/underflow for this 
SdrTextObj
-GetTextChain()->SetNilChainingEvent(this, true);
 
 if (aTxtChainFlow.IsOverflow()) {
 fprintf(stderr, "[CHAINING] Overflow going on\n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdedxv.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 778373d9408c1a47e8a8511ebd4a7445e5fc3883
Author: matteocam 
Date:   Mon Jul 6 17:38:13 2015 -0400

Changed parameters to Sdr*TextEdit

Change-Id: Ic6faf12a2a0aeea756a25dc82e0d2768bcf39813

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index cc16d53..8cb9779 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -517,8 +517,8 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 pOLV->SetSelection(aPreChainingSel);
 break;
 case CursorChainingEvent::TO_NEXT_LINK:
-SdrEndTextEdit();
-SdrBeginTextEdit(pNextLink);
+SdrEndTextEdit(true);
+SdrBeginTextEdit(pNextLink, nullptr, nullptr, false, 
nullptr, nullptr, true, true);
 break;
 case CursorChainingEvent::TO_PREV_LINK:
 // XXX: To be handled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libxml2

[David Ostrovsky]

 external/libxml2/UnpackedTarball_xml2.mk |1 +
 external/libxml2/libxml2-vc15.patch  |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 51b7970292b724e658a61ddcc79b138b4865c667
Author: David Ostrovsky 
Date:   Sat Jul 4 21:46:55 2015 +0200

Libxml2: Fix compilation on VS 2015

Change-Id: Ia2bb2897bc3fdb04c89f3328718f32fecd30eb64
Reviewed-on: https://gerrit.libreoffice.org/16760
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/libxml2/UnpackedTarball_xml2.mk 
b/external/libxml2/UnpackedTarball_xml2.mk
index beed009..66659b0 100644
--- a/external/libxml2/UnpackedTarball_xml2.mk
+++ b/external/libxml2/UnpackedTarball_xml2.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\
$(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \
external/libxml2/libxml2-icu.patch.0 \
external/libxml2/ubsan.patch.0 \
+   external/libxml2/libxml2-vc15.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxml2/libxml2-vc15.patch 
b/external/libxml2/libxml2-vc15.patch
new file mode 100644
index 000..bdb9bb1
--- /dev/null
+++ b/external/libxml2/libxml2-vc15.patch
@@ -0,0 +1,13 @@
+diff -ur xml2.org/include/win32config.h xml2/include/win32config.h
+--- misc/xml2/include/win32config.h2015-07-04 21:35:50.600013534 +0200
 misc/xml2/include/win32config.h2015-07-04 21:36:12.455015001 +0200
+@@ -95,7 +95,9 @@
+ 
+ #if defined(_MSC_VER)
+ #define mkdir(p,m) _mkdir(p)
++#if _MSC_VER < 1900
+ #define snprintf _snprintf
++#endif
+ #if _MSC_VER < 1500
+ #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libxslt

[David Ostrovsky]

 external/libxslt/UnpackedTarball_xslt.mk |1 +
 external/libxslt/libxslt-vc15.patch  |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit dacdb66fd52380caa079cd8eac61bb9b01bcfe4c
Author: David Ostrovsky 
Date:   Sat Jul 4 22:41:26 2015 +0200

Libxslt: Fix compilation on VS 2015

Change-Id: Icb7f7cb20f5e2b200442bbc2d2bd4eb540170045
Reviewed-on: https://gerrit.libreoffice.org/16761
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/libxslt/UnpackedTarball_xslt.mk 
b/external/libxslt/UnpackedTarball_xslt.mk
index b81cd1d..5c44e0e 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
$(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \
external/libxslt/libxslt-config-guess.patch.0 \
external/libxslt/rpath.patch.0 \
+   external/libxslt/libxslt-vc15.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/libxslt-vc15.patch 
b/external/libxslt/libxslt-vc15.patch
new file mode 100644
index 000..47b0708
--- /dev/null
+++ b/external/libxslt/libxslt-vc15.patch
@@ -0,0 +1,13 @@
+diff -ur xslt.org/libxslt/win32config.h xslt/libxslt/win32config.h
+--- misc/xslt/libxslt/win32config.h2015-07-04 22:36:52.522061462 +0200
 misc/xslt/libxslt/win32config.h2015-07-04 22:37:33.023064181 +0200
+@@ -79,7 +79,9 @@
+ #include 
+ #if defined(_MSC_VER) || defined(__MINGW32__)
+ #define mkdir(p,m) _mkdir(p)
++#if _MSC_VER < 1900
+ #define snprintf _snprintf
++#endif
+ #if _MSC_VER < 1500
+ #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source

[Winfried Donkers]

 sc/inc/columnspanset.hxx  |2 
 sc/source/core/data/columnspanset.cxx |   43 +
 sc/source/core/tool/interpr6.cxx  |  251 +-
 3 files changed, 115 insertions(+), 181 deletions(-)

New commits:
commit 5d88cb48a77e65810ea6d0be32b5387b1767a216
Author: Winfried Donkers 
Date:   Fri Apr 17 11:06:30 2015 +0200

unify code duplication in ScInterpreter::ScSum and IterateParameters

The code in ScSum is mostly identical with that in IterateParameters.
Worse, functions like SUBTOTAL and AGGREGATE use IterateParameters for
the SUM function.
Now we have one set of code for all SUM-functions and averted the danger of
diverting pieces of code which are supposed to do the same thing.

Removed old-style bNull-method too.

Change-Id: Ia4f22c21c4b3c3a244ea1cd10c30d8cfcaa8ef6c
Reviewed-on: https://gerrit.libreoffice.org/15362
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 797b425..741b855 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -84,6 +84,7 @@ public:
 virtual ~ColumnAction() = 0;
 virtual void startColumn(ScColumn* pCol) = 0;
 virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) = 0;
+virtual void executeSum(SCROW, SCROW, bool, double& )  { return; } ;
 };
 
 ColumnSpanSet(bool bInit);
@@ -103,6 +104,7 @@ public:
 
 void executeAction(Action& ac) const;
 void executeColumnAction(ScDocument& rDoc, ColumnAction& ac) const;
+void executeColumnAction(ScDocument& rDoc, ColumnAction& ac, double& fMem) 
const;
 
 void swap( ColumnSpanSet& r );
 };
diff --git a/sc/source/core/data/columnspanset.cxx 
b/sc/source/core/data/columnspanset.cxx
index 25f6b5b..e128a3d 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -227,6 +227,49 @@ void ColumnSpanSet::executeColumnAction(ScDocument& rDoc, 
ColumnAction& ac) cons
 }
 }
 
+void ColumnSpanSet::executeColumnAction(ScDocument& rDoc, ColumnAction& ac, 
double& fMem) const
+{
+for (size_t nTab = 0; nTab < maDoc.size(); ++nTab)
+{
+if (!maDoc[nTab])
+continue;
+
+const TableType& rTab = *maDoc[nTab];
+for (size_t nCol = 0; nCol < rTab.size(); ++nCol)
+{
+if (!rTab[nCol])
+continue;
+
+ScTable* pTab = rDoc.FetchTable(nTab);
+if (!pTab)
+continue;
+
+if (!ValidCol(nCol))
+{
+// End the loop.
+nCol = rTab.size();
+continue;
+}
+
+ScColumn& rColumn = pTab->aCol[nCol];
+ac.startColumn(&rColumn);
+ColumnType& rCol = *rTab[nCol];
+ColumnSpansType::const_iterator it = rCol.maSpans.begin(), itEnd = 
rCol.maSpans.end();
+SCROW nRow1, nRow2;
+nRow1 = it->first;
+bool bVal = it->second;
+for (++it; it != itEnd; ++it)
+{
+nRow2 = it->first-1;
+ac.executeSum( nRow1, nRow2, bVal, fMem );
+
+nRow1 = nRow2+1; // for the next iteration.
+bVal = it->second;
+}
+}
+}
+}
+
 void ColumnSpanSet::swap( ColumnSpanSet& r )
 {
 maDoc.swap(r.maDoc);
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index b3daedd..425af00 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -205,15 +205,19 @@ namespace {
 
 class NumericCellAccumulator
 {
-double mfSum;
+double mfFirst;
+double mfRest;
 sal_uInt16 mnError;
 
 public:
-NumericCellAccumulator() : mfSum(0.0), mnError(0) {}
+NumericCellAccumulator() : mfFirst(0.0), mfRest(0.0), mnError(0) {}
 
 void operator() (size_t, double fVal)
 {
-mfSum += fVal;
+if ( !mfFirst )
+mfFirst = fVal;
+else
+mfRest += fVal;
 }
 
 void operator() (size_t, const ScFormulaCell* pCell)
@@ -236,11 +240,15 @@ public:
 return;
 }
 
-mfSum += fVal;
+if ( !mfFirst )
+mfFirst = fVal;
+else
+mfRest += fVal;
 }
 
 sal_uInt16 getError() const { return mnError; }
-double getSum() const { return mfSum; }
+double getFirst() const { return mfFirst; }
+double getRest() const { return mfRest; }
 };
 
 class NumericCellCounter
@@ -326,7 +334,9 @@ public:
 mpCol->InitBlockPosition(maPos);
 }
 
-virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) SAL_OVERRIDE
+virtual void execute(SCROW, SCROW, bool) SAL_OVERRIDE { return; };
+
+virtual void executeSum(SCROW nRow1, SCROW nRow2, bool bVal, double& fMem 
) SAL_OVERRIDE
 {
 if (!bVal)
 return;
@@ -340,7 +350,14 @@ public:
 if (mnError)
 r

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf92481.rtf   |6 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 ++
 writerfilter/source/dmapper/SettingsTable.cxx  |   25 +++--
 writerfilter/source/ooxml/model.xml|4 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
 5 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit ff3a1d983acc04715e16373c1ca8cc64dafdccd0
Author: Miklos Vajna 
Date:   Mon Jul 6 09:09:41 2015 +0200

tdf#92481 RTF import: handle \widowctrl

(cherry picked from commit ffc7b671e213d366e59d39ddbbef66544ebf01e5)

Change-Id: I1af1d6bc150c16a2c6b0fe788a41c8c18caee6c6
Reviewed-on: https://gerrit.libreoffice.org/16785
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/rtfimport/data/tdf92481.rtf 
b/sw/qa/extras/rtfimport/data/tdf92481.rtf
new file mode 100644
index 000..09a6c5e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf92481.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+\widowctrl
+\pard\plain
+Hello.
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8a22358..99637e8 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2313,6 +2313,12 @@ DECLARE_RTFIMPORT_TEST(testTdf92061, "tdf92061.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("body-after"), getRun(getParagraph(1), 
3)->getString());
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf92481, "tdf92481.rtf")
+{
+// This was 0, RTF_WIDOWCTRL was not imported.
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
getProperty(getParagraph(1), "ParaWidows"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx 
b/writerfilter/source/dmapper/SettingsTable.cxx
index ef4ed92..dbb2da1 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -79,6 +79,7 @@ struct SettingsTable_Impl
 boolm_bDoNotUseHTMLParagraphAutoSpacing;
 boolm_bNoColumnBalance;
 boolm_bAutoHyphenation;
+boolm_bWidowControl;
 boolm_bSplitPgBreakAndParaMark;
 boolm_bMirrorMargin;
 uno::Sequence m_pThemeFontLangProps;
@@ -111,6 +112,7 @@ struct SettingsTable_Impl
 , m_bDoNotUseHTMLParagraphAutoSpacing(false)
 , m_bNoColumnBalance(false)
 , m_bAutoHyphenation(false)
+, m_bWidowControl(false)
 , m_bSplitPgBreakAndParaMark(false)
 , m_bMirrorMargin(false)
 , m_pThemeFontLangProps(3)
@@ -288,6 +290,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
 case NS_ooxml::LN_CT_Settings_autoHyphenation:
 m_pImpl->m_bAutoHyphenation = nIntValue;
 break;
+case NS_ooxml::LN_CT_Settings_widowControl:
+m_pImpl->m_bWidowControl = nIntValue;
+break;
 default:
 {
 #ifdef DEBUG_WRITERFILTER
@@ -373,6 +378,11 @@ uno::Sequence 
SettingsTable::GetCompatSettings() const
 return comphelper::containerToSequence(m_pImpl->m_aCompatSettings);
 }
 
+static bool lcl_isDefault(const uno::Reference& 
xPropertyState, const OUString& rPropertyName)
+{
+return xPropertyState->getPropertyState(rPropertyName) == 
beans::PropertyState_DEFAULT_VALUE;
+}
+
 void SettingsTable::ApplyProperties(uno::Reference const& 
xDoc)
 {
 uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY );
@@ -382,18 +392,29 @@ void 
SettingsTable::ApplyProperties(uno::Reference const& x
 xDocProps->setPropertyValue("RecordChanges", uno::makeAny( 
m_pImpl->m_bRecordChanges ) );
 
 // Auto hyphenation: turns on hyphenation by default, 
 may still disable it at a paragraph level.
-if (m_pImpl->m_bAutoHyphenation)
+// Situation is similar for RTF_WIDOWCTRL, which turns on widow / orphan 
control by default.
+if (m_pImpl->m_bAutoHyphenation || m_pImpl->m_bWidowControl)
 {
 uno::Reference 
xStyleFamiliesSupplier(xDoc, uno::UNO_QUERY);
+if (!xStyleFamiliesSupplier.is())
+return;
+
 uno::Reference xStyleFamilies = 
xStyleFamiliesSupplier->getStyleFamilies();
 uno::Reference xParagraphStyles = 
xStyleFamilies->getByName("ParagraphStyles").get< 
uno::Reference >();
 uno::Reference xDefault = 
xParagraphStyles->getByName("Standard").get< uno::Reference >();
 uno::Reference xPropertyState(xDefault, 
uno::UNO_QUERY);
-if (xPropertyState->getPropertyState("ParaIsHyphenation") == 
beans::PropertyState_DEFAULT_VALUE)
+if (m_pImpl->m_bAutoHyphenation && lcl_isDefault(xPropertyState, 
"ParaIsHyphenation"))
 {
 uno::Reference xPropertySet(xDefault, 
uno::UNO_QUERY);
 xPropertySet->setPropertyValue("ParaIsHyphenation", 
uno::makeAny(true));
 }
+if (m_pImpl->m_bWidowControl && lcl_isDefault(xPropertyState, 
"ParaWidows") && lcl_isDefault(xPropertyState, "ParaOr

[GSoC] Haskell UNO Language Binding - Weekly Report 6

[Jorge Mendes]

Hi,

The past week I've put the compilation of the example in the
repository [1] working. The compilation process is not too complex,
and Haskell programmers (and others) should be able to compile and run
the example.

Having the compilation infrastructure done, I was able to test what I
had for the code generation from the IDL files, and quickly fixed some
small problems.

I also started working on implementing code generation for more entity
types. I'll continue this during this week.

Kind regards,
Jorge

[1] https://github.com/jorgecunhamendes/haskell-uno-binding
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/tool/interpr6.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cd4bbac0a866432adf7a7104add3a55f43636576
Author: Eike Rathke 
Date:   Tue Jul 7 00:29:57 2015 +0200

also ifCOUNT2 return type is always number

and an on-the-fly comment translation

Change-Id: I7e2d24928c3b508db39053ea768c25048bfb5d87

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 425af00..81cf0d1 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -819,9 +819,9 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, 
bool bTextAsZero )
 case ifPRODUCT: if ( !nCount ) fRes = 0.0; break;
 default: ; // nothing
 }
-// Bei Summen etc. macht ein bool-Ergebnis keinen Sinn
-// und Anzahl ist immer Number (#38345#)
-if( nFuncFmtType == css::util::NumberFormat::LOGICAL || eFunc == ifCOUNT )
+// A boolean return type makes no sense on sums et al.
+// Counts are always numbers.
+if( nFuncFmtType == css::util::NumberFormat::LOGICAL || eFunc == ifCOUNT 
|| eFunc == ifCOUNT2 )
 nFuncFmtType = css::util::NumberFormat::NUMBER;
 return fRes;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Rework the Expert Configuration dialog Week 5-6

[Mihály Palenik]

Hello,

In the 5th week I had last exam. But after the exam and in 6th week I
continued my work. First I implemented expanding handler instead of double
click handler and fixed the search function. Here are my commits:
https://gerrit.libreoffice.org/#/c/16674/
https://gerrit.libreoffice.org/#/c/16806/

Best regards,

Mihály Palenik
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/sfx2 include/vcl sfx2/source vcl/generic vcl/source

[Katarina Behrens]

 include/sfx2/viewsh.hxx|1 +
 include/vcl/print.hxx  |2 ++
 sfx2/source/view/viewprn.cxx   |2 ++
 sfx2/source/view/viewsh.cxx|1 +
 vcl/generic/print/prtsetup.cxx |2 +-
 vcl/source/gdi/print3.cxx  |   16 +---
 6 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 0251e61640b94094918406b33ee7b05564409feb
Author: Katarina Behrens 
Date:   Thu Jul 2 15:34:11 2015 +0200

tdf#91362: Make "printer was modified" status persistent

To test:

Scenario 1:
* go to Writer -> Format -> Page
* select page format and orientation, if possible a different one than the 
default
  in your env.
* File -> Print -> Properties should now show those values (and not the 
default
  values from the printer)

Scenario 2 (aka Scenario 2 from tdf#61186)
* now go to File -> Printer settings
* change page format and orientation, if possible to yet a different one 
than the
  printer default and a page one
* File -> Print -> Properties should now show what was selected in Printer 
settings
  and not the format of the page

Change-Id: Ibc84540f428b79dbec2587c50eefe526a62751b3
Reviewed-on: https://gerrit.libreoffice.org/16716
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 39effbb..c6e7f4a 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -148,6 +148,7 @@ friend class SfxPrinterController;
 SfxShell*   pSubShell;
 VclPtr pWindow;
 boolbNoNewWindow;
+boolmbPrinterSettingsModified;
 
 protected:
 virtual voidActivate(bool IsMDIActivate) SAL_OVERRIDE;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index e3eba8e..cc2e80d 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -563,6 +563,8 @@ public:
 SAL_DLLPRIVATE bool getReversePrint() const;
 SAL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup );
 SAL_DLLPRIVATE bool getPapersizeFromSetup() const;
+VCL_PLUGIN_PUBLIC void setPrinterModified( bool i_bPapersizeFromSetup );
+VCL_PLUGIN_PUBLIC bool getPrinterModified() const;
 SAL_DLLPRIVATE void pushPropertiesToPrinter();
 SAL_DLLPRIVATE void resetPaperToLastConfigured();
 VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 3f238fb..13a0aed 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -612,6 +612,7 @@ void SfxViewShell::StartPrint( const uno::Sequence < 
beans::PropertyValue >& rPr
 SfxObjectShell *pObjShell = GetObjectShell();
 xNewController->setValue( OUString( "JobName"  ),
 makeAny( OUString( pObjShell->GetTitle(0) ) ) );
+xNewController->setPrinterModified( mbPrinterSettingsModified );
 }
 
 void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& 
rProps, bool bIsAPI, bool bIsDirect )
@@ -868,6 +869,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
 
 // forget new printer, it was taken over (as pPrinter) or 
deleted
 pDlgPrinter = NULL;
+mbPrinterSettingsModified = true;
 }
 else
 {
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 055d5f3..f8e0d21 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1256,6 +1256,7 @@ SfxViewShell::SfxViewShell
 ,   pSubShell(0)
 ,   pWindow(0)
 ,   bNoNewWindow( nFlags & SfxViewShellFlags::NO_NEWWINDOW )
+,   mbPrinterSettingsModified(false)
 {
 
 if ( pViewFrame->GetParentViewFrame() )
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 1d69db4..25fddc4 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -282,11 +282,11 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
 }
 if( pKey )
 {
-m_pParent->SetDataModified( true );
 PPDValue* pValue = static_cast(pBox->GetSelectEntryData());
 m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue );
 update();
 }
+m_pParent->SetDataModified( true );
 return 0;
 }
 
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index edbae14..be73eaa 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -152,6 +152,7 @@ public:
 boolmbLastPage;
 boolmbReversePageOrder;
 bool
mbPapersizeFromSetup;
+boolmbPrinterModified;
 view::PrintableStatemeJobState;
 
 vcl::Pr

[GSoC] Cleanup internal drawing units in Calc

[Krisztian Pinter]

Hi all!

Work has been difficult on this project, I got a bit stuck.
ScOutputData::DrawRotatedBorder() turned out to be trickier than I thought;
when I try changing the points of the polygon to be drawn, it has no effect
on what is actually being drawn, and a Processor is used for drawing which
also doesn't help seeing things clearer. (I read up on Processors and it
didn't really help so far.)

Also this week I'm doing a presentation about my thesis project, and
preparation for that and travelling took up a lot of my time.

Hopefully I'll be able to get through this roadblock soon.

All the best,
Krisztian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 90222] replace ScaList in scaddins with a std container

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90222

ashutosh75  changed:

   What|Removed |Added

 CC||ashutoshnaran...@gmail.com

--- Comment #9 from ashutosh75  ---
Hey I'm new at this.
Where can get started?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 90222] replace ScaList in scaddins with a std container

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90222

--- Comment #10 from Tor Lillqvist  ---
Start by readin the previous comments? Based on them, it seems to me that this
has already been done? Don't start by assigning it to yourself before you have
any idea what to do...

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 90222] replace ScaList in scaddins with a std container

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90222

--- Comment #11 from Tor Lillqvist  ---
(Which you didn't, but just in case;)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 6 commits - basic/source idl/inc idl/source include/basic include/svx include/tools svx/source sw/qa tools/source

[Stephan Bergmann]

 basic/source/runtime/basrdll.cxx   |   19 +
 idl/inc/globals.hxx|9 +---
 idl/source/cmptools/lex.cxx|4 -
 idl/source/prj/command.cxx |   13 +-
 idl/source/prj/database.cxx|2 
 idl/source/prj/globals.cxx |   21 +-
 idl/source/prj/svidl.cxx   |1 
 include/basic/basrdll.hxx  |2 
 include/svx/svdetc.hxx |   10 
 include/tools/shl.hxx  |8 +--
 svx/source/svdraw/svdetc.cxx   |9 
 sw/qa/extras/uiwriter/uiwriter.cxx |4 -
 tools/source/ref/errinf.cxx|   77 +
 13 files changed, 79 insertions(+), 100 deletions(-)

New commits:
commit f9663211b6a452b45242786eeed227c0779fba9b
Author: Stephan Bergmann 
Date:   Tue Jul 7 07:47:52 2015 +0200

loplugin:stringconstant

Change-Id: I2908fc052d44a8bddf8ebb628f67ce346ac519c7

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8bbf6eb..d3c6272 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1010,8 +1010,8 @@ void SwUiWriterTest::testTdf81995()
 {
 uno::Reference 
xDefNum(m_xSFactory->createInstance("com.sun.star.text.DefaultNumberingProvider"),
 uno::UNO_QUERY);
 com::sun::star::lang::Locale alocale;
-alocale.Language = OUString("en");
-alocale.Country = OUString("US");
+alocale.Language = "en";
+alocale.Country = "US";
 uno::Sequence> 
aIndexAccess(xDefNum->getDefaultOutlineNumberings(alocale));
 CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aIndexAccess.getLength());
 for(int i=0;i
Date:   Mon Jul 6 23:15:00 2015 +0200

Replace GetAppData(SHL_IDL) with a static pointer var

Change-Id: Ia1e22ff95457a958ef26974091aa2092b32505bd

diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index e02c0f67..e10b7b3 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 #include 
 #include 
@@ -46,15 +45,21 @@ struct BasicDLL::Impl
 { }
 };
 
+namespace {
+
+BasicDLL * BASIC_DLL;
+
+}
+
 BasResId::BasResId( sal_uInt32 nId ) :
-ResId( nId, *(BASIC_DLL()->GetBasResMgr()) )
+ResId( nId, *(BASIC_DLL->GetBasResMgr()) )
 {
 }
 
 BasicDLL::BasicDLL()
 : m_xImpl(new Impl)
 {
-BASIC_DLL() = this;
+BASIC_DLL = this;
 }
 
 BasicDLL::~BasicDLL()
@@ -65,7 +70,7 @@ ResMgr* BasicDLL::GetBasResMgr() const { return 
m_xImpl->xBasResMgr.get(); }
 
 void BasicDLL::EnableBreak( bool bEnable )
 {
-BasicDLL* pThis = BASIC_DLL();
+BasicDLL* pThis = BASIC_DLL;
 DBG_ASSERT( pThis, "BasicDLL::EnableBreak: No instance yet!" );
 if ( pThis )
 {
@@ -75,7 +80,7 @@ void BasicDLL::EnableBreak( bool bEnable )
 
 void BasicDLL::SetDebugMode( bool bDebugMode )
 {
-BasicDLL* pThis = BASIC_DLL();
+BasicDLL* pThis = BASIC_DLL;
 DBG_ASSERT( pThis, "BasicDLL::EnableBreak: No instance yet!" );
 if ( pThis )
 {
@@ -86,7 +91,7 @@ void BasicDLL::SetDebugMode( bool bDebugMode )
 
 void BasicDLL::BasicBreak()
 {
-BasicDLL* pThis = BASIC_DLL();
+BasicDLL* pThis = BASIC_DLL;
 DBG_ASSERT( pThis, "BasicDLL::EnableBreak: No instance yet!" );
 if ( pThis )
 {
@@ -106,7 +111,7 @@ void BasicDLL::BasicBreak()
 
 SbxAppData& GetSbxData_Impl()
 {
-return *BASIC_DLL()->m_xImpl->xSbxAppData;
+return *BASIC_DLL->m_xImpl->xSbxAppData;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx
index 159e856..623ec6a 100644
--- a/include/basic/basrdll.hxx
+++ b/include/basic/basrdll.hxx
@@ -43,8 +43,6 @@ public:
 static void SetDebugMode( bool bDebugMode );
 };
 
-#define BASIC_DLL() (*reinterpret_cast(GetAppData( SHL_BASIC )) )
-
 #endif // INCLUDED_BASIC_BASRDLL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/shl.hxx b/include/tools/shl.hxx
index c310c55..db6693c 100644
--- a/include/tools/shl.hxx
+++ b/include/tools/shl.hxx
@@ -47,7 +47,7 @@
 //20 (SHL_IDE) removed
 //21 (SHL_EDIT) removed
 //22 (SHL_VCED) removed
-#define SHL_BASIC   23
+//23 (SHL_BASIC) removed
 //24 (SHL_HELP) removed
 //25 (SHL_LNKCCH) removed
 //26 (SHL_CHANNEL) removed
commit e294fa9283071cb2816b6d8c759ed76ee552410e
Author: Stephan Bergmann 
Date:   Mon Jul 6 23:10:38 2015 +0200

Replace GetAppData(SHL_IDL) with an rtl::Static

Change-Id: Ia7a75c4686734aa811006858343666d2edfde8a1

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 3569d97..014aac7 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -125,13 +125,12 @@ public:
 ~IdlDll();
 };
 
-IdlDll * GetIdlApp();
-#define IDLAPP GetIdlApp()
+IdlDll & GetIdlApp();
 
 #define SV_GLOBAL_HASH_ACCESS( Name )   \
-if( !IDLAPP->pGlobalNames )