[Libreoffice-commits] core.git: basic/source mergeclasses.results rsc/inc rsc/source vcl/source

[Noel Grandin]

 basic/source/classes/sbunoobj.cxx |   16 
 mergeclasses.results  |2 --
 rsc/inc/rsctree.hxx   |   38 ++
 rsc/source/tools/rsctree.cxx  |   24 
 vcl/source/filter/sgvmain.cxx |2 --
 vcl/source/filter/sgvmain.hxx |   11 +++
 6 files changed, 33 insertions(+), 60 deletions(-)

New commits:
commit 751c771adc45cb150fa42bc70397e2571b28a60b
Author: Noel Grandin 
Date:   Thu Aug 27 13:07:42 2015 +0200

loplugin:mergeclass, merge BiNode with NameNode, Obj0Type with ObjkType

Change-Id: Icbc0dfc6096a6e2c651dad4fe9f78d176f389390

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index da07e3b..c7a95f1 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4311,18 +4311,9 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, 
SbxArray& rPar, bool bWrite )
 
 
 
-namespace {
-class OMutexBasis
-{
-protected:
-// this mutex is necessary for OInterfaceContainerHelper
-::osl::Mutex m_aMutex;
-};
-} // namespace
-
-class ModuleInvocationProxy : public OMutexBasis,
-  public WeakImplHelper< XInvocation, XComponent >
+class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent >
 {
+::osl::Mutexm_aMutex;
 OUStringm_aPrefix;
 SbxObjectRefm_xScopeObj;
 boolm_bProxyIsClassModuleObject;
@@ -4357,7 +4348,8 @@ public:
 };
 
 ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, 
SbxObjectRef xScopeObj )
-: m_aPrefix( aPrefix + "_" )
+: m_aMutex()
+, m_aPrefix( aPrefix + "_" )
 , m_xScopeObj( xScopeObj )
 , m_aListeners( m_aMutex )
 {
diff --git a/mergeclasses.results b/mergeclasses.results
index 85739e1..572d9a4 100644
--- a/mergeclasses.results
+++ b/mergeclasses.results
@@ -5,7 +5,6 @@ merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl
 merge AbstractSearchProgress with AbstractSearchProgress_Impl
 merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl
 merge AbstractTakeProgress with AbstractTakeProgress_Impl
-merge BiNode with NameNode
 merge CffGlobal with CffSubsetterContext
 merge CompareLine with SwCompareLine
 merge DdeGetPutItem with sfx2::ImplDdeItem
@@ -53,7 +52,6 @@ merge ImplGlyphFallbackFontSubstitution with 
FcGlyphFallbackSubstititution
 merge ImplPreMatchFontSubstitution with FcPreMatchSubstititution
 merge LwpDLList with LwpParaProperty
 merge LwpDLVListHead with LwpPropList
-merge Obj0Type with ObjkType
 merge OldBasicPassword with basic::SfxScriptLibraryContainer
 merge OpenGLDeviceInfo with X11OpenGLDeviceInfo
 merge OpenGLSalBitmapOp with ScaleOp
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 12ee456..f2f6ac2 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -22,40 +22,30 @@
 #include 
 #include 
 
-class BiNode
+class NameNode
 {
+voidSubOrderTree( NameNode * pOrderNode );
+
 protected:
-BiNode* pLeft;// left subtree
-BiNode* pRight;   // right subtree
+NameNode* pLeft;// left subtree
+NameNode* pRight;   // right subtree
 
-public:
+// pCmp ist Zeiger auf Namen
+NameNode*   Search( const void * pCmp ) const;
 
  // convert a double linked list into a binary tree
-BiNode *ChangeDLListBTree( BiNode * pList );
-
-BiNode();
-virtual ~BiNode();
+NameNode*   ChangeDLListBTree( NameNode * pList );
 
+NameNode();
+virtual ~NameNode();
 
 // convert a binary tree in a double linked list
-BiNode* ChangeBTreeDLList();
-
-BiNode *Left() const { return pLeft  ; }
-BiNode *Right() const{ return pRight ; }
-voidEnumNodes( Link<> aLink ) const;
-};
-
-class NameNode : public BiNode
-{
-voidSubOrderTree( NameNode * pOrderNode );
-
-protected:
-// pCmp is a pointer to name
-NameNode*   Search( const void * pCmp ) const;
+NameNode* ChangeBTreeDLList();
 
 public:
-NameNode*   Left() const { return static_cast(pLeft); }
-NameNode*   Right() const{ return static_cast(pRight); 
}
+voidEnumNodes( Link<> aLink ) const;
+NameNode*   Left() const { return pLeft; }
+NameNode*   Right() const{ return pRight; }
 NameNode*   Search( const NameNode * pName ) const;
 // insert a new node in the b-tree
 boolInsert( NameNode * pTN, sal_uInt32 * nDepth );
diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
index eb69285..8ee5036 100644
--- a/rsc/source/tools/rsctree.cxx
+++ b/rsc/sourc

Re: a deadlock question

[Stephan Bergmann]

On 09/08/2015 08:47 AM, meilin wrote:

Hi，I had send a same mail a few days ago. But I didn't receive some
helpful mails, So I use another mail address to send you a mail for help.


see 
 
"Re: deadlock question"

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

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

[Michael Stahl]

 sw/source/core/doc/tblrwcl.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 969ba5fe88c2f817f2121bb26f2d472cff891399
Author: Michael Stahl 
Date:   Fri Sep 4 21:53:34 2015 +0200

sw: erroneous vector assignment in SwTable::OldMerge()

+rLineBoxes = pFndBox->GetLines()[nEnd]->GetBoxes();

This actually assigns the boxes vector of the last line to the first
line, which the previous code didn't do.

Notably after converting the types from boost::ptr_vector to
std::vector, the assignment produces a several page
error message from both GCC and clang, and infuriatingly neither
compiler was able to tell on which line in tblrwcl.cxx the template
was instantiated, so i had to bisect that.

(regression from be5e4247e2a164bd1f2eacf9a33d6d73df16d0e3)

Change-Id: I646e3ca678895480d38ec48f38d720458860a985
(cherry picked from commit 8bf0e60d1da6d1ab79455dc916fd8701122812d2)
Reviewed-on: https://gerrit.libreoffice.org/18379
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 08db77b..12c24a5 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1613,17 +1613,15 @@ bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& 
rBoxes,
 _InsULPara aPara( pTableNd, true, true, pLeftBox, pMergeBox, pRightBox, 
pInsLine );
 
 // Move the overlapping upper/lower Lines of the selected Area
-_FndBoxes& rLineBoxes = pFndBox->GetLines().front().GetBoxes();
-for (_FndBoxes::iterator it = rLineBoxes.begin(); it != rLineBoxes.end(); 
++it)
+for (auto & it : pFndBox->GetLines().front().GetBoxes())
 {
-lcl_Merge_MoveBox(*it, &aPara);
+lcl_Merge_MoveBox(it, &aPara);
 }
 aPara.SetLower( pInsLine );
 const auto nEnd = pFndBox->GetLines().size()-1;
-rLineBoxes = pFndBox->GetLines()[nEnd].GetBoxes();
-for (_FndBoxes::iterator it = rLineBoxes.begin(); it != rLineBoxes.end(); 
++it)
+for (auto & it : pFndBox->GetLines()[nEnd].GetBoxes())
 {
-lcl_Merge_MoveBox(*it, &aPara);
+lcl_Merge_MoveBox(it, &aPara);
 }
 
 // Move the Boxes extending into the selected Area from left/right
___
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' - sw/source

[Michael Stahl]

 sw/source/uibase/app/docstyle.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 1805b7549cd240009bf67eba3a030e19b4f6f046
Author: Michael Stahl 
Date:   Mon Sep 7 16:18:53 2015 +0200

tdf#90991: sw: fix style preview creating undo objects

SwDocStyleSheet::FillStyleSheet() already takes care to remove all
temporarily created styles, so assume that works and suppress the
creation of user-visible Undo objects.

Change-Id: I748f0e8304c42e767b331ebd22be0290b9c0d89d
(cherry picked from commit 779b547ca6271156a59965569fa44fbeb3f63ce5)
Reviewed-on: https://gerrit.libreoffice.org/18382
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/uibase/app/docstyle.cxx 
b/sw/source/uibase/app/docstyle.cxx
index bb0f62f..016b1a1 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1727,6 +1727,9 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 bPhysical = 0 != pCharFormat;
 if( bFillOnlyInfo && !bPhysical )
 {
+// create style (plus all needed parents) and clean it up
+// later - without affecting the undo/redo stack
+::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 bDeleteInfo = true;
 ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
 pCharFormat = lcl_FindCharFormat(rDoc, aName, this, true );
@@ -1754,6 +1757,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 bPhysical = 0 != pColl;
 if( bFillOnlyInfo && !bPhysical )
 {
+::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 bDeleteInfo = true;
 ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
 pColl = lcl_FindParaFormat(rDoc, aName, this, true );
@@ -1777,6 +1781,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 bPhysical = 0 != pFrameFormat;
 if( bFillOnlyInfo && bPhysical )
 {
+::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 bDeleteInfo = true;
 ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
 pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this, true );
@@ -1796,6 +1801,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 bPhysical = 0 != pDesc;
 if( bFillOnlyInfo && !pDesc )
 {
+::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 bDeleteInfo = true;
 ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
 pDesc = lcl_FindPageDesc( rDoc, aName, this, true );
@@ -1824,6 +1830,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 bPhysical = 0 != pNumRule;
 if( bFillOnlyInfo && !pNumRule )
 {
+::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 bDeleteInfo = true;
 ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
 pNumRule = lcl_FindNumRule( rDoc, aName, this, true );
@@ -1890,7 +1897,10 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 SetMask( _nMask );
 }
 if( bDeleteInfo && bFillOnlyInfo )
+{
+::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 ::lcl_DeleteInfoStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
+}
 return bRet;
 }
 
___
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' - sw/source

[Michael Stahl]

 sw/source/uibase/app/docstyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b9c51bd265908e8bf65cb2a462dd8fd9a88904f
Author: Michael Stahl 
Date:   Mon Sep 7 16:21:53 2015 +0200

sw: fix not-quite-copypaste code in SwDocStyleSheet::FillStyleSheet()

This causes the temporary creation of frame styles to fail.

Change-Id: I5d148ae008660d9c0f457a4c0e9dc256e0dfc49a
(cherry picked from commit 110dc43d97d559b6369bca308f9dd39fd02e751e)
Reviewed-on: https://gerrit.libreoffice.org/18380
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/uibase/app/docstyle.cxx 
b/sw/source/uibase/app/docstyle.cxx
index 016b1a1..8c0c438 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1779,7 +1779,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType 
eFType )
 case SFX_STYLE_FAMILY_FRAME:
 pFrameFormat = lcl_FindFrameFormat(rDoc,  aName, this, bCreate);
 bPhysical = 0 != pFrameFormat;
-if( bFillOnlyInfo && bPhysical )
+if (bFillOnlyInfo && !bPhysical)
 {
 ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 bDeleteInfo = true;
___
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 #49 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=bfa5b13b42770fb709dc2af7cab7aff1942eaa50

toolkit: 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: toolkit/source

[Takeshi Abe]

 toolkit/source/awt/asynccallback.cxx|4 ++--
 toolkit/source/awt/stylesettings.hxx|4 ++--
 toolkit/source/awt/vclxtoolkit.cxx  |6 +++---
 toolkit/source/controls/animatedimages.cxx  |1 -
 toolkit/source/controls/dialogcontrol.cxx   |4 ++--
 toolkit/source/controls/grid/defaultgridcolumnmodel.cxx |4 ++--
 toolkit/source/controls/grid/defaultgriddatamodel.cxx   |4 ++--
 toolkit/source/controls/grid/gridcolumn.hxx |4 ++--
 toolkit/source/controls/grid/gridcontrol.hxx|4 ++--
 toolkit/source/controls/grid/sortablegriddatamodel.cxx  |4 ++--
 toolkit/source/controls/tabpagemodel.cxx|1 -
 toolkit/source/controls/tree/treecontrol.cxx|3 ++-
 toolkit/source/controls/tree/treecontrol.hxx|2 --
 toolkit/source/controls/unocontrolcontainer.cxx |4 ++--
 14 files changed, 23 insertions(+), 26 deletions(-)

New commits:
commit bfa5b13b42770fb709dc2af7cab7aff1942eaa50
Author: Takeshi Abe 
Date:   Tue Sep 8 10:41:27 2015 +0900

toolkit: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

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

diff --git a/toolkit/source/awt/asynccallback.cxx 
b/toolkit/source/awt/asynccallback.cxx
index cc988b2..f344eb8 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -24,7 +24,7 @@
 #include "osl/mutex.hxx"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include 
 #include 
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include 
@@ -34,7 +34,7 @@
 namespace {
 
 class AsyncCallback:
-public ::cppu::WeakImplHelper2<
+public ::cppu::WeakImplHelper<
 css::lang::XServiceInfo,
 css::awt::XRequestCallback>,
 private boost::noncopyable
diff --git a/toolkit/source/awt/stylesettings.hxx 
b/toolkit/source/awt/stylesettings.hxx
index c49f1b7..1274b59 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include 
 
@@ -42,7 +42,7 @@ namespace toolkit
 //= WindowStyleSettings
 
 struct WindowStyleSettings_Data;
-typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::awt::XStyleSettings
+typedef ::cppu::WeakImplHelper <   ::com::sun::star::awt::XStyleSettings
 >   WindowStyleSettings_Base;
 class WindowStyleSettings : public WindowStyleSettings_Base
 {
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 9d5ff01..43174f5 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -45,7 +45,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -147,7 +147,7 @@ protected:
 };
 
 class VCLXToolkit : public VCLXToolkit_Impl,
-public cppu::WeakComponentImplHelper2<
+public cppu::WeakComponentImplHelper<
 css::awt::XToolkitExperimental,
 css::lang::XServiceInfo >
 {
@@ -648,7 +648,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
 
 // constructor, which might initialize VCL
 VCLXToolkit::VCLXToolkit():
-cppu::WeakComponentImplHelper2<
+cppu::WeakComponentImplHelper<
 ::com::sun::star::awt::XToolkitExperimental,
 ::com::sun::star::lang::XServiceInfo>( GetMutex() ),
 m_aTopWindowListeners(rBHelper.rMutex),
diff --git a/toolkit/source/controls/animatedimages.cxx 
b/toolkit/source/controls/animatedimages.cxx
index a434239b9..b12e37c 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 #include "helper/unopropertyarrayhelper.hxx"
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 018b239..5481a78 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -43,7 +43,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::util;
 // => use some template magic
 
 template< typename T >
-class SimpleNamedThingContainer : public ::cppu::WeakImplHelper1< 
container::XNameContainer >
+class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< 
container::XNameContainer >
 {
 typedef std::unordered_map< OUString, Reference< T >, OUStringHash,
std::equal_to< OUString > > NamedThingsHash;
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx 
b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index f6e1b61..27

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

[Albert Thuswaldner]

 sc/source/ui/view/tabvwshc.cxx |   24 
 sc/source/ui/view/tabvwshd.cxx |2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 607197f6ce494ed8672b0e5c44d975ad942f00fa
Author: Albert Thuswaldner 
Date:   Fri Sep 4 21:00:11 2015 +0200

tdf#39468 translated german comments in tabvwshc.cxx and tabvwshd.cxx

Change-Id: I1dd4c8a27bb63a91bead11d386748cd9cf2fe31c
Reviewed-on: https://gerrit.libreoffice.org/18349
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 38502d2..6b8118e 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -118,8 +118,8 @@ VclPtr ScTabViewShell::CreateRefDialog(
 SfxChildWinInfo* pInfo,
 vcl::Window* pParent, sal_uInt16 nSlotId )
 {
-//  Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit
-//  z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen 
(#42341#).
+// only open dialog when called through ScModule::SetRefDialog,
+// so that it does not re appear for instance after a crash (#42341#).
 
 if ( SC_MOD()->GetCurRefDlgId() != nSlotId )
 return NULL;
@@ -236,7 +236,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 case SID_DEFINE_DBNAME:
 {
-//  wenn auf einem bestehenden Bereich aufgerufen, den markieren
+// when called for an existing range, then mark
 GetDBData( true, SC_DB_OLD );
 const ScMarkData& rMark = GetViewData().GetMarkData();
 if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
@@ -268,7 +268,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 aArgSet.Put( aItem );
 
-// aktuelle Tabelle merken (wg. RefInput im Dialog)
+// mark current sheet (due to RefInput in dialog)
 GetViewData().SetRefTabNo( GetViewData().GetTabNo() );
 
 pResult = VclPtr::Create( pB, pCW, pParent, 
aArgSet );
@@ -295,7 +295,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
   &GetViewData(),
   &aQueryParam ) );
 
-// aktuelle Tabelle merken (wg. RefInput im Dialog)
+// mark current sheet (due to RefInput in dialog)
 GetViewData().SetRefTabNo( GetViewData().GetTabNo() );
 
 pResult = VclPtr::Create( pB, pCW, pParent, aArgSet );
@@ -406,7 +406,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 case SID_OPENDLG_PIVOTTABLE:
 {
-//  all settings must be in pDialogDPObject
+// all settings must be in pDialogDPObject
 
 if( pDialogDPObject )
 {
@@ -427,7 +427,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 case SID_OPENDLG_FUNCTION:
 {
-//  Dialog schaut selber, was in der Zelle steht
+// dialog checks, what is in the cell
 
 pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData(),ScGlobal::GetStarCalcFunctionMgr() );
 }
@@ -443,7 +443,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 case FID_CHG_SHOW:
 {
-//  Dialog schaut selber, was in der Zelle steht
+// dialog checks, what is in the cell
 
 pResult = VclPtr::Create( pB, pCW, pParent, 
&GetViewData() );
 }
@@ -451,7 +451,7 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 case WID_SIMPLE_REF:
 {
-//  Dialog schaut selber, was in der Zelle steht
+// dialog checks, what is in the cell
 
 ScViewData& rViewData = GetViewData();
 rViewData.SetRefTabNo( rViewData.GetTabNo() );
@@ -518,9 +518,9 @@ VclPtr ScTabViewShell::CreateRefDialog(
 
 if (pResult)
 {
-//  Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf,
-//  darum muss die Groesse ueber das Initialize gerettet werden
-//  (oder den Zusaetze-Status mit speichern !!!)
+// the dialogs are always displayed with the option button collapsed,
+// the size has to be carried over initialize
+// (or store the option status !!!)
 
 Size aSize = pResult->GetSizePixel();
 pResult->Initialize( pInfo );
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index de13fc6..1602ef5 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -32,7 +32,7 @@
 
 // STATIC DATA ---
 
-//! Parent-Window fuer Dialoge
+//! parent window for dialogs
 //! Problem: OLE Server!
 
 vcl::Window* ScTabViewShell::GetDialogParent()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #208 from Commit Notification 
 ---
Albert Thuswaldner committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468 translated german comments in tabvwshc.cxx and tabvwshd.cxx

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: Branch 'libreoffice-5-0' - include/svl svl/source svx/source sw/inc sw/source

[Michael Stahl]

 include/svl/style.hxx|5 +
 svl/source/items/style.cxx   |5 +
 svx/source/styles/CommonStylePreviewRenderer.cxx |   36 ++-
 svx/source/tbxctrls/tbcontrl.cxx |   35 ++-
 sw/inc/docstyle.hxx  |7 +-
 sw/source/uibase/app/docstyle.cxx|   70 ++-
 6 files changed, 121 insertions(+), 37 deletions(-)

New commits:
commit 19347304b2594f28fadf7cefe6aab4fdb5c9047f
Author: Michael Stahl 
Date:   Mon Sep 7 16:36:24 2015 +0200

tdf#91383: sw: prevent style preview from actually creating styles

The dialog/sidebar should not actually create styles that don't exist yet,
because it messes up Undo and the (unused) styles are then unnecessarily
exported to documents.

Due to Writer's ... unusual SwDocStyleSheet class this is a bit tricky.

Add a new function GetItemSetForPreview() and use it from the style preview
code.

The implementation does not use FillPhysical so will temporarily create and
then delete any non-existing styles.

Skip page and numbering styles for now since they don't have a useful 
preview.

(regression from ca95307638207db5d662059aa61594151a13e927)

(cherry picked from commit 93067f37cf22aa119db5878c4345fea500cbbb42)

-Werror,-Wreturn-type
(cherry picked from commit 0ed64030f17849ea943800343003c5ec3f4f1388)

Change-Id: Id6ee30ea467fc24c991547a4c23a9ce14fdd86c7
Reviewed-on: https://gerrit.libreoffice.org/18381
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 5798b49..79eadf6 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -143,6 +143,11 @@ public:
 virtual void   SetHelpId( const OUString& r, sal_uLong nId );
 
 virtual SfxItemSet& GetItemSet();
+/// Due to writer's usual lack of sanity this is a separate function for
+/// preview only; it shall not create the style in case it does not exist.
+/// If the style has parents, it is _not_ required that the returned item
+/// set has parents (i.e. use it for display purposes only).
+virtual std::unique_ptr GetItemSetForPreview();
 };
 
 /* Class to iterate and search on a SfxStyleSheetBasePool */
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index bbbd45e..01da088 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -284,6 +284,11 @@ SfxItemSet& SfxStyleSheetBase::GetItemSet()
 return *pSet;
 }
 
+std::unique_ptr SfxStyleSheetBase::GetItemSetForPreview()
+{
+return std::unique_ptr(new SfxItemSet(GetItemSet()));
+}
+
 /**
  * Set help file and ID and return it
  */
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx 
b/svx/source/styles/CommonStylePreviewRenderer.cxx
index ab1271a..67f9b89 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -60,65 +60,67 @@ CommonStylePreviewRenderer::~CommonStylePreviewRenderer()
 
 bool CommonStylePreviewRenderer::recalculate()
 {
-const SfxItemSet& aItemSet = mpStyle->GetItemSet();
-
 maFont = SvxFont();
 
+std::unique_ptr pItemSet(mpStyle->GetItemSetForPreview());
+
+if (!pItemSet) return false;
+
 const SfxPoolItem* pItem;
 
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_WEIGHT)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_WEIGHT)) != nullptr)
 {
 maFont.SetWeight(static_cast(pItem)->GetWeight());
 }
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_POSTURE)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_POSTURE)) != nullptr)
 {
 maFont.SetItalic(static_cast(pItem)->GetPosture());
 }
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_CONTOUR)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_CONTOUR)) != nullptr)
 {
 maFont.SetOutline(static_cast< const 
SvxContourItem*>(pItem)->GetValue());
 }
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_SHADOWED)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_SHADOWED)) != nullptr)
 {
 maFont.SetShadow(static_cast(pItem)->GetValue());
 }
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_RELIEF)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_RELIEF)) != nullptr)
 {
 maFont.SetRelief(static_cast(static_cast(pItem)->GetValue()));
 }
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_UNDERLINE)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_UNDERLINE)) != nullptr)
 {
 maFont.SetUnderline(static_cast< const 
SvxUnderlineItem*>(pItem)->GetLineStyle());
 }
-if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr)
+if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr)
 {
 maFont.SetOverline(static_cast(static_cast(pItem)->GetValue()));
 }

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

[Michael Stahl]

 include/svx/CommonStylePreviewRenderer.hxx   |2 
 svx/source/styles/CommonStylePreviewRenderer.cxx |   51 +--
 2 files changed, 31 insertions(+), 22 deletions(-)

New commits:
commit 3a0d2c51021022233015c3318cfcf26aceb3b650
Author: Michael Stahl 
Date:   Mon Sep 7 16:40:20 2015 +0200

svx: fix font rendering in the style preview

If the style does not actually have any font items, as is the case for
frame, page and number styles in Writer, the maFont will be
default-initialized and the maPixelSize incorrect.
Avoid using these variables.

(cherry picked from commit 07df816d73884d094f0f56be022aa0b4eff00b2d)

Change-Id: I084cd8faa90a3d53310ceec55e8dae3af3dd586c
Reviewed-on: https://gerrit.libreoffice.org/18383
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/svx/CommonStylePreviewRenderer.hxx 
b/include/svx/CommonStylePreviewRenderer.hxx
index 1e7d54e..0a7dd89 100644
--- a/include/svx/CommonStylePreviewRenderer.hxx
+++ b/include/svx/CommonStylePreviewRenderer.hxx
@@ -22,7 +22,7 @@ namespace svx
 
 class SVX_DLLPUBLIC CommonStylePreviewRenderer : public 
sfx2::StylePreviewRenderer
 {
-SvxFont maFont;
+std::unique_ptr m_pFont;
 Color maFontColor;
 Color maBackgroundColor;
 Size maPixelSize;
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx 
b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 67f9b89..fefd43b 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -47,7 +47,7 @@ CommonStylePreviewRenderer::CommonStylePreviewRenderer(
 const SfxObjectShell& rShell, OutputDevice& 
rOutputDev,
 SfxStyleSheetBase* pStyle, long nMaxHeight)
 : StylePreviewRenderer(rShell, rOutputDev, pStyle, nMaxHeight)
-, maFont()
+, m_pFont()
 , maFontColor(COL_AUTO)
 , maBackgroundColor(COL_AUTO)
 , maPixelSize()
@@ -60,53 +60,55 @@ CommonStylePreviewRenderer::~CommonStylePreviewRenderer()
 
 bool CommonStylePreviewRenderer::recalculate()
 {
-maFont = SvxFont();
+m_pFont.reset();
 
 std::unique_ptr pItemSet(mpStyle->GetItemSetForPreview());
 
 if (!pItemSet) return false;
 
+std::unique_ptr pFont(new SvxFont);
+
 const SfxPoolItem* pItem;
 
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_WEIGHT)) != nullptr)
 {
-maFont.SetWeight(static_cast(pItem)->GetWeight());
+pFont->SetWeight(static_cast(pItem)->GetWeight());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_POSTURE)) != nullptr)
 {
-maFont.SetItalic(static_cast(pItem)->GetPosture());
+pFont->SetItalic(static_cast(pItem)->GetPosture());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_CONTOUR)) != nullptr)
 {
-maFont.SetOutline(static_cast< const 
SvxContourItem*>(pItem)->GetValue());
+pFont->SetOutline(static_cast< const 
SvxContourItem*>(pItem)->GetValue());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_SHADOWED)) != nullptr)
 {
-maFont.SetShadow(static_cast(pItem)->GetValue());
+pFont->SetShadow(static_cast(pItem)->GetValue());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_RELIEF)) != nullptr)
 {
-maFont.SetRelief(static_cast(static_cast(pItem)->GetValue()));
+pFont->SetRelief(static_cast(static_cast(pItem)->GetValue()));
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_UNDERLINE)) != nullptr)
 {
-maFont.SetUnderline(static_cast< const 
SvxUnderlineItem*>(pItem)->GetLineStyle());
+pFont->SetUnderline(static_cast< const 
SvxUnderlineItem*>(pItem)->GetLineStyle());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr)
 {
-maFont.SetOverline(static_cast(static_cast(pItem)->GetValue()));
+pFont->SetOverline(static_cast(static_cast(pItem)->GetValue()));
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_STRIKEOUT)) != nullptr)
 {
-maFont.SetStrikeout(static_cast(pItem)->GetStrikeout());
+pFont->SetStrikeout(static_cast(pItem)->GetStrikeout());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_CASEMAP)) != nullptr)
 {
-maFont.SetCaseMap(static_cast(pItem)->GetCaseMap());
+pFont->SetCaseMap(static_cast(pItem)->GetCaseMap());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_EMPHASISMARK)) != nullptr)
 {
-maFont.SetEmphasisMark(static_cast(pItem)->GetEmphasisMark());
+pFont->SetEmphasisMark(static_cast(pItem)->GetEmphasisMark());
 }
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_COLOR)) != nullptr)
 {
@@ -131,8 +133,8 @@ bool CommonStylePreviewRenderer::recalculate()
 if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_FONT)) != nullptr)
 {
 const SvxFontItem* pFontItem = static_cast(pItem);
-maFont.SetName(pFontItem->GetFamilyName());
-maFont.Set

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

[Michael Stahl]

 sw/source/uibase/app/docstyle.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit d83fc62ada63ea784faeee72a29b414e3efa61b3
Author: Michael Stahl 
Date:   Mon Sep 7 20:41:11 2015 +0200

tdf#91383: sw: actually reset the modified status too

... when deleting the temporarily inserted styles in
SwDocStyleSheet::FillStyleSheet().

Change-Id: Id4abc067ce10b41486f659350267c7e3933db472
(cherry picked from commit 66133fd8882a070674bbb3803634c5e75e8ae772)
Reviewed-on: https://gerrit.libreoffice.org/18387
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/uibase/app/docstyle.cxx 
b/sw/source/uibase/app/docstyle.cxx
index 6727cb8..08da17c 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1779,6 +1779,7 @@ bool SwDocStyleSheet::FillStyleSheet(
 bool bDeleteInfo = false;
 bool bFillOnlyInfo = FillAllInfo == eFType || FillPreview == eFType;
 std::vector aDelArr;
+bool const isModified(rDoc.getIDocumentState().IsModified());
 
 switch(nFamily)
 {
@@ -1966,6 +1967,10 @@ bool SwDocStyleSheet::FillStyleSheet(
 {
 ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
 ::lcl_DeleteInfoStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
+if (!isModified)
+{
+rDoc.getIDocumentState().ResetModified();
+}
 }
 return bRet;
 }
___
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' - sw/inc sw/source

[Michael Stahl]

 sw/inc/IDocumentStatistics.hxx   |2 +-
 sw/source/core/doc/DocumentStatisticsManager.cxx |7 +--
 sw/source/core/inc/DocumentStatisticsManager.hxx |2 +-
 sw/source/uibase/app/docsh2.cxx  |5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit da094918215757fa61e969f819576f49b91701ba
Author: Michael Stahl 
Date:   Mon Sep 7 21:52:49 2015 +0200

sw: fix newly created document being modified

After the document is created, an event is dispatched on the main loop
that calls SfxPickList::Notify(), which modifies document properties.

It tries to prevent setting the document to modified by calling
SfxObjectShell::EnableSetModified(false), but Writer cunningly outwits
it by simply having its own independent(?) modified flag that is set
unconditionally in DocumentStatisticsManager::DocInfoChgd().

Let's assume that if the modified flag shouldn't be modified in
SfxObjectShell, it shouldn't be modified in DocumentStatisticsManager.

Somehow in 4.4 and 4.3 the same thing was going on, but it didn't result
in a visibly enabled Save icon in the UI, but with 5.0 it does - cannot
easily bisect why that changed due to tdf#91383.

Change-Id: Id30fd831eb29910c9fb44ed3031bf8da23586bea
(cherry picked from commit 5adc8ee343e5c32d30095bc4005b7b022016b745)
Reviewed-on: https://gerrit.libreoffice.org/18388
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 7cb50ae..9f953d4 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -31,7 +31,7 @@ public:
 /** DocInfo has changed (notify via DocShell):
 make required fields update.
 */
-virtual void DocInfoChgd() = 0;
+virtual void DocInfoChgd(bool isEnableSetModified) = 0;
 
 /** Document - Statistics
 */
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx 
b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 4fed190..8525ab1 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -77,11 +77,14 @@ DocumentStatisticsManager::DocumentStatisticsManager( 
SwDoc& i_rSwdoc ) : m_rDoc
 maStatsUpdateTimer.SetTimeoutHdl( LINK( this, DocumentStatisticsManager, 
DoIdleStatsUpdate ) );
 }
 
-void DocumentStatisticsManager::DocInfoChgd( )
+void DocumentStatisticsManager::DocInfoChgd(bool const isEnableSetModified)
 {
 m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD 
)->UpdateFields();
 m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_TEMPLNAMEFLD 
)->UpdateFields();
-m_rDoc.getIDocumentState().SetModified();
+if (isEnableSetModified)
+{
+m_rDoc.getIDocumentState().SetModified();
+}
 }
 
 const SwDocStat& DocumentStatisticsManager::GetDocStat() const
diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx 
b/sw/source/core/inc/DocumentStatisticsManager.hxx
index be1e78a..2ad06cc 100644
--- a/sw/source/core/inc/DocumentStatisticsManager.hxx
+++ b/sw/source/core/inc/DocumentStatisticsManager.hxx
@@ -37,7 +37,7 @@ public:
 
 DocumentStatisticsManager( SwDoc& i_rSwdoc );
 
-void DocInfoChgd() SAL_OVERRIDE;
+void DocInfoChgd(bool isEnableSetModified) SAL_OVERRIDE;
 const SwDocStat &GetDocStat() const SAL_OVERRIDE;
 SwDocStat & GetDocStat(); //Non const version of the above, not part of 
the interface.
 const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool 
bFields = true) SAL_OVERRIDE;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index d75d160..166cbeb 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -207,7 +207,7 @@ void SwDocShell::DoFlushDocInfo()
 m_pWrtShell->StartAllAction();
 }
 
-m_pDoc->getIDocumentStatistics().DocInfoChgd();
+m_pDoc->getIDocumentStatistics().DocInfoChgd(IsEnableSetModified());
 
 if (m_pWrtShell)
 {
@@ -296,8 +296,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 EnableSetModified( false );
 // #i41679#
 const bool bIsDocModified = 
m_pDoc->getIDocumentState().IsModified();
+// TODO: is the ResetModified() below because of only the 
direct call from DocInfoChgd, or does UpdateFields() set it too?
 
-m_pDoc->getIDocumentStatistics().DocInfoChgd( );
+m_pDoc->getIDocumentStatistics().DocInfoChgd(false);
 
 // #i41679#
 if ( !bIsDocModified )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 basic/source/comp/exprtree.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 4b4a7c0d87eb580272aba0777c9021789025bdc0
Author: Stephan Bergmann 
Date:   Tue Sep 8 10:48:43 2015 +0200

Revert a fix that can never have worked in the first place?

clang-analyzer-deadcode.DeadStores finds that conditionally assigning

  eTok = SYMBOL

inside the "if( SbiTokenizer::IsKws( eTok ) )" block is useless, as the 
directly
following

  if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )

will unconditionally assign into eTok again, without intermediate use of 
the old
eTok value.

Now, the conditional "eTok = SYMBOL" assignment was added as
5d98ed5c6a4afc0a7943318c510e56aef8c45193 "INTEGRATION: CWS ab12fixes: 
#118234#
SbiExpression::Term(): Allow Input as symbol for action option compatible,"
while the unconditional "eTok = eNextTok" assignment had followed that block
ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import."

The referenced "#118234#" was a Sun-internal bug and is no longer 
available, but
it does very much look as if this alleged bugfix never worked in the first
place.  So revert the code back to what it looked before
5d98ed5c6a4afc0a7943318c510e56aef8c45193, for now.

Change-Id: I1fe1178d2c5b0c0372da32b8dd0f2dfbdb22a1ae

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 190822c..8b22257 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -217,15 +217,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* 
pKeywordSymbolInfo )
 // no keywords allowed from here on!
 if( SbiTokenizer::IsKwd( eTok ) )
 {
-if( pParser->IsCompatible() && eTok == INPUT )
-{
-eTok = SYMBOL;
-}
-else
-{
-pParser->Error( ERRCODE_BASIC_SYNTAX );
-bError = true;
-}
+pParser->Error( ERRCODE_BASIC_SYNTAX );
+bError = true;
 }
 
 if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: df#50950 sort out Calc (ISO)WEEKNUM functions

[Winfried Donkers]

Hi Eike,

> > I'm a bit lost here. Maybe we need to sort that out from scratch again.
> > This appears to be the most complicated change in function names we're
> > tackling because of the different functions AND having an Add-In
> > function involved AND different names for similar but not quite
> > identical functions in UI and file formats.
> As you know, the problem is that the ODFF function name ISOWEEKNUM is
> currently used for a function with WEEKNUM functionality.

This keep nagging me and I have a suggestion which will make that we lose less 
time once I start implementing the ODFF1.2 ISOWEEKNUM function:

1.
I propose to change the saved function name for the current WEEKNUM function 
and to add backward compatibility to read saved ISOWEEKNUM and automatically 
redirect to WEEKNUM.

2.
This way ISOWEEKNUM will get 'obsolete' in saved documents, making it possible 
to add the ODFF1.2 IDSOWEEKNUM function to Calc one or more versions after step 
1.

I hope I didn't write in riddles ;)

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

[Libreoffice-commits] online.git: 2 commits - loleaflet/spec loolwsd/LOOLWSD.cpp

[Mihai Varga]

 loleaflet/spec/data/lorem.odt |binary
 loleaflet/spec/loleaflet/loleafletSpec.js |5 -
 loleaflet/spec/tilebench/TileBenchSpec.js |5 -
 loolwsd/LOOLWSD.cpp   |   15 +++
 4 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit d57100db3b6a82b3fcb5af622c63f9ba1bb05735
Author: Mihai Varga 
Date:   Tue Sep 8 12:01:59 2015 +0300

loleaflet: test document

diff --git a/loleaflet/spec/data/lorem.odt b/loleaflet/spec/data/lorem.odt
new file mode 100644
index 000..1b26ee1
Binary files /dev/null and b/loleaflet/spec/data/lorem.odt differ
diff --git a/loleaflet/spec/loleaflet/loleafletSpec.js 
b/loleaflet/spec/loleaflet/loleafletSpec.js
index fd16985..dd8fe14 100644
--- a/loleaflet/spec/loleaflet/loleafletSpec.js
+++ b/loleaflet/spec/loleaflet/loleafletSpec.js
@@ -13,10 +13,13 @@ describe('TileBench', function () {
}
 
before(function () {
+   var htmlPath = window.location.pathname;
+   var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
+   var fileURL = 'file://' + dir + '/data/lorem.odt';
// initialize the map and load the document
map = L.map('map', {
server: 'ws://localhost:9980',
-   doc: 'file:///home/mihai/Desktop/test_docs/eval.odt',
+   doc: fileURL,
edit: false,
readOnly: false
});
diff --git a/loleaflet/spec/tilebench/TileBenchSpec.js 
b/loleaflet/spec/tilebench/TileBenchSpec.js
index 25882a7..b266848 100644
--- a/loleaflet/spec/tilebench/TileBenchSpec.js
+++ b/loleaflet/spec/tilebench/TileBenchSpec.js
@@ -14,10 +14,13 @@ describe('TileBench', function () {
}
 
before(function () {
+   var htmlPath = window.location.pathname;
+   var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
+   var fileURL = 'file://' + dir + '/data/lorem.odt';
// initialize the map and load the document
map = L.map('map', {
server: 'ws://localhost:9980',
-   doc: 'file:///home/mihai/Desktop/test_docs/eval.odt',
+   doc: fileURL,
edit: false,
readOnly: false
});
commit e17598e866830390673c89062bb34844f23e10df
Author: Mihai Varga 
Date:   Tue Sep 8 11:31:49 2015 +0300

loolwsd: also copy /etc/nsswitch.conf

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index b1154b0..8fc7262 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -895,15 +895,14 @@ void LOOLWSD::desktopMain()
 linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
 // We need this because sometimes the hostname is not resolved
-File resolv("/etc/resolv.conf");
-if (resolv.exists())
+std::vector networkFiles = {"/etc/hosts", 
"/etc/nsswitch.conf", "/etc/resolv.conf"};
+for (std::vector::iterator it = networkFiles.begin(); it != 
networkFiles.end(); ++it)
 {
-resolv.copyTo(Path(jail, "/etc").toString());
-}
-File hosts("/etc/hosts");
-if (hosts.exists())
-{
-hosts.copyTo(Path(jail, "/etc").toString());
+File networkFile(*it);
+if (networkFile.exists())
+{
+networkFile.copyTo(Path(jail, "/etc").toString());
+}
 }
 #ifdef __linux
 // Create the urandom and random devices
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: basic/source "Revert a fix that can never have worked in the first place?"

[Stephan Bergmann]

...in case anybody can make any sense of what the original bugfix 
 
"INTEGRATION: CWS ab12fixes: #118234# SbiExpression::Term(): Allow Input 
as symbol for action option compatible" actually wanted to achieve, or 
what "Allow Input as symbol for action option compatible" shall even mean:


On 09/08/2015 10:58 AM, Stephan Bergmann wrote:

commit 4b4a7c0d87eb580272aba0777c9021789025bdc0
Author: Stephan Bergmann 
Date:   Tue Sep 8 10:48:43 2015 +0200

 Revert a fix that can never have worked in the first place?

 clang-analyzer-deadcode.DeadStores finds that conditionally assigning

   eTok = SYMBOL

 inside the "if( SbiTokenizer::IsKws( eTok ) )" block is useless, as the 
directly
 following

   if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )

 will unconditionally assign into eTok again, without intermediate use of 
the old
 eTok value.

 Now, the conditional "eTok = SYMBOL" assignment was added as
 5d98ed5c6a4afc0a7943318c510e56aef8c45193 "INTEGRATION: CWS ab12fixes: 
#118234#
 SbiExpression::Term(): Allow Input as symbol for action option compatible,"
 while the unconditional "eTok = eNextTok" assignment had followed that 
block
 ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import."

 The referenced "#118234#" was a Sun-internal bug and is no longer 
available, but
 it does very much look as if this alleged bugfix never worked in the first
 place.  So revert the code back to what it looked before
 5d98ed5c6a4afc0a7943318c510e56aef8c45193, for now.

 Change-Id: I1fe1178d2c5b0c0372da32b8dd0f2dfbdb22a1ae

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 190822c..8b22257 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -217,15 +217,8 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* 
pKeywordSymbolInfo )
  // no keywords allowed from here on!
  if( SbiTokenizer::IsKwd( eTok ) )
  {
-if( pParser->IsCompatible() && eTok == INPUT )
-{
-eTok = SYMBOL;
-}
-else
-{
-pParser->Error( ERRCODE_BASIC_SYNTAX );
-bError = true;
-}
+pParser->Error( ERRCODE_BASIC_SYNTAX );
+bError = true;
  }

  if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )

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

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

[Miklos Vajna]

 sw/source/core/doc/docfmt.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 965d27280bed1832d6424f378aa89525ccbff1f6
Author: Miklos Vajna 
Date:   Tue Sep 8 08:59:44 2015 +0200

sw: use std::unique_ptr<> in docfmt

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

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index f71186a..dbf47c0 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -79,7 +79,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
@@ -296,7 +296,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
 }
 
 // #i96644#
-boost::scoped_ptr< SwDataChanged > xDataChanged;
+std::unique_ptr< SwDataChanged > xDataChanged;
 if ( bSendDataChangedEvents )
 {
 xDataChanged.reset( new SwDataChanged( *pPam ) );
@@ -1037,7 +1037,7 @@ static bool lcl_SetTextFormatColl( const SwNodePtr& 
rpNode, void* pArgs )
 
 if ( bChangeOfListStyleAtParagraph )
 {
-boost::scoped_ptr< SwRegHistory > pRegH;
+std::unique_ptr< SwRegHistory > pRegH;
 if ( pPara->pHistory )
 {
 pRegH.reset( new SwRegHistory( pTNd, *pTNd, 
pPara->pHistory ) );
___
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' - avmedia/source

[Michael Meeks]

 avmedia/source/opengl/oglplayer.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit eb570808aae8080e2dbb925db6b15cc257b2b9e5
Author: Michael Meeks 
Date:   Mon Sep 7 17:31:03 2015 +0100

tdf#93996 - throttle gltf rendering to let UI re-rendering get in.

Change-Id: I4a61595294c24a609a5952ce72f9f88524969784
Reviewed-on: https://gerrit.libreoffice.org/18384
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index 75caec6..f1a3ada 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -121,8 +121,10 @@ bool OGLPlayer::create( const OUString& rURL )
 }
 
 // Set timer
-m_aTimer.SetTimeout(1);
+m_aTimer.SetTimeout(8); // is 125fps enough for anyone ?
+m_aTimer.SetPriority(SchedulerPriority::LOW);
 m_aTimer.SetTimeoutHdl(LINK(this,OGLPlayer,TimerHandler));
+
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - idl/inc idl/source mergeclasses.results sw/inc sw/source

[Noel Grandin]

 idl/inc/basobj.hxx  |   78 +++-
 idl/inc/bastype.hxx |   37 +---
 idl/inc/database.hxx|6 
 idl/inc/types.hxx   |8 
 idl/source/objects/basobj.cxx   |   30 +--
 idl/source/objects/bastype.cxx  |4 
 idl/source/objects/module.cxx   |2 
 idl/source/objects/object.cxx   |4 
 idl/source/objects/slot.cxx |4 
 idl/source/objects/types.cxx|8 
 idl/source/prj/database.cxx |2 
 mergeclasses.results|2 
 sw/inc/ndhints.hxx  |  142 +---
 sw/source/core/access/acchyperlink.cxx  |2 
 sw/source/core/access/accpara.cxx   |4 
 sw/source/core/crsr/callnk.cxx  |2 
 sw/source/core/crsr/crstrvl.cxx |2 
 sw/source/core/crsr/findattr.cxx|   16 -
 sw/source/core/crsr/findtxt.cxx |   22 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx |4 
 sw/source/core/doc/DocumentFieldsManager.cxx|2 
 sw/source/core/doc/dbgoutsw.cxx |2 
 sw/source/core/doc/docruby.cxx  |2 
 sw/source/core/doc/doctxm.cxx   |6 
 sw/source/core/docnode/nodes.cxx|4 
 sw/source/core/edit/acorrect.cxx|2 
 sw/source/core/edit/edattr.cxx  |2 
 sw/source/core/frmedt/fefly1.cxx|2 
 sw/source/core/table/swtable.cxx|2 
 sw/source/core/text/frmform.cxx |4 
 sw/source/core/text/itratr.cxx  |   24 +-
 sw/source/core/text/itrpaint.cxx|4 
 sw/source/core/text/itrtxt.cxx  |2 
 sw/source/core/text/porfly.cxx  |2 
 sw/source/core/text/porlay.cxx  |4 
 sw/source/core/text/pormulti.cxx|   12 -
 sw/source/core/text/txtfld.cxx  |6 
 sw/source/core/text/txtfrm.cxx  |4 
 sw/source/core/text/txtftn.cxx  |4 
 sw/source/core/tox/ToxTextGenerator.cxx |2 
 sw/source/core/txtnode/modeltoviewhelper.cxx|2 
 sw/source/core/txtnode/ndhints.cxx  |   67 +++
 sw/source/core/txtnode/ndtxt.cxx|   44 ++--
 sw/source/core/txtnode/thints.cxx   |   69 ---
 sw/source/core/txtnode/txatritr.cxx |2 
 sw/source/core/txtnode/txtedt.cxx   |6 
 sw/source/core/undo/rolbck.cxx  |2 
 sw/source/core/unocore/unocrsrhelper.cxx|4 
 sw/source/core/unocore/unoportenum.cxx  |   26 +-
 sw/source/filter/ascii/ascatr.cxx   |4 
 sw/source/filter/html/htmlatr.cxx   |6 
 sw/source/filter/html/swhtml.cxx|4 
 sw/source/filter/html/wrthtml.cxx   |2 
 sw/source/filter/ww8/wrtw8nds.cxx   |   16 -
 sw/source/filter/ww8/ww8par.cxx |2 
 55 files changed, 321 insertions(+), 406 deletions(-)

New commits:
commit d4c6a3883a38187effdd7414a0a07a9a2d3d026d
Author: Noel Grandin 
Date:   Fri Aug 28 11:53:11 2015 +0200

loplugin:mergeclasses merge SvMetaObject with SvMetaName

Change-Id: I8c65ad9a5e2141b6fdf578e1361f8685d2f8517e

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 89ca0a6..71dc136 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -32,8 +32,23 @@ typedef SvMetaObject * (*CreateMetaObjectType)();
 
 #define C_PREF  "C_"
 
+class SvMetaObjectMemberList : public SvRefMemberList {};
+
 class SvMetaObject : public SvRttiBase
 {
+protected:
+SvString  aName;
+SvHelpContext aHelpContext;
+SvHelpTextaHelpText;
+SvString  aConfigName;
+SvString  aDescription;
+
+bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
+ char c = '\0' );
+virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
+virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
+  SvTokenStream & rInStm );
 public:
 TYPEINFO_OVERRIDE();
 SvMetaObject();
@@ -42,14 +57,17 @@ public:
 static void Back2Delemitter( SvStream & );

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

[Stephan Bergmann]

 xmloff/source/chart/SchXMLExport.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 81ced97e322be1316e4709ce2dadff50a01b8973
Author: Stephan Bergmann 
Date:   Tue Sep 8 11:52:55 2015 +0200

clang-analyzer-deadcode.DeadStores

...ever since its inception with e9ec6f67bf4aa0d7474e54b5f55ca71671356a48
"#i110617# avoid changes on copy from calc to writer"

Change-Id: I9e26f92f4f50fe728efa7d0ac2ba873a227623ea

diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 4d60557..4e034c7 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -806,12 +806,10 @@ lcl_TableData lcl_getDataForLocalTable(
 SchXMLExportHelper_Impl::tDataSequenceCont::const_iterator aEnd( 
aSequencesToExport.end());
 SchXMLExportHelper_Impl::tDataSequenceCont::const_iterator aIt( aBegin 
);
 
-size_t nMaxSequenceLength( lcl_getMaxSequenceLength( 
aSequencesToExport ));
-size_t nCategoriesLength( aSimpleCategories.getLength() );
-if( nCategoriesLength > nMaxSequenceLength )
+auto nMaxSequenceLength( lcl_getMaxSequenceLength( aSequencesToExport 
));
+if( aSimpleCategories.getLength() > nMaxSequenceLength )
 {
 aSimpleCategories.realloc(nMaxSequenceLength);//#i110617#
-nCategoriesLength = nMaxSequenceLength;
 }
 size_t nNumColumns( bSeriesFromColumns ? nNumSequences : 
nMaxSequenceLength );
 size_t nNumRows( bSeriesFromColumns ? nMaxSequenceLength : 
nNumSequences );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLWSD.cpp loolwsd/loolwsd-systemplate-setup

[Mihai Varga]

 loolwsd/LOOLWSD.cpp   |2 +-
 loolwsd/loolwsd-systemplate-setup |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8a371765bceb3a2581c785cc2d57073a078c8907
Author: Mihai Varga 
Date:   Tue Sep 8 13:03:43 2015 +0300

loolwsd: copy /etc/localtime when running systemplate-setup

diff --git a/loolwsd/loolwsd-systemplate-setup 
b/loolwsd/loolwsd-systemplate-setup
index 3d18283..f501ae0 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -30,6 +30,8 @@ cd / || exit 1
 lib/libnss_* lib64/libnss_* \
 var/cache/fontconfig \
 etc/fonts \
+etc/localtime \
+usr/share/zoneinfo/* \
 usr/share/liblangtag \
 lib/*-linux-gnu/libnss* \
 -type f
commit 564572e5612fe15781d2f2397aab3778a612b01a
Author: Mihai Varga 
Date:   Tue Sep 8 13:03:14 2015 +0300

loolwsd: also add /etc/host.conf in chroot

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8fc7262..0b12474 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -895,7 +895,7 @@ void LOOLWSD::desktopMain()
 linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
 // We need this because sometimes the hostname is not resolved
-std::vector networkFiles = {"/etc/hosts", 
"/etc/nsswitch.conf", "/etc/resolv.conf"};
+std::vector networkFiles = {"/etc/host.conf", "/etc/hosts", 
"/etc/nsswitch.conf", "/etc/resolv.conf"};
 for (std::vector::iterator it = networkFiles.begin(); it != 
networkFiles.end(); ++it)
 {
 File networkFile(*it);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 4 commits - loleaflet/spec loolwsd/LOOLWSD.cpp loolwsd/loolwsd-systemplate-setup

[Mihai Varga]

 loleaflet/spec/data/lorem.odt |binary
 loleaflet/spec/loleaflet/loleafletSpec.js |5 -
 loleaflet/spec/tilebench/TileBenchSpec.js |5 -
 loolwsd/LOOLWSD.cpp   |   15 +++
 loolwsd/loolwsd-systemplate-setup |2 ++
 5 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 76304bbd379033e683f53cfc50c8cb906fe3d91b
Author: Mihai Varga 
Date:   Tue Sep 8 13:03:43 2015 +0300

loolwsd: copy /etc/localtime when running systemplate-setup

diff --git a/loolwsd/loolwsd-systemplate-setup 
b/loolwsd/loolwsd-systemplate-setup
index 3d18283..f501ae0 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup
@@ -30,6 +30,8 @@ cd / || exit 1
 lib/libnss_* lib64/libnss_* \
 var/cache/fontconfig \
 etc/fonts \
+etc/localtime \
+usr/share/zoneinfo/* \
 usr/share/liblangtag \
 lib/*-linux-gnu/libnss* \
 -type f
commit e3951886287de774ae37689c0eaedde0e8eede8e
Author: Mihai Varga 
Date:   Tue Sep 8 13:03:14 2015 +0300

loolwsd: also add /etc/host.conf in chroot

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 76bb8cf..d0acb7b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -864,7 +864,7 @@ void LOOLWSD::desktopMain()
 linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
 // We need this because sometimes the hostname is not resolved
-std::vector networkFiles = {"/etc/hosts", 
"/etc/nsswitch.conf", "/etc/resolv.conf"};
+std::vector networkFiles = {"/etc/host.conf", "/etc/hosts", 
"/etc/nsswitch.conf", "/etc/resolv.conf"};
 for (std::vector::iterator it = networkFiles.begin(); it != 
networkFiles.end(); ++it)
 {
 File networkFile(*it);
commit 96bb22241de099c9a750b2d6c3e93457b63077a2
Author: Mihai Varga 
Date:   Tue Sep 8 12:01:59 2015 +0300

loleaflet: test document

diff --git a/loleaflet/spec/data/lorem.odt b/loleaflet/spec/data/lorem.odt
new file mode 100644
index 000..1b26ee1
Binary files /dev/null and b/loleaflet/spec/data/lorem.odt differ
diff --git a/loleaflet/spec/loleaflet/loleafletSpec.js 
b/loleaflet/spec/loleaflet/loleafletSpec.js
index fd16985..dd8fe14 100644
--- a/loleaflet/spec/loleaflet/loleafletSpec.js
+++ b/loleaflet/spec/loleaflet/loleafletSpec.js
@@ -13,10 +13,13 @@ describe('TileBench', function () {
}
 
before(function () {
+   var htmlPath = window.location.pathname;
+   var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
+   var fileURL = 'file://' + dir + '/data/lorem.odt';
// initialize the map and load the document
map = L.map('map', {
server: 'ws://localhost:9980',
-   doc: 'file:///home/mihai/Desktop/test_docs/eval.odt',
+   doc: fileURL,
edit: false,
readOnly: false
});
diff --git a/loleaflet/spec/tilebench/TileBenchSpec.js 
b/loleaflet/spec/tilebench/TileBenchSpec.js
index 7fb85de..f3882a0 100644
--- a/loleaflet/spec/tilebench/TileBenchSpec.js
+++ b/loleaflet/spec/tilebench/TileBenchSpec.js
@@ -14,10 +14,13 @@ describe('TileBench', function () {
}
 
before(function () {
+   var htmlPath = window.location.pathname;
+   var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
+   var fileURL = 'file://' + dir + '/data/lorem.odt';
// initialize the map and load the document
map = L.map('map', {
server: 'ws://localhost:9980',
-   doc: 'file:///home/mihai/Desktop/test_docs/eval.odt',
+   doc: fileURL,
edit: false,
readOnly: false
});
commit e80da7a5848806951a1fb781d39e3a1015d2e2f5
Author: Mihai Varga 
Date:   Tue Sep 8 11:31:49 2015 +0300

loolwsd: also copy /etc/nsswitch.conf

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8e76a80..76bb8cf 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -864,15 +864,14 @@ void LOOLWSD::desktopMain()
 linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
 // We need this because sometimes the hostname is not resolved
-File resolv("/etc/resolv.conf");
-if (resolv.exists())
+std::vector networkFiles = {"/etc/hosts", 
"/etc/nsswitch.conf", "/etc/resolv.conf"};
+for (std::vector::iterator it = networkFiles.begin(); it != 
networkFiles.end(); ++it)
 {
-resolv.copyTo(Path(jail, "/etc").toString());
-}
-File hosts("/etc/hosts");
-if (hosts.exists())
-{
-hosts.copyTo(Path(jail, "/etc").toString());
+File networkFile(*it);
+if (networkFile.exists())
+{
+networkFile.copyTo(Path(jail, "/etc").toString());
+}
 }
 #ifdef __linux
 // 

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

[Caolán McNamara]

 sw/source/filter/ww8/docxsdrexport.cxx |   16 +++-
 sw/source/filter/ww8/wrtw8esh.cxx  |2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit d9aed0bc2e741fa02a6ffdf90193aae7ce471e52
Author: Caolán McNamara 
Date:   Tue Sep 8 09:45:12 2015 +0100

Related: tdf#93676 msword wraps slightly differently than us

Change-Id: I688d4d193709d9c9829065c87f0d656a94fd9f16

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 02b134a..71a357e 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -516,6 +516,21 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 }
 m_pImpl->m_pSerializer->endElementNS(XML_wp, XML_positionH);
 m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_positionV, 
XML_relativeFrom, relativeFromV, FSEND);
+
+sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.Y);
+
+// tdf#93675, 0 below line/paragraph and/or top line/paragraph with
+// wrap top+bottom or other wraps is affecting the line directly
+// above the anchor line, which seems odd, but a tiny adjustment
+// here to bring the top down convinces msoffice to wrap like us
+if (nTwipstoEMU == 0 &&
+(strcmp(relativeFromV, "line") == 0 || strcmp(relativeFromV, 
"paragraph") == 0) &&
+(!alignV || strcmp(alignV, "top") == 0))
+{
+alignV = NULL;
+nTwipstoEMU = 635;
+}
+
 if (alignV != NULL)
 {
 m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_align, FSEND);
@@ -525,7 +540,6 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 else
 {
 m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_posOffset, 
FSEND);
-sal_Int64 nTwipstoEMU = TwipsToEMU(aPos.Y);
 if (nTwipstoEMU > MAX_INTEGER_VALUE)
 {
 nTwipstoEMU = MAX_INTEGER_VALUE;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index fd6dfbc..2b7cebe 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -810,7 +810,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
 // wrap top+bottom or other wraps is affecting the line directly
 // above the anchor line, which seems odd, but a tiny adjustment
 // here to bring the top down convinces msoffice to wrap like us
-if (nTop < 8 && !rFrameFormat.IsInline() &&
+if (nTop == 0 && !rFrameFormat.IsInline() &&
 rVOr.GetVertOrient() == text::VertOrientation::NONE &&
 rVOr.GetRelationOrient() == text::RelOrientation::FRAME)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 xmloff/source/text/txtflde.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 27b77b9754e74ebb4e2efac2723de2de11b2e3e1
Author: Stephan Bergmann 
Date:   Tue Sep 8 13:00:22 2015 +0200

clang-analyzer-deadcode.DeadStores

...ever since 4b3df269f81184c4951457daa5181df2bcc5d259 "INTEGRATION: CWS
sb19: #i32429# ExplodeFieldMasterName should not try to copy non-existent 
string
parts"

Change-Id: Idf642d1c9c5516ad9c837c4cb9d397dc7e3f5e39

diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 4f1a9d0..43478b0 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2898,7 +2898,6 @@ bool XMLTextFieldExport::ExplodeFieldMasterName(
 
 // '.' found?
 if (nSeparator <= nLength) {
-nSeparator = sMasterName.getLength();
 SAL_WARN("xmloff.text", "no field var name!");
 bReturn = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |  330 +
 mergeclasses.results   |  330 -
 2 files changed, 330 insertions(+), 330 deletions(-)

New commits:
commit c542679e721db11035505cab2268d8cec19fa380
Author: Noel Grandin 
Date:   Tue Sep 8 13:09:16 2015 +0200

move mergeclasses loplugin result file to compilerplugins/

to keep it out of the top-level folder

Change-Id: I4bb95b8ae856462e9638f43fde1553e49dd31cc9

diff --git a/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
similarity index 100%
rename from mergeclasses.results
rename to compilerplugins/clang/mergeclasses.results
___
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

[Tor Lillqvist]

 sc/inc/formulacell.hxx  |4 
 sc/source/core/data/formulacell.cxx |4 
 2 files changed, 8 deletions(-)

New commits:
commit 64c6b0ed6c67d169021732d276ec02706e139261
Author: Tor Lillqvist 
Date:   Tue Sep 8 13:27:53 2015 +0300

USE_MEMPOOL is not defined anywhere

Change-Id: I4d3c87aac31c6690cd061ce41e7efae113055c12

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index dbafa1b..1b67b40 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -164,10 +164,6 @@ public:
 
 enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
 
-#ifdef USE_MEMPOOL
-DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-#endif
-
 ScAddress   aPos;
 
 virtual ~ScFormulaCell();
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 2483382..dc3f9bb 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -66,10 +66,6 @@
 
 using namespace formula;
 
-#ifdef USE_MEMPOOL
-IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-#endif
-
 #define DEBUG_CALCULATION 0
 #if DEBUG_CALCULATION
 static ScAddress aDebugCalculationTriggerAddress(1,2,0);// Sheet1.B3, 
whatever you like
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 helpauthoring/filter/soffice2xmlhelp.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd9ddd7bdb8420b58b42e32136c83f2f589907f2
Author: Yousuf Philips 
Date:   Tue Sep 8 15:14:48 2015 +0400

Have title tag id attribute before xml-lang

Most .xhp files have it in this format, so no need to change this line
unnecessarily everytime a file is saved using the tool.

diff --git a/helpauthoring/filter/soffice2xmlhelp.xsl 
b/helpauthoring/filter/soffice2xmlhelp.xsl
index 4d4e557..56f47d1 100644
--- a/helpauthoring/filter/soffice2xmlhelp.xsl
+++ b/helpauthoring/filter/soffice2xmlhelp.xsl
@@ -106,7 +106,7 @@ DOCUMENT SKELETON
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - avmedia/source canvas/source include/vcl slideshow/source vcl/inc vcl/opengl vcl/source vcl/unx vcl/workben

[Michael Meeks]

 avmedia/source/opengl/oglplayer.cxx|   15 
+-
 avmedia/source/opengl/oglplayer.hxx|2 
 avmedia/source/opengl/oglwindow.cxx|   10 -
 avmedia/source/opengl/oglwindow.hxx|4 
 canvas/source/opengl/ogl_spritedevicehelper.cxx|   33 
++---
 canvas/source/opengl/ogl_spritedevicehelper.hxx|2 
 include/vcl/opengl/OpenGLContext.hxx   |   19 
+--
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |8 -
 vcl/inc/opengl/salbmp.hxx  |4 
 vcl/inc/opengl/win/gdiimpl.hxx |7 -
 vcl/inc/opengl/x11/gdiimpl.hxx |4 
 vcl/inc/openglgdiimpl.hxx  |   10 -
 vcl/inc/salgdi.hxx |2 
 vcl/opengl/gdiimpl.cxx |   47 
++-
 vcl/opengl/salbmp.cxx  |   16 
+-
 vcl/opengl/texture.cxx |6 -
 vcl/opengl/win/gdiimpl.cxx |   10 -
 vcl/opengl/x11/gdiimpl.cxx |   10 -
 vcl/source/app/svdata.cxx  |   12 
--
 vcl/source/gdi/salgdilayout.cxx|2 
 vcl/source/opengl/OpenGLContext.cxx|   59 
+++---
 vcl/source/window/openglwin.cxx|7 -
 vcl/unx/generic/window/salframe.cxx|4 
 vcl/workben/vcldemo.cxx|   10 -
 24 files changed, 129 insertions(+), 174 deletions(-)

New commits:
commit 56900a441de1d4cc896ad1e36a44622ed1598fad
Author: Michael Meeks 
Date:   Tue Sep 8 11:46:13 2015 +0100

tdf#94006 - fix OpenGLContext mis-use in several places.

gltf rendering, OpenGL canvas, GL transitions & GL capable (charts)
Avoid GLX operations on un-initialized contexts.

Change-Id: I7f523640f66ab656896181e5c865879234f6640e

diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index a8a9f7d..c7bb7fb 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -28,6 +28,7 @@ namespace avmedia { namespace ogl {
 OGLPlayer::OGLPlayer()
 : Player_BASE(m_aMutex)
 , m_pHandle(NULL)
+, m_xContext(OpenGLContext::Create())
 , m_pOGLWindow(NULL)
 , m_bIsRendering(false)
 {
@@ -38,7 +39,7 @@ OGLPlayer::~OGLPlayer()
 osl::MutexGuard aGuard(m_aMutex);
 if( m_pHandle )
 {
-m_aContext.makeCurrent();
+m_xContext->makeCurrent();
 gltf_renderer_release(m_pHandle);
 }
 releaseInputFiles();
@@ -258,13 +259,13 @@ uno::Reference< media::XPlayerWindow > SAL_CALL 
OGLPlayer::createPlayerWindow( c
 }
 assert(pChildWindow->GetParent());
 
-if( !m_aContext.init(pChildWindow) )
+if( !m_xContext->init(pChildWindow) )
 {
 SAL_WARN("avmedia.opengl", "Context initialization failed");
 return uno::Reference< media::XPlayerWindow >();
 }
 
-if( !m_aContext.supportMultiSampling() )
+if( !m_xContext->supportMultiSampling() )
 {
 SAL_WARN("avmedia.opengl", "Context does not support multisampling!");
 return uno::Reference< media::XPlayerWindow >();
@@ -277,7 +278,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL 
OGLPlayer::createPlayerWindow( c
 }
 
 Size aSize = pChildWindow->GetSizePixel();
-m_aContext.setWinSize(aSize);
+m_xContext->setWinSize(aSize);
 m_pHandle->viewport.x = 0;
 m_pHandle->viewport.y = 0;
 m_pHandle->viewport.width = aSize.Width();
@@ -294,7 +295,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL 
OGLPlayer::createPlayerWindow( c
 // The background color is white by default, but we need to separate the
 // OpenGL window from the main window so set background color to grey
 glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
-m_pOGLWindow = new OGLWindow(*m_pHandle, m_aContext, 
*pChildWindow->GetParent());
+m_pOGLWindow = new OGLWindow(*m_pHandle, m_xContext, 
*pChildWindow->GetParent());
 return uno::Reference< media::XPlayerWindow >( m_pOGLWindow );
 }
 
@@ -304,13 +305,13 @@ uno::Reference< media::XFrameGrabber > SAL_CALL 
OGLPlayer::createFrameGrabber()
 osl::MutexGuard aGuard(m_aMutex);
 assert(m_pHandle);
 
-if( !m_aContext.init() )
+if( !m_xContext->init() )
 {
 SAL_WARN("avmedia.opengl", "Offscreen context initialization failed");
 return uno::Reference< media::XFrameGrabber >();
 }
 
-if( !m_aConte

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

[Eike Rathke]

 sc/inc/formulacell.hxx  |2 ++
 sc/source/core/data/formulacell.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 37a36671e0abfa0e1dfd2cfdd6470a3f2805b199
Author: Eike Rathke 
Date:   Tue Sep 8 13:59:57 2015 +0200

reactivate fixed mempool for ScFormulaCell

... it got lost with 8b252f30267d043522ff2cbf2bf42275bb7a6ec6

Change-Id: I1a7c9bbaa1fd70d24c168d53aae6691a45c29085

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index dbafa1b..30fd1b1 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -164,9 +164,7 @@ public:
 
 enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
 
-#ifdef USE_MEMPOOL
 DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-#endif
 
 ScAddress   aPos;
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 2483382..e21a26e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -66,9 +66,7 @@
 
 using namespace formula;
 
-#ifdef USE_MEMPOOL
 IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
-#endif
 
 #define DEBUG_CALCULATION 0
 #if DEBUG_CALCULATION
commit 7df729da30f89ad20cd5705e3a1a91866ac71898
Author: Eike Rathke 
Date:   Tue Sep 8 13:27:14 2015 +0200

Revert "USE_MEMPOOL is not defined anywhere"

Well.. then let's remove the ifdef instead of the implementation,
dammit..

This reverts commit 64c6b0ed6c67d169021732d276ec02706e139261.

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 1b67b40..dbafa1b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -164,6 +164,10 @@ public:
 
 enum CompareState { NotEqual = 0, EqualInvariant, EqualRelativeRef };
 
+#ifdef USE_MEMPOOL
+DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+#endif
+
 ScAddress   aPos;
 
 virtual ~ScFormulaCell();
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index dc3f9bb..2483382 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -66,6 +66,10 @@
 
 using namespace formula;
 
+#ifdef USE_MEMPOOL
+IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell )
+#endif
+
 #define DEBUG_CALCULATION 0
 #if DEBUG_CALCULATION
 static ScAddress aDebugCalculationTriggerAddress(1,2,0);// Sheet1.B3, 
whatever you like
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 linguistic/source/lngprophelp.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit f89475ce90f184e15e10508c1eace674a01a6740
Author: Stephan Bergmann 
Date:   Tue Sep 8 14:08:34 2015 +0200

clang-analyzer-deadcode.DeadStores

...ever since its inception with 4c9ed88132bb472eb1b759c8e53874e79402c769
"INTEGRATION: CWS tl04: #118281# switch to Proximity linguistic"

Change-Id: Id1579bfc6dffa3685641c96b7a79489338e8dd22

diff --git a/linguistic/source/lngprophelp.cxx 
b/linguistic/source/lngprophelp.cxx
index 24c3733..3083d5c 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -190,10 +190,6 @@ bool PropertyChgHelper::propertyChange_Impl( const 
PropertyChangeEvent& rEvt )
 bSCWA = bSWWA = true;
 break;
 }
-default:
-{
-bRes = false;
-}
 }
 if (pbVal)
 rEvt.NewValue >>= *pbVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 helpauthoring/filter/soffice2xmlhelp.xsl |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2abf85b691cc27ea3c6832652226f78ada8229af
Author: Yousuf Philips 
Date:   Tue Sep 8 15:39:50 2015 +0400

Embed tags should be on their own line

When embed tags arent preceeded by a newline, a group of embeds all get
put on the same line and sometimes on a previous paragraph line.

diff --git a/helpauthoring/filter/soffice2xmlhelp.xsl 
b/helpauthoring/filter/soffice2xmlhelp.xsl
index 56f47d1..2534b39 100644
--- a/helpauthoring/filter/soffice2xmlhelp.xsl
+++ b/helpauthoring/filter/soffice2xmlhelp.xsl
@@ -395,6 +395,7 @@ EMBED
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/unx/gtk/window/gtksalframe.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 920ff4aef83b4b97b8cd075844ce17ff9b324f5b
Author: Stephan Bergmann 
Date:   Tue Sep 8 14:21:26 2015 +0200

clang-analyzer-deadcode.DeadStores

same as 12a2a78cd1860ab5fea21889275a46c2456f00db

Change-Id: Ibb4930abfd620f81c528ed0fe6ca62d887d77636

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 6bc25f3..21a1876 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3187,7 +3187,6 @@ void GtkSalFrame::createNewWindow( ::Window aNewParent, 
bool bXEmbed, SalX11Scre
 aParentData.bXEmbedSupport = bXEmbed;
 if( aNewParent == None )
 {
-aNewParent = getDisplay()->GetRootWindow(nXScreen);
 aParentData.aWindow = None;
 aParentData.bXEmbedSupport = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/flat/ETable.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 8a13dc598b015a6047f6be1c0f03de3695bf6fc1
Author: Stephan Bergmann 
Date:   Tue Sep 8 14:34:24 2015 +0200

clang-analyzer-deadcode.DeadStores

...at least since 4695f7d361641ea4dcd927a7b4aab86e0c971d5b "#82018# check 
for
double column names" removed the commented-out code that would have used it 
(and
which had been commented out ever since the code got introduced)

Change-Id: I11e9cafb53894ce7cb7ffc031f2d6b047bd3258d

diff --git a/connectivity/source/drivers/flat/ETable.cxx 
b/connectivity/source/drivers/flat/ETable.cxx
index fa80969..7e31289 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -324,7 +324,6 @@ void 
OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
 }
 }
 
-sal_Int32 nFlags = 0;
 if (bNumeric)
 {
 if (cDecimalDelimiter)
@@ -346,7 +345,6 @@ void 
OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
 io_nPrecisions = 0;
 io_nScales = 0;
 }
-nFlags = ColumnSearch::BASIC;
 }
 else
 {
@@ -370,7 +368,6 @@ void 
OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
 io_nScales = 0;
 o_sTypeName = "VARCHAR";
 };
-nFlags |= ColumnSearch::CHAR;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/README

[Jan Holesovsky]

 .git-hooks/README |   24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

New commits:
commit 417c9fa8a96cd071a2900621b42fa089cadf6eb1
Author: Jan Holesovsky 
Date:   Tue Sep 8 14:50:48 2015 +0200

git-hooks: Info how to install them manually.

Change-Id: I42f007a1ef18e39a6f42e882b43ece771052081a

diff --git a/.git-hooks/README b/.git-hooks/README
index 3ddd71a..56ac974 100644
--- a/.git-hooks/README
+++ b/.git-hooks/README
@@ -1,9 +1,15 @@
-Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to 
trigger action at certain points. 
-
-There are two groups of these hooks: client side and server side. 
-The client-side hooks:
-are for client operations such as committing and merging.
-The server-side hooks:
-are for Git server operations such as receiving pushed commits.
-
-See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ]
\ No newline at end of file
+Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to 
trigger action at certain points.
+
+To install manually, run:
+
+  cd .git/hooks && ln -s ../../.git-hooks/* ./
+
+There are two groups of these hooks: client side and server side.
+
+The client-side hooks:
+are for client operations such as committing and merging.
+
+The server-side hooks:
+are for Git server operations such as receiving pushed commits.
+
+See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: .git-hooks/commit-msg .git-hooks/post-merge .git-hooks/pre-commit .git-hooks/README

[Jan Holesovsky]

 .git-hooks/README |   15 +++
 .git-hooks/commit-msg |  193 ++
 .git-hooks/post-merge |   12 +++
 .git-hooks/pre-commit |  157 
 4 files changed, 377 insertions(+)

New commits:
commit 63833851913c2fdb009e49df933dfef7b051013d
Author: Jan Holesovsky 
Date:   Tue Sep 8 14:51:43 2015 +0200

git-hooks: Copy them from the 'core' repo here too.

It's increasingly useful to be able to edit help without having 'core' 
around.

diff --git a/.git-hooks/README b/.git-hooks/README
new file mode 100644
index 000..56ac974
--- /dev/null
+++ b/.git-hooks/README
@@ -0,0 +1,15 @@
+Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to 
trigger action at certain points.
+
+To install manually, run:
+
+  cd .git/hooks && ln -s ../../.git-hooks/* ./
+
+There are two groups of these hooks: client side and server side.
+
+The client-side hooks:
+are for client operations such as committing and merging.
+
+The server-side hooks:
+are for Git server operations such as receiving pushed commits.
+
+See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ]
diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
new file mode 100755
index 000..fb08d10
--- /dev/null
+++ b/.git-hooks/commit-msg
@@ -0,0 +1,193 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by git-commit with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, make this file executable.
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+base_dir=$(dirname $0)
+MSG="$1"
+
+abort() {
+cp $1 $1.save
+cat >&2 <'`" ] 
; then
+abort "$1" "The commit message looks like ChangeLog, please use the git 
form."
+fi
+
+# Check for whitespace in front of *'s
+
+if [ -n "`sed '/^#/,$d' $1 | grep '^[[:space:]]\+\*.*:'`" -a -z "`grep '^\*' 
$1`" ] ; then
+abort "$1" "Please don't use whitespace in front of '* file: Description.' 
entries."
+fi
+
+# Check that lines do not start with '#' (possibly accidental 
commit,
+# such as starting the message with '#ifdef', git commits start with 
'#'.
+
+if [ -n "`grep '^#[^[:blank:]]' $1`" ] ; then
+abort "$1" "Possible accidental comment in the commit message (leading # 
without space)."
+fi
+
+
+#-- copied gerrit commit-msg hook to handle ChangeId -->
+# From Gerrit Code Review 2.3
+#
+# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+CHANGE_ID_AFTER="Bug|Issue"
+
+# Check for, and add if missing, a unique Change-Id
+#
+add_ChangeId() {
+clean_message=`sed -e '
+/^diff --git a\/.*/{
+s///
+q
+}
+/^Signed-off-by:/d
+/^#/d
+' "$MSG" | git stripspace`
+if test -z "$clean_message"
+then
+return
+fi
+
+id=`grep -i '^Change-Id:' "$MSG" | sed -e "s/.*: I//"`
+temp_msg=`grep -v -i '^Change-Id:' "$MSG"`
+echo "$temp_msg" > "$MSG"
+
+if  test -z "$id"
+then
+id=`_gen_ChangeId`
+fi
+perl -e '
+$MSG = shift;
+$id = shift;
+$CHANGE_ID_AFTER = shift;
+
+undef $/;
+open(I, $MSG); $_ = ; close I;
+s|^diff --git a/.*||ms;
+s|^#.*$||mg;
+exit unless $_;
+
+@message = split /\n/;
+$haveFooter = 0;
+$startFooter = @message;
+for($line = @message - 1; $line >= 0; $line--) {
+$_ = $message[$line];
+
+if (/^[a-zA-Z0-9-]+: /) {
+$haveFooter++;
+next;
+}
+next if /^[ []/;
+$startFooter = $line if ($haveFooter && /^\r?$/);
+

[Libreoffice-commits] core.git: helpcontent2

[Jan Holesovsky]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08337faeae1d126b8929a511ec0cfa63061a8fb9
Author: Jan Holesovsky 
Date:   Tue Sep 8 14:51:43 2015 +0200

Updated core
Project: help  63833851913c2fdb009e49df933dfef7b051013d

git-hooks: Copy them from the 'core' repo here too.

It's increasingly useful to be able to edit help without having 'core' 
around.

diff --git a/helpcontent2 b/helpcontent2
index 7ab7700..6383385 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7ab770081ca955ae0da5d6c98f4badefd1f8f064
+Subproject commit 63833851913c2fdb009e49df933dfef7b051013d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sc/source/core/data/formulacell.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 241a0c1ab1fbbd3038f8add3bb2b2e1683598daa
Author: Tor Lillqvist 
Date:   Tue Sep 8 15:59:38 2015 +0300

aTopPos is not used for anything as far as I can see

Change-Id: Id7ef5fbceffecb6cee8efb80b6de4946a8300839

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index e21a26e..27796ae 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3935,8 +3935,6 @@ bool ScFormulaCell::InterpretFormulaGroup()
 return InterpretInvariantFormulaGroup();
 
 ScTokenArray aCode;
-ScAddress aTopPos = aPos;
-aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row());
 ScGroupTokenConverter aConverter(aCode, *pDocument, *this, 
mxGroup->mpTopCell->aPos);
 std::vector aLoopControl;
 if (!aConverter.convert(*pCode, aLoopControl))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/odbc/OTools.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 4e95a613dc5cc836d0c9582fd647d676107d1786
Author: Stephan Bergmann 
Date:   Tue Sep 8 15:14:10 2015 +0200

clang-analyzer-deadcode.DeadStores

...ever since b309e422c631ce6ce729552cc8053478f9539dfd "#95348# type usage
changed" introduced the local nMaxLen and passed that instead of _nMaxLen 
into
the two ODBC3SQLFunctionId::BindCol calls

Change-Id: Ifb561106c87b6e424ccc9d350752b19b3648c7c8

diff --git a/connectivity/source/drivers/odbc/OTools.cxx 
b/connectivity/source/drivers/odbc/OTools.cxx
index f08b767..8777b3d 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -164,7 +164,6 @@ void OTools::bindValue( OConnection* _pConnection,
 SQLRETURN nRetcode;
 SQLSMALLINT   fSqlType;
 SQLSMALLINT   fCType;
-SQLLEN nMaxLen = _nMaxLen;
 
 OTools::getBindTypes(   false,
 _bUseOldTimeDate,
@@ -179,7 +178,7 @@ void OTools::bindValue( OConnection* _pConnection,
 (SQLUSMALLINT)columnIndex,
 fCType,
 _pData,
-nMaxLen,
+_nMaxLen,
 pLen
 );
 }
@@ -195,7 +194,6 @@ void OTools::bindValue( OConnection* _pConnection,
 OString aString(OUStringToOString(*static_cast(_pValue),_nTextEncoding));
 *pLen = SQL_NTS;
 *static_cast(_pData) = aString;
-_nMaxLen = (SQLSMALLINT)aString.getLength();
 
 // Pointer on Char*
 _pData = const_cast(aString.getStr());
@@ -208,8 +206,7 @@ void OTools::bindValue( OConnection* _pConnection,
 case SQL_NUMERIC:
 {
 OString aString = OString::number(*static_cast(_pValue));
-_nMaxLen = (SQLSMALLINT)aString.getLength();
-*pLen = _nMaxLen;
+*pLen = (SQLSMALLINT)aString.getLength();
 *static_cast(_pData) = aString;
 // Pointer on Char*
 _pData = const_cast(static_cast(_pData)->getStr());
@@ -280,7 +277,7 @@ void OTools::bindValue( OConnection* _pConnection,
 (SQLUSMALLINT)columnIndex,
 fCType,
 _pData,
-nMaxLen,
+_nMaxLen,
 pLen
 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

[Mihai Varga]

 loolwsd/debian/loolwsd.preinst |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit aad12a8f2bc82615d82ed0c178da312bfdb859f4
Author: Mihai Varga 
Date:   Tue Sep 8 16:31:49 2015 +0300

loolwsd: stop loolwsd service before installing .deb

diff --git a/loolwsd/debian/loolwsd.preinst b/loolwsd/debian/loolwsd.preinst
new file mode 100755
index 000..78112a4
--- /dev/null
+++ b/loolwsd/debian/loolwsd.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# Stop any running loolwsd process
+if [ -d /run/systemd/system ]; then
+deb-systemd-invoke stop loolwsd.service >/dev/null || true
+fi
+
+exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/odbc/OResultSet.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd53697bab53d46df952eeb23b609c59adc330cc
Author: Stephan Bergmann 
Date:   Tue Sep 8 15:34:46 2015 +0200

clang-analyzer-deadcode.DeadStores

...ever since OResultSet::fillNeededData got introduced in
8687beec5dfc08b28accc7779e0f7762cd947f12 "INTEGRATION: CWS insight01" (and 
the
return value of the N3SQLPutData call in the first case block had always 
been
ignored completely, not even unnecessarily assigned to nRet as in these 
later
two case blocks)

Change-Id: I1d2005e7c91749510b23f86ac792bd11ae564608

diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx 
b/connectivity/source/drivers/odbc/OResultSet.cxx
index f813668..b6feb2f 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -1805,7 +1805,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
 {
 OUString sRet;
 sRet = m_aRow[nColumnIndex].getString();
-nRet = N3SQLPutData (m_aStatementHandle, 
static_cast(const_cast(sRet.getStr())), 
sizeof(sal_Unicode)*sRet.getLength());
+N3SQLPutData (m_aStatementHandle, 
static_cast(const_cast(sRet.getStr())), 
sizeof(sal_Unicode)*sRet.getLength());
 break;
 }
 case DataType::LONGVARCHAR:
@@ -1814,7 +1814,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
 OUString sRet;
 sRet = m_aRow[nColumnIndex].getString();
 OString aString(OUStringToOString(sRet,m_nTextEncoding));
-nRet = N3SQLPutData (m_aStatementHandle, 
static_cast(const_cast(aString.getStr())), 
aString.getLength());
+N3SQLPutData (m_aStatementHandle, 
static_cast(const_cast(aString.getStr())), 
aString.getLength());
 break;
 }
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - loolwsd/debian

[Mihai Varga]

 loolwsd/debian/loolwsd.preinst |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 95ecfe3614a163e5f1eeb8bac0abdb496f3ae6a6
Author: Mihai Varga 
Date:   Tue Sep 8 16:31:49 2015 +0300

loolwsd: stop loolwsd service before installing .deb

diff --git a/loolwsd/debian/loolwsd.preinst b/loolwsd/debian/loolwsd.preinst
new file mode 100755
index 000..78112a4
--- /dev/null
+++ b/loolwsd/debian/loolwsd.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# Stop any running loolwsd process
+if [ -d /run/systemd/system ]; then
+deb-systemd-invoke stop loolwsd.service >/dev/null || true
+fi
+
+exit 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' - vcl/source

[Markus Mohrhard]

 vcl/source/opengl/OpenGLContext.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a2731f219fd5b7b86efb9519a3680c93d7bb4029
Author: Markus Mohrhard 
Date:   Mon Sep 7 16:39:04 2015 +0200

tdf#93989 - prevent crash with non-vcl OpenGL contexts

Change-Id: Ia829b0f723c8ded1237e52d48f034da3c1ac249e
Signed-off-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/18409
Reviewed-by: Jan Holesovsky 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index e217690..978fdd7f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1505,7 +1505,8 @@ void OpenGLContext::resetCurrent()
 #elif defined( IOS ) || defined( ANDROID ) || defined(LIBO_HEADLESS)
 // nothing
 #elif defined( UNX )
-glXMakeCurrent(m_aGLWin.dpy, None, NULL);
+if (m_aGLWin.dpy)
+glXMakeCurrent(m_aGLWin.dpy, None, NULL);
 #endif
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 2 commits - loolwsd/configure.ac

[Mihai Varga]

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

New commits:
commit 130b69871ec872c1758cfee987c7b8b17f007ba8
Author: Mihai Varga 
Date:   Tue Sep 8 17:04:39 2015 +0300

loolwsd: bump version after tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 7e8afa8..ab2a481 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.2.22], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.2.23], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 4544bc35b6c96db733c4812a135dd13425773f54
Author: Mihai Varga 
Date:   Tue Sep 8 17:03:58 2015 +0300

loolwsd: bump version before tarball

bump 2 versions because I once forgot to commit

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index b3b3d1b..7e8afa8 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.2.19], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.2.22], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 162 commits - apple_remote/Library_AppleRemote.mk apple_remote/source avmedia/Library_avmediaQuickTime.mk avmedia/Module_avmedia.mk a

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit b7957406a90649af1740a15559c2784f29b39578
Author: Douglas Mencken 
Date:   Wed Dec 24 10:47:02 2014 -0500

use -lobjc-gnu and GNUstep libraries when compiler is GCC

for:
  vcl
  toolkit
  apple_remote
  sfx2
  avmedia-quicktime
  fpicker-aqua
  shell-macbe1

{ note: path to GNUstep libraries is currently hard-coded }

Change-Id: Ia28778f3e262e71c87c48e71fbfd9001d5d6ac7a

diff --git a/apple_remote/Library_AppleRemote.mk 
b/apple_remote/Library_AppleRemote.mk
index cf48553..5d8cbfd 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -17,6 +17,10 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,AppleRemote,\
 IOKit \
 ))
 
+$(eval $(call gb_Library_add_libs,AppleRemote,\
+$(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
+))
+
 $(eval $(call gb_Library_add_objcobjects,AppleRemote,\
 apple_remote/source/KeyspanFrontRowControl \
 apple_remote/source/AppleRemote \
diff --git a/avmedia/Library_avmediaQuickTime.mk 
b/avmedia/Library_avmediaQuickTime.mk
index 20bf9c3..8bc097d 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -35,6 +35,10 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,avmediaQuickTime,\
QTKit \
 ))
 
+$(eval $(call gb_Library_add_libs,avmediaQuickTime,\
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
+))
+
 $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\
avmedia/source/quicktime/framegrabber \
avmedia/source/quicktime/manager \
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index e4b7ef5..c8a2dc5 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -44,4 +44,8 @@ $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\
fpicker/source/aqua/SalAquaPicker \
 ))
 
+$(eval $(call gb_Library_add_libs,fps_aqua,\
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index faba426..d75c41a 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -326,7 +326,7 @@ $(eval $(call gb_Library_add_objcxxobjects,sfx,\
 sfx2/source/appl/shutdowniconaqua \
 ))
 $(eval $(call gb_Library_add_libs,sfx,\
--lobjc \
+$(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
 ))
 $(eval $(call gb_Library_use_system_darwin_frameworks,sfx,\
 Cocoa \
diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk
index c693e11..5b13704 100644
--- a/shell/Library_macbe.mk
+++ b/shell/Library_macbe.mk
@@ -18,6 +18,10 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,macbe1,\
SystemConfiguration \
 ))
 
+$(eval $(call gb_Library_add_libs,macbe1,\
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
+))
+
 $(eval $(call gb_Library_use_libraries,macbe1,\
cppu \
cppuhelper \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 148a236..7d8958f 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -120,7 +120,7 @@ $(eval $(call 
gb_Library_add_objcxxflags_exception_objects,tk,\
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_libs,tk,\
-   -lobjc \
+   $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
 ))
 endif
 
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ffaf49b..cc29e10 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
 -framework IOKit \
 -F/System/Library/PrivateFrameworks \
 -framework CoreUI \
--lobjc \
+$(if $(filter TRUE,$(COM_GCC_IS_CLANG)),-lobjc,-lobjc-gnu 
-L/usr/GNUstep/System/Library/Libraries -lgnustep-base -lgnustep-gui) \
 ))
 endif
 
commit af363ba422e9618e1b83294729570150dfa9b286
Author: Douglas Mencken 
Date:   Tue Sep 8 08:06:37 2015 -0400

ctfonts.cxx: add kCTForegroundColorFromContextAttributeName as extern

Although the Apple documentation claims 
kCTForegroundColorFromContextAttributeName
is supported on 10.5 and later, it is not defined in CTStringAttributes.h
or anywhere else. I think it was inadvertently omitted from 
CTStringAttributes.h
on 10.5, along with a few other symbols.

related commit: 507efabe8b40e34c2bebfdaa00d4264c5345d3dd

Change-Id: I8ea33f64d79eff4b73552ec48ea2016c7d9d0bb4

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 1978c91..f3d3116 100644
--- a/vcl/quartz

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

[Stephan Bergmann]

 include/svtools/table/tablerenderer.hxx|   23 ---
 svtools/inc/table/gridtablerenderer.hxx|3 ---
 svtools/source/table/gridtablerenderer.cxx |   12 +++-
 svtools/source/table/tablecontrol_impl.cxx |2 +-
 svtools/source/table/tabledatawindow.cxx   |7 ++-
 5 files changed, 6 insertions(+), 41 deletions(-)

New commits:
commit f19049065aa3e187377ab73cc70b6faa7803102a
Author: Stephan Bergmann 
Date:   Tue Sep 8 16:32:18 2015 +0200

Remove unused function params

Change-Id: I0db4352ab7a14b4a62bebb650d1956c4a177b67f

diff --git a/include/svtools/table/tablerenderer.hxx 
b/include/svtools/table/tablerenderer.hxx
index a198465..f34e386 100644
--- a/include/svtools/table/tablerenderer.hxx
+++ b/include/svtools/table/tablerenderer.hxx
@@ -221,22 +221,6 @@ namespace svt { namespace table
 
 /** checks whether a given cell content fits into a given target area 
on a given device.
 
-@param i_colPos
-denotes the column which the cell content would be painted 
into. Your renderer implementation
-would only need this parameter if rendering is done 
differently for different columns.
-
-@param i_rowPos
-denotes the row which the cell content would be painted into. 
Your renderer implementation
-would only need this parameter if rendering is done 
differently for different rows.
-
-@param i_active
-is  if and only if the renderer should assume the cell 
content would be painted for the active
-cell.
-
-@param i_selected
-is  if and only if the renderer should assume the cell 
content would be painted for a selected
-cell.
-
 @param i_targetDevice
 denotes the target device for the assumed rendering operation
 
@@ -249,8 +233,6 @@ namespace svt { namespace table
 */
 virtual boolFitsIntoCell(
 ::com::sun::star::uno::Any const & i_cellContent,
-ColPos const i_colPos, RowPos const i_rowPos,
-bool const i_active, bool const i_selected,
 OutputDevice& i_targetDevice, Rectangle const & 
i_targetArea
 ) const = 0;
 
@@ -258,10 +240,6 @@ namespace svt { namespace table
 
 @param i_cellValue
 the value for which an attempt for a string conversion should 
be made
-@param  i_colPos
-the column position of the cell in question
-@param  i_rowPos
-the row position of the cell in question
 @param  o_cellString
 the cell content, formatted as string
 @return
@@ -269,7 +247,6 @@ namespace svt { namespace table
 */
 virtual boolGetFormattedCellString(
 ::com::sun::star::uno::Any const & i_cellValue,
-ColPos const i_colPos, RowPos const i_rowPos,
 OUString & o_cellString
 ) const = 0;
 
diff --git a/svtools/inc/table/gridtablerenderer.hxx 
b/svtools/inc/table/gridtablerenderer.hxx
index 4df38f8..e3f14cd 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -87,13 +87,10 @@ namespace svt { namespace table
 virtual voidHideCellCursor( vcl::Window& _rView, const Rectangle& 
_rCursorRect) SAL_OVERRIDE;
 virtual boolFitsIntoCell(
 ::com::sun::star::uno::Any const & i_cellContent,
-ColPos const i_colPos, RowPos const i_rowPos,
-bool const i_active, bool const i_selected,
 OutputDevice& i_targetDevice, Rectangle const & 
i_targetArea
 ) const SAL_OVERRIDE;
 virtual boolGetFormattedCellString(
 ::com::sun::star::uno::Any const & i_cellValue,
-ColPos const i_colPos, RowPos const i_rowPos,
 OUString & o_cellString
 ) const SAL_OVERRIDE;
 
diff --git a/svtools/source/table/gridtablerenderer.cxx 
b/svtools/source/table/gridtablerenderer.cxx
index 0074590..a7cce61 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -558,8 +558,8 @@ namespace svt { namespace table
 }
 
 
-bool GridTableRenderer::FitsIntoCell( Any const & i_cellContent, ColPos 
const i_colPos, RowPos const i_rowPos,
-bool const i_active, bool const i_selected, OutputDevice& 
i_targetDevice, Rectangle const & i_targetArea ) const
+bool GridTableRenderer::FitsIntoCell( Any const & i_cellContent,
+OutputDevice& i_targetDevice, Rectangle const & i_targetArea ) const
 {
 if ( !i_cellContent.hasValue() )
   

[Libreoffice-commits] dev-tools.git: helpauthoring/Addons.xcu

[Yousuf Philips]

 helpauthoring/Addons.xcu |  240 +--
 1 file changed, 173 insertions(+), 67 deletions(-)

New commits:
commit 7f315a5ba62ebe8653ed25031de0d184e4cf618e
Author: Yousuf Philips 
Date:   Tue Sep 8 17:42:07 2015 +0400

Reorganize the menu according to usage

Change-Id: Id988003fdc08afe541b2294d005447bc41180583
Reviewed-on: https://gerrit.libreoffice.org/18408
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/helpauthoring/Addons.xcu b/helpauthoring/Addons.xcu
index 80c44eb..2dab2c5 100644
--- a/helpauthoring/Addons.xcu
+++ b/helpauthoring/Addons.xcu
@@ -31,196 +31,302 @@
 
 
 
-
vnd.sun.star.script:HelpAuthoring.Helpers.SetDocumentRoot?language=Basic&location=application
+
vnd.sun.star.script:HelpAuthoring._Main.CreateFile?language=Basic&location=application
 
 
 
-Set Document 
Root...
+New Help File
 
 
 
 
+
vnd.sun.star.script:HelpAuthoring._Main.OpenXHP?language=Basic&location=application
+
+
+
+Open Help File
+
+
+
+
+
 private:separator
 
 
-
+
 
-
vnd.sun.star.script:HelpAuthoring._Main.CreateFile?language=Basic&location=application
+com.sun.star.text.TextDocument
 
 
-
-Create Help File...
-
+Paragraph Styles
+
+
+
+
+
.uno:StyleApply?Style:string=hlp_head1&FamilyName:string=ParagraphStyles
+
+
+Page Title 
(hlp_head1)
+
+
+
+
+
.uno:StyleApply?Style:string=hlp_head2&FamilyName:string=ParagraphStyles
+
+
+Heading 2 
(hlp_head2)
+
+
+
+
+
.uno:StyleApply?Style:string=hlp_head3&FamilyName:string=ParagraphStyles
+
+
+Heading 3 
(hlp_head3)
+
+
+
+
+
.uno:StyleApply?Style:string=hlp_paragraph&FamilyName:string=ParagraphStyles
+
+
+Default 
(hlp_paragraph)
+
+
+
+
+
.uno:StyleApply?Style:string=hlp_warning&FamilyName:string=ParagraphStyles
+
+
+Warning 
(hlp_warning)
+
+
+
+
+
.uno:StyleApply?Style:string=hlp_note&FamilyName:string=ParagraphStyles
+
+
+Note 
(hlp_note)
+
+
+
 
-
+
 
-
vnd.sun.star.script:HelpAuthoring._Main.OpenXHP?language=Basic&location=application
+com.sun.star.text.TextDocument
 
 
-
-Open Help File...
+Character Styles
+
+
+
+
+

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

[Yousuf Philips]

 helpauthoring/filter/soffice2xmlhelp.xsl |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 10522c945308d88ce49de7212fbf98a4f0ccd6c1
Author: Yousuf Philips 
Date:   Tue Sep 8 17:59:44 2015 +0400

Have level attribute of paragraph tag appear before xml-lang

Change-Id: I1dbb3522fd57394fabfb8169ffa3e2efd67a2cb2
Reviewed-on: https://gerrit.libreoffice.org/18410
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/helpauthoring/filter/soffice2xmlhelp.xsl 
b/helpauthoring/filter/soffice2xmlhelp.xsl
index 2534b39..ca5f8f8 100644
--- a/helpauthoring/filter/soffice2xmlhelp.xsl
+++ b/helpauthoring/filter/soffice2xmlhelp.xsl
@@ -871,10 +871,10 @@ PARAGRAPH
 
 
 
-
-
-
-
+
+
+
+
 
 
 
___
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' - avmedia/source canvas/source include/vcl slideshow/source svx/inc svx/source vcl/inc vcl/opengl vcl/source vcl/unx vcl/workben

[Michael Meeks]

 avmedia/source/opengl/oglplayer.cxx|   15 
+-
 avmedia/source/opengl/oglplayer.hxx|2 
 avmedia/source/opengl/oglwindow.cxx|   10 -
 avmedia/source/opengl/oglwindow.hxx|4 
 canvas/source/opengl/ogl_spritedevicehelper.cxx|   33 
++---
 canvas/source/opengl/ogl_spritedevicehelper.hxx|2 
 include/vcl/opengl/OpenGLContext.hxx   |   19 
+-
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |8 -
 svx/inc/svdoopengl.hxx |4 
 svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx|4 
 svx/source/svdraw/svdoopengl.cxx   |7 -
 vcl/inc/opengl/salbmp.hxx  |4 
 vcl/inc/opengl/win/gdiimpl.hxx |7 -
 vcl/inc/opengl/x11/gdiimpl.hxx |4 
 vcl/inc/openglgdiimpl.hxx  |   10 -
 vcl/inc/salgdi.hxx |2 
 vcl/opengl/gdiimpl.cxx |   47 
++-
 vcl/opengl/salbmp.cxx  |   16 
+-
 vcl/opengl/texture.cxx |6 
 vcl/opengl/win/gdiimpl.cxx |   10 -
 vcl/opengl/x11/gdiimpl.cxx |   10 -
 vcl/source/app/svdata.cxx  |   12 -
 vcl/source/gdi/salgdilayout.cxx|2 
 vcl/source/opengl/OpenGLContext.cxx|   66 
+++---
 vcl/source/window/openglwin.cxx|7 -
 vcl/unx/generic/window/salframe.cxx|4 
 vcl/workben/vcldemo.cxx|7 -
 27 files changed, 141 insertions(+), 181 deletions(-)

New commits:
commit 61b7d3436fb789fecf460d2b47c7210585f496a5
Author: Michael Meeks 
Date:   Mon Sep 7 22:21:15 2015 +0100

tdf#94006 - re-factor and fix OpenGLContext mis-use.

Squashes two related patches from master:

Don't use rtl::Reference for the global / list state, so the
ref-count reflects the number of real users.
Hold a reference during ~OpenGLContext.

Fix mis-use in:
gltf rendering, OpenGL canvas, GL transitions & GL capable (charts)
Avoid GLX operations on un-initialized contexts.

Signed-off-by: Miklos Vajna 

Conflicts:
vcl/source/opengl/OpenGLContext.cxx
vcl/workben/vcldemo.cxx
canvas/source/opengl/ogl_spritedevicehelper.hxx

Change-Id: I7ea29b544d53bb80b25fa6663d39f345bf8f4e64

diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index f1a3ada..7d04807 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -28,6 +28,7 @@ namespace avmedia { namespace ogl {
 OGLPlayer::OGLPlayer()
 : Player_BASE(m_aMutex)
 , m_pHandle(NULL)
+, m_xContext(OpenGLContext::Create())
 , m_pOGLWindow(NULL)
 , m_bIsRendering(false)
 {
@@ -38,7 +39,7 @@ OGLPlayer::~OGLPlayer()
 osl::MutexGuard aGuard(m_aMutex);
 if( m_pHandle )
 {
-m_aContext.makeCurrent();
+m_xContext->makeCurrent();
 gltf_renderer_release(m_pHandle);
 }
 releaseInputFiles();
@@ -258,13 +259,13 @@ uno::Reference< media::XPlayerWindow > SAL_CALL 
OGLPlayer::createPlayerWindow( c
 }
 assert(pChildWindow->GetParent());
 
-if( !m_aContext.init(pChildWindow) )
+if( !m_xContext->init(pChildWindow) )
 {
 SAL_WARN("avmedia.opengl", "Context initialization failed");
 return uno::Reference< media::XPlayerWindow >();
 }
 
-if( !m_aContext.supportMultiSampling() )
+if( !m_xContext->supportMultiSampling() )
 {
 SAL_WARN("avmedia.opengl", "Context does not support multisampling!");
 return uno::Reference< media::XPlayerWindow >();
@@ -277,7 +278,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL 
OGLPlayer::createPlayerWindow( c
 }
 
 Size aSize = pChildWindow->GetSizePixel();
-m_aContext.setWinSize(aSize);
+m_xContext->setWinSize(aSize);
 m_pHandle->viewport.x = 0;
 m_pHandle->viewport.y = 0;
 m_pHandle->viewport.width = aSize.Width();
@@ -294,7 +295,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL 
OGLPlayer::createPlayerWindow( c
 // The background color is white by default, but we need to separate the
 // OpenGL window from the main window so set background color to grey
 glClearColor(0.5f, 0.5f, 0.5f, 

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

[Michael Meeks]

 avmedia/source/opengl/oglplayer.cxx |1 +
 canvas/source/opengl/ogl_spritedevicehelper.cxx |2 +-
 include/vcl/opengl/OpenGLContext.hxx|1 +
 vcl/source/opengl/OpenGLContext.cxx |9 +
 vcl/source/window/openglwin.cxx |8 +++-
 5 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 82d25c02f8569aadf166fa92fb581fa68c12fbd1
Author: Michael Meeks 
Date:   Tue Sep 8 15:57:55 2015 +0100

tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.

Previously we would get an explicit ~OpenGLContext - and potentially
leave FMR's around for other OGC users, now we treat the other users
properly - we need an explicit dispose() to get Window::dispose ordering
right.

Change-Id: I5edcbd73399b6db3dbcfb391570f364f9ab0c70d
Reviewed-on: https://gerrit.libreoffice.org/18412
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index c7bb7fb..a8854d2 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -41,6 +41,7 @@ OGLPlayer::~OGLPlayer()
 {
 m_xContext->makeCurrent();
 gltf_renderer_release(m_pHandle);
+m_xContext->dispose();
 }
 releaseInputFiles();
 }
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx 
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index ab7e764..b6de667 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -90,7 +90,7 @@ namespace oglcanvas
 {}
 
 SpriteDeviceHelper::~SpriteDeviceHelper()
-{}
+{ mxContext->dispose(); }
 
 void SpriteDeviceHelper::init( vcl::Window&   rWindow,
SpriteCanvas& rSpriteCanvas,
diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 0addfcb..fbe1238 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -175,6 +175,7 @@ public:
 ~OpenGLContext();
 void acquire() { mnRefCount++; }
 void release() { if ( --mnRefCount == 0 ) delete this; }
+void dispose();
 
 void requestLegacyContext();
 void requestSingleBufferedRendering();
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 432241f..f65341a 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -112,6 +112,13 @@ OpenGLContext::~OpenGLContext()
 assert (mnRefCount == 1);
 }
 
+// release associated child-window if we have one
+void OpenGLContext::dispose()
+{
+reset();
+m_pChildWindow.disposeAndClear();
+}
+
 rtl::Reference OpenGLContext::Create()
 {
 return rtl::Reference(new OpenGLContext);
@@ -1191,6 +1198,7 @@ void OpenGLContext::reset()
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext( m_aGLWin.hRC );
 ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
+m_aGLWin.hRC = 0;
 }
 #elif defined( MACOSX )
 OpenGLWrapper::resetCurrent();
@@ -1212,6 +1220,7 @@ void OpenGLContext::reset()
 
 if (mbPixmap && m_aGLWin.glPix != None)
 glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
+m_aGLWin.ctx = 0;
 }
 #endif
 }
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index e079375..9af4c0f 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -16,7 +16,7 @@ class OpenGLWindowImpl
 {
 public:
 explicit OpenGLWindowImpl(vcl::Window* pWindow);
-~OpenGLWindowImpl() { mxChildWindow.disposeAndClear(); }
+~OpenGLWindowImpl();
 OpenGLContext& getContext() { return *mxContext.get(); }
 private:
 rtl::Reference mxContext;
@@ -33,6 +33,12 @@ OpenGLWindowImpl::OpenGLWindowImpl(vcl::Window* pWindow)
 pWindow->SetMouseTransparent(false);
 }
 
+OpenGLWindowImpl::~OpenGLWindowImpl()
+{
+mxContext->dispose();
+mxChildWindow.disposeAndClear();
+}
+
 OpenGLWindow::OpenGLWindow(vcl::Window* pParent):
 Window(pParent, 0),
 mxImpl(new OpenGLWindowImpl(this)),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 include/vcl/scheduler.hxx|2 +-
 vcl/source/app/idle.cxx  |2 +-
 vcl/source/app/scheduler.cxx |   15 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 5bac7853a89b9b34d64334d6d77582c7cd79b4ee
Author: Michael Meeks 
Date:   Tue Sep 8 16:58:32 2015 +0100

Ensure the scheduler can set longer timeouts.

Regression from: 6d64d2f38d9f6c2f54e05675ecd0709eabf6d8ca.

Also fix the low priority idle min timeout to 5ms.

Change-Id: I26a6e89ef7fa173e64ee34f7a500157ba82b7198

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 612bd08..a197cbc 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -64,7 +64,7 @@ protected:
 static const sal_uInt64 ImmediateTimeoutMs = 1;
 static const sal_uInt64 MaximumTimeoutMs = SAL_MAX_UINT64;
 
-static void ImplStartTimer(sal_uInt64 nMS);
+static void ImplStartTimer(sal_uInt64 nMS, bool bForce = false);
 
 friend struct ImplSchedulerData;
 virtual void SetDeletionFlags();
diff --git a/vcl/source/app/idle.cxx b/vcl/source/app/idle.cxx
index 6929d62..dcf11b2 100644
--- a/vcl/source/app/idle.cxx
+++ b/vcl/source/app/idle.cxx
@@ -65,7 +65,7 @@ sal_uInt64 Idle::UpdateMinPeriod( sal_uInt64 nMinPeriod, 
sal_uInt64 /* nTime */
 break;
 default:
 // FIXME: tdf#92036 workaround, I should be 1 too - wait 5ms
-if (nMinPeriod > 5)
+if (nMinPeriod < 5)
 nMinPeriod = 5;
 break;
 }
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index b8849a1..c4fb701 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -104,15 +104,22 @@ void Scheduler::ImplDeInitScheduler()
 pSVData->mpSalTimer = 0;
 }
 
-void Scheduler::ImplStartTimer(sal_uInt64 nMS)
+/**
+ * Start a new timer if we need to for @nMS duration.
+ *
+ * if this is longer than the existing duration we're
+ * waiting for, do nothing - unless @bForce - which means
+ * to reset the minimum period; used by the scheduled itself.
+ */
+void Scheduler::ImplStartTimer(sal_uInt64 nMS, bool bForce)
 {
 ImplSVData* pSVData = ImplGetSVData();
 InitSystemTimer(pSVData);
 
 // Update timeout only when not in timer handler and
 // only if smaller timeout, to avoid skipping.
-if (!pSVData->mnUpdateStack &&
-nMS < pSVData->mnTimerPeriod)
+if (bForce || (!pSVData->mnUpdateStack &&
+   nMS < pSVData->mnTimerPeriod))
 {
 pSVData->mnTimerPeriod = nMS;
 pSVData->mpSalTimer->Start(nMS);
@@ -198,7 +205,7 @@ void Scheduler::ProcessTaskScheduling( bool bTimer )
 }
 else
 {
-Scheduler::ImplStartTimer(nMinPeriod);
+Scheduler::ImplStartTimer(nMinPeriod, true);
 }
 pSVData->mnUpdateStack--;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/svtools/table/tablemodel.hxx|8 +---
 svtools/source/table/tablecontrol_impl.cxx  |4 +---
 svtools/source/table/tablecontrol_impl.hxx  |2 +-
 svtools/source/uno/unocontroltablemodel.cxx |2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 1b082cdfbe8cc9961741a1bb906af810ea129da5
Author: Stephan Bergmann 
Date:   Tue Sep 8 18:02:10 2015 +0200

Remove unused function param

Change-Id: Iab33c8008e07c4f17482dc3a8e4d15e38dc32b4e

diff --git a/include/svtools/table/tablemodel.hxx 
b/include/svtools/table/tablemodel.hxx
index 563ff88..9c07ef2 100644
--- a/include/svtools/table/tablemodel.hxx
+++ b/include/svtools/table/tablemodel.hxx
@@ -105,14 +105,8 @@ namespace svt { namespace table
 
 /** notifies the listener that one or more columns have been inserted 
into
 the table
-
-@param first
-the index of the first newly inserted row
-@param last
-the index of the last newly inserted row. Must not be smaller
-than ->first
 */
-virtual voidcolumnInserted( ColPos const i_colIndex ) = 0;
+virtual voidcolumnInserted() = 0;
 
 /** notifies the listener that one or more columns have been removed 
from
 the table
diff --git a/svtools/source/table/tablecontrol_impl.cxx 
b/svtools/source/table/tablecontrol_impl.cxx
index 7100781..d99e88e 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -425,14 +425,12 @@ namespace svt { namespace table
 }
 
 
-void TableControl_Impl::columnInserted( ColPos const i_colIndex )
+void TableControl_Impl::columnInserted()
 {
 m_nColumnCount = m_pModel->getColumnCount();
 impl_ni_relayout();
 
 m_rAntiImpl.Invalidate();
-
-OSL_UNUSED( i_colIndex );
}
 
 
diff --git a/svtools/source/table/tablecontrol_impl.hxx 
b/svtools/source/table/tablecontrol_impl.hxx
index 59f3299..25084ab 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -298,7 +298,7 @@ namespace svt { namespace table
 // ITableModelListener
 virtual voidrowsInserted( RowPos first, RowPos last ) SAL_OVERRIDE;
 virtual voidrowsRemoved( RowPos first, RowPos last ) SAL_OVERRIDE;
-virtual voidcolumnInserted( ColPos const i_colIndex ) SAL_OVERRIDE;
+virtual voidcolumnInserted() SAL_OVERRIDE;
 virtual voidcolumnRemoved( ColPos const i_colIndex ) SAL_OVERRIDE;
 virtual voidallColumnsRemoved() SAL_OVERRIDE;
 virtual voidcellsUpdated( ColPos const i_firstCol, ColPos 
i_lastCol, RowPos const i_firstRow, RowPos const i_lastRow ) SAL_OVERRIDE;
diff --git a/svtools/source/uno/unocontroltablemodel.cxx 
b/svtools/source/uno/unocontroltablemodel.cxx
index 7997de8..7140933 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -238,7 +238,7 @@ namespace svt { namespace table
 ++loop
 )
 {
-(*loop)->columnInserted( i_position );
+(*loop)->columnInserted();
 }
 }
 
___
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

[Markus Mohrhard]

 vcl/source/opengl/OpenGLContext.cxx |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 2fd94938a9e45ef143aac51a589654387796e388
Author: Markus Mohrhard 
Date:   Mon Sep 7 22:33:22 2015 +0200

don't use a null display

Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532
(cherry picked from commit c94d60d6c164e4552b491d348ab0f5c198b6e856)
Signed-off-by: Michael Stahl 

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index db39c73..5ca7704 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -465,18 +465,24 @@ public:
 TempErrorHandler(Display* dpy, errorHandler newErrorHandler):
 mdpy(dpy)
 {
-XLockDisplay(dpy);
-XSync(dpy, false);
-oldErrorHandler = XSetErrorHandler(newErrorHandler);
+if (mdpy)
+{
+XLockDisplay(dpy);
+XSync(dpy, false);
+oldErrorHandler = XSetErrorHandler(newErrorHandler);
+}
 }
 
 ~TempErrorHandler()
 {
-// sync so that we possibly get an XError
-glXWaitGL();
-XSync(mdpy, false);
-XSetErrorHandler(oldErrorHandler);
-XUnlockDisplay(mdpy);
+if (mdpy)
+{
+// sync so that we possibly get an XError
+glXWaitGL();
+XSync(mdpy, false);
+XSetErrorHandler(oldErrorHandler);
+XUnlockDisplay(mdpy);
+}
 }
 };
 
___
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' - avmedia/source canvas/source include/vcl vcl/source

[Michael Meeks]

 avmedia/source/opengl/oglplayer.cxx |1 +
 canvas/source/opengl/ogl_spritedevicehelper.cxx |2 +-
 include/vcl/opengl/OpenGLContext.hxx|1 +
 vcl/source/opengl/OpenGLContext.cxx |9 +
 vcl/source/window/openglwin.cxx |   10 --
 5 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 56ece7860dc16b244cb7d409ff4ffcb2dd88f76a
Author: Michael Meeks 
Date:   Tue Sep 8 15:57:55 2015 +0100

tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.

Previously we would get an explicit ~OpenGLContext - and potentially
leave FMR's around for other OGC users, now we treat the other users
properly - we need an explicit dispose() to get Window::dispose ordering
right.

Reviewed-on: https://gerrit.libreoffice.org/18412
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

Conflicts:
vcl/source/window/openglwin.cxx

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

diff --git a/avmedia/source/opengl/oglplayer.cxx 
b/avmedia/source/opengl/oglplayer.cxx
index 7d04807..7ddaa50 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -41,6 +41,7 @@ OGLPlayer::~OGLPlayer()
 {
 m_xContext->makeCurrent();
 gltf_renderer_release(m_pHandle);
+m_xContext->dispose();
 }
 releaseInputFiles();
 }
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx 
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 091279c..e76b86e 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -92,7 +92,7 @@ namespace oglcanvas
 {}
 
 SpriteDeviceHelper::~SpriteDeviceHelper()
-{}
+{ mxContext->dispose(); }
 
 void SpriteDeviceHelper::init( vcl::Window&   rWindow,
SpriteCanvas& rSpriteCanvas,
diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 5d1c4b4..a5a6905 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -175,6 +175,7 @@ public:
 ~OpenGLContext();
 void acquire() { mnRefCount++; }
 void release() { if ( --mnRefCount == 0 ) delete this; }
+void dispose();
 
 void requestLegacyContext();
 void requestSingleBufferedRendering();
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 5ca7704..e14e013 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -112,6 +112,13 @@ OpenGLContext::~OpenGLContext()
 assert (mnRefCount == 1);
 }
 
+// release associated child-window if we have one
+void OpenGLContext::dispose()
+{
+reset();
+m_pChildWindow.disposeAndClear();
+}
+
 rtl::Reference OpenGLContext::Create()
 {
 return rtl::Reference(new OpenGLContext);
@@ -1279,6 +1286,7 @@ void OpenGLContext::reset()
 wglMakeCurrent(NULL, NULL);
 wglDeleteContext( m_aGLWin.hRC );
 ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
+m_aGLWin.hRC = 0;
 }
 #elif defined( MACOSX )
 OpenGLWrapper::resetCurrent();
@@ -1300,6 +1308,7 @@ void OpenGLContext::reset()
 
 if (mbPixmap && m_aGLWin.glPix != None)
 glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix);
+m_aGLWin.ctx = 0;
 }
 #endif
 }
diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 37d1ea5..9af4c0f 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -15,8 +15,8 @@
 class OpenGLWindowImpl
 {
 public:
-OpenGLWindowImpl(vcl::Window* pWindow);
-~OpenGLWindowImpl() { mxChildWindow.disposeAndClear(); }
+explicit OpenGLWindowImpl(vcl::Window* pWindow);
+~OpenGLWindowImpl();
 OpenGLContext& getContext() { return *mxContext.get(); }
 private:
 rtl::Reference mxContext;
@@ -33,6 +33,12 @@ OpenGLWindowImpl::OpenGLWindowImpl(vcl::Window* pWindow)
 pWindow->SetMouseTransparent(false);
 }
 
+OpenGLWindowImpl::~OpenGLWindowImpl()
+{
+mxContext->dispose();
+mxChildWindow.disposeAndClear();
+}
+
 OpenGLWindow::OpenGLWindow(vcl::Window* pParent):
 Window(pParent, 0),
 mxImpl(new OpenGLWindowImpl(this)),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/tools/diagnose_ex.h  |   10 --
 tools/source/debug/debug.cxx |9 +++--
 2 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 8ab005af961709b51398c523516fe61a54ca2131
Author: Tor Lillqvist 
Date:   Tue Sep 8 18:26:02 2015 +0300

Avoid pain when using selective debuginfo

Compile in the DbgUnhandledException function always.

Change-Id: I302954598e599e8db71967974b18ade54ca2de13

diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 1294615..7efffc6 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -27,10 +27,12 @@
 
 #include 
 
-#define OSL_UNUSED( expression ) \
-(void)(expression)
+#include 
 
+#define OSL_UNUSED( expression )\
+(void)(expression)
 
+TOOLS_DLLPUBLIC void DbgUnhandledException(const ::com::sun::star::uno::Any& 
caughtException, const char* currentFunction, const char* fileAndLineNo);
 
 #if OSL_DEBUG_LEVEL > 0
 #include 
@@ -38,10 +40,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-
-TOOLS_DLLPUBLIC void DbgUnhandledException(const 
::com::sun::star::uno::Any& caughtException, const char* currentFunction, const 
char* fileAndLineNo);
 
 /** reports a caught UNO exception via OSL diagnostics
 
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 1d1c8d6..4006b51 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -28,12 +28,15 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
+#include 
 #include 
 
 #include 
@@ -77,8 +80,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
 
 #endif
 
-#if OSL_DEBUG_LEVEL > 0
-
 void DbgUnhandledException(const css::uno::Any & caught, const char* 
currentFunction, const char* fileAndLineNo)
 {
 OString sMessage( "caught an exception!" );
@@ -124,8 +125,4 @@ void DbgUnhandledException(const css::uno::Any & caught, 
const char* currentFunc
 "legacy.osl", fileAndLineNo, "%s", sMessage.getStr());
 }
 
-#endif
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/boost external/liborcus

[Michael Stahl]

 external/boost/UnpackedTarball_boost.mk|3 +
 external/boost/boost.system.error_code_header_only_fix.patch.1 |   21 
++
 external/liborcus/ExternalProject_liborcus.mk  |2 
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit fa9ee4c1fd5d2907ae28813a9b41a9dcf1ae9e95
Author: Michael Stahl 
Date:   Tue Sep 8 16:43:16 2015 +0200

boost: fix boost_system BOOST_ERROR_CODE_HEADER_ONLY breakage

Ugly hack in ExternalProject_liborcus.mk as apparently it fails with the
define on Windows, and without on MacOSX :(

Change-Id: If0b52825122edd956044f61d413c57a76f485101

diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index b0ffa9e..7dac750 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -110,6 +110,9 @@ boost_patches += w4702.patch.0
 boost_patches += ubsan.patch.0
 boost_patches += rtti.patch.0
 
+# 5.0 branch fix
+boost_patches += boost.system.error_code_header_only_fix.patch.1
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost.system.error_code_header_only_fix.patch.1 
b/external/boost/boost.system.error_code_header_only_fix.patch.1
new file mode 100644
index 000..68d2c1c
--- /dev/null
+++ b/external/boost/boost.system.error_code_header_only_fix.patch.1
@@ -0,0 +1,21 @@
+bundled boost 1.55 error_code.cpp breaks when compiled with 
BOOST_ERROR_CODE_HEADER_ONLY
+
+--- boost/libs/system/src/error_code.cpp.orig  2015-09-08 16:37:11.595528207 
+0200
 boost/libs/system/src/error_code.cpp   2015-09-08 16:39:12.696518815 
+0200
+@@ -17,6 +17,10 @@
+ #define BOOST_SYSTEM_SOURCE 
+ 
+ #include 
++
++#ifndef BOOST_ERROR_CODE_CPP
++#define BOOST_ERROR_CODE_CPP
++
+ #include 
+ #include 
+ #include 
+@@ -477,3 +480,5 @@
+ 
+   } // namespace system
+ } // namespace boost
++
++#endif // BOOST_ERROR_CODE_CPP
diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index ee890cd..e9726c1 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED $(if 
$(filter MACOSX,$(OS)),-DBOOST_ERROR_CODE_HEADER_ONLY)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
___
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' - external/liborcus

[Michael Stahl]

 external/liborcus/ExternalProject_liborcus.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e00fc3439aa642485e55b8247e80af286f08a84
Author: Michael Stahl 
Date:   Tue Sep 8 18:51:32 2015 +0200

boost fix, next attempt: just because jenkins Linux can build it...

Change-Id: I7b6910a131d95a74168ccee9140bc58393ceddb0

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index e9726c1..47fbdfb 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED $(if 
$(filter MACOSX,$(OS)),-DBOOST_ERROR_CODE_HEADER_ONLY)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED $(if 
$(filter-out WNT,$(OS)),-DBOOST_ERROR_CODE_HEADER_ONLY)
 liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/hcvcastro/preinit' - desktop/source

[Henry Castro]

 desktop/source/lib/init.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5476f0f4eed5123e2c70887ed8f03f6a55bc7e5e
Author: Henry Castro 
Date:   Tue Sep 8 15:25:14 2015 -0400

desktop: make sure Application is created ...

before trying to acquire SolarMutex

Change-Id: I0628c9638daff649bb8f4b532460efebba844ec0

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9c2fcfc..98a0548 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -941,7 +941,8 @@ static bool initialize_uno(const OUString& aAppProgramURL)
 
 static void lo_startmain(void*)
 {
-Application::GetSolarMutex().tryToAcquire();
+if (GetpApp())
+Application::GetSolarMutex().tryToAcquire();
 
 soffice_main();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Oliver Specht]

 sw/source/core/doc/docfld.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1553ace0a46c2659540dbf746aa862ccbb160ffd
Author: Oliver Specht 
Date:   Tue Sep 8 14:56:05 2015 +0200

tdf#91523 sw: fix navigation to index mark

Access pTextTox instead of pTextField in case of TEXTTOXMARK

Change-Id: I92ece6f4c5d6a6427f89cbd43a15a4b0a3adb645
Reviewed-on: https://gerrit.libreoffice.org/18407
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 88015e3..410892e 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -323,9 +323,11 @@ sal_Int32 _SetGetExpField::GetCntPosFromContent() const
 {
 case TEXTFIELD:
 case TEXTINET:
-case TEXTTOXMARK:
 nRet = CNTNT.pTextField->GetStart();
 break;
+case TEXTTOXMARK:
+nRet = CNTNT.pTextTOX->GetStart();
+break;
 case CRSRPOS:
 nRet =  CNTNT.pPos->nContent.GetIndex();
 break;
___
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' - sw/inc

[Michael Stahl]

 sw/inc/docstyle.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 015c21cb486e559b697fec9dde288273866c65a8
Author: Michael Stahl 
Date:   Tue Sep 8 21:44:04 2015 +0200

sw: fix build with GCC 4.6

Change-Id: Ib8294e66cb9482ae2502f4741c90dccac36a117b

diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 275d5e2..8ad216d 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -101,7 +101,7 @@ public:
 const bool 
bResetIndentAttrsAtParagraphStyle = false );
 
 virtual SfxItemSet& GetItemSet() SAL_OVERRIDE;
-virtual std::unique_ptr GetItemSetForPreview() override;
+virtual std::unique_ptr GetItemSetForPreview() SAL_OVERRIDE;
 /** new method for paragraph styles to merge indent attributes of applied 
list
  style into the given item set, if the list style indent attributes are 
applicable. */
 void MergeIndentAttrsOfListStyle( SfxItemSet& rSet );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/loolstat

[Henry Castro]

 loolwsd/loolstat |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a04d9dab7ee843423183e2bf603a0bc0b32007b4
Author: Henry Castro 
Date:   Tue Sep 8 16:11:29 2015 -0400

loolwsd: update loolstat for preinit.

diff --git a/loolwsd/loolstat b/loolwsd/loolstat
index c2f4706..1dd619a 100755
--- a/loolwsd/loolstat
+++ b/loolwsd/loolstat
@@ -79,7 +79,7 @@ LOOLWSD=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e 
"s/\`//g" | $TR -d ' |-' |
 LOOLBROKER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' 
|-' | $GREP -o '^loolbroker,' | $WC -l);
 
 # get the number of running processes.
-LOOLKIT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' 
| $GREP -o '^loolkit,' | $WC -l);
+LOOLKIT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' 
| $GREP -o '^libreofficekit,' | $WC -l);
 
 # get the number of running threads.
 LOOLWSD_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{.*}' | $WC -l);
@@ -105,5 +105,5 @@ $TOP -bn 1 -p $LOOLWSD_PID | $GREP -E 'loolwsd|COMMAND'
 printf "\n %-10s %d\n" "Running loolbroker process:" "$LOOLBROKER";
 $TOP -bn 1 | $GREP -E 'loolbroker|COMMAND'
 printf "\n%-10s %d\n" "Running LibreOfficeKit process:" "$LOOLKIT";
-$TOP -bn 1 | $GREP -E 'loolkit|COMMAND'
+$TOP -bn 1 | $GREP -E 'libreofficekit|COMMAND'
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/loolmap.c

[Henry Castro]

 loolwsd/loolmap.c |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ae79d896d536c4b5c6e2b07613b87b762575e7a3
Author: Henry Castro 
Date:   Tue Sep 8 16:15:28 2015 -0400

loolwsd: update loolmap for preinit

diff --git a/loolwsd/loolmap.c b/loolwsd/loolmap.c
index 4debdd4..8397537 100644
--- a/loolwsd/loolmap.c
+++ b/loolwsd/loolmap.c
@@ -122,9 +122,12 @@ static void total_smaps(unsigned proc_id, const char 
*file, const char *cmdline)
   printf("Process ID:%20ld\n", proc_id);
   printf("--\n");
   printf("Shared Clean  :%20ld kB\n", total_shared_clean);
-  printf("Shared Diry   :%20ld kB\n", total_shared_dirty);
+  printf("Shared Dirty  :%20ld kB\n", total_shared_dirty);
   printf("Private Clean :%20ld kB\n", total_private_clean);
-  printf("Private Diry  :%20ld kB\n\n", total_private_dirty);
+  printf("Private Dirty :%20ld kB\n", total_private_dirty);
+  printf("--\n");
+  printf("Shared:%20ld kB\n", total_shared_clean + total_shared_dirty);
+  printf("Private   :%20ld kB\n\n", total_private_clean + 
total_private_dirty);
 }
 
 int main(int argc, char **argv)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |3 
++-
 vcl/opengl/gdiimpl.cxx |4 
++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a37d3b1c5cc1186142ab75c7cb15f4bbf07f8435
Author: Michael Meeks 
Date:   Tue Sep 8 21:25:17 2015 +0100

OpenGL: use CHECK_GL_ERROR() only when a context is bound.

Removes a large number of spurious GL errors left & right.

Change-Id: I0b5639478812982b39d3b88be2600dad5d3f1fd0

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 5ac45f3..a914b63 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1230,11 +1230,12 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime 
) throw (uno::RuntimeExc
 if (isDisposed() || !mbValidOpenGLContext || 
mpTransition->getSettings().mnRequiredGLVersion > mnGLVersion)
 return;
 
-CHECK_GL_ERROR();
 mpContext->makeCurrent();
+CHECK_GL_ERROR();
 
 glEnable(GL_DEPTH_TEST);
 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+CHECK_GL_ERROR();
 
 if(mpTransition)
 {
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 5487347..21208b3 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1863,9 +1863,9 @@ void OpenGLSalGraphicsImpl::endPaint()
 mpContext->AcquireDefaultFramebuffer();
 glFlush();
 mpContext->swapBuffers();
-}
 
-CHECK_GL_ERROR();
+CHECK_GL_ERROR();
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |2 
+-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d39630bb68faf190e181527ce012ad14ac77019b
Author: Michael Meeks 
Date:   Tue Sep 8 21:55:41 2015 +0100

OpenGL: use CHECK_GL_ERROR() only when a context is bound.

Change-Id: I2cdc14defe5c4bd95776206df65fd57589d40429

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index a914b63..d21c52b 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1278,8 +1278,8 @@ void SAL_CALL OGLTransitionerImpl::viewChanged( const 
Reference< presentation::X
 
 void OGLTransitionerImpl::disposeTextures()
 {
-CHECK_GL_ERROR();
 mpContext->makeCurrent();
+CHECK_GL_ERROR();
 
 #if defined( GLX_EXT_texture_from_pixmap )
 const GLWindow& rGLWindow(mpContext->getOpenGLWindow());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Niklas Johansson]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 985bf0e7ae0d046cae28f89db0c6ac059d397fd4
Author: Niklas Johansson 
Date:   Tue Sep 8 17:28:45 2015 +0200

Updated core
Project: dictionaries  40ab637125f31ca5e1a8c174e7e204ae1db2cc1e

Update Swedish spelling dictionary

See the extensions website for detailed information
on what changed from the latest version.

http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan

Change-Id: I282828bded6d73803eb73185e106df35f43062cc
Reviewed-on: https://gerrit.libreoffice.org/18413
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index e34d023..40ab637 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit e34d023f8c69599f2bca233396a2a0fab55a7e8f
+Subproject commit 40ab637125f31ca5e1a8c174e7e204ae1db2cc1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: sv_SE/description.xml sv_SE/LICENSE_en_US.txt sv_SE/LICENSE_sv_SE.txt sv_SE/sv_FI.aff sv_SE/sv_FI.dic sv_SE/sv_SE.aff sv_SE/sv_SE.dic

[Niklas Johansson]

 sv_SE/LICENSE_en_US.txt |   16 
 sv_SE/LICENSE_sv_SE.txt |   16 
 sv_SE/description.xml   |4 
 sv_SE/sv_FI.aff |7 
 sv_SE/sv_FI.dic |13747 ++-
 sv_SE/sv_SE.aff |2 
 sv_SE/sv_SE.dic |13900 ++--
 7 files changed, 20066 insertions(+), 7626 deletions(-)

New commits:
commit 40ab637125f31ca5e1a8c174e7e204ae1db2cc1e
Author: Niklas Johansson 
Date:   Tue Sep 8 17:28:45 2015 +0200

Update Swedish spelling dictionary

See the extensions website for detailed information
on what changed from the latest version.

http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan

Change-Id: I282828bded6d73803eb73185e106df35f43062cc
Reviewed-on: https://gerrit.libreoffice.org/18413
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sv_SE/LICENSE_en_US.txt b/sv_SE/LICENSE_en_US.txt
index 35aa1d6..b84ac15 100644
--- a/sv_SE/LICENSE_en_US.txt
+++ b/sv_SE/LICENSE_en_US.txt
@@ -1,8 +1,8 @@
-This Swedish Dictionary for Spell Checking is maintained by
-Göran Andersson .
-
- COPYRIGHT 
-
-Copyright © 2003-14 Göran Andersson .
-
-This dictionary is made available subject to the terms of GNU Lesser General 
Public License Version 3. A copy of the LGPL license can be found at 
http://www.gnu.org/licenses/lgpl-3.0.html.
\ No newline at end of file
+This Swedish Dictionary for Spell Checking is maintained by
+Göran Andersson .
+
+ COPYRIGHT 
+
+Copyright © 2003-15 Göran Andersson .
+
+This dictionary is made available subject to the terms of GNU Lesser General 
Public License Version 3. A copy of the LGPL license can be found at 
http://www.gnu.org/licenses/lgpl-3.0.html .
diff --git a/sv_SE/LICENSE_sv_SE.txt b/sv_SE/LICENSE_sv_SE.txt
index ba7e705..e9ea1f6 100644
--- a/sv_SE/LICENSE_sv_SE.txt
+++ b/sv_SE/LICENSE_sv_SE.txt
@@ -1,8 +1,8 @@
-Denna svenska ordlista för rättstavning underhålls av
-Göran Andersson .
-
- COPYRIGHT 
-
-Copyright © 2003-14 Göran Andersson .
-
-Denna ordlista är tillgänglig under licensen GNU Lesser General Public 
License Version 3. Licenstexten finns på adressen 
http://www.gnu.org/licenses/lgpl-3.0.html .
\ No newline at end of file
+Denna svenska ordlista för rättstavning underhålls av
+Göran Andersson .
+
+ COPYRIGHT 
+
+Copyright © 2003-15 Göran Andersson .
+
+Denna ordlista är tillgänglig under licensen GNU Lesser General Public 
License Version 3. Licenstexten finns på adressen 
http://www.gnu.org/licenses/lgpl-3.0.html .
diff --git a/sv_SE/description.xml b/sv_SE/description.xml
index 5a06b13..989318e 100644
--- a/sv_SE/description.xml
+++ b/sv_SE/description.xml
@@ -1,9 +1,9 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
-Swedish spelling dictionary, and thesaurus
+Swedish spelling dictionary, hyphenation and 
thesaurus
 
 
 
diff --git a/sv_SE/sv_FI.aff b/sv_SE/sv_FI.aff
index e79d598..7dd3ebf 100644
--- a/sv_SE/sv_FI.aff
+++ b/sv_SE/sv_FI.aff
@@ -1,5 +1,5 @@
 SET UTF-8
-TRY aerndtislogmkpbhfjuväcöåyqxzvwéâàáèćńłšőř:-.
+TRY aerndtislogmkpbhfjuväcöåyqxzvwéâàáèóćńłšőř:-.
 
 WORDCHARS -0123456789.:
 
@@ -69,7 +69,7 @@ MAP fi(fi)
 MAP fl(fl)
 
 # Some letters that should be replacable and have higher priority
-REP 58
+REP 59
 REP e ä
 REP ä e
 REP ngn gn
@@ -128,6 +128,7 @@ REP ^iår$ i_år
 REP ^iövrigt$ i_övrigt
 REP ^utochin$ ut_och_in
 REP ^åfärde$ å_färde
+REP is eece
 #REP m mm
 #REP ss s
 #REP ll l
@@ -798,7 +799,7 @@ SFX  b  0  -  .
 # for adjectives: )k
 # for verbs: >j
 
-#pragma no-merge 268¤jk
+#pragma no-merge 268¤jkc
 
 COMPOUNDRULE 12
 COMPOUNDRULE 0*
diff --git a/sv_SE/sv_FI.dic b/sv_SE/sv_FI.dic
index 31358f0..417075a 100644
--- a/sv_SE/sv_FI.dic
+++ b/sv_SE/sv_FI.dic
@@ -1,6 +1,6 @@
-145107
+151252
 -/XY06-
--/b
+-/b!
 ---
 ,/1
 :/0
@@ -49,14 +49,15 @@ A-aktie/EAI
 Aalborg/A
 Aaliyah/A
 Aalto/A
+Aapua/A
 Aargau/A
-Aarhus
+Aarhus/X
 Aaron/A
+AAS/!
 Ab/Q
 AB-/JX
 abakus/HD
 abandon/AD
-abandonnering/ADGYv
 ABB-/JX
 Abba/ARX
 ABBA-/JX
@@ -82,6 +83,7 @@ abchazisk/QOY
 abderitisk/QOY
 abdikation/AHDYv
 abdikations-
+abdikationsakt/AHD
 abdikera/NAPmDj
 abdikering/ADGY
 Abdirahman/A
@@ -111,13 +113,14 @@ Abigail/A
 abilitet/AD
 abiotisk/Ok
 Abisko/AX
+Abiskojaure/A
 abiturient/AHDYX
 abiturientbal/AHD
 abiturientklass/HD
 ablation/AHDv
 ablativ/AHDX
 Abloy/A
-ablution/AHDYv
+ablution/AHDYv!
 ABM/r
 abnorm/QOPk
 abnorm/XZ
@@ -128,7 +131,7 @@ abolitionist/AHDYX
 abolitionistisk/Ok
 abominabel/Mk
 abonnemang/ABDYvf
-abonnemangs-
+abonnemangs-/Y
 abonnemangsavgift/AHDY
 abonnemangsbiljett/AHDY
 abonnemangskonsert/AHDY
@@ -191,7 +194,7 @@ absolution/A

Nathaniel Pearson license statement

[Nathaniel Pearson]

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


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

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

[Eike Rathke]

 sc/inc/dbdata.hxx  |1 
 sc/qa/unit/ucalc_formula.cxx   |  223 +
 sc/source/core/tool/dbdata.cxx |   53 -
 3 files changed, 250 insertions(+), 27 deletions(-)

New commits:
commit 470848093a2687a6d8056629da6b43773ff4cb0c
Author: Eike Rathke 
Date:   Tue Sep 8 23:30:27 2015 +0200

factor out duplicated code into NamedDBs::initInserted()

Change-Id: Idc95d4b8acae9dcd4ed0092c43986e6687f06c11

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 85ace9f..1f825e7 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -243,6 +243,7 @@ public:
 NamedDBs(const NamedDBs& r);
 virtual ~NamedDBs();
 NamedDBs & operator=(NamedDBs const&) = delete;
+void initInserted( ScDBData* p );
 
 public:
 typedef DBsType::iterator iterator;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 19c460b..9edd5d0 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -1058,27 +1058,7 @@ ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r)
 ScDBData* p = new ScDBData(*it);
 std::unique_ptr pData(p);
 if (m_DBs.insert( std::move(pData)).second)
-{
-p->SetContainer( this);
-if (!mrDoc.IsClipOrUndo())
-{
-p->StartTableColumnNamesListener(); // needs the container be 
set already
-if (p->AreTableColumnNamesDirty())
-{
-if (p->HasHeader())
-{
-// Refresh table column names in next round.
-maDirtyTableColumnNames.Join( p->GetHeaderArea());
-}
-else
-{
-// Header-less table can generate its column names
-// already without accessing the document.
-p->RefreshTableColumnNames( nullptr);
-}
-}
-}
-}
+initInserted(p);
 }
 }
 
@@ -1086,6 +1066,29 @@ ScDBCollection::NamedDBs::~NamedDBs()
 {
 }
 
+void ScDBCollection::NamedDBs::initInserted( ScDBData* p )
+{
+p->SetContainer( this);
+if (!mrDoc.IsClipOrUndo())
+{
+p->StartTableColumnNamesListener(); // needs the container be set 
already
+if (p->AreTableColumnNamesDirty())
+{
+if (p->HasHeader())
+{
+// Refresh table column names in next round.
+maDirtyTableColumnNames.Join( p->GetHeaderArea());
+}
+else
+{
+// Header-less table can generate its column names
+// already without accessing the document.
+p->RefreshTableColumnNames( nullptr);
+}
+}
+}
+}
+
 ScDBCollection::NamedDBs::iterator ScDBCollection::NamedDBs::begin()
 {
 return m_DBs.begin();
@@ -1136,25 +1139,7 @@ bool ScDBCollection::NamedDBs::insert(ScDBData* p)
 
 if (r.second)
 {
-p->SetContainer( this);
-if (!mrDoc.IsClipOrUndo())
-{
-p->StartTableColumnNamesListener(); // needs the container be set 
already
-if (p->AreTableColumnNamesDirty())
-{
-if (p->HasHeader())
-{
-// Refresh table column names in next round.
-maDirtyTableColumnNames.Join( p->GetHeaderArea());
-}
-else
-{
-// Header-less table can generate its column names
-// already without accessing the document.
-p->RefreshTableColumnNames( nullptr);
-}
-}
-}
+initInserted(p);
 
 /* TODO: shouldn't the import refresh not be setup for
  * clipboard/undo documents? It was already like this before.. */
commit 70a1e658c0d1f111c8c0991fb87561e3be5683f0
Author: Eike Rathke 
Date:   Tue Sep 8 23:03:09 2015 +0200

TableRef: add unit tests for column names updates and header-less

Change-Id: I244866c91a4f98a55e7ba5f6f87a820cb3de0ead

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 4aa08b7..675e517 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5434,6 +5434,9 @@ void Test::testFuncTableRef()
 sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
 
 m_pDoc->InsertTab(0, "Sheet1");
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+ScDocFunc& rDocFunc = getDocShell().GetDocFunc();
 
 {
 ScDBCollection* pDBs = m_pDoc->GetDBCollection();
@@ -5552,6 +,226 @@ void Test::testFuncTableRef()
 aPrefix + m_pDoc->GetString( aPos));
 }
 
+// Insert a column at column B to extend database range from column A,B to
+// A,B,C. Use ScDocFunc so RefreshDirtyTableColumnNames()

Libreoffice build

[Madhura Ravindra Palsule]

hii,
My Libre build resulting msi is not able to install on Win xp.

is there any flag  missing?


On September 8, 2015 at 6:20 PM Madhura Ravindra Palsule 
wrote:

>  Hi,
>  Build is crashing on f5 fullscreen operation on Win 7 and win 10 working fine
> on win 8
>  Thanks,
>  Madhura
> 

---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

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

Liberoffice 5.0 - ICONS missing

[sridhar]

Hi

 

I installed libreoffice 5.0 on ubuntu 14.04.

But the desktops icons are missing. It's not visible on launcher or
dashboard.

All liberoffice.desktop files are found in /usr/shar/mimelink/application/

 

Please suggest the solution.

 

Regards

 

S.Sridhar

 


---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

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

Re: Libreoffice build : Chart and spellcheck not working

[Madhura Ravindra Palsule]

Hi,

My OS version is Win 7.
trying to build using a patch updated.
Struggling with spellcheck, unable to add dictionaries in build (tried using
 flag --with-external-dict-dir = libo-core/dictionsries/en  and
--with-myspell-dicts= libo-core/dictionsries/en ) But no use, giving same
output. No dictionary is copied to installed folder\extension folder
How to include dictionaries form source in resulting msi?

Thanks
Madhura

On September 7, 2015 at 7:04 PM Michael Meeks 
wrote:
>
> On Mon, 2015-09-07 at 12:16 +0530, Madhura Ravindra Palsule wrote:
> > In my LibreOffice 5.0.2.0 build, I am struggling with 2 issues
> >
> > 1) in my build: Chart icon is not working. when clicked it is giving
> > MessageBox LibreOffice5.0 Fatal Error SEH Exception:Access
> > violation!
>
> Thanks - filed here:
>
> https://bugs.documentfoundation.org/show_bug.cgi?id=93989
>
> can you confirm your OS/version & whether you have OpenGL enabled
> (check help->about). It seems that there is a mismatch between the
> chart's use of OpenGLContext and what we expect in VCL somehow - am
> digging into it.
>
> Thanks !
>
> Michael.
>
> --
> michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
>
---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

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

Libreoffice build : Impress crashes on fullscreen F5 option

[Madhura Ravindra Palsule]

Hi,
Build is crashing on f5 fullscreen operation on Win 7 and win 10 working fine on
win 8
Thanks,
Madhura
---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

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

Re: Libreoffice build

[Regina Henschel]

Hi Madhura,

Madhura Ravindra Palsule schrieb:

hii,
My Libre build resulting msi is not able to install on Win xp.
is there any flag  missing?


Do you took notice of "If you want your builds to run on Windows XP, you 
need to use --with-windows-sdk=7.1A" in 
https://wiki.documentfoundation.org/Development/BuildingOnWindows?


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

[Libreoffice-commits] core.git: Branch 'feature/vba-export' - 2 commits - sc/source

[Markus Mohrhard]

 sc/source/filter/excel/xestream.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 23dcc4bc32ee4f792af1c32c7a162f3d10b6c9cd
Author: Markus Mohrhard 
Date:   Wed Sep 9 03:54:51 2015 +0200

copy the vba stream to the xlsx file

Change-Id: I48d4a37a35e047b6f26b7d1da03e2d423cab1241

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index 9cc3b74..e51e3c5 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -59,6 +59,7 @@
 
 #include 
 #include 
+#include 
 
 #define DEBUG_XL_ENCRYPTION 0
 
@@ -1094,9 +1095,15 @@ bool XclExpXmlStream::exportDocument()
 if (aExport.containsVBAProject())
 {
 const OUString aVbaStreamLocation("/tmp/vba_out.bin");
-SvFileStream aVbaStream(aVbaStreamLocation, STREAM_READWRITE);
+SvMemoryStream aVbaStream(4096, 4096);
 tools::SvRef pVBAStorage(new SotStorage(aVbaStream));
 aExport.exportVBA(pVBAStorage);
+aVbaStream.Seek(0);
+css::uno::Reference xVBAStream(
+new utl::OInputStreamWrapper(aVbaStream));
+css::uno::Reference xVBAOutput =
+openFragmentStream("xl/vbaProject.bin", "VBA");
+comphelper::OStorageHelper::CopyInputToOutput(xVBAStream, xVBAOutput);
 }
 
 // destruct at the end of the block
commit 65360b916c67e9f3d5613f7a253f51508e926940
Author: Markus Mohrhard 
Date:   Wed Sep 9 03:22:35 2015 +0200

remove unused using statements

Change-Id: I096a6f61677b451074bf3626f21c694ef7193bc1

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index 363339f..9cc3b74 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -62,13 +62,11 @@
 
 #define DEBUG_XL_ENCRYPTION 0
 
-using ::com::sun::star::embed::XStorage;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::registry::InvalidRegistryException;
 using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::XInterface;
-using ::utl::OStreamWrapper;
 using ::std::vector;
 
 using namespace com::sun::star;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vba-export' - oox/source

[Markus Mohrhard]

 oox/source/ole/vbaexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 996c78e175318380229b663c5d49e97a31bfedab
Author: Markus Mohrhard 
Date:   Wed Sep 9 04:59:46 2015 +0200

the correct stream name is PROJECTwm

Change-Id: I82d12a9451670ab181996d3ab8ec1a8fa32ce86c

diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 772a24f..0b213e0 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -685,7 +685,7 @@ void VbaExport::exportVBA(SotStorage* pRootStorage)
 pModuleStream[i] = pVBAStream->OpenSotStream(aElementNames[i], 
STREAM_READWRITE);
 }
 SotStorageStream* pVBAProjectStream = 
pVBAStream->OpenSotStream("_VBA_PROJECT", STREAM_READWRITE);
-SotStorageStream* pPROJECTwmStream = 
pRootStorage->OpenSotStream("PROJECT", STREAM_READWRITE);
+SotStorageStream* pPROJECTwmStream = 
pRootStorage->OpenSotStream("PROJECTwm", STREAM_READWRITE);
 
 
 // export
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Albert Thuswaldner]

 sc/source/ui/view/hintwin.cxx  |4 ++--
 sc/source/ui/view/notemark.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5aa58e499a1fbd4e54692233d1b7f8c6237ad8e2
Author: Albert Thuswaldner 
Date:   Tue Sep 8 19:05:03 2015 +0200

tdf#39468 translated german comments in hintwin.cxx and notemark.cxx

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

diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index b9d5113..c0e630e 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -29,8 +29,8 @@ ScHintWindow::ScHintWindow( vcl::Window* pParent, const 
OUString& rTit, const OU
 aTitle( rTit ),
 aMessage( convertLineEnd(rMsg, LINEEND_CR) )
 {
-//  Hellgelb, wie Notizen in detfunc.cxx
-Color aYellow( 255,255,192 );   // hellgelb
+// pale yellow, the same as for notes in detfunc.cxx
+Color aYellow( 255,255,192 );   // pale yellow
 SetBackground( aYellow );
 
 aTextFont = GetFont();
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 64b63ac..24ae12d 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -86,8 +86,8 @@ IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void)
 OutputDevice* pPrinter = pDoc->GetRefDevice();
 if (pPrinter)
 {
-//  Am Outliner des Draw-Model ist auch der Drucker als RefDevice 
gesetzt,
-//  und es soll einheitlich aussehen.
+// On the outliner of the draw model also the printer is set as 
RefDevice,
+// and it should look uniform.
 Outliner& rOutliner = pModel->GetDrawOutliner();
 rOutliner.SetRefDevice(pPrinter);
 }
@@ -101,7 +101,7 @@ IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void)
 aRect = pObject->GetCurrentBoundRect();
 }
 
-// Page einfuegen damit das Model sie kennt und auch deleted
+// Insert page so that the model recognise it and also deleted
 pModel->InsertPage( pPage );
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Albert Thuswaldner]

 sc/source/ui/view/printfun.cxx |   12 ++--
 sc/source/ui/view/tabcont.cxx  |   32 
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit a49d4ead6f3e90e5acc0ac264933a2472915b891
Author: Albert Thuswaldner 
Date:   Tue Sep 8 18:50:32 2015 +0200

tdf#39468 translated german comments in printfun.cxx and tabcont.cxx

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

diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index cff117f..e6e6f7b 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -205,7 +205,7 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions 
)
 
 InitParam(pOptions);
 
-pPageData = NULL;   // wird nur zur Initialisierung gebraucht
+pPageData = NULL;   // is only needed for initialisation
 }
 
 ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB 
nTab,
@@ -650,7 +650,7 @@ bool ScPrintFunc::AdjustPrintArea( bool bNew )
 nStartCol = 0;
 nStartRow = 0;
 if (!pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes ))
-return false;   // nix
+return false;   // nothing
 }
 else
 {
@@ -1213,13 +1213,13 @@ static void lcl_DrawGraphic( const SvxBrushItem 
&rBrush, vcl::RenderContext *pOu
 }
 }
 
-//  Rahmen wird nach innen gezeichnet
+// The frame is drawn inwards
 
 void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH,
 const SvxBoxItem* pBorderData, const 
SvxBrushItem* pBackground,
 const SvxShadowItem* pShadow )
 {
-//! direkte Ausgabe aus SvxBoxItem !!!
+//! direct output from SvxBoxItem !!!
 
 if (pBorderData)
 if ( !pBorderData->GetTop() && !pBorderData->GetBottom() && 
!pBorderData->GetLeft() &&
@@ -1227,7 +1227,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, 
long nScrW, long nScrH,
 pBorderData = NULL;
 
 if (!pBorderData && !pBackground && !pShadow)
-return; // nichts zu tun
+return; // nothing to do
 
 long nLeft   = 0;
 long nRight  = 0;
@@ -2877,7 +2877,7 @@ void ScPrintFunc::CalcZoom( sal_uInt16 nRangeNo ) 
  // calcu
 }
 else
 {
-OSL_ENSURE( aTableParam.bScaleNone, "kein Scale-Flag gesetzt" );
+OSL_ENSURE( aTableParam.bScaleNone, "no scale flag is set" );
 nZoom = 100;
 CalcPages();
 }
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index abe0aac..53f5e85 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -167,8 +167,8 @@ void ScTabControl::MouseButtonDown( const MouseEvent& rMEvt 
)
 ScModule* pScMod = SC_MOD();
 if ( !pScMod->IsModalMode() && !pScMod->IsFormulaMode() && !IsInEditMode() 
)
 {
-//  View aktivieren
-pViewData->GetViewShell()->SetActive(); // Appear und 
SetViewFrame
+// activate View
+pViewData->GetViewShell()->SetActive(); // Appear and 
SetViewFrame
 pViewData->GetView()->ActiveGrabFocus();
 }
 
@@ -237,9 +237,9 @@ void ScTabControl::Select()
 SCTAB nCount = pDoc->GetTableCount();
 SCTAB i;
 
-if ( pScMod->IsTableLocked() )  // darf jetzt nicht umgeschaltet 
werden ?
+if ( pScMod->IsTableLocked() )  // may not be switched now ?
 {
-//  den alten Zustand des TabControls wiederherstellen:
+// restore the old state of TabControls
 
 for (i=0; i(i)+1, rMark.GetTableSelect(i) 
);
@@ -249,14 +249,14 @@ void ScTabControl::Select()
 }
 
 sal_uInt16 nCurId = GetCurPageId();
-if (!nCurId) return;// kann vorkommen, wenn bei Excel-Import 
alles versteckt ist
+if (!nCurId) return;// for Excel import it can happen that 
everything is hidden
 sal_uInt16 nPage = nCurId - 1;
 
-// OLE-inplace deaktivieren
+// OLE-inplace deactivate
 if ( nPage != static_cast(pViewData->GetTabNo()) )
 pViewData->GetView()->DrawMarkListHasChanged();
 
-//  InputEnterHandler nur wenn nicht Referenzeingabe
+//  InputEnterHandler onlw when not reference input
 
 bool bRefMode = pScMod->IsFormulaMode();
 if (!bRefMode)
@@ -270,7 +270,7 @@ void ScTabControl::Select()
 pViewData->GetView()->SetTabNo( static_cast(nPage) );
 else
 {
-//  Tabelle fuer Basic ist 1-basiert
+// sheet for basic is 1-based
 SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 );
 rDisp.Execute( SID_CURRENTTAB, SfxCallMode::SLOT | SfxCallMode::RECORD,
 &aItem, nullptr );
@@ -289,9 +289,9 @@ void ScTabControl::Select()
 rBind.Invalidate( 

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #209 from Commit Notification 
 ---
Albert Thuswaldner committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468 translated german comments in hintwin.cxx and notemark.cxx

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 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #210 from Commit Notification 
 ---
Albert Thuswaldner committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468 translated german comments in printfun.cxx and tabcont.cxx

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 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #211 from Commit Notification 
 ---
Albert Thuswaldner committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468 translated german comments in preview.cxx and prevwsh.cxx

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: sc/source

[Albert Thuswaldner]

 sc/source/ui/view/preview.cxx |6 +++---
 sc/source/ui/view/prevwsh.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit dd0ceb50c2d95ac0587db2c983ac58f2e3b13028
Author: Albert Thuswaldner 
Date:   Tue Sep 8 18:56:12 2015 +0200

tdf#39468 translated german comments in preview.cxx and prevwsh.cxx

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

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 666abee..9d4b150 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -164,7 +164,7 @@ void ScPreview::UpdateDrawView()// nTab must be 
right
 SdrPage* pPage = pModel->GetPage(nTab);
 if ( pDrawView && ( !pDrawView->GetSdrPageView() || 
pDrawView->GetSdrPageView()->GetPage() != pPage ) )
 {
-//  die angezeigte Page der DrawView umzustellen (s.u.) 
funktioniert nicht ?!?
+// convert the displayed Page of drawView (see below) does not 
work?!?
 delete pDrawView;
 pDrawView = NULL;
 }
@@ -299,7 +299,7 @@ void ScPreview::CalcPages()
 DoInvalidate();
 }
 
-void ScPreview::RecalcPages()   // only nPageNo is changed
+void ScPreview::RecalcPages()   // only nPageNo is changed
 {
 if (!bValid)
 return; // then CalcPages is called
@@ -410,7 +410,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* 
pFillLocation )
 aPage.Select( aPageRange );
 
 long nPrinted = pPrintFunc->DoPrint( aPage, nTabStart, nDisplayStart, 
bDoPrint, pFillLocation );
-OSL_ENSURE(nPrinted<=1, "was'n nu los?");
+OSL_ENSURE(nPrinted<=1, "What is happening?");
 
 SetMapMode(aMMMode);
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 60a9fb7..7c4f303 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -544,11 +544,11 @@ void ScPreviewShell::Activate(bool bMDI)
 {
 SfxViewShell::Activate(bMDI);
 
-//! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4)
+//! Basic etc. -> outsource to its own file (see tabvwsh4)
 
 if (bMDI)
 {
-// InputHdl ist jetzt meistens Null, keine Assertion mehr!
+// InputHdl is now mostly Null, no moreasssertion!
 ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl();
 if ( pInputHdl )
 pInputHdl->NotifyChange( NULL );
@@ -1173,7 +1173,7 @@ void ScPreviewShell::RemoveAccessibilityObject( 
SfxListener& rObject )
 rObject.EndListening( *pAccessibilityBroadcaster );
 else
 {
-OSL_FAIL("kein Accessibility-Broadcaster?");
+OSL_FAIL("no accessibility broadcaster?");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice 5.0.2 RC1 available

[Robinson Tryon]

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of LibreOffice 5.0.2. The upcoming 5.0.2 will be the second
bugfix release of our fresh 5.0 line. Please be aware that LibreOffice
5.0.2 RC1 has not been flagged as ready for production use yet,
however feel free to give it a try instead of 5.0.1.

A work-in-progress list of new features in LibreOffice 5.0 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/5.0

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Windows builds are also provided in 64bit version.

Should you find bugs, please report them to our Bugzilla:

  https://bugs.documentfoundation.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs compared to 5.0.1 final (rc2) is
available from our wiki:

  http://wiki.documentfoundation.org/Releases/5.0.2/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Cheers,
Robinson

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
802-379-9482 | IRC: colonelqubit on Freenode
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - connectivity/source include/svtools include/tools svtools/source toolkit/source

[Stephan Bergmann]

 connectivity/source/commontools/DateConversion.cxx   |7 -
 connectivity/source/commontools/dbcharset.cxx|2 
 connectivity/source/commontools/dbtools.cxx  |4 -
 connectivity/source/cpool/ZPoolCollection.cxx|1 
 connectivity/source/drivers/ado/Aolevariant.cxx  |   24 --
 connectivity/source/drivers/ado/Awrapado.cxx |4 -
 connectivity/source/drivers/dbase/DIndex.cxx |8 --
 connectivity/source/drivers/dbase/dindexnode.cxx |4 -
 connectivity/source/drivers/file/FPreparedStatement.cxx  |6 -
 connectivity/source/drivers/hsqldb/HDriver.cxx   |1 
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx|   22 +++--
 connectivity/source/drivers/hsqldb/HStorageMap.cxx   |1 
 connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx |8 +-
 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx|   17 ++--
 connectivity/source/drivers/jdbc/JDriver.cxx |1 
 connectivity/source/drivers/mork/MConnection.cxx |3 
 connectivity/source/drivers/mork/MPreparedStatement.cxx  |6 -
 connectivity/source/drivers/mork/MStatement.cxx  |1 
 connectivity/source/drivers/mozab/MConnection.cxx|3 
 connectivity/source/drivers/mozab/MPreparedStatement.cxx |6 -
 connectivity/source/drivers/mozab/MStatement.cxx |3 
 connectivity/source/drivers/odbc/OConnection.cxx |6 -
 connectivity/source/drivers/odbc/OPreparedStatement.cxx  |6 -
 connectivity/source/drivers/odbc/ORealDriver.cxx |4 -
 connectivity/source/drivers/odbc/OResultSet.cxx  |9 --
 connectivity/source/drivers/odbc/OStatement.cxx  |4 -
 connectivity/source/drivers/odbc/OTools.cxx  |2 
 connectivity/source/inc/diagnose_ex.h|   40 
--
 connectivity/source/parse/sqliterator.cxx|2 
 include/svtools/table/tablemodel.hxx |7 -
 include/tools/diagnose_ex.h  |3 
 svtools/source/table/mousefunction.cxx   |8 --
 svtools/source/table/tablecontrol_impl.cxx   |9 --
 svtools/source/table/tablecontrol_impl.hxx   |4 -
 svtools/source/uno/svtxgridcontrol.cxx   |6 -
 svtools/source/uno/unocontroltablemodel.cxx  |8 --
 svtools/source/uno/unogridcolumnfacade.cxx   |3 
 toolkit/source/controls/grid/sortablegriddatamodel.cxx   |4 -
 38 files changed, 56 insertions(+), 201 deletions(-)

New commits:
commit 0e13c94ad3615dd20d83a95efc18b99b16e074e3
Author: Stephan Bergmann 
Date:   Tue Sep 8 18:46:11 2015 +0200

Get rid of connectivity's diagnose_ex.h

...that rather trivially wrapped some osl/diagnose.h functionality

Change-Id: I4105708488114a9c87aa415affb997a783241248

diff --git a/connectivity/source/commontools/DateConversion.cxx 
b/connectivity/source/commontools/DateConversion.cxx
index a3e5bb8..4678990 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include "TConnection.hxx"
-#include "diagnose_ex.h"
 #include 
 #include 
 #include 
@@ -131,7 +130,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, 
const Any& _rVal, bool b
 else
 bOk = _rVal >>= aDateTime;
 
-OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal 
is not datetime!");
+OSL_ENSURE( bOk, "DBTypeConversion::toSQLString: _rVal is 
not datetime!");
 // check if this is really a timestamp or only a date
 if ( bOk )
 {
@@ -164,7 +163,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, 
const Any& _rVal, bool b
 }
 else
 bOk = _rVal >>= aDate;
-OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal 
is not date!");
+OSL_ENSURE( bOk, "DBTypeConversion::toSQLString: _rVal is 
not date!");
 if (bQuote)
 aRet.append("{d '");
 aRet.append(DBTypeConversion::toDateString(aDate));
@@ -191,7 +190,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, 
const Any& _rVal, bool b
 }
 else
 bOk = _rVal >>= aTime;
-OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal 
is not time!");
+OSL_ENSURE( bO

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

[Tor Lillqvist]

 sc/qa/unit/ucalc_formula.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e4757b79e2938e48a57d129413df3f06bf638b4d
Author: Tor Lillqvist 
Date:   Wed Sep 9 09:19:00 2015 +0300

WaE: loplugin:stringconstant

Elide construction of rtl::OUString with string constant argument in
call of rtl::operator+.

Change-Id: Ic5bce873550d9755094bbd5a0867994d1670e02a

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 675e517..5df5457 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5596,7 +5596,7 @@ void Test::testFuncTableRef()
 OUString aFormula( OUString::createFromAscii( pColumn2Formula));
 ScAddress aPos(1,5,0);
 OUString aPrefix( aPos.Format(SCA_VALID) + " " + aFormula + " : ");
-CPPUNIT_ASSERT_EQUAL( aPrefix + OUString("448"), aPrefix + 
m_pDoc->GetString( aPos));
+CPPUNIT_ASSERT_EQUAL( OUString(aPrefix + "448"), OUString(aPrefix + 
m_pDoc->GetString(aPos)));
 }
 
 // Set header in column B. Use ScDocFunc to have table column names 
refreshed.
@@ -5772,7 +5772,7 @@ void Test::testFuncTableRef()
 OUString aFormula( OUString::createFromAscii( pColumn3Formula));
 ScAddress aPos(5,13,0);
 OUString aPrefix( aPos.Format(SCA_VALID) + " " + aFormula + " : ");
-CPPUNIT_ASSERT_EQUAL( aPrefix + OUString("448"), aPrefix + 
m_pDoc->GetString( aPos));
+CPPUNIT_ASSERT_EQUAL( OUString(aPrefix + "448"), OUString(aPrefix + 
m_pDoc->GetString(aPos)));
 }
 
 m_pDoc->DeleteTab(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits