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

[Miklos Vajna]

 include/svl/srchitem.hxx  |  114 +-
 svl/source/items/srchitem.cxx |  256 +-
 2 files changed, 185 insertions(+), 185 deletions(-)

New commits:
commit 849278b952a3886f0196aac32f6fcf0c7ae72806
Author: Miklos Vajna 
Date:   Thu Jun 4 08:59:45 2015 +0200

svl: prefix remaining members of SvxSearchItem

Change-Id: Id538ee368de6cd63f08618e6284bca97e20bf7a3

diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 9a29858..9c6be0c 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -63,26 +63,26 @@ class SVL_DLLPUBLIC SvxSearchItem :
 public SfxPoolItem,
 public utl::ConfigItem
 {
-com::sun::star::util::SearchOptions aSearchOpt;
+com::sun::star::util::SearchOptions m_aSearchOpt;
 
-SfxStyleFamily  eFamily;// style family
+SfxStyleFamily  m_eFamily;// style family
 
-SvxSearchCmdnCommand;   // command (Search, Search all, 
Replace, Replace all)
+SvxSearchCmdm_nCommand;   // command (Search, Search all, 
Replace, Replace all)
 
 // Calc-specific
-SvxSearchCellType nCellType;  // Search in Formulas/Values/Notes
-SvxSearchAppnAppFlag;   // application which the dialog is for
-boolbRowDirection;  // search direction: 
row-wise/column-wise
-boolbAllTables; // search in all sheets
-boolbSearchFiltered;  // search filtered cells.
+SvxSearchCellType m_nCellType;  // Search in Formulas/Values/Notes
+SvxSearchAppm_nAppFlag;   // application which the dialog is 
for
+boolm_bRowDirection;  // search direction: 
row-wise/column-wise
+boolm_bAllTables; // search in all sheets
+boolm_bSearchFiltered;  // search filtered cells.
 
 // Writer-specific
-boolbNotes;
+boolm_bNotes;
 
-boolbBackward;  // search backwards
-boolbPattern;   // search for styles
-boolbContent;   // search in content
-boolbAsianOptions;  // use asian options?
+boolm_bBackward;  // search backwards
+boolm_bPattern;   // search for styles
+boolm_bContent;   // search in content
+boolm_bAsianOptions;  // use asian options?
 
 // Start search at this point (absolute twips).
 sal_Int32   m_nStartPointX;
@@ -109,8 +109,8 @@ public:
 // ConfigItem
 virtual voidNotify( const com::sun::star::uno::Sequence< 
OUString > &rPropertyNames ) SAL_OVERRIDE;
 
-SvxSearchCmdGetCommand() const { return nCommand; }
-voidSetCommand(SvxSearchCmd nNewCommand) { nCommand = 
nNewCommand; }
+SvxSearchCmdGetCommand() const { return m_nCommand; }
+voidSetCommand(SvxSearchCmd nNewCommand) { m_nCommand 
= nNewCommand; }
 
 inline  const OUString  GetSearchString() const;
 inline  voidSetSearchString(const OUString& rNewString);
@@ -124,8 +124,8 @@ public:
 inline  boolGetExact() const;
 voidSetExact(bool bNewExact);
 
-boolGetBackward() const { return bBackward; }
-voidSetBackward(bool bNewBackward) { bBackward = 
bNewBackward; }
+boolGetBackward() const { return m_bBackward; }
+voidSetBackward(bool bNewBackward) { m_bBackward = 
bNewBackward; }
 
 inline  boolGetSelection() const;
 voidSetSelection(bool bNewSelection);
@@ -133,33 +133,33 @@ public:
 inline  boolGetRegExp() const;
 voidSetRegExp( bool bVal );
 
-boolGetPattern() const { return bPattern; }
-voidSetPattern(bool bNewPattern) { bPattern = 
bNewPattern; }
+boolGetPattern() const { return m_bPattern; }
+voidSetPattern(bool bNewPattern) { m_bPattern = 
bNewPattern; }
 
-boolIsContent() const { return bContent; }
-voidSetContent( bool bNew ) { bContent = bNew; }
+boolIsContent() const { return m_bContent; }
+voidSetContent( bool bNew ) { m_bContent = bNew; }
 
-SfxStyleFamily  GetFamily() const { return eFamily; }
+SfxStyleFamily  GetFamily() const { return m_eFamily; }
 voidSetFamily( SfxStyleFamily eNewFamily )
-{ eFamily = eNewFamily; }
+{ m_eFamily = eNewFamily; }
 
-boolGetRowDirection() const { return bRowDirection; }
-voidSetRowDirection(bool

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

[Noel Grandin]

 sw/inc/fesh.hxx |   32 
 sw/source/core/frmedt/feshview.cxx  |   21 +++--
 sw/source/uibase/docvw/edtwin.cxx   |2 +-
 sw/source/uibase/shells/txtcrsr.cxx |4 ++--
 sw/source/uibase/uiview/viewmdi.cxx |   10 +-
 5 files changed, 39 insertions(+), 30 deletions(-)

New commits:
commit 3d30077af27c8a6e91fb91175e6d2ea9a6f03d11
Author: Noel Grandin 
Date:   Wed May 20 21:10:50 2015 +0200

convert GOTOOBJ constants to scoped enum

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

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index b3bbfcd..d0c557f 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -86,14 +86,22 @@ namespace o3tl
 }
 
 //! values can be combined via logical or
-#define GOTOOBJ_DRAW_CONTROL(sal_uInt16)  1
-#define GOTOOBJ_DRAW_SIMPLE (sal_uInt16)  2
-#define GOTOOBJ_DRAW_ANY(sal_uInt16)  3
-#define GOTOOBJ_FLY_FRM (sal_uInt16)  4
-#define GOTOOBJ_FLY_GRF (sal_uInt16)  8
-#define GOTOOBJ_FLY_OLE (sal_uInt16) 16
-#define GOTOOBJ_FLY_ANY (sal_uInt16) 28
-#define GOTOOBJ_GOTO_ANY(sal_uInt16) 31
+enum class GotoObjFlags
+{
+NONE   =  0,
+DrawControl=  1,
+DrawSimple =  2,
+DrawAny= DrawControl | DrawSimple,
+FlyFrm =  4,
+FlyGrf =  8,
+FlyOLE = 16,
+FlyAny = FlyOLE | FlyGrf | FlyFrm,
+Any= FlyAny | DrawAny,
+};
+namespace o3tl
+{
+template<> struct typed_flags : is_typed_flags {};
+}
 
 //! values can be combined via logical or
 #define FLYPROTECT_CONTENT  (sal_uInt16)  1
@@ -381,9 +389,9 @@ public:
 SwFrameFormat* WizzardGetFly();
 
 /// Independent selecting of flys.
-bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
+bool GotoNextFly( GotoObjFlags eType = GotoObjFlags::FlyAny )
 { return GotoObj( true, eType ); }
-bool GotoPrevFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY)
+bool GotoPrevFly( GotoObjFlags eType = GotoObjFlags::FlyAny)
 { return GotoObj( false, eType); }
 
/// Iterate over flys  - for Basic-collections.
@@ -467,8 +475,8 @@ public:
 bool GetObjAttr( SfxItemSet &rSet ) const;
 bool SetObjAttr( const SfxItemSet &rSet );
 
-const SdrObject* GetBestObject( bool bNext, sal_uInt16 eType = 
GOTOOBJ_DRAW_ANY, bool bFlat = true, const svx::ISdrObjectFilter* pFilter = 
NULL );
-bool GotoObj( bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = 
GOTOOBJ_DRAW_ANY);
+const SdrObject* GetBestObject( bool bNext, GotoObjFlags eType = 
GotoObjFlags::DrawAny, bool bFlat = true, const svx::ISdrObjectFilter* pFilter 
= NULL );
+bool GotoObj( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny);
 
 /// Set DragMode (e.g. Rotate), but do nothing when frame is selected.
 void SetDragMode( sal_uInt16 eSdrDragMode );
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index ab12724..fe3ee4c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1258,7 +1258,7 @@ namespace
 };
 }
 
-const SdrObject* SwFEShell::GetBestObject( bool bNext, sal_uInt16 
/*GOTOOBJ_...*/ eType, bool bFlat, const svx::ISdrObjectFilter* pFilter )
+const SdrObject* SwFEShell::GetBestObject( bool bNext, GotoObjFlags eType, 
bool bFlat, const svx::ISdrObjectFilter* pFilter )
 {
 if( !Imp()->HasDrawView() )
 return NULL;
@@ -1271,8 +1271,8 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, 
sal_uInt16 /*GOTOOBJ_...*
 Point aTopPos(  nTmp, nTmp );
 Point aCurPos;
 Point aPos;
-bool bNoDraw = 0 == (GOTOOBJ_DRAW_ANY & eType);
-bool bNoFly = 0 == (GOTOOBJ_FLY_ANY & eType);
+bool bNoDraw(GotoObjFlags::DrawAny & eType);
+bool bNoFly(GotoObjFlags::FlyAny & eType);
 
 if( !bNoFly && bNoDraw )
 {
@@ -1331,34 +1331,35 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, 
sal_uInt16 /*GOTOOBJ_...*
 bool bFlyFrm = pObj->ISA(SwVirtFlyDrawObj);
 if( ( bNoFly && bFlyFrm ) ||
 ( bNoDraw && !bFlyFrm ) ||
-( eType == GOTOOBJ_DRAW_SIMPLE && lcl_IsControlGroup( pObj ) ) 
||
-( eType == GOTOOBJ_DRAW_CONTROL && !lcl_IsControlGroup( pObj ) 
) ||
+( eType == GotoObjFlags::DrawSimple && lcl_IsControlGroup( 
pObj ) ) ||
+( eType == GotoObjFlags::DrawControl && !lcl_IsControlGroup( 
pObj ) ) ||
 ( pFilter && !pFilter->includeObject( *pObj ) ) )
 continue;
 if( bFlyFrm )
 {
 SwVirtFlyDrawObj *pO = static_cast(pObj);
 SwFlyFrm *pFly = pO->GetFlyFrm();
-if( GOTOOBJ_FLY_ANY != ( GOTOOBJ_FLY_ANY & eType ) )
+

[Bug 91831] sharing gcc / UNO bridges code ...

[bugzilla-daemon]

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

--- Comment #1 from Stephan Bergmann  ---
Be /very/ careful here.  There may be some low-hanging fruit that are obvious
candidates for consolidation, but there may also be subtle differences that are
there for a reason.  Also, changes should ideally only be made if you can
actually test the changed code, i.e., have access to each specific OS/hardware
combination.

-- 
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 'feature/gsoc-tiled-rendering' - libreofficekit/source

[Pranav Kant]

 libreofficekit/source/gtk/lokdocview.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 3aad0cd0428667c4620977cdc6f1f21616a5835e
Author: Pranav Kant 
Date:   Thu Jun 4 13:08:01 2015 +0530

lokdocview: fixed the values for invalidation region

Change-Id: If7b2cbef01e0a5f953a04717aacfaffc55a6053e

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 2a3a395..d3f0820 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -939,10 +939,10 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 aRectanglePixels.y = twipToPixel(aRectangle.y);
 aRectanglePixels.width = twipToPixel(aRectangle.width);
 aRectanglePixels.height = twipToPixel(aRectangle.height);
-int rowStart = aRectanglePixels.x / nTileSizePixels;
-int colStart = aRectanglePixels.y / nTileSizePixels;
-int rowEnd = (aRectanglePixels.x + aRectanglePixels.height + 
nTileSizePixels) / nTileSizePixels;
-int colEnd = (aRectanglePixels.y + aRectanglePixels.width + 
nTileSizePixels) / nTileSizePixels;
+int rowStart = aRectanglePixels.y / nTileSizePixels;
+int colStart = aRectanglePixels.x / nTileSizePixels;
+int rowEnd = (aRectanglePixels.y + aRectanglePixels.height + 
nTileSizePixels) / nTileSizePixels;
+int colEnd = (aRectanglePixels.x + aRectanglePixels.width + 
nTileSizePixels) / nTileSizePixels;
 int i,j;
 for (i = rowStart; i < rowEnd; i++) {
 for (j = colStart; j < colEnd; j++) {
@@ -967,10 +967,10 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 aRectanglePixels.y = twipToPixel(m_aVisibleCursor.y);
 aRectanglePixels.width = twipToPixel(m_aVisibleCursor.width);
 aRectanglePixels.height = twipToPixel(m_aVisibleCursor.height);
-int rowStart = aRectanglePixels.x / nTileSizePixels;
-int colStart = aRectanglePixels.y / nTileSizePixels;
-int rowEnd = (aRectanglePixels.x + aRectanglePixels.height + 
nTileSizePixels) / nTileSizePixels;
-int colEnd = (aRectanglePixels.y + aRectanglePixels.width + 
nTileSizePixels) / nTileSizePixels;
+int rowStart = aRectanglePixels.y / nTileSizePixels;
+int colStart = aRectanglePixels.x / nTileSizePixels;
+int rowEnd = (aRectanglePixels.y + aRectanglePixels.height + 
nTileSizePixels) / nTileSizePixels;
+int colEnd = (aRectanglePixels.x + aRectanglePixels.width + 
nTileSizePixels) / nTileSizePixels;
 int i,j;
 for (i = rowStart; i < rowEnd; i++) {
 for (j = colStart; j < colEnd; j++) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 desktop/source/splash/splash.cxx |   19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

New commits:
commit aca61aa5ffa4fab458d03e469b569c50952ed077
Author: Tomaž Vajngerl 
Date:   Thu Jun 4 16:48:31 2015 +0900

tdf#91529 hopefully fixes the issue by painting immediately

Change-Id: I0c97e489150cd65d1ab1dbff4ee9f1699f89ac2e

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 6794d15..63c8232 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -59,6 +59,8 @@ public:
 virtual void dispose() SAL_OVERRIDE;
 // workwindow
 virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) 
SAL_OVERRIDE;
+void Redraw();
+
 };
 
 class  SplashScreen
@@ -143,6 +145,15 @@ void SplashScreenWindow::dispose()
 IntroWindow::dispose();
 }
 
+void SplashScreenWindow::Redraw()
+{
+Invalidate();
+// Trigger direct painting too - otherwise the splash screen won't be
+// shown in some cases (when the idle timer won't be hit).
+Paint(*this, Rectangle());
+Flush();
+}
+
 SplashScreen::SplashScreen()
 : pWindow( new SplashScreenWindow (this) )
 , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED))
@@ -194,8 +205,7 @@ void SAL_CALL SplashScreen::start(const OUString&, 
sal_Int32 nRange)
 if ( _eBitmapMode == BM_FULLSCREEN )
 pWindow->ShowFullScreenMode( true );
 pWindow->Show();
-pWindow->Invalidate();
-pWindow->Flush();
+pWindow->Redraw();
 }
 }
 
@@ -352,8 +362,7 @@ void SplashScreen::updateStatus()
 return;
 if (!_bPaintProgress)
 _bPaintProgress = true;
-pWindow->Invalidate();
-pWindow->Flush();
+pWindow->Redraw();
 }
 
 // internal private methods
@@ -364,7 +373,7 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, 
VclWindowEvent *, inEvent )
 switch ( inEvent->GetId() )
 {
 case VCLEVENT_WINDOW_SHOW:
-pWindow->Invalidate();
+pWindow->Redraw();
 break;
 default:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 3 commits - sc/source

[Henry Castro]

 sc/source/core/data/documen3.cxx |   19 +++
 sc/source/ui/view/viewfun2.cxx   |   23 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit fa0eed40e7e5e5f83146ba4133b62c20e33e096d
Author: Henry Castro 
Date:   Mon May 25 23:45:06 2015 -0400

sc LOKit callback for search not found.

Needed for signaling the user when no match was found for the searched input

Change-Id: I10089d065c26deea7cb57a9dc20f130f9afb6d99

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 2449867..47b0ace 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1792,7 +1792,11 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 
 GetFrameWin()->LeaveWait();
 if (!bIsApi)
+{
+
rDoc.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+
pSearchItem->GetSearchString().toUtf8().getStr());
 SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+}
 
 break;  // break 'while (TRUE)'
 }
commit 7c338fe589bc5e15c244c37f8b89f8ae86277564
Author: Henry Castro 
Date:   Sat May 30 11:55:01 2015 -0400

sc: Notify about the part change when searching.

Change-Id: Ieea445b64f72f270885d6e21d4070fefe8d82567

diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index d521bd6..da216f2 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -74,6 +74,7 @@
 
 #include "globalnames.hxx"
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -1289,8 +1290,17 @@ bool ScDocument::SearchAndReplace(
 rTab = nTab;
 }
 else
+{
 ScDocument::GetSearchAndReplaceStart(
 rSearchItem, nCol, nRow );
+
+// notify LibreOfficeKit about changed page
+if ( GetDrawLayer() && 
GetDrawLayer()->isTiledRendering() )
+{
+OString aPayload = OString::number(nTab);
+
GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
+}
 }
 }
 }
@@ -1310,8 +1320,17 @@ bool ScDocument::SearchAndReplace(
 rTab = nTab;
 }
 else
+{
 ScDocument::GetSearchAndReplaceStart(
 rSearchItem, nCol, nRow );
+
+// notify LibreOfficeKit about changed page
+if ( GetDrawLayer() && 
GetDrawLayer()->isTiledRendering() )
+{
+OString aPayload = OString::number(nTab);
+
GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
+}
 }
 }
 }
commit 572abb94b12d959c0f16b475101041e4ea27e48d
Author: Henry Castro 
Date:   Fri May 29 11:53:50 2015 -0400

sc: SvxSearchItem, m_nStartPoint{X,Y}

The idea is that if you have your cursor at the begining of a Calc 
document, and you scroll down a
lot, then search, then it's annoying that search jumps back to the start of 
the document for the
first hit.

Add an optional way to provide what is the starting point of such a search, 
so we can have "when
nothing is selected, then search from the top left corner of the visible 
area".

Change-Id: I22624dd52a093759d46541e003d838aeb0db943f

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 5b5ec3b..2449867 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1640,6 +1640,23 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 if (bAddUndo && !rDoc.IsUndoEnabled())
 bAddUndo = false;
 
+if ( !rMark.IsMarked() && !rMark.IsMultiMarked() && 
(pSearchItem->HasStartPoint()) )
+{
+// No selection -> but we have a start point (top left corner of the
+// current view), start searching from there, not from the current
+// cursor position.
+SCsCOL nPosX;
+SCsROW nPosY;
+
+int nPixelX = pSearchItem->GetStartPointX() * GetViewData().GetPPTX();
+int nPixelY = pSearchItem->GetStartPointY() * GetViewData().GetPPTY();
+
+GetViewData().GetPosFromPixel

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

[Henry Castro]

 sc/source/core/data/documen3.cxx |   19 +++
 sc/source/ui/view/viewfun2.cxx   |   23 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 2fbd07db9ed3c8ae2f455ad08ce52ef709ac0f06
Author: Henry Castro 
Date:   Sat May 30 11:55:01 2015 -0400

sc: Notify about the part change when searching.

Change-Id: Ieea445b64f72f270885d6e21d4070fefe8d82567

diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index d521bd6..da216f2 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -74,6 +74,7 @@
 
 #include "globalnames.hxx"
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -1289,8 +1290,17 @@ bool ScDocument::SearchAndReplace(
 rTab = nTab;
 }
 else
+{
 ScDocument::GetSearchAndReplaceStart(
 rSearchItem, nCol, nRow );
+
+// notify LibreOfficeKit about changed page
+if ( GetDrawLayer() && 
GetDrawLayer()->isTiledRendering() )
+{
+OString aPayload = OString::number(nTab);
+
GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
+}
 }
 }
 }
@@ -1310,8 +1320,17 @@ bool ScDocument::SearchAndReplace(
 rTab = nTab;
 }
 else
+{
 ScDocument::GetSearchAndReplaceStart(
 rSearchItem, nCol, nRow );
+
+// notify LibreOfficeKit about changed page
+if ( GetDrawLayer() && 
GetDrawLayer()->isTiledRendering() )
+{
+OString aPayload = OString::number(nTab);
+
GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SET_PART, 
aPayload.getStr());
+}
+}
 }
 }
 }
commit 4481e3b244216d373eb1cff3dffc48524b2093f0
Author: Henry Castro 
Date:   Fri May 29 11:53:50 2015 -0400

sc: SvxSearchItem, m_nStartPoint{X,Y}

The idea is that if you have your cursor at the begining of a Calc 
document, and you scroll down a
lot, then search, then it's annoying that search jumps back to the start of 
the document for the
first hit.

Add an optional way to provide what is the starting point of such a search, 
so we can have "when
nothing is selected, then search from the top left corner of the visible 
area".

Change-Id: I22624dd52a093759d46541e003d838aeb0db943f

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 49d70d8..47b0ace 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1640,6 +1640,23 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 if (bAddUndo && !rDoc.IsUndoEnabled())
 bAddUndo = false;
 
+if ( !rMark.IsMarked() && !rMark.IsMultiMarked() && 
(pSearchItem->HasStartPoint()) )
+{
+// No selection -> but we have a start point (top left corner of the
+// current view), start searching from there, not from the current
+// cursor position.
+SCsCOL nPosX;
+SCsROW nPosY;
+
+int nPixelX = pSearchItem->GetStartPointX() * GetViewData().GetPPTX();
+int nPixelY = pSearchItem->GetStartPointY() * GetViewData().GetPPTY();
+
+GetViewData().GetPosFromPixel(nPixelX, nPixelY, 
GetViewData().GetActivePart(), nPosX, nPosY);
+
+AlignToCursor( nPosX, nPosY, SC_FOLLOW_JUMP );
+SetCursor( nPosX, nPosY, true );
+}
+
 SCCOL nCol, nOldCol;
 SCROW nRow, nOldRow;
 SCTAB nTab, nOldTab;
@@ -1829,9 +1846,9 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* 
pSearchItem,
 if (pGridWindow)
 {
 // move the cell selection handles
+pGridWindow->SetCellSelectionPixel(LOK_SETTEXTSELECTION_RESET, 
aCurPos.X(), aCurPos.Y());
 pGridWindow->SetCellSelectionPixel(LOK_SETTEXTSELECTION_START, 
aCurPos.X(), aCurPos.Y());
 pGridWindow->SetCellSelectionPixel(LOK_SETTEXTSELECTION_END, 
aCurPos.X(), aCurPos.Y());
-pGridWindow->SetCellSelectionPixel(LOK_SETTEXTSELECTION_RESET, 
aCurPos.X(), aCurPos.Y());
 }
 }
 
commit dc2ddf00b68322d715ebf9521d36653563d22bde
Author: Henry Castro 
Date:   Mon May 25 23:45:06 2015 -0400

sc LOKit callbac

[Libreoffice-commits] core.git: 4 commits - binaryurp/source connectivity/Jar_ConnectivityTools.mk connectivity/qa dbaccess/JunitTest_dbaccess_complex.mk dbaccess/qa

[Stephan Bergmann]

 binaryurp/source/reader.cxx  |4 
 connectivity/Jar_ConnectivityTools.mk|4 
 connectivity/qa/connectivity/tools/AbstractDatabase.java |   16 
 dbaccess/JunitTest_dbaccess_complex.mk   |1 
 dbaccess/qa/complex/dbaccess/RowSet.java |  365 +--
 5 files changed, 156 insertions(+), 234 deletions(-)

New commits:
commit bf98e6acde066ce3d204c3cdcfbd06ec70f7f17d
Author: Stephan Bergmann 
Date:   Thu Jun 4 09:58:31 2015 +0200

Revert "disable JunitTest_dbaccess_complex part RowSet"

This reverts commit 217dbf61ece9318f4430780d10cef60920086de7, the test 
should
work now reliably after the preceeding "Finalizers must not access UNO 
objects"
commit.

diff --git a/dbaccess/JunitTest_dbaccess_complex.mk 
b/dbaccess/JunitTest_dbaccess_complex.mk
index e3f2c00..7a0b17b 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
 $(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
 complex.dbaccess.Beamer \
 complex.dbaccess.PropertyBag \
+complex.dbaccess.RowSet \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
commit 3766f2a0d3bc50919366b0e43f5ee8c814019c8b
Author: Stephan Bergmann 
Date:   Thu Jun 4 09:49:54 2015 +0200

Finalizers must not access UNO objects

If the object being finalized (A) has the last reference to the UNO object 
(B),
and B is actually a proxy for a remote UNO object, then A and B become 
eligible
for finalization in parallel, and the finalizer of B may already have run 
when
the finalizer for A runs.  That means that B may already have been removed 
from
the remote bridge, causing an "unknown OID" error from the remote end when 
the
finalizer of A now tries to make a call on B.

(We try to assert that close() has actually been called before finalize() 
calls
delete(), but the corresponding exception may be silently swallowed by the 
JVM
finalization machinery.)

This caused spurious "URP: queryInterface request message with unknown OID
received" failures during JunitTest_dbaccess_unoapi.

Change-Id: Ia47c3ef2c22a6adc75b1b8271eb4b3140accebe7

diff --git a/connectivity/Jar_ConnectivityTools.mk 
b/connectivity/Jar_ConnectivityTools.mk
index e398d73..fc8a861 100644
--- a/connectivity/Jar_ConnectivityTools.mk
+++ b/connectivity/Jar_ConnectivityTools.mk
@@ -19,6 +19,10 @@ $(eval $(call gb_Jar_use_jars,ConnectivityTools,\
OOoRunner \
 ))
 
+$(eval $(call gb_Jar_use_system_jars,ConnectivityTools, \
+$(OOO_JUNIT_JAR) \
+))
+
 $(eval $(call gb_Jar_set_packageroot,ConnectivityTools,connectivity))
 
 $(eval $(call gb_Jar_add_sourcefiles,ConnectivityTools,\
diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java 
b/connectivity/qa/connectivity/tools/AbstractDatabase.java
index 3207daf..f7295d9 100644
--- a/connectivity/qa/connectivity/tools/AbstractDatabase.java
+++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java
@@ -31,6 +31,7 @@ import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.CloseVetoException;
 import connectivity.tools.sdb.Connection;
 import java.io.File;
+import static org.junit.Assert.*;
 
 public abstract class AbstractDatabase implements DatabaseAccess
 {
@@ -120,7 +121,11 @@ public abstract class AbstractDatabase implements 
DatabaseAccess
 public void closeAndDelete()
 {
 close();
+delete();
+}
 
+private void delete()
+{
 if (m_databaseDocumentFile != null)
 {
 final File file = new File(m_databaseDocumentFile);
@@ -184,7 +189,16 @@ public abstract class AbstractDatabase implements 
DatabaseAccess
 @Override
 protected void finalize() throws Throwable
 {
-closeAndDelete();
+// Cannot call close() here, as it accesses UNO objects (that may
+// already have been finalized):
+assertNull(
+"missing call to connectivity.tools.AbstractDatabase.close",
+m_connection);
+assertNull(
+"missing call to connectivity.tools.AbstractDatabase.close",
+m_databaseDocument);
+
+delete();
 super.finalize();
 }
 
commit 1d7220d0346c336ca6d7fd6b79beccd1daa070cd
Author: Stephan Bergmann 
Date:   Thu Jun 4 09:21:50 2015 +0200

More informative exception message

Change-Id: If168a3be2630170636c333e177c5db0d40092cbe

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 4c0ba37..d4b4074 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -309,8 +309,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
   css::uno::XInterface > >::get())
 {
 throw css::uno::RuntimeException(
-"URP: queryInterfac

Re: URP: queryInterface request message with unknown OID received

[Stephan Bergmann]

On 06/03/2015 12:54 PM, Stephan Bergmann wrote:

On 06/02/2015 02:32 PM, Lionel Elie Mamane wrote:

So, if you would like to work on that (which would make me happier),
then apply the attached patch, then:
  make JunitTest_dbaccess_complex
several times in a row, and you should get the problem. If not, try
uncommenting more "@Test" instances.


Thanks for the reproducer.  Looking into it a bit, it smells like a
reincarnation of an ages-old phenomenon where the JVM garbage-collects
objects "too aggressively" (i.e., with the object still nominally on the
call stack, but optimized away) and we thus send a release call from
Java URP to binary URP too soon.  I'll look into it further.


Ah, not quite.  Should be fixed now with 
 
"Finalizers must not access UNO objects" (see there for details).

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d4/dcdfa54b940afb09d6086a179a02c6ff1daa40

[Caolán McNamara]

 d4/dcdfa54b940afb09d6086a179a02c6ff1daa40 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3b0660a805da4be79df6f36dcf0e1ed8cfb20514
Author: Caolán McNamara 
Date:   Thu Jun 4 09:07:53 2015 +0100

Notes added by 'git notes add'

diff --git a/d4/dcdfa54b940afb09d6086a179a02c6ff1daa40 
b/d4/dcdfa54b940afb09d6086a179a02c6ff1daa40
new file mode 100644
index 000..7239d27
--- /dev/null
+++ b/d4/dcdfa54b940afb09d6086a179a02c6ff1daa40
@@ -0,0 +1 @@
+prefer: f974db5d89eacf0c23e303c22c62972014e9db16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/unitver' - download.lst

[Andrzej Hunt]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0d21421210e222c07f700a753cb79d14dcef9cc3
Author: Andrzej Hunt 
Date:   Thu Jun 4 09:14:24 2015 +0100

Upgrade to udunits 2.2.19

This has some fixes that should help the windows build

Change-Id: I71b17ee74d5d3a9b7c0eed4805fc0136b8db0607

diff --git a/download.lst b/download.lst
index 901553c..94bd3f9 100644
--- a/download.lst
+++ b/download.lst
@@ -139,8 +139,8 @@ export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
 export SERF_TARBALL := serf-1.2.1.tar.bz2
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export UDUNITS2_MD5SUM := a2492adfbd9ae2f05a331673a2067cab
-export UDUNITS2_TARBALL := udunits-2.2.17.tar.gz
+export UDUNITS2_MD5SUM := 12aeae488567622feb51458d62cf294c
+export UDUNITS2_TARBALL := udunits-2.2.19.tar.gz
 export VIGRA_TARBALL := d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 export VISIO_MD5SUM := 726c1f5be65eb7d649e0d48b63d920e7
 export VISIO_TARBALL := libvisio-0.1.1.tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 91831] sharing gcc / UNO bridges code ...

[bugzilla-daemon]

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

Tor Lillqvist  changed:

   What|Removed |Added

 Whiteboard|easyHack difficultyBeginner |easyHack skillCpp
   |skillCpp topicCleanup   |topicCleanup

--- Comment #2 from Tor Lillqvist  ---
I agree strongly with Stephan. This is far from "difficultyBeginner". Do *not*
touch code for an architecture you can't test yourself.

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

[Caolán McNamara]

 sc/source/core/data/documen9.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fbcd55ea26b4536e7611a44fc63b79733b82b81e
Author: Caolán McNamara 
Date:   Wed Jun 3 16:51:41 2015 +0100

Resolves: tdf#90435 secondary pool set to that of temp docs drawing layers

overwriting the original one, and when the temp doc goes away then its 
drawing
layer goes away autoamtically settings the secondary pools of the other 
pools
it is a secondary of back to 0

(see also tdf#87245)

Change-Id: Ie6dd8d615f81cf4d4776eaeac1cc2507b2abaa37
(cherry picked from commit 8ae25bbc092254f680e2976873f15bdbc26615ef)

diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index f780169..3b5bd93 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -139,11 +139,11 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell 
)
 // in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
 // the PageStyle using SvxBrushItem is visualized and will be 
potentially
 // used more intense in the future
-if(xPoolHelper.is())
+if (xPoolHelper.is() && !IsClipOrUndo()) //Using IsClipOrUndo as a 
proxy for SharePooledResources called
 {
 ScDocumentPool* pLocalPool = xPoolHelper->GetDocPool();
 
-if(pLocalPool)
+if (pLocalPool)
 {
 OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a 
secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
 pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/inc/fesh.hxx  |   23 +++
 sw/source/core/frmedt/feshview.cxx   |   32 
 sw/source/ui/frmdlg/frmpage.cxx  |2 +-
 sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
 sw/source/uibase/docvw/edtdd.cxx |2 +-
 sw/source/uibase/docvw/edtwin.cxx|   20 ++--
 sw/source/uibase/shells/basesh.cxx   |   18 +-
 sw/source/uibase/shells/drawsh.cxx   |4 ++--
 sw/source/uibase/shells/drwbassh.cxx |6 +++---
 sw/source/uibase/shells/frmsh.cxx|   12 ++--
 sw/source/uibase/shells/grfsh.cxx|6 +++---
 sw/source/uibase/uiview/view.cxx |2 +-
 sw/source/uibase/uiview/viewdraw.cxx |2 +-
 sw/source/uibase/uiview/viewstat.cxx |6 +++---
 sw/source/uibase/uiview/viewtab.cxx  |8 
 15 files changed, 76 insertions(+), 69 deletions(-)

New commits:
commit 407c6c871ea53d9fb97c50e1ee24db7a8e5d70e1
Author: Noel Grandin 
Date:   Mon Jun 1 20:58:44 2015 +0200

replace FLYPROTECT with scoped enum

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

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index d0c557f..14112a6 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -104,12 +104,20 @@ namespace o3tl
 }
 
 //! values can be combined via logical or
-#define FLYPROTECT_CONTENT  (sal_uInt16)  1
-#define FLYPROTECT_SIZE (sal_uInt16)  2
-#define FLYPROTECT_POS  (sal_uInt16)  4
-#define FLYPROTECT_PARENT   (sal_uInt16)  8 ///< Check only parents.
-#define FLYPROTECT_FIXED(sal_uInt16) 16 /**< Only protection that 
cannot be withdrawn
+enum class FlyProtectFlags
+{
+NONE = 0,
+Content  = 1,
+Size = 2,
+Pos  = 4,
+Parent   = 8,  ///< Check only parents.
+Fixed= 16,/**< Only protection that cannot be withdrawn
 e.g. by OLE-server; also 
relevant for dialog. */
+};
+namespace o3tl
+{
+template<> struct typed_flags : 
is_typed_flags {};
+}
 
 // For figuring out contents by position (D&D)
 enum ObjCntType
@@ -353,9 +361,8 @@ public:
 /// @return a format too, if the point is over the text of any fly.
 const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const;
 
-/** Which Protection is set at selected object?
- returns several flags in sal_uInt8 */
-sal_uInt8 IsSelObjProtected( sal_uInt16 /*FLYPROTECT_...*/ eType ) const;
+/** Which Protection is set at selected object? */
+FlyProtectFlags IsSelObjProtected( FlyProtectFlags eType ) const;
 
 /** Deliver graphic in rName besides graphic name. If graphic is
  linked give name with path. rbLink is TRUE if graphic is linked. */
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index fe3ee4c..87661a8 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2343,10 +2343,10 @@ void SwFEShell::MakeSelVisible()
 }
 
 // how is the selected object protected?
-sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const
+FlyProtectFlags SwFEShell::IsSelObjProtected( FlyProtectFlags eType ) const
 {
-int nChk = 0;
-const bool bParent = (eType & FLYPROTECT_PARENT);
+FlyProtectFlags nChk = FlyProtectFlags::NONE;
+const bool bParent(eType & FlyProtectFlags::Parent);
 if( Imp()->HasDrawView() )
 {
 const SdrMarkList &rMrkList = 
Imp()->GetDrawView()->GetMarkedObjectList();
@@ -2355,14 +2355,14 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 
eType ) const
 SdrObject *pObj = rMrkList.GetMark( --i )->GetMarkedSdrObj();
 if( !bParent )
 {
-nChk |= ( pObj->IsMoveProtect() ? FLYPROTECT_POS : 0 ) |
-( pObj->IsResizeProtect()? FLYPROTECT_SIZE : 0 );
+nChk |= ( pObj->IsMoveProtect() ? FlyProtectFlags::Pos : 
FlyProtectFlags::NONE ) |
+( pObj->IsResizeProtect()? FlyProtectFlags::Size : 
FlyProtectFlags::NONE );
 
 if( pObj->ISA(SwVirtFlyDrawObj) )
 {
 SwFlyFrm *pFly = 
static_cast(pObj)->GetFlyFrm();
-if ( (FLYPROTECT_CONTENT & eType) && 
pFly->GetFormat()->GetProtect().IsContentProtected() )
-nChk |= FLYPROTECT_CONTENT;
+if ( (FlyProtectFlags::Content & eType) && 
pFly->GetFormat()->GetProtect().IsContentProtected() )
+nChk |= FlyProtectFlags::Content;
 
 if ( pFly->Lower() && pFly->Lower()->IsNoTextFrm() )
 {
@@ -2372,24 +2372,24 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 
eType ) const
 {
 // TODO/LATER: use correct aspect
 const 

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

[Tomaž Vajngerl]

 desktop/source/splash/splash.cxx  |   19 +-
 include/svtools/ruler.hxx |9 -
 include/vcl/status.hxx|2 
 svtools/source/contnr/treelistbox.cxx |2 
 svtools/source/control/ruler.cxx  |  248 +++---
 vcl/source/window/status.cxx  |   96 -
 6 files changed, 162 insertions(+), 214 deletions(-)

New commits:
commit 4d68f980a5b41b6713563cf7119dd7b9eb5a67d4
Author: Tomaž Vajngerl 
Date:   Thu Jun 4 16:48:31 2015 +0900

tdf#91529 hopefully fixes the issue by painting immediately

Change-Id: I0c97e489150cd65d1ab1dbff4ee9f1699f89ac2e
(cherry picked from commit aca61aa5ffa4fab458d03e469b569c50952ed077)

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 6794d15..63c8232 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -59,6 +59,8 @@ public:
 virtual void dispose() SAL_OVERRIDE;
 // workwindow
 virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) 
SAL_OVERRIDE;
+void Redraw();
+
 };
 
 class  SplashScreen
@@ -143,6 +145,15 @@ void SplashScreenWindow::dispose()
 IntroWindow::dispose();
 }
 
+void SplashScreenWindow::Redraw()
+{
+Invalidate();
+// Trigger direct painting too - otherwise the splash screen won't be
+// shown in some cases (when the idle timer won't be hit).
+Paint(*this, Rectangle());
+Flush();
+}
+
 SplashScreen::SplashScreen()
 : pWindow( new SplashScreenWindow (this) )
 , _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED))
@@ -194,8 +205,7 @@ void SAL_CALL SplashScreen::start(const OUString&, 
sal_Int32 nRange)
 if ( _eBitmapMode == BM_FULLSCREEN )
 pWindow->ShowFullScreenMode( true );
 pWindow->Show();
-pWindow->Invalidate();
-pWindow->Flush();
+pWindow->Redraw();
 }
 }
 
@@ -352,8 +362,7 @@ void SplashScreen::updateStatus()
 return;
 if (!_bPaintProgress)
 _bPaintProgress = true;
-pWindow->Invalidate();
-pWindow->Flush();
+pWindow->Redraw();
 }
 
 // internal private methods
@@ -364,7 +373,7 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, 
VclWindowEvent *, inEvent )
 switch ( inEvent->GetId() )
 {
 case VCLEVENT_WINDOW_SHOW:
-pWindow->Invalidate();
+pWindow->Redraw();
 break;
 default:
 break;
commit 4ad0738f0203d3219d5570e08836ca801624b0a4
Author: Tomaž Vajngerl 
Date:   Thu Jun 4 12:18:36 2015 +0900

fix status bar flickering (zoom slider fo example)

Change-Id: I3fb71868a9f8f56c76353f3a2d84fdb078c8f8fb
(cherry picked from commit 758916a88d6dfbabc31b8430b1cc605cb2c1e890)

diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 85a94cd..fd79dd1 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -96,7 +96,7 @@ private:
 
 using Window::ImplInit;
 SAL_DLLPRIVATE void  ImplInit( vcl::Window* pParent, WinBits nStyle );
-SAL_DLLPRIVATE void  ImplInitSettings( bool bFont, bool bForeground, 
bool bBackground );
+SAL_DLLPRIVATE void  ImplInitSettings();
 SAL_DLLPRIVATE void  ImplFormat();
 SAL_DLLPRIVATE bool  ImplIsItemUpdate();
 
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index b9669d7..211e383 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -123,7 +123,7 @@ void StatusBar::ImplInit( vcl::Window* pParent, WinBits 
nStyle )
 
 // remember WinBits
 mpItemList  = new ImplStatusItemList;
-mpImplData->mpVirDev= VclPtr::Create( *this );
+mpImplData->mpVirDev = VclPtr::Create( *this );
 mnCurItemId = 0;
 mbFormat= true;
 mbVisibleItems  = true;
@@ -137,8 +137,7 @@ void StatusBar::ImplInit( vcl::Window* pParent, WinBits 
nStyle )
 mnItemY = STATUSBAR_OFFSET_Y;
 mnTextY = STATUSBAR_OFFSET_TEXTY;
 
-ImplInitSettings( true, true, true );
-SetLineColor();
+ImplInitSettings();
 
 SetOutputSizePixel( CalcWindowSizePixel() );
 }
@@ -175,6 +174,8 @@ void StatusBar::AdjustItemWidthsForHiDPI(bool bAdjustHiDPI)
 
 void StatusBar::ApplySettings(vcl::RenderContext& rRenderContext)
 {
+rRenderContext.SetLineColor();
+
 const StyleSettings& rStyleSettings = 
rRenderContext.GetSettings().GetStyleSettings();
 vcl::Font aFont = rStyleSettings.GetToolFont();
 if (IsControlFont())
@@ -209,56 +210,15 @@ void StatusBar::ApplySettings(vcl::RenderContext& 
rRenderContext)
 }
 }
 
-void StatusBar::ImplInitSettings(bool bFont, bool bForeground, bool 
bBackground)
+void StatusBar::ImplInitSettings()
 {
-const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-
-if (bFont)
-{
-vcl::Font aFont = rStyleSettings.GetToolFont();
-if (IsControlFont())
-aFont.Merge(GetControlFon

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

[Pranav Kant]

 libreofficekit/source/gtk/lokdocview.cxx |  198 ++-
 libreofficekit/source/gtk/tilebuffer.cxx |   10 -
 libreofficekit/source/gtk/tilebuffer.hxx |   13 +-
 3 files changed, 108 insertions(+), 113 deletions(-)

New commits:
commit 5f1a56aba2a93855d77575de232c3692a6132fc3
Author: Pranav Kant 
Date:   Thu Jun 4 14:34:49 2015 +0530

lokdocview: style fixes

Change-Id: I27434cd87bef15904c8f8b98c3b260de2d957bfb

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 1faf771..ff00253 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1155,12 +1155,19 @@ static void lok_docview_init( GTypeInstance* pInstance, 
gpointer )
  "expose-event",
  G_CALLBACK(LOKDocView_Impl::renderOverlay), pDocView);
 gtk_widget_add_events(pDocView->m_pImpl->m_pDrawingArea,
-  GDK_BUTTON_PRESS_MASK
-  | GDK_BUTTON_RELEASE_MASK
-  | GDK_BUTTON_MOTION_MASK);
-g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"button-press-event", G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
-g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"button-release-event", G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
-g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"motion-notify-event", G_CALLBACK(LOKDocView_Impl::signalMotion), pDocView);
+   GDK_BUTTON_PRESS_MASK
+  |GDK_BUTTON_RELEASE_MASK
+  |GDK_BUTTON_MOTION_MASK);
+
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ "button-press-event",
+ G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ "button-release-event",
+ G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ "motion-notify-event",
+ G_CALLBACK(LOKDocView_Impl::signalMotion), pDocView);
 
 g_signal_connect(G_OBJECT(pDocView), "destroy", 
G_CALLBACK(LOKDocView_Impl::destroy), 0);
 }
commit fb7f9d21457ef274d4b6dbbf1ac534a56b5f0db5
Author: Pranav Kant 
Date:   Thu Jun 4 14:33:11 2015 +0530

lokdocview: lets use new/recommended style

Change-Id: Ib75bbcf73133560c947f062ba33f0a4284a7f8dd

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 7b5bb41..1faf771 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1148,12 +1148,12 @@ static void lok_docview_init( GTypeInstance* pInstance, 
gpointer )
 gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(pDocView),
pDocView->m_pImpl->m_pDrawingArea );
 
-g_signal_connect(GTK_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
  "expose-event",
- GTK_SIGNAL_FUNC(LOKDocView_Impl::on_exposed), pDocView);
-g_signal_connect(GTK_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ G_CALLBACK(LOKDocView_Impl::on_exposed), pDocView);
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
  "expose-event",
- GTK_SIGNAL_FUNC(LOKDocView_Impl::renderOverlay), 
pDocView);
+ G_CALLBACK(LOKDocView_Impl::renderOverlay), pDocView);
 gtk_widget_add_events(pDocView->m_pImpl->m_pDrawingArea,
   GDK_BUTTON_PRESS_MASK
   | GDK_BUTTON_RELEASE_MASK
@@ -1162,7 +1162,7 @@ static void lok_docview_init( GTypeInstance* pInstance, 
gpointer )
 g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"button-release-event", G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
 g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"motion-notify-event", G_CALLBACK(LOKDocView_Impl::signalMotion), pDocView);
 
-gtk_signal_connect(GTK_OBJECT(pDocView), "destroy", 
GTK_SIGNAL_FUNC(LOKDocView_Impl::destroy), 0);
+g_signal_connect(G_OBJECT(pDocView), "destroy", 
G_CALLBACK(LOKDocView_Impl::destroy), 0);
 }
 
 SAL_DLLPUBLIC_EXPORT guint lok_docview_get_type()
commit 733609eff2e7c2d96627cb943590d6d9ec5b35ed
Author: Pranav Kant 
Date:   Thu Jun 4 14:29:11 2015 +0530

lokdocview: add debug statements

Change-Id: I08d29a31e88f92d9c66a03573f63ab4105938119

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index fb8e4a3..7b5bb41 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -824,7 +824,7 @@ void LOKDocView_Impl::renderDocument(Gd

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

[Tomaž Vajngerl]

 svtools/source/control/ruler.cxx |   40 +++
 vcl/source/window/status.cxx |2 -
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit a3091c319d45c3793910ad88c9442e1f3949575f
Author: Tomaž Vajngerl 
Date:   Thu Jun 4 18:12:01 2015 +0900

fix cherry-pick from master

Change-Id: I8c75292755877e678cadbda8cf5b2307150fa90c

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 69bc040..ed0995e 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1469,7 +1469,7 @@ void Ruler::ImplUpdate( bool bMustCalc )
 {
 // clear lines in this place so they aren't considered at recalculation
 if (!mbFormat)
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 
 // set flags
 if (bMustCalc)
@@ -1483,7 +1483,7 @@ void Ruler::ImplUpdate( bool bMustCalc )
 // otherwise trigger update
 if (IsReallyVisible() && IsUpdateMode())
 {
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 }
 
@@ -1879,7 +1879,7 @@ bool Ruler::ImplStartDrag( RulerSelection* pHitTest, 
sal_uInt16 nModifier )
 mbDrag = true;
 mnStartDragPos = mnDragPos;
 StartTracking();
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 return true;
 }
 else
@@ -1946,7 +1946,7 @@ void Ruler::ImplDrag( const Point& rPos )
 Drag();
 
 // and redraw
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 
 // reset the data as before cancel
 *mpDragData = aTempData;
@@ -1967,7 +1967,7 @@ void Ruler::ImplDrag( const Point& rPos )
 
 // redraw
 if (mbFormat)
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 }
 
@@ -1996,7 +1996,7 @@ void Ruler::ImplEndDrag()
 mnStartDragPos  = 0;
 
 // redraw
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 
 void Ruler::MouseButtonDown( const MouseEvent& rMEvt )
@@ -2010,7 +2010,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt )
 // update ruler
 if ( mbFormat )
 {
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 
 if ( maExtraRect.IsInside( aMousePos ) )
@@ -2119,7 +2119,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt )
 
 if (mbFormat)
 {
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 }
 
@@ -2176,7 +2176,7 @@ void Ruler::Resize()
 if ( bVisible && !mpData->pLines.empty() )
 {
 mnUpdateFlags |= RULER_UPDATE_LINES;
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 
 // recalculate some values if the height/width changes
@@ -2199,7 +2199,7 @@ void Ruler::Resize()
 if ( bVisible )
 {
 if ( nNewHeight )
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 else if ( mpData->bAutoPageWidth )
 {
 // only at AutoPageWidth muss we redraw
@@ -2226,7 +2226,7 @@ void Ruler::Resize()
 aRect.Right()   = RULER_OFF + mnVirHeight;
 }
 
-Invalidate(aRect, InvalidateFlags::NoErase);
+Invalidate(aRect, INVALIDATE_NOERASE);
 }
 }
 
@@ -2318,13 +2318,13 @@ void Ruler::Activate()
 
 // update positionlies - draw is delayed
 mnUpdateFlags |= RULER_UPDATE_LINES;
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 
 void Ruler::Deactivate()
 {
 // clear positionlines
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 
 mbActive = false;
 }
@@ -2344,7 +2344,7 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, 
RulerType eDragType )
 // update ruler
 if ( mbFormat )
 {
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 
 if ( nMouseClicks == 1 )
@@ -2409,7 +2409,7 @@ RulerType Ruler::GetType( const Point& rPos, sal_uInt16* 
pAryPos )
 // update ruler
 if ( IsReallyVisible() && mbFormat )
 {
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 
 (void)ImplHitTest(rPos, &aHitTest);
@@ -2459,7 +2459,7 @@ void Ruler::SetBorderPos( long nOff )
 mnBorderOff = nOff;
 
 if ( IsReallyVisible() && IsUpdateMode() )
-Invalidate(InvalidateFlags::NoErase);
+Invalidate(INVALIDATE_NOERASE);
 }
 }
 }
@@ -2534,7 +2534,7 @@ void Ruler::SetExtraType( RulerExtra eNewExtraType, 
sal_uInt16 nStyle )
 meExtraType  = eNewExtraType;
 mnExtraStyle = nStyle;
 if (IsReallyVisible() && IsUp

No x64 Daily builds for Windows

[Pedro]

Hi all

In case no one noticed

1)  The latest daily build for Windows x86 in the 5.0 branch is from May
28th
http://dev-builds.libreoffice.org/daily/libreoffice-5-0/Win-x86@62-merge-TDF/

2) There is no Windows x64 folder in the 5.0 branch
http://dev-builds.libreoffice.org/daily/libreoffice-5-0/

3) Tinderbox 42 (the only one producing x64 Windows builds) stopped
producing any builds for the Master branch
http://dev-builds.libreoffice.org/daily/master/Win-x86@42/
http://dev-builds.libreoffice.org/daily/master/Win-x86_64@42/

Regards,
Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/No-x64-Daily-builds-for-Windows-tp4150529.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 loolwsd/configure.ac |2 +-
 loolwsd/debian/changelog |   15 +++
 loolwsd/debian/compat|1 +
 loolwsd/debian/control   |   14 ++
 loolwsd/debian/copyright |   33 +
 loolwsd/debian/postinst  |9 +
 loolwsd/debian/rules |   19 +++
 loolwsd/debian/source/format |1 +
 8 files changed, 93 insertions(+), 1 deletion(-)

New commits:
commit 6b0ab577ce78084d61fda0a896fe8fe68c18cfaa
Author: Tor Lillqvist 
Date:   Thu Jun 4 13:06:23 2015 +0300

Add Debian packaging

diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
new file mode 100644
index 000..bfb559a
--- /dev/null
+++ b/loolwsd/debian/changelog
@@ -0,0 +1,15 @@
+loolwsd (1.0.34-1) UNRELEASED; urgency=medium
+
+  * Back to packaging this for Debian.
+
+ -- Tor Lillqvist   Wed, 03 Jun 2015 20:24:50 +0300
+
+loolwsd (1.0.0-1) unstable; urgency=low
+
+  * Initial release
+
+  * Local Variables:
+  * Mode: fundamental
+  * End:
+
+ -- Tor Lillqvist   Fri, 15 May 2015 11:10:20 +0300
diff --git a/loolwsd/debian/compat b/loolwsd/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/loolwsd/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
new file mode 100644
index 000..a15e63e
--- /dev/null
+++ b/loolwsd/debian/control
@@ -0,0 +1,14 @@
+Source: loolwsd
+Section: web
+Priority: optional
+Maintainer: Tor Lillqvist 
+Build-Depends: debhelper (>= 8.0.0), libcap-dev, libcap2-bin, libpcre3-dev, 
libpng-dev, libpoco-dev (>= 1.6.0)
+Standards-Version: 3.9.2
+
+Package: loolwsd
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibreOffice On-Line WebSocket Daemon
+ LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
+ services.
diff --git a/loolwsd/debian/copyright b/loolwsd/debian/copyright
new file mode 100644
index 000..d2a2a46
--- /dev/null
+++ b/loolwsd/debian/copyright
@@ -0,0 +1,33 @@
+Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: loolwsd
+Maintainer: Tor Lillqvist 
+Source: git://gerrit.libreoffice.org/online
+
+Copyright: 2015 Collabora Productivity 
+License: MPL-2
+
+Copyright: 2004-2006, Applied Informatics Software Engineering GmbH
+License:
+   Boost Software License - Version 1.0 - August 17th, 2003
+
+   Permission is hereby granted, free of charge, to any person or organization
+   obtaining a copy of the software and accompanying documentation covered by
+   this license (the "Software") to use, reproduce, display, distribute,
+   execute, and transmit the Software, and to prepare derivative works of the
+   Software, and to permit third-parties to whom the Software is furnished to
+   do so, all subject to the following:
+
+   The copyright notices in the Software and this entire statement, including
+   the above license grant, this restriction and the following disclaimer,
+   must be included in all copies of the Software, in whole or in part, and
+   all derivative works of the Software, unless such copies or derivative
+   works are solely in the form of machine-executable object code generated by
+   a source language processor.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
diff --git a/loolwsd/debian/postinst b/loolwsd/debian/postinst
new file mode 100755
index 000..7822fc1
--- /dev/null
+++ b/loolwsd/debian/postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+configure)
+   setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
+   ;;
+esac
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
new file mode 100755
index 000..474a309
--- /dev/null
+++ b/loolwsd/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+
+include /usr/share/dpkg/default.mk
+
+CONFFLAGS = --prefix=/usr --with-lokit-path=bundled/include
+
+# Avoid setcap when doing "make", when building for packaging
+# the setcap is done at installation time
+export BUILDING_FROM_RPMBUILD=yes
+
+# main packaging script based on dh7 syntax
+%:
+   dh $@
+
+override_dh_auto_configure:
+   ./configure $(CONFFLAGS)
diff --git a/loolwsd/debian/source/format b/loolwsd/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/loolwsd/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
commit 9ab0aaed03251a958d0ccaad8803cee33a75be6f
Author: Tor Lillqvist 
Da

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

[Caolán McNamara]

 toolkit/source/awt/vclxtoolkit.cxx |   20 
 vcl/source/app/svapp.cxx   |3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 3f69547397e5841d0915921be5be8b3edfdfdbc5
Author: Caolán McNamara 
Date:   Thu Jun 4 10:06:17 2015 +0100

Resolves: tdf#46440 SIGSEGV on toolkit bootstrap without running instance

Change-Id: I9a78a75b3d72586b1702ed6fa63bb0b62ce6cd72

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 8745157..642c636 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -595,6 +596,25 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
 {
 osl_setThreadName("VCLXToolkit VCL main thread");
 
+css::uno::Reference xServiceManager;
+try
+{
+xServiceManager = ::comphelper::getProcessServiceFactory();
+}
+catch (const css::uno::DeploymentException&)
+{
+}
+if (!xServiceManager.is())
+{
+css::uno::Reference xContext =
+::cppu::defaultBootstrap_InitialComponentContext();
+
+xServiceManager = css::uno::Reference(
+xContext->getServiceManager(), css::uno::UNO_QUERY_THROW );
+// set global process service factory used by unotools config helpers
+::comphelper::setProcessServiceFactory( xServiceManager );
+}
+
 VCLXToolkit * pTk = static_cast(pArgs);
 bInitedByVCLToolkit = InitVCL();
 if( bInitedByVCLToolkit )
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 34bc5505..bf35873 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -418,7 +418,8 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
 
 bool Application::IsInMain()
 {
-return ImplGetSVData()->maAppData.mbInAppMain;
+ImplSVData* pSVData = ImplGetSVData();
+return pSVData ? pSVData->maAppData.mbInAppMain : false;
 }
 
 bool Application::IsInExecute()
___
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' - toolkit/source vcl/source

[Caolán McNamara]

 toolkit/source/awt/vclxtoolkit.cxx |   20 
 vcl/source/app/svapp.cxx   |3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 7d8383fb96a71e8ff2a5991c24dc36d82357207f
Author: Caolán McNamara 
Date:   Thu Jun 4 10:06:17 2015 +0100

Resolves: tdf#46440 SIGSEGV on toolkit bootstrap without running instance

Change-Id: I9a78a75b3d72586b1702ed6fa63bb0b62ce6cd72
(cherry picked from commit 3f69547397e5841d0915921be5be8b3edfdfdbc5)

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 5962c95..edf624a 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -595,6 +596,25 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
 {
 osl_setThreadName("VCLXToolkit VCL main thread");
 
+css::uno::Reference xServiceManager;
+try
+{
+xServiceManager = ::comphelper::getProcessServiceFactory();
+}
+catch (const css::uno::DeploymentException&)
+{
+}
+if (!xServiceManager.is())
+{
+css::uno::Reference xContext =
+::cppu::defaultBootstrap_InitialComponentContext();
+
+xServiceManager = css::uno::Reference(
+xContext->getServiceManager(), css::uno::UNO_QUERY_THROW );
+// set global process service factory used by unotools config helpers
+::comphelper::setProcessServiceFactory( xServiceManager );
+}
+
 VCLXToolkit * pTk = static_cast(pArgs);
 bInitedByVCLToolkit = InitVCL();
 if( bInitedByVCLToolkit )
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 4edae11..fc058ce 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -418,7 +418,8 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
 
 bool Application::IsInMain()
 {
-return ImplGetSVData()->maAppData.mbInAppMain;
+ImplSVData* pSVData = ImplGetSVData();
+return pSVData ? pSVData->maAppData.mbInAppMain : false;
 }
 
 bool Application::IsInExecute()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitignore

[Zsolt Bölöny]

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

New commits:
commit d67f4ed258c2103e07c7a2bd94d16b604a20a8aa
Author: Zsolt Bölöny 
Date:   Thu Jun 4 10:34:45 2015 +0200

Fix typo in .gitignore

Change-Id: Ibecee87ffe3ec6990e36952488668b790a8e54eb
Reviewed-on: https://gerrit.libreoffice.org/16076
Tested-by: Jenkins 
Reviewed-by: Joren De Cuyper 

diff --git a/.gitignore b/.gitignore
index e198d7f..6f7b854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 # As a rule of thumb:
 # File that are generated by configure or the build
 # but that are not deleted by make clean
-# can be listed here... These must be deleted by maek distclean
+# can be listed here... These must be deleted by make distclean
 #
 # Files that are generated by the build but deleted by make clean
 # should all be under workdir or instdir
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

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

New commits:
commit 656d9046a246a214c465e7984c22425c8ae9bb04
Author: Tomaž Vajngerl 
Date:   Thu Jun 4 21:07:32 2015 +0900

disable off-screen drawing of statusbar items (for now)

Change-Id: I5deac9924b99ac1b3e1440623364004b0b44aaf5

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 3cfb43c..c073621 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -729,7 +729,7 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, 
const Rectangle&)
 if (mbVisibleItems)
 {
 for (sal_uInt16 i = 0; i < nItemCount; i++)
-ImplDrawItem(rRenderContext, true, i, true, true);
+ImplDrawItem(rRenderContext, false, i, true, true);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 57e7f48633f820223e8dd1dd06af42dc164dfe26
Author: Stephan Bergmann 
Date:   Thu Jun 4 14:13:38 2015 +0200

loplugin:simplifybool

Change-Id: I19e96b882a5cc8991035a8275aebd4ff586bf9f3

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index bf35873..0fe915f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -419,7 +419,7 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
 bool Application::IsInMain()
 {
 ImplSVData* pSVData = ImplGetSVData();
-return pSVData ? pSVData->maAppData.mbInAppMain : false;
+return pSVData && pSVData->maAppData.mbInAppMain;
 }
 
 bool Application::IsInExecute()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sc/source/core/data/table2.cxx |   46 +++--
 1 file changed, 26 insertions(+), 20 deletions(-)

New commits:
commit 1ba1cbe48c40d649c33661abb32369c39a23fff4
Author: Takeshi Abe 
Date:   Thu Jun 4 02:19:09 2015 +0900

tdf#91425 CRASH - Calc Insert Columns Left

This fix is a SCCOL variant of:

commit c66d1b9fcc2244b4fd8940f17ebf4e772f09c84e
Author: Kohei Yoshida 
Date:   Thu May 5 00:23:25 2011 -0400

fdo#36406: Let's not use invalidated iterators.

std::set::erase(iterator) call invalidates the iterator of the erased
element.  We better not use it after the erase() call.  Since the number
of manual breaks should not be high enough to cause a performance
bottleneck under normal usage, a safer linear copy should just be fine.

Now, I'm not sure if this indeed is the cause of the erroneous amount
of manual breaks in the test document, but I didn't see any other likely
spot.

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

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 196eb59..4659d28 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -295,18 +295,17 @@ void ScTable::InsertCol(
 
 if (!maColManualBreaks.empty())
 {
-std::set::reverse_iterator rit = maColManualBreaks.rbegin();
-while (rit != maColManualBreaks.rend())
-{
-SCCOL nCol = *rit;
-if (nCol < nStartCol)
-break;  // while
-else
-{
-maColManualBreaks.erase( (++rit).base());
-maColManualBreaks.insert( static_cast( nCol + 
nSize));
-}
-}
+// Copy all breaks up to nStartCol (non-inclusive).
+::std::set::iterator itr1 = 
maColManualBreaks.lower_bound(nStartCol);
+::std::set aNewBreaks(maColManualBreaks.begin(), itr1);
+
+// Copy all breaks from nStartCol (inclusive) to the last element,
+// but add nSize to each value.
+::std::set::iterator itr2 = maColManualBreaks.end();
+for (; itr1 != itr2; ++itr1)
+aNewBreaks.insert(static_cast(*itr1 + nSize));
+
+maColManualBreaks.swap(aNewBreaks);
 }
 }
 
@@ -376,14 +375,21 @@ void ScTable::DeleteCol(
 
 if (!maColManualBreaks.empty())
 {
-std::set::iterator it = maColManualBreaks.upper_bound( 
static_cast( nStartCol + nSize - 1));
-maColManualBreaks.erase( maColManualBreaks.lower_bound( 
nStartCol), it);
-while (it != maColManualBreaks.end())
-{
-SCCOL nCol = *it;
-maColManualBreaks.erase( it++);
-maColManualBreaks.insert( static_cast( nCol - nSize));
-}
+// Erase all manual breaks between nStartCol and nStartCol + nSize 
- 1 (inclusive).
+std::set::iterator itr1 = 
maColManualBreaks.lower_bound(nStartCol);
+std::set::iterator itr2 = 
maColManualBreaks.upper_bound(static_cast(nStartCol + nSize - 1));
+maColManualBreaks.erase(itr1, itr2);
+
+// Copy all breaks from the 1st element up to nStartCol to the new 
container.
+itr1 = maColManualBreaks.lower_bound(nStartCol);
+::std::set aNewBreaks(maColManualBreaks.begin(), itr1);
+
+// Copy all breaks from nStartCol to the last element, but 
subtract each value by nSize.
+itr2 = maColManualBreaks.end();
+for (; itr1 != itr2; ++itr1)
+aNewBreaks.insert(static_cast(*itr1 - nSize));
+
+maColManualBreaks.swap(aNewBreaks);
 }
 }
 
___
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

[Tomaž Vajngerl]

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

New commits:
commit 5c6b66249e05ab1cbc4e29d08552347c1dc29c29
Author: Tomaž Vajngerl 
Date:   Thu Jun 4 21:07:32 2015 +0900

disable off-screen drawing of statusbar items (for now)

Change-Id: I5deac9924b99ac1b3e1440623364004b0b44aaf5

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 01de587..0909bb7 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -729,7 +729,7 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, 
const Rectangle&)
 if (mbVisibleItems)
 {
 for (sal_uInt16 i = 0; i < nItemCount; i++)
-ImplDrawItem(rRenderContext, true, i, true, true);
+ImplDrawItem(rRenderContext, false, i, true, true);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sc/source/core/data/table2.cxx |   46 +++--
 1 file changed, 26 insertions(+), 20 deletions(-)

New commits:
commit 0856fa11ec5319231c3927a2ba595ab500262dc1
Author: Takeshi Abe 
Date:   Thu Jun 4 02:19:09 2015 +0900

tdf#91425 CRASH - Calc Insert Columns Left

This fix is a SCCOL variant of:

commit c66d1b9fcc2244b4fd8940f17ebf4e772f09c84e
Author: Kohei Yoshida 
Date:   Thu May 5 00:23:25 2011 -0400

fdo#36406: Let's not use invalidated iterators.

std::set::erase(iterator) call invalidates the iterator of the erased
element.  We better not use it after the erase() call.  Since the number
of manual breaks should not be high enough to cause a performance
bottleneck under normal usage, a safer linear copy should just be fine.

Now, I'm not sure if this indeed is the cause of the erroneous amount
of manual breaks in the test document, but I didn't see any other likely
spot.

Change-Id: I0c2e8f738949776aa7f8ea5528e2c0eeb9351c16
Reviewed-on: https://gerrit.libreoffice.org/16063
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 1ba1cbe48c40d649c33661abb32369c39a23fff4)
Reviewed-on: https://gerrit.libreoffice.org/16080

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 660a776..59c31ab 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -295,18 +295,17 @@ void ScTable::InsertCol(
 
 if (!maColManualBreaks.empty())
 {
-std::set::reverse_iterator rit = maColManualBreaks.rbegin();
-while (rit != maColManualBreaks.rend())
-{
-SCCOL nCol = *rit;
-if (nCol < nStartCol)
-break;  // while
-else
-{
-maColManualBreaks.erase( (++rit).base());
-maColManualBreaks.insert( static_cast( nCol + 
nSize));
-}
-}
+// Copy all breaks up to nStartCol (non-inclusive).
+::std::set::iterator itr1 = 
maColManualBreaks.lower_bound(nStartCol);
+::std::set aNewBreaks(maColManualBreaks.begin(), itr1);
+
+// Copy all breaks from nStartCol (inclusive) to the last element,
+// but add nSize to each value.
+::std::set::iterator itr2 = maColManualBreaks.end();
+for (; itr1 != itr2; ++itr1)
+aNewBreaks.insert(static_cast(*itr1 + nSize));
+
+maColManualBreaks.swap(aNewBreaks);
 }
 }
 
@@ -376,14 +375,21 @@ void ScTable::DeleteCol(
 
 if (!maColManualBreaks.empty())
 {
-std::set::iterator it = maColManualBreaks.upper_bound( 
static_cast( nStartCol + nSize - 1));
-maColManualBreaks.erase( maColManualBreaks.lower_bound( 
nStartCol), it);
-while (it != maColManualBreaks.end())
-{
-SCCOL nCol = *it;
-maColManualBreaks.erase( it++);
-maColManualBreaks.insert( static_cast( nCol - nSize));
-}
+// Erase all manual breaks between nStartCol and nStartCol + nSize 
- 1 (inclusive).
+std::set::iterator itr1 = 
maColManualBreaks.lower_bound(nStartCol);
+std::set::iterator itr2 = 
maColManualBreaks.upper_bound(static_cast(nStartCol + nSize - 1));
+maColManualBreaks.erase(itr1, itr2);
+
+// Copy all breaks from the 1st element up to nStartCol to the new 
container.
+itr1 = maColManualBreaks.lower_bound(nStartCol);
+::std::set aNewBreaks(maColManualBreaks.begin(), itr1);
+
+// Copy all breaks from nStartCol to the last element, but 
subtract each value by nSize.
+itr2 = maColManualBreaks.end();
+for (; itr1 != itr2; ++itr1)
+aNewBreaks.insert(static_cast(*itr1 - nSize));
+
+maColManualBreaks.swap(aNewBreaks);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sc/source/core/data/table2.cxx |   46 +++--
 1 file changed, 26 insertions(+), 20 deletions(-)

New commits:
commit c41f604ecf65550bcb456f8a635aa6d534e9452b
Author: Takeshi Abe 
Date:   Thu Jun 4 02:19:09 2015 +0900

tdf#91425 CRASH - Calc Insert Columns Left

This fix is a SCCOL variant of:

commit c66d1b9fcc2244b4fd8940f17ebf4e772f09c84e
Author: Kohei Yoshida 
Date:   Thu May 5 00:23:25 2011 -0400

fdo#36406: Let's not use invalidated iterators.

std::set::erase(iterator) call invalidates the iterator of the erased
element.  We better not use it after the erase() call.  Since the number
of manual breaks should not be high enough to cause a performance
bottleneck under normal usage, a safer linear copy should just be fine.

Now, I'm not sure if this indeed is the cause of the erroneous amount
of manual breaks in the test document, but I didn't see any other likely
spot.

Change-Id: I0c2e8f738949776aa7f8ea5528e2c0eeb9351c16
Reviewed-on: https://gerrit.libreoffice.org/16063
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 1ba1cbe48c40d649c33661abb32369c39a23fff4)
Reviewed-on: https://gerrit.libreoffice.org/16081

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index fad5443..95eee7f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -295,18 +295,17 @@ void ScTable::InsertCol(
 
 if (!maColManualBreaks.empty())
 {
-std::set::reverse_iterator rit = maColManualBreaks.rbegin();
-while (rit != maColManualBreaks.rend())
-{
-SCCOL nCol = *rit;
-if (nCol < nStartCol)
-break;  // while
-else
-{
-maColManualBreaks.erase( (++rit).base());
-maColManualBreaks.insert( static_cast( nCol + 
nSize));
-}
-}
+// Copy all breaks up to nStartCol (non-inclusive).
+::std::set::iterator itr1 = 
maColManualBreaks.lower_bound(nStartCol);
+::std::set aNewBreaks(maColManualBreaks.begin(), itr1);
+
+// Copy all breaks from nStartCol (inclusive) to the last element,
+// but add nSize to each value.
+::std::set::iterator itr2 = maColManualBreaks.end();
+for (; itr1 != itr2; ++itr1)
+aNewBreaks.insert(static_cast(*itr1 + nSize));
+
+maColManualBreaks.swap(aNewBreaks);
 }
 }
 
@@ -376,14 +375,21 @@ void ScTable::DeleteCol(
 
 if (!maColManualBreaks.empty())
 {
-std::set::iterator it = maColManualBreaks.upper_bound( 
static_cast( nStartCol + nSize - 1));
-maColManualBreaks.erase( maColManualBreaks.lower_bound( 
nStartCol), it);
-while (it != maColManualBreaks.end())
-{
-SCCOL nCol = *it;
-maColManualBreaks.erase( it++);
-maColManualBreaks.insert( static_cast( nCol - nSize));
-}
+// Erase all manual breaks between nStartCol and nStartCol + nSize 
- 1 (inclusive).
+std::set::iterator itr1 = 
maColManualBreaks.lower_bound(nStartCol);
+std::set::iterator itr2 = 
maColManualBreaks.upper_bound(static_cast(nStartCol + nSize - 1));
+maColManualBreaks.erase(itr1, itr2);
+
+// Copy all breaks from the 1st element up to nStartCol to the new 
container.
+itr1 = maColManualBreaks.lower_bound(nStartCol);
+::std::set aNewBreaks(maColManualBreaks.begin(), itr1);
+
+// Copy all breaks from nStartCol to the last element, but 
subtract each value by nSize.
+itr2 = maColManualBreaks.end();
+for (; itr1 != itr2; ++itr1)
+aNewBreaks.insert(static_cast(*itr1 - nSize));
+
+maColManualBreaks.swap(aNewBreaks);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 loleaflet/Makefile   |2 +-
 loolwsd/debian/rules |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 314a9ba826744abf93dec52cec6b5e8f58787797
Author: Tor Lillqvist 
Date:   Thu Jun 4 15:53:19 2015 +0300

We want --localstatedir=/var on Debian

diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 474a309..a1e9d92 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --with-lokit-path=bundled/include
+CONFFLAGS = --prefix=/usr --localstatedir=/var 
--with-lokit-path=bundled/include
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
commit 28d28dd67cb45bee8dff5e26ea15e5c0ea39cf72
Author: Tor Lillqvist 
Date:   Thu Jun 4 14:20:11 2015 +0300

Bump version after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 61d54f2..4b95dc5 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.10
+VERSION=1.0.11
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit 41c5359d828ba7559ee0d9e4a09532dd77c62251
Author: Tor Lillqvist 
Date:   Thu Jun 4 14:19:48 2015 +0300

Bump version for tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 6ae9e76..61d54f2 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.9
+VERSION=1.0.10
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/view/vprint.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit eea5ac7910d61796d77fe2cc03681dd24bb7dd95
Author: Caolán McNamara 
Date:   Thu Jun 4 11:41:30 2015 +0100

Resolves: tdf#84483 postit layout not available in print preview mode

for the moment don't crash anyway, maybe we can rearrange matters
to make this possible.

Change-Id: I2dc9831e5b026004b2f7603e618330154dbd6d1b

diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 87997be..1096448 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -537,9 +537,10 @@ bool SwViewShell::PrintOrPDFExport(
 
 SwPaintQueue::Repaint();
 
-if (nPostItMode == POSTITS_INMARGINS)
+SwPostItMgr *pPostItManager = (nPostItMode == POSTITS_INMARGINS) ?
+pShell->GetPostItMgr() : NULL;
+if (pPostItManager)
 {
-SwPostItMgr *pPostItManager = pShell->GetPostItMgr();
 pPostItManager->CalcRects();
 pPostItManager->LayoutPostIts();
 pPostItManager->DrawNotesForPage(pOutDev, nPage-1);
___
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

[Caolán McNamara]

 sw/source/core/view/vprint.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 84c9d54eb3c007066908794a1443dca6670a3922
Author: Caolán McNamara 
Date:   Thu Jun 4 11:41:30 2015 +0100

Resolves: tdf#84483 postit layout not available in print preview mode

for the moment don't crash anyway, maybe we can rearrange matters
to make this possible.

Change-Id: I2dc9831e5b026004b2f7603e618330154dbd6d1b
(cherry picked from commit eea5ac7910d61796d77fe2cc03681dd24bb7dd95)

diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index b674f92..f2997ce 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -537,9 +537,10 @@ bool SwViewShell::PrintOrPDFExport(
 
 SwPaintQueue::Repaint();
 
-if (nPostItMode == POSTITS_INMARGINS)
+SwPostItMgr *pPostItManager = (nPostItMode == POSTITS_INMARGINS) ?
+pShell->GetPostItMgr() : NULL;
+if (pPostItManager)
 {
-SwPostItMgr *pPostItManager = pShell->GetPostItMgr();
 pPostItManager->CalcRects();
 pPostItManager->LayoutPostIts();
 pPostItManager->DrawNotesForPage(pOutDev, nPage-1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - extensions/source extensions/uiconfig

[Miklos Vajna]

 extensions/source/abpilot/abpfinalpage.cxx|   17 +++
 extensions/source/abpilot/abpfinalpage.hxx|3 +
 extensions/source/abpilot/abspilot.cxx|3 -
 extensions/source/abpilot/addresssettings.hxx |1 
 extensions/source/abpilot/datasourcehandling.cxx  |   52 --
 extensions/source/abpilot/datasourcehandling.hxx  |3 -
 extensions/uiconfig/sabpilot/ui/datasourcepage.ui |   22 +++--
 7 files changed, 92 insertions(+), 9 deletions(-)

New commits:
commit b3f5ab776591f134e5f1692e745f62a2df599a67
Author: Miklos Vajna 
Date:   Thu Jun 4 14:19:38 2015 +0200

abpilot: embed the data source definition, if possible + requested

Change-Id: I0e70459e331995388b36c77c351bff89ece004a6

diff --git a/extensions/source/abpilot/abspilot.cxx 
b/extensions/source/abpilot/abspilot.cxx
index 459f321..1ef0ebe 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -158,7 +158,7 @@ namespace abp
 m_aNewDataSource.rename( m_aSettings.sDataSourceName );
 
 // 1. the data source
-m_aNewDataSource.store();
+m_aNewDataSource.store(m_aSettings);
 
 // 2. check if we need to register the data source
 if ( m_aSettings.bRegisterDataSource )
diff --git a/extensions/source/abpilot/datasourcehandling.cxx 
b/extensions/source/abpilot/datasourcehandling.cxx
index 3895268..f3d6268 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -22,6 +22,7 @@
 #include "abptypes.hxx"
 #include "componentmodule.hxx"
 #include "datasourcehandling.hxx"
+#include "addresssettings.hxx"
 
 #include 
 #include 
@@ -46,7 +47,28 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
+namespace
+{
+
+/// Returns the URL of this object shell.
+OUString lcl_getOwnURL(SfxObjectShell* pObjectShell)
+{
+OUString aRet;
+
+if (!pObjectShell)
+return aRet;
+
+const INetURLObject& rURLObject = 
pObjectShell->GetMedium()->GetURLObject();
+aRet = rURLObject.GetMainURL(INetURLObject::DECODE_WITH_CHARSET);
+return aRet;
+}
+
+}
 
 namespace abp
 {
@@ -54,6 +76,7 @@ namespace abp
 
 using namespace ::utl;
 using namespace ::comphelper;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdb;
@@ -347,8 +370,7 @@ namespace abp
 delete m_pImpl;
 }
 
-
-void ODataSource::store()
+void ODataSource::store(const AddressSettings& rSettings)
 {
 if (!isValid())
 // nothing to do
@@ -361,7 +383,31 @@ namespace abp
 xStorable.set(xDocAccess->getDatabaseDocument(), 
css::uno::UNO_QUERY);
 OSL_ENSURE( xStorable.is(),"DataSource is no XStorable!" );
 if ( xStorable.is() )
-
xStorable->storeAsURL(m_pImpl->sName,Sequence());
+{
+SfxObjectShell* pObjectShell = 
SfxViewFrame::Current()->GetObjectShell();
+OUString aOwnURL = lcl_getOwnURL(pObjectShell);
+if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource)
+{
+// Cannot or should not embed.
+
xStorable->storeAsURL(m_pImpl->sName,Sequence());
+}
+else
+{
+// Embed.
+OUString aStreamRelPath = "EmbeddedDatabase";
+OUString sTmpName = "vnd.sun.star.pkg://";
+sTmpName += INetURLObject::encode(aOwnURL, 
INetURLObject::PART_AUTHORITY, INetURLObject::ENCODE_ALL);
+sTmpName += "/" + aStreamRelPath;
+uno::Reference xStorage = 
pObjectShell->GetStorage();
+uno::Sequence aSequence = 
comphelper::InitPropertySequence(
+{
+{"TargetStorage", uno::makeAny(xStorage)},
+{"StreamRelPath", uno::makeAny(aStreamRelPath)}
+});
+xStorable->storeAsURL(sTmpName, aSequence);
+m_pImpl->sName = sTmpName;
+}
+}
 }
 catch(const Exception&)
 {
diff --git a/extensions/source/abpilot/datasourcehandling.hxx 
b/extensions/source/abpilot/datasourcehandling.hxx
index fd4a75f..0d96f1d 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -95,6 +95,7 @@ namespace abp
 
 struct ODataSourceImpl;
 struct PackageAccessControl;
+struct AddressSettings;
 /** a non-UNO wrapper for a data source
 This class allows to access data sources without the need to 
compile the respective file with
 exception handling enabled (hopefully :).
@@ -159,7 +160,7 @@ namespace abp
 voiddisconnect( );
 
 

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

[Katarina Behrens]

 svx/source/tbxctrls/tbcontrl.cxx |  101 ---
 1 file changed, 63 insertions(+), 38 deletions(-)

New commits:
commit 42f4a65103a1a6d281ea201392aae97213421ff4
Author: Katarina Behrens 
Date:   Thu Jun 4 12:11:42 2015 +0200

tdf#91840: Default to transparent text background

(+ label the button)

Change-Id: Icc6a0c5e3e715bcfe1392496bef2514fd1bdb62b

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9db5611..2e668f2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1230,6 +1230,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& 
   rCommand,
 {
 case SID_ATTR_CHAR_COLOR_BACKGROUND:
 case SID_BACKGROUND_COLOR:
+case SID_ATTR_CHAR_BACK_COLOR:
 {
 mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
 mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) 
);
@@ -1380,6 +1381,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl)
 {
 case SID_ATTR_CHAR_COLOR_BACKGROUND:
 case SID_BACKGROUND_COLOR:
+case SID_ATTR_CHAR_BACK_COLOR:
 {
 aColor = COL_TRANSPARENT;
 break;
commit 0deb0326b32cdb2b90b620b3403128196c2d4d74
Author: Katarina Behrens 
Date:   Thu Jun 4 12:07:24 2015 +0200

Use switch-case instead of overly long 'if (a || b || ...)'

they were growing a bit out of control

Change-Id: I80441179b4d4aacc57c469fc8f3a3937866ceae8

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 25847fa..9db5611 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1226,43 +1226,54 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUString&rCommand,
 mpColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK 
| WB_NO_DIRECTSELECT | WB_TABSTOP) );
 mpRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | 
WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) );
 
-if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR 
== theSlotId )
+switch ( theSlotId )
 {
-mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
-mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
-}
-else if ( SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == 
theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId )
-{
-SfxPoolItem* pDummy;
-
-Reference< XDispatchProvider > aDisp( GetFrame()->getController(), 
UNO_QUERY );
-SfxQueryStatus aQueryStatus( aDisp,
- SID_ATTR_AUTO_COLOR_INVALID,
- OUString( ".uno:AutoColorInvalid" ));
-SfxItemState eState = aQueryStatus.QueryState( pDummy );
-if( (SfxItemState::DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == 
theSlotId ) )
+case SID_ATTR_CHAR_COLOR_BACKGROUND:
+case SID_BACKGROUND_COLOR:
 {
-mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
-mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) 
);
+mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
+mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) 
);
+break;
+}
+case SID_ATTR_CHAR_COLOR:
+case SID_ATTR_CHAR_COLOR2:
+case SID_EXTRUSION_3D_COLOR:
+{
+SfxPoolItem* pDummy;
+
+Reference< XDispatchProvider > aDisp( GetFrame()->getController(), 
UNO_QUERY );
+SfxQueryStatus aQueryStatus( aDisp,
+ SID_ATTR_AUTO_COLOR_INVALID,
+ OUString( ".uno:AutoColorInvalid" ));
+SfxItemState eState = aQueryStatus.QueryState( pDummy );
+if( (SfxItemState::DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR 
== theSlotId ) )
+{
+mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) 
);
+mpColorSet->SetAccessibleName( SVX_RESSTR( 
RID_SVXSTR_TEXTCOLOR ) );
+}
+break;
+}
+case SID_FRAME_LINECOLOR:
+{
+mpButtonAutoColor->Hide();
+mpAutomaticSeparator->Hide();
+mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR 
) );
+break;
+}
+case SID_ATTR_LINE_COLOR:
+{
+mpButtonAutoColor->Hide();
+mpAutomaticSeparator->Hide();
+mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) 
);
+break;
+}
+case SID_ATTR_FILL_COLOR:
+{
+mpButtonAutoColor->Hide();
+mpAutomaticSeparator->Hide();
+mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FILLCOLOR ) 
);
+   

Re: test infrastructure ideas appreciated ...

[Noel Grandin]

On 2015-06-03 03:33 PM, Michael Meeks wrote:


The ESC are interested in improving unit (and other automated) testing
and are interested in concrete ideas for implementing new automated
tests to prevent regressions.


Hi

mjayfrancis(IRC) is doing some interesting automated-UI testing work using the UNO accessibility API - perhaps get him 
on contract to finish it up and make it nice?


Perhaps a contract to convert the Java unit tests to C++?

Perhaps hand out some SSD's to our top QA people (and any other developers that need them, but I think most of them 
already have one), should speed up their workflow a little.


Regards, Noel


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

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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 987a7c933836282cb4c0cf46ec55d98a61461594
Author: matteocam 
Date:   Thu Jun 4 10:42:47 2015 -0400

Calling ReformatText after setting para object in src box

Change-Id: I1c27ec0e91a248d894af929dde11a311089de259

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index e60cbb8..804cacb 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -730,7 +730,7 @@ void SdrTextObj::impDecomposeContourTextPrimitive(
 
 void SdrTextObj::impLeaveOnlyNonOverflowingText() const
 {
-// Cut non overflowing text // FIXME: Move this in separate function
+// Cut non overflowing text
 NonOverflowingText *pNonOverflowingTxt =
 pEdtOutl->GetNonOverflowingText();
 SdrOutliner &rOutliner = ImpGetDrawOutliner();
@@ -756,6 +756,7 @@ void SdrTextObj::impLeaveOnlyNonOverflowingText() const
 
 OutlinerParaObject *pNewText = rOutliner.CreateParaObject();
 const_cast(this)->NbcSetOutlinerParaObject(pNewText);
+const_cast(this)->ReformatText();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/appl/app.cxx |4 ++--
 sfx2/source/appl/appserv.cxx |2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 588591d94803c8e3807000e9f9bdbaeaae69fecd
Author: Stephan Bergmann 
Date:   Thu Jun 4 16:59:56 2015 +0200

Match basicide_macro_organizer in basctl/source/basicide/basobj2.cxx

Change-Id: Ib185645e84f8792d3ed29e7d5e674e5e7cc39fc5

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 43fc768..9b2b88c 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -468,14 +468,14 @@ void SfxApplication::Invalidate( sal_uInt16 nId )
 #ifndef DISABLE_DYNLOADING
 
 typedef long (SAL_CALL *basicide_handle_basic_error)(void*);
-typedef void* (SAL_CALL *basicide_macro_organizer)(sal_Int16);
+typedef void (SAL_CALL *basicide_macro_organizer)(sal_Int16);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
 extern "C" long basicide_handle_basic_error(void*);
-extern "C" void *basicide_macro_organizer(sal_Int16);
+extern "C" void basicide_macro_organizer(sal_Int16);
 
 #endif
 
commit 530ebc516b89af2b14c94eaa184c0fe7953e655a
Author: Stephan Bergmann 
Date:   Thu Jun 4 16:58:02 2015 +0200

unused

Change-Id: Ie11bf740c0ae672e7e1b14652f93bb6222bf45b7

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 40c8014..70645ee 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -833,14 +833,12 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 #ifndef DISABLE_DYNLOADING
 
 typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, 
rtl_uString*);
-typedef void (SAL_CALL *basicide_macro_organizer)( sal_Int16 );
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
 extern "C" rtl_uString* basicide_choose_macro(XModel*, sal_Bool, rtl_uString*);
-extern "C" void basicide_macro_organizer( sal_Int16 );
 
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sfx2/source/appl/appserv.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8439ca1b42276aef19971cd8b321f12001355d6
Author: Stephan Bergmann 
Date:   Thu Jun 4 17:20:51 2015 +0200

Match basicide_choose_macro in basctl/source/basicide/basobj2.cxx

Change-Id: I9add8be1c20c2529edf8d8616fe5e372938cd355

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 70645ee..8efbbb6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -832,13 +832,13 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 
 #ifndef DISABLE_DYNLOADING
 
-typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(XModel*, sal_Bool, 
rtl_uString*);
+typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, sal_Bool, 
rtl_uString*);
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
 #else
 
-extern "C" rtl_uString* basicide_choose_macro(XModel*, sal_Bool, rtl_uString*);
+extern "C" rtl_uString* basicide_choose_macro(void*, sal_Bool, rtl_uString*);
 
 #endif
 
___
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

[Caolán McNamara]

 sw/source/core/access/accfrmobj.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0ae00643fc87ca30ddf788df9f31cec8dae4e544
Author: Caolán McNamara 
Date:   Thu Jun 4 16:20:18 2015 +0100

GetWin seen as NULL sometimes

Change-Id: I08974e3a8a3f34e2c1f0843c536e72ca0eb4b29d
(cherry picked from commit 4bf829ba2a4e02188b41064759d17eaf57f22dfe)

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index ce9d3d8..a1bd0bf 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -262,10 +262,14 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& 
rAccMap ) const
 }
 else if ( mpWindow )
 {
-aBox = SwRect( rAccMap.GetShell()->GetWin()->PixelToLogic(
-Rectangle( mpWindow->GetPosPixel(),
-   mpWindow->GetSizePixel() ) 
) );
-}
+vcl::Window *pWin = rAccMap.GetShell()->GetWin();
+if (pWin)
+{
+aBox = SwRect( pWin->PixelToLogic(
+Rectangle( mpWindow->GetPosPixel(),
+   
mpWindow->GetSizePixel() ) ) );
+}
+}
 
 return aBox;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 writerfilter/source/dmapper/DomainMapper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b89f112f16e6780acb7bccf4277a8f6f39433a5e
Author: Mike Kaganski 
Date:   Thu Jun 4 17:02:44 2015 +1000

DomainMapper::lcl_attribute: fix missing break

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

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5542cca..8c28cd3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -899,6 +899,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 break;
 case NS_ooxml::LN_CT_FtnEdnRef_id:
 // footnote or endnote reference id - not needed
+break;
 case NS_ooxml::LN_CT_Color_themeColor:
 m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, 
"themeColor", TDefTableHandler::getThemeColorTypeString(nIntValue));
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/access/accfrmobj.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 4bf829ba2a4e02188b41064759d17eaf57f22dfe
Author: Caolán McNamara 
Date:   Thu Jun 4 16:20:18 2015 +0100

GetWin seen as NULL sometimes

Change-Id: I08974e3a8a3f34e2c1f0843c536e72ca0eb4b29d

diff --git a/sw/source/core/access/accfrmobj.cxx 
b/sw/source/core/access/accfrmobj.cxx
index ce9d3d8..a1bd0bf 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -262,10 +262,14 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& 
rAccMap ) const
 }
 else if ( mpWindow )
 {
-aBox = SwRect( rAccMap.GetShell()->GetWin()->PixelToLogic(
-Rectangle( mpWindow->GetPosPixel(),
-   mpWindow->GetSizePixel() ) 
) );
-}
+vcl::Window *pWin = rAccMap.GetShell()->GetWin();
+if (pWin)
+{
+aBox = SwRect( pWin->PixelToLogic(
+Rectangle( mpWindow->GetPosPixel(),
+   
mpWindow->GetSizePixel() ) ) );
+}
+}
 
 return aBox;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sc/source/core/data/table4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a977937927729eaff61bd670fdd45d3508b19371
Author: Mike Kaganski 
Date:   Fri Jun 5 00:10:24 2015 +1000

tdf#90996: don't overwrite comments in ScTable::FillFormulaVertical

IDF_CONTENTS includes IDF_NOTE, which should not be used here

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

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 46025f9..be1bc8f 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1170,7 +1170,7 @@ void ScTable::FillFormulaVertical(
 if (aSpans.empty())
 return;
 
-aCol[nCol].DeleteRanges(aSpans, IDF_CONTENTS, false);
+aCol[nCol].DeleteRanges(aSpans, IDF_VALUE | IDF_DATETIME | IDF_STRING | 
IDF_FORMULA | IDF_OUTLINE, false);
 aCol[nCol].CloneFormulaCell(rSrcCell, sc::CellTextAttr(), aSpans, NULL);
 
 boost::shared_ptr pSet(new 
sc::ColumnBlockPositionSet(*pDocument));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Sophie, Norbert, Stephan, Eike, Miklos, Robinson, Kendy, Noel,
  Bjoern, Jacobo, Muthu, Jay, Andras, Michael M, Caolan
 
* Completed Action Items:
+ kick-off a set of "who wants what test infrastructure" thread (Michael)
+ poke 2x certification candidates (Stephan)
[ working through mailing list setup with Italo & waiting responses ]
+ chasing un-translated 4.4 string (Sophie)
 [ a commit with hard-coded string, made translatable later but not
   back-ported due to the freeze => should break the rule & back-port
   it's an important string in the UI.
   Please back-port commit:
   commit bf6a14e0ba4eb2a47da0146379ec905089ab3a6c
  ]
+ add ooenv MALLOC_CHECK etc. to script wrapper for tinderboxes (Norbert)
 [ Would (by now) only improve the build tooling -> axe it ]
 
* Pending Action Items:
+ find some developer/sysadmin'y type people to train in CI maintenance 
(Cloph/Norbert)
[ had a chat after the call with Cloph - started this; ongoing ]
+ move problem writer tests from check -> subsequentcheck for sw.all 
(Michael S)
+ encourage QA guys to test mork / thunderbird bits on Win64 (Robinson)
 [ encouraged people to build there; have only 1x tinderbox that
   can make builds but isn't.
   In the process of buying bare-metal Win64 infra boxes (Norbert)
   + pending delivery etc. couple of weeks ?
   + spec. decided on - and in TDF procurement
   Who runs the Win64 tinderbox ? (Michael)
AI:+ Thorsten - can we get builds up-loaded (?) ]
 
* Release Engineering update (Robinson)
+ 5.0.0 - Beta 2
  + going to tag shortly, and get builds out soon.
 + Status ? (Norbert)
 + need Cloph's help to trigger builds (Robinson)
 + good to ping Bjoern/Rene/Norbert when tagging (Norbert)
 + build/sign machines have v. limited access (Norbert)
  + Late Feature Status (Michael)
 + LibreOfficeKit / Online tweaks (Kendy)
 + mostly fixes this week etc.
 + OpenGL / double-buffer RenderContext (Kendy)
 + similar - lots of fixes, some other bits for review in gerrit
 + gtk3+ theming, embedded video, cut/paste (Caolan)
 + no concerns.
 + toolbar search / wrap-around (Kendy)
 [ got its reviews & went in ]
 + text wrapping for chart labels (Marco)
 [ punted to 5.1 -> remove]
 + orcus with gnumeric import (Markus)
 [ build issues -> will not push to 5.0 ... -> remove. ]
 + Win64
 + pending more QA work.
+ 4.4.4 RC2 status
 + freeze next week / last fixes ?
+ Android & iOS Remote
* Menu changes / help & documentation handling (Jay / Sophie)
+ Interface / communication concerns between Help & Development (Sophie)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=91781
+ How do we tell docs team wrt. change ? (Norbert)
+ docs team don't work on help files (Sophie)
+ dev. team thinks docs team is working on it & they are unable
  to edit the help & are under-resourced
+ talked wrt. what is technically necessary to edit help files (Kendy)
+ Pushing in changes to re-org the menu bar (Jay)
+ changes would affect docs as well as help.
+ how to approach that ?
+ editing the help XML files - easier than changing
  menu XML descriptions (Miklos)
+ documentation more problematic than help (Jay)
+ not reasonable to ask dev to fix documentation screenshots (Norbert)
+ important to fix the limbo problem between dev & docs
+ Changes made will affect people too (Jay)
+ good to do that in 5.0 (Kendy)
+ hoping to get them in there, completing toolbars / context menus 
(Jay)
+ completed the menu-bars for writer, calc, impress, draw
+ reviewing the changes currently (Sophie)
+ don't want to loose functionality.
+ Wiki Help makes it easy & familiar to change the help (Kendy)
+ grow the community of those able to lead improvements in the help.
+ technically barrier to entry stops those who have good writing skills
  but perhaps less technical / manual-XML editing familiarity.
+ not there yet unfortunately.
+ no easy path for editable 5.0
+ what is the mechanism for notifying docs generally ? (Norbert)
+ an issue and a wiki-page about this (Sophie)
+ Currently a wiki page with 4.4 and 4.5 UI / string changes (Jay)
+ 
https://wiki.documentfoundation.org/Documentation/RecentStringChanges
AI: + link it from the developer pages (Sophie)
+ ideally we'd automatically generate screensh

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

[Miklos Vajna]

 extensions/source/abpilot/datasourcehandling.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 3705cf82121667674b582e9317d972b1ac9d57f4
Author: Miklos Vajna 
Date:   Thu Jun 4 17:48:27 2015 +0200

abpilot: refer embedded data source from doc settings

So that even if the address book data source wizard creates the embedded
data source, next time the document is loaded, we can find it.

Change-Id: Ibb11fa119fb27976437e54bed1d590cfd9863236

diff --git a/extensions/source/abpilot/datasourcehandling.cxx 
b/extensions/source/abpilot/datasourcehandling.cxx
index f3d6268..0115775 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -406,6 +406,12 @@ namespace abp
 });
 xStorable->storeAsURL(sTmpName, aSequence);
 m_pImpl->sName = sTmpName;
+
+// Refer to the sub-storage name in the document settings, 
so
+// we can load it again next time the file is imported.
+uno::Reference 
xFactory(pObjectShell->GetModel(), uno::UNO_QUERY);
+uno::Reference 
xPropertySet(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
+xPropertySet->setPropertyValue("EmbeddedDatabaseName", 
uno::makeAny(aStreamRelPath));
 }
 }
 }
___
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' - basctl/source basic/source chart2/source cui/source dbaccess/source editeng/source extensions/source sc/source sd/source sfx2/source svx/sour

[Michael Meeks]

 basctl/source/basicide/baside2b.cxx  |2 -
 basctl/source/basicide/basides1.cxx  |6 +--
 basctl/source/basicide/basidesh.cxx  |2 -
 basic/source/runtime/basrdll.cxx |2 -
 basic/source/runtime/iosys.cxx   |5 +-
 chart2/source/controller/dialogs/DataBrowser.cxx |8 ++--
 chart2/source/controller/dialogs/tp_Scale.cxx|2 -
 chart2/source/controller/main/ChartController_Window.cxx |2 -
 cui/source/customize/cfg.cxx |9 ++---
 cui/source/dialogs/multipat.cxx  |4 +-
 cui/source/options/treeopt.cxx   |2 -
 cui/source/tabpages/page.cxx |2 -
 dbaccess/source/ui/dlg/ConnectionHelper.cxx  |2 -
 dbaccess/source/ui/misc/UITools.cxx  |2 -
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx|   12 +++---
 dbaccess/source/ui/querydesign/querycontroller.cxx   |2 -
 dbaccess/source/ui/relationdesign/RelationController.cxx |2 -
 editeng/source/editeng/editdbg.cxx   |2 -
 editeng/source/editeng/editeng.cxx   |2 -
 editeng/source/misc/unolingu.cxx |2 -
 extensions/source/propctrlr/propcontroller.cxx   |2 -
 sc/source/ui/dbgui/consdlg.cxx   |2 -
 sc/source/ui/dbgui/scendlg.cxx   |4 +-
 sc/source/ui/docshell/dbdocfun.cxx   |4 +-
 sc/source/ui/docshell/docfunc.cxx|8 ++--
 sc/source/ui/miscdlgs/crnrdlg.cxx|4 +-
 sc/source/ui/miscdlgs/scuiautofmt.cxx|2 -
 sc/source/ui/navipi/scenwnd.cxx  |2 -
 sc/source/ui/optdlg/tpusrlst.cxx |6 +--
 sc/source/ui/view/cellsh3.cxx|4 +-
 sc/source/ui/view/dbfunc.cxx |4 +-
 sc/source/ui/view/dbfunc3.cxx|4 +-
 sc/source/ui/view/spelleng.cxx   |4 +-
 sc/source/ui/view/tabvwshf.cxx   |4 +-
 sc/source/ui/view/viewfunc.cxx   |4 +-
 sd/source/core/drawdoc3.cxx  |2 -
 sd/source/ui/dlg/custsdlg.cxx|4 +-
 sd/source/ui/func/fudraw.cxx |2 -
 sd/source/ui/view/drawview.cxx   |5 +-
 sd/source/ui/view/drviews2.cxx   |   26 +++
 sd/source/ui/view/drviews4.cxx   |2 -
 sd/source/ui/view/drviewse.cxx   |   18 +-
 sd/source/ui/view/sdview4.cxx|2 -
 sfx2/source/appl/linkmgr2.cxx|2 -
 sfx2/source/bastyp/fltfnc.cxx|4 +-
 sfx2/source/dialog/securitypage.cxx  |2 -
 svx/source/svdraw/svdedtv1.cxx   |2 -
 svx/source/svdraw/svdedxv.cxx|2 -
 svx/source/svdraw/svdpntv.cxx|2 -
 sw/source/ui/misc/bookmark.cxx   |2 -
 sw/source/uibase/app/docsh.cxx   |6 +--
 sw/source/uibase/app/docsh2.cxx  |2 -
 sw/source/uibase/dochdl/gloshdl.cxx  |2 -
 sw/source/uibase/lingu/hyp.cxx   |2 -
 sw/source/uibase/uiview/viewling.cxx |4 +-
 sw/source/uibase/uiview/viewprt.cxx  |2 -
 sw/source/uibase/uiview/viewsrch.cxx |2 -
 sw/source/uibase/utlui/unotools.cxx  |2 -
 xmlsecurity/workben/signaturetest.cxx|2 -
 59 files changed, 115 insertions(+), 116 deletions(-)

New commits:
commit 07074e0e072f33fe8954eded5cd2495822f5f0e4
Author: Michael Meeks 
Date:   Thu May 28 21:35:43 2015 +0100

tdf#91702 - fix stack-based MessBox allocation.

Change-Id: I62dd164e281911d9db3de453789a5badc7cd5fd7
Reviewed-on: https://gerrit.libreoffice.org/15954
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 68592f4..459449a 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -483,7 +483,7 @@ bool EditorWindow::ImpCanModify()
 {
 // If in Trace-mode, abort the trace or refuse input
 // Remove markers in the modules in Notify at Basic::Stoped
-if ( QueryBox( 0, WB_OK_CANCEL, 
IDEResId(RID_STR_WILLSTOPPRG).toString() ).Execute() == RET_OK )
+if ( ScopedVclPtr::Create( nullptr, WB_OK_CANCEL, 
IDEResId(RID_ST

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 123dc8f836afd108ea69804546116f17438a7861
Author: Miklos Vajna 
Date:   Wed Jun 3 19:20:02 2015 +0200

sw: fix Win-x86@51-TDF build

I forgot that the paste() method in this suite is not available on
Windows on 4-4, just on 5-0 and newer.

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

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index bfa13c5..66f04e7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2274,20 +2274,24 @@ DECLARE_RTFIMPORT_TEST(testTdf91074, "tdf91074.rtf")
 
 DECLARE_RTFIMPORT_TEST(testTdf90260Nopar, "hello.rtf")
 {
+#if !defined WNT
 uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
 uno::Reference xText(xTextDocument->getText(), 
uno::UNO_QUERY);
 uno::Reference xEnd = xText->getEnd();
 paste("tdf90260-nopar.rtf", xEnd);
 CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+#endif
 }
 
 DECLARE_RTFIMPORT_TEST(testTdf90260Par, "hello.rtf")
 {
+#if !defined WNT
 uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
 uno::Reference xText(xTextDocument->getText(), 
uno::UNO_QUERY);
 uno::Reference xEnd = xText->getEnd();
 paste("tdf90260-par.rtf", xEnd);
 CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+#endif
 }
 
 DECLARE_RTFIMPORT_TEST(testTdf86814, "tdf86814.rtf")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/inc/anyrefdg.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cd17c9f96ae2ba52a07178c1b59c6efc090b45ed
Author: Stephan Bergmann 
Date:   Thu Jun 4 18:06:17 2015 +0200

Don't downcast this to derived in base ctor

Change-Id: I1a0a6a7f0ac2292a7824bd35967140a20ee93f89

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index cb7a087..bb6dd5b 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -258,19 +258,19 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef >
 ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& 
rt4 )
 : ScRefHdlrImplBase(rt1, rt2, rt3, rt4)
 {
-SC_MOD()->RegisterRefWindow( static_cast( 
static_cast(this)->SLOTID ), this );
+SC_MOD()->RegisterRefWindow( static_cast( TDerived::SLOTID 
), this );
 }
 
 template
 ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& 
rt4, const T5& rt5 )
 : ScRefHdlrImplBase(rt1, rt2, rt3, rt4, rt5)
 {
-SC_MOD()->RegisterRefWindow( static_cast( 
static_cast(this)->SLOTID ), this );
+SC_MOD()->RegisterRefWindow( static_cast( TDerived::SLOTID 
), this );
 }
 
 virtual void dispose() SAL_OVERRIDE
 {
-SC_MOD()->UnregisterRefWindow( static_cast( 
static_cast(this)->SLOTID ), this );
+SC_MOD()->UnregisterRefWindow( static_cast( 
TDerived::SLOTID ), this );
 ScRefHdlrImplBase::disposeRefHandler();
 TBase::dispose();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

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

New commits:
commit 177f8e8bbdc2a554f3f795e4e766c2e184410f81
Author: László Németh 
Date:   Thu Jun 4 18:01:55 2015 +0200

fix rendercontext rendering of standard toolbar icons

Change-Id: I6e0399c16d3e900fbca56fc757f342ea893d0ad4

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index ccd2029..ad7fb72 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -177,7 +177,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
 {
 WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
 vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
-if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL)
+if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || m_pBuffer)
 {
 pWindowImpl->maInvalidateRegion = *pWinChildClipRegion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sw/uiconfig/swriter/menubar/menubar.xml |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 76a9afc9da110dbf3a00a628311a0b5d9aa6d2bc
Author: Yousuf Philips 
Date:   Thu Jun 4 02:03:31 2015 +0400

tdf#91781 Changes based on discussion of heiko suggestions

Change-Id: I6d70e40c829e125205516d894e4fd1a36e7882fa
Reviewed-on: https://gerrit.libreoffice.org/16067
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index ed92ccb..cb50434 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -25,7 +25,6 @@
   
   
   
-  
   
   
   
@@ -33,6 +32,9 @@
   
   
   
+  
+  
+  
   
   
   
@@ -41,9 +43,6 @@
   
   
   
-  
-  
-  
   
   
   
@@ -86,14 +85,14 @@
   
   
   
-  
+  
   
 
   
   
 
   
-  
+  
   
   
   
@@ -145,6 +144,7 @@
   
   
   
+  
   
   
   
@@ -197,6 +197,7 @@
   
   
   
+  
 
   
   
@@ -263,8 +264,6 @@
   
   
   
-  
-  
 
   
   
@@ -537,7 +536,6 @@
   
   
   
-  
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 sw/source/core/objectpositioning/anchoredobjectposition.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 2f779fc046c9afec04b4a4500b213e77aee51ae1
Author: László Németh 
Date:   Thu Jun 4 18:15:12 2015 +0200

tdf#91260: cleanup - textboxes extending beyond the page

Storing Undo data is unnecessary here, because shrinking is applied
only on the  text frame of the textbox. The shape component of the
textbox isn't modified.

Change-Id: Iaff64ff4953adbfa830832da146343cef2734547

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx 
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 2957aa0..b4e63e3 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -482,13 +482,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( 
const SwTwips nTopOfAnc
 {
 // shrink textboxes to extend beyond the page bottom
 SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject());
-SfxItemSet aTextBoxSet(pFrameFormat->GetDoc()->GetAttrPool(), 
aFrameFormatSetRange);
 SwFormatFrmSize aSize(pFormat->GetFrmSize());
 SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - 
nAdjustedRelPosY);
 aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 );
-aTextBoxSet.Put(aSize);
-if (aTextBoxSet.Count())
-pFrameFormat->GetDoc()->SetFlyFrmAttr(*pFrameFormat, 
aTextBoxSet);
+pFrameFormat->SetFormatAttr(aSize);
 nAdjustedRelPosY = nProposedRelPosY;
 } else if ( SwTextBoxHelper::findTextBox(pFormat) )
 // when the shape has a textbox, use only the proposed 
vertical position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: test infrastructure ideas appreciated ...

[Michael Meeks]

Hi Robert,

On Wed, 2015-06-03 at 15:44 +0200, Robert Antoni Buj i Gelonch wrote:
> We could add an automatic validation test for checking the discovery
> of dynamic library dependencies on OS X & Linux.
>   * OS X: otool -L file
>   * Linux: ldd file

Sounds interesting - the concern would be having added new
dependencies ? or what could we check with that ?

Thanks,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
84 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1304135:  Control flow issues  (MISSING_BREAK)
/svx/source/sidebar/text/TextPropertyPanel.cxx: 162 in 
svx::sidebar::TextPropertyPanel::HandleContextChange(const 
sfx2::sidebar::EnumContext &)()



*** CID 1304135:  Control flow issues  (MISSING_BREAK)
/svx/source/sidebar/text/TextPropertyPanel.cxx: 162 in 
svx::sidebar::TextPropertyPanel::HandleContextChange(const 
sfx2::sidebar::EnumContext &)()
156 break;
157 
158 case CombinedEnumContext(Application_Calc, Context_EditCell):
159 case CombinedEnumContext(Application_Calc, Context_DrawText):
160 bNeedTextSpacing = true;
161 
>>> CID 1304135:  Control flow issues  (MISSING_BREAK)
>>> The above case falls through to this one.
162 case CombinedEnumContext(Application_WriterVariants, 
Context_DrawText):
163 case CombinedEnumContext(Application_WriterVariants, 
Context_Annotation):
164 case CombinedEnumContext(Application_DrawImpress, 
Context_DrawText):
165 case CombinedEnumContext(Application_DrawImpress, Context_Text):
166 case CombinedEnumContext(Application_DrawImpress, 
Context_Table):
167 case CombinedEnumContext(Application_DrawImpress, 
Context_OutlineText):



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/211?tab=overview

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://scan.coverity.com/subscriptions/edit?email=libreoffice%40lists.freedesktop.org&token=d6481d718a775246b2340f282ebe5939
 .

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

Re: test infrastructure ideas appreciated ... - a11y based testing

[Michael Meeks]

On Thu, 2015-06-04 at 16:14 +0200, Noel Grandin wrote:
> mjayfrancis(IRC) is doing some interesting automated-UI testing work using
> the UNO accessibility API - perhaps get him on contract to finish it up and 
> make it nice?

Ah - it'd be great to use our UNO API directly, rather than via some
wrapper - then it can be effortlessly cross-platform ... will split your
ideas up - perhaps into threads ?

Thanks =)

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: test infrastructure ideas appreciated ... - junit ...

[Michael Meeks]

On Thu, 2015-06-04 at 16:14 +0200, Noel Grandin wrote:
> Perhaps a contract to convert the Java unit tests to C++?

Might be interesting - I wonder if that can be partially automated in
some way ;->

At a minimum for JUnit it'd be good to further accelerate the tests by
processing the idle messages instead of sleeping I guess.

=)

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

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

[Mike Kaganski]

 sc/source/core/data/table4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2519e0aca7c0d479f7ff381d95929dbe47942503
Author: Mike Kaganski 
Date:   Fri Jun 5 00:10:24 2015 +1000

tdf#90996: don't overwrite comments in ScTable::FillFormulaVertical

IDF_CONTENTS includes IDF_NOTE, which should not be used here

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

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index c82469b..2a2c150 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1170,7 +1170,7 @@ void ScTable::FillFormulaVertical(
 if (aSpans.empty())
 return;
 
-aCol[nCol].DeleteRanges(aSpans, IDF_CONTENTS, false);
+aCol[nCol].DeleteRanges(aSpans, IDF_VALUE | IDF_DATETIME | IDF_STRING | 
IDF_FORMULA | IDF_OUTLINE, false);
 aCol[nCol].CloneFormulaCell(rSrcCell, sc::CellTextAttr(), aSpans, NULL);
 
 boost::shared_ptr pSet(new 
sc::ColumnBlockPositionSet(*pDocument));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: test infrastructure ideas appreciated ... - Help / Doc screenshots ...

[Michael Meeks]

This was mostly a Norbert idea from the ESC call :-)

* Find some way to automate the creation of (translated)
  screenshots for help and documentation
+ this can be used to keep the help up-to-date
+ and also to test significant dialog open/close with it
+ and to add more screenshots (cheaply) to
  the documentation

* Ideally would include some way of highlighting / annotating
  certain bits of the UI, and intelligently cropping too.

I imagine it would need some form of annotation / markup / RDF magic on
images in documentation to allow those to be re-built easily.

=)

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: test infrastructure ideas appreciated ... - layout tests ...

[Michael Meeks]

I'm no expert on the current state here, but my feeling is that there
are a lot of document / chart layout issues that are a real problem to
regression test.

I imagine that funding an investigation of the best of breed of
whatever we have, plus some combination of custom fonts,
built-in-everything (including freetype, harfbuz), no system hyphenation
data etc. etc. and basebmp rendering to ensure consistency across
platforms (& so the widest default reach) -might- get us to a place that
people can routinely run (at least on Linux) some layout tests (?) -
assuming we can find some way to reasonably describe workable and
maintainable constraints for that.

Thoughts much appreciated ;-)

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Re: sourceforge hijack libreoffice page?

[Wols Lists]

On 03/06/15 12:14, Simos Xenitellis wrote:
> 
> On Wed, Jun 3, 2015 at 12:58 PM, Sharuzzaman Ahmat Raslan
> mailto:sharuzza...@gmail.com>> wrote:
> 
> Hi Libreoffice developers,
> 
> I was reading news about Sourceforge is hijacking nmap page in
> Sourceforge.
> 
> When I listed the page owned by user sf-editor1, it looks like
> LibreOffice page and installer was also hijacked.
> 
> 
> And Sourceforge staff actively add installation packages to the download
> page at
> http://sourceforge.net/projects/libreoffice.mirror/files/
> 
There's an article on lwn about gimp being hi-jacked.

My experience with downloading a package called Alcohol from its
official site makes me very suspicious of all this ... :-(

Cheers,
Wol

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

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

[Szymon Kłos]

 include/svtools/RemoteFilesDialog.hxx|   33 +++-
 svtools/source/dialogs/RemoteFilesDialog.cxx |  217 ++-
 svtools/uiconfig/ui/remotefilesdialog.ui |   73 -
 3 files changed, 310 insertions(+), 13 deletions(-)

New commits:
commit e7359daa22f58bac005cb3d455fd4acd5353bd01
Author: Szymon Kłos 
Date:   Thu Jun 4 18:58:11 2015 +0200

empty TreeListBox & splitter

Change-Id: I948b62bade41b7b7998d0e22c10c1169d78ec506

diff --git a/include/svtools/RemoteFilesDialog.hxx 
b/include/svtools/RemoteFilesDialog.hxx
index 0ae497f..aac99ba 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/include/svtools/RemoteFilesDialog.hxx
@@ -19,6 +19,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -51,7 +53,7 @@ class SVT_DLLPUBLIC RemoteFilesDialog : public ModalDialog
 {
 public:
 RemoteFilesDialog(vcl::Window* pParent, WinBits nBits);
-~RemoteFilesDialog();
+virtual ~RemoteFilesDialog();
 
 virtual void dispose() SAL_OVERRIDE;
 virtual void Resize() SAL_OVERRIDE;
@@ -70,6 +72,8 @@ private:
 VclPtr m_pAddService_btn;
 VclPtr m_pServices_lb;
 VclPtr m_pPath_ed;
+VclPtr m_pSplitter;
+VclPtr m_pTreeView;
 VclPtr m_pFileView;
 VclPtr m_pContainer;
 VclPtr m_pFilter_lb;
@@ -92,6 +96,8 @@ private:
 
 DECL_LINK( DoubleClickHdl, void * );
 DECL_LINK( SelectHdl, void * );
+
+DECL_LINK( SplitHdl, void * );
 };
 
 #endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index f13aa2d..5976ea6 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -17,11 +17,15 @@ class FileViewContainer : public vcl::Window
 {
 private:
 VclPtr m_pFileView;
+VclPtr m_pTreeView;
+VclPtr m_pSplitter;
 
 public:
 FileViewContainer(vcl::Window *pParent)
 : Window(pParent)
 , m_pFileView(NULL)
+, m_pTreeView(NULL)
+, m_pSplitter(NULL)
 {
 }
 
@@ -33,29 +37,51 @@ class FileViewContainer : public vcl::Window
 virtual void dispose() SAL_OVERRIDE
 {
 m_pFileView.clear();
+m_pSplitter.clear();
 vcl::Window::dispose();
 }
 
-void init(SvtFileView* pFileView)
+void init(SvtFileView* pFileView,
+  Splitter* pSplitter,
+  SvTreeListBox* pTreeView)
 {
 m_pFileView = pFileView;
+m_pTreeView = pTreeView;
+m_pSplitter = pSplitter;
 }
 
 virtual void Resize() SAL_OVERRIDE
 {
 Window::Resize();
 
-if(!m_pFileView)
+if(!m_pFileView || !m_pTreeView)
 return;
 
 Size aSize = GetSizePixel();
-m_pFileView->SetSizePixel( aSize );
+Point aPos( m_pFileView->GetPosPixel() );
+Size aNewSize(aSize.Width() - aPos.X(), aSize.Height());
+
+m_pFileView->SetSizePixel( aNewSize );
+
+// Resize the Splitter to fit the height
+Size splitterNewSize = m_pSplitter->GetSizePixel( );
+splitterNewSize.Height() = aSize.Height();
+m_pSplitter->SetSizePixel( splitterNewSize );
+sal_Int32 nMinX = m_pTreeView->GetPosPixel( ).X( );
+sal_Int32 nMaxX = m_pFileView->GetPosPixel( ).X( ) + 
m_pFileView->GetSizePixel( ).Width() - nMinX;
+m_pSplitter->SetDragRectPixel( Rectangle( Point( nMinX, 0 ), Size( 
nMaxX, aSize.Width() ) ) );
+
+// Resize the tree list box to fit the height of the FileView
+Size placesNewSize(m_pTreeView->GetSizePixel());
+placesNewSize.Height() = aSize.Height();
+m_pTreeView->SetSizePixel( placesNewSize );
 }
 };
 
 RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent, WinBits nBits)
 : ModalDialog(pParent, "RemoteFilesDialog", "svt/ui/remotefilesdialog.ui")
 , m_context(comphelper::getProcessComponentContext())
+, m_pSplitter(NULL)
 , m_pFileView(NULL)
 , m_pContainer(NULL)
 {
@@ -98,7 +124,24 @@ RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent, 
WinBits nBits)
 m_pFileView->SetDoubleClickHdl( LINK( this, RemoteFilesDialog, 
DoubleClickHdl ) );
 m_pFileView->SetSelectHdl( LINK( this, RemoteFilesDialog, SelectHdl ) );
 
-m_pContainer->init(m_pFileView);
+m_pSplitter = VclPtr::Create( m_pContainer, WB_HSCROLL );
+m_pSplitter->SetBackground( Wallpaper( 
Application::GetSettings().GetStyleSettings().GetFaceColor() ));
+m_pSplitter->SetSplitHdl( LINK( this, RemoteFilesDialog, SplitHdl ) );
+m_pSplitter->Show();
+
+m_pTreeView = VclPtr::Create( m_pContainer, WB_BORDER );
+Size aSize(100, 200);
+m_pTreeView->set_height_request(aSize.Height());
+m_pTreeView->set_width_request(aSize.Width());
+m_pTreeView->SetSizePixel(aSize);
+m_pTreeView->Show();
+
+sal_Int32 nPosX = m_pTreeView->GetSizePixel().Width();
+m_pSplitter->SetPosPixel(Point(nPosX, 0));
+nP

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 8 commits - libreofficekit/Library_libreofficekitgtk.mk libreofficekit/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit 9e5b792642fe39b9558c26f9d76b8ed9b6752942
Author: Pranav Kant 
Date:   Thu Jun 4 22:09:57 2015 +0530

lokdocview, tilebuffer: clean up

Improve documentation, style fixes

Change-Id: I5000e32e90cd8e3b75e8df2907673efc303a55fd

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 50ddc76..4191fa1 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -177,12 +177,12 @@ struct LOKDocView_Impl
 /// Implementation of the timeout handler, invoked by handleTimeout().
 gboolean handleTimeoutImpl();
 /**
- * Renders the document to a number of tiles.
+ * Renders the document to a number of visible tiles.
  *
  * This method is invoked only manually, not when some Gtk signal is
  * emitted.
  *
- * @param pPartial if 0, then the full document is rendered, otherwise only
+ * @param pPartial if 0, then the full visible document is rendered, 
otherwise only
  * the tiles that intersect with pPartial.
  */
 void renderDocument(GdkRectangle* pPartial);
@@ -665,7 +665,7 @@ void LOKDocView_Impl::setTilesInvalid(const GdkRectangle& 
rRectangle)
 
 for (int i = aStart.x; i < aEnd.x; i++)
 for (int j = aStart.y; j < aEnd.y; j++)
-m_pTileBuffer->tile_buffer_set_invalid(i, j);
+m_pTileBuffer->setInvalid(i, j);
 }
 
 void LOKDocView_Impl::renderHandle(cairo_t* pCairo, const GdkRectangle& 
rCursor, cairo_surface_t* pHandle, GdkRectangle& rRectangle)
@@ -824,10 +824,10 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* 
pPartial)
 
 if (bPaint)
 {
-//g_info("gettile: (%d %d)", nRow, nColumn);
+g_info("tile_buffer_get_tile (%d, %d)", nRow, nColumn);
 
-Tile& currentTile = m_pTileBuffer->tile_buffer_get_tile(nRow, 
nColumn);
-GdkPixbuf* pPixBuf = currentTile.tile_get_buffer();
+Tile& currentTile = m_pTileBuffer->getTile(nRow, nColumn);
+GdkPixbuf* pPixBuf = currentTile.getBuffer();
 
 gdk_cairo_set_source_pixbuf (pcairo, pPixBuf, 
twipToPixel(aTileRectangleTwips.x, m_fZoom), twipToPixel(aTileRectangleTwips.y, 
m_fZoom));
 cairo_paint(pcairo);
@@ -942,7 +942,7 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 }
 else
 {
-m_pTileBuffer->tile_buffer_reset_all_tiles();
+m_pTileBuffer->resetAllTiles();
 renderDocument(0);
 }
 }
@@ -1148,21 +1148,28 @@ static void lok_docview_init( GTypeInstance* pInstance, 
gpointer )
 gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(pDocView),
pDocView->m_pImpl->m_pDrawingArea );
 
-g_signal_connect(GTK_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
  "expose-event",
- GTK_SIGNAL_FUNC(LOKDocView_Impl::on_exposed), pDocView);
-g_signal_connect(GTK_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ G_CALLBACK(LOKDocView_Impl::on_exposed), pDocView);
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
  "expose-event",
- GTK_SIGNAL_FUNC(LOKDocView_Impl::renderOverlay), 
pDocView);
+ G_CALLBACK(LOKDocView_Impl::renderOverlay), pDocView);
 gtk_widget_add_events(pDocView->m_pImpl->m_pDrawingArea,
-  GDK_BUTTON_PRESS_MASK
-  | GDK_BUTTON_RELEASE_MASK
-  | GDK_BUTTON_MOTION_MASK);
-g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"button-press-event", G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
-g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"button-release-event", G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
-g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea), 
"motion-notify-event", G_CALLBACK(LOKDocView_Impl::signalMotion), pDocView);
-
-gtk_signal_connect(GTK_OBJECT(pDocView), "destroy", 
GTK_SIGNAL_FUNC(LOKDocView_Impl::destroy), 0);
+   GDK_BUTTON_PRESS_MASK
+  |GDK_BUTTON_RELEASE_MASK
+  |GDK_BUTTON_MOTION_MASK);
+
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ "button-press-event",
+ G_CALLBACK(LOKDocView_Impl::signalButton), pDocView);
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+ "but

Minutes of the Design Hangout: 2015-05-27

[Jan Holesovsky]

* Present: Heiko, Kendy, Andreas, Jay (late)
 
* Completed Action Items:
 
* Pending Action Items:
 
+ Kendy: Create a CoreHack to modify the tree view to have a 
Proof-of-concept of the Accordion widget
+ Jay: Send a mail to documentat...@global.libreoffice.org with the wiki 
page that collects changes in menus
+ Kendy: Collecting of the user information should be incremental, 
somewhere in the user's profile
+ Ahmed: Push the new Sifr icons he's done recently
+ Kendy: Talk to Milos wrt. 
https://bugs.freedesktop.org/show_bug.cgi?id=48622
+ Alex: Gnome 2.20-style 'a' icons & Gnome 3-style text line icons
+ Samuel: Formulas and Navigator should open in the sidebar, not as a 
special window
  https://bugs.freedesktop.org/show_bug.cgi?id=85897
+ Is that issue for the Navigator too (I dont read it from the issue)
  and in Writer the choice anycase was to allow opening separate too. 
(Cor, after discussion on 20150128)
+ the bug report only discusses the separate formulas sidebar in 
calc (Jay)
+ Kendy: https://bugs.freedesktop.org/show_bug.cgi?id=87794
 + check how the sliders in the Audio/Video toolbar are implemented to 
move them to sidebar
+ Kendy: Make sifr icons fall back on breeze icons as breeze is， more 
complete
 
* UI changes integrated the last week:
 
+ sorting table in named ranges (Bubli)
+ update tango icons (Adolfo)
+ menubar fixes (Jay)
 
* Artwork for LibreOffice 5.0 call for proposals (Stuart/Kendy)
 
+ Added the 5.0 Branding artwork call for proposals (Stuart)
  https://wiki.documentfoundation.org/Design/Whiteboards/5.0_Branding
 
+ results:
+ contributions from 5 people: those listed on the page + one sent 
by mail
+ conclusion: send a mail to the visual identity committee what 
should be chosen, and how to proceed
 
* UI Guidelines (Heiko)
 
+ 
https://docs.google.com/document/d/1hSYOFoG6jnj2G0zWDbUYkrGZoj7YCSI9j3onkTZ65bU/edit

+ agreed menus & toolbars the last week (Heiko)
+ menus should contain everything - Eve can work with menus
+ while Benjamin prefers toolbars
 
+ Heiko will transfer the content to the wiki, and then writer a summary 
blogpost
+ announce on the mailing list
+ and a short blopost - about the recent changes (Heiko)
/done
+ https://wiki.documentfoundation.org/Design/MenuBar
+ https://wiki.documentfoundation.org/Design/ToolBar
+ 
http://user-prompt.com/libreoffice-human-interface-guidelines-the-second-step/
 
* How autofilter should work (Mattias, Heiko)
 
+ https://bugs.documentfoundation.org/show_bug.cgi?id=63416
  Should it be "smart" and try to guess about header fields (and possibly 
sometimes fail)
  or should it be always consistent and just assume the first row is the 
header (as MSO does it)
+ sorting is also affected by auto filter
+ check the competitor's solutions (Jay)
  -> define test scenario first
  - what happens when autofilter buttons are placed in the middle of 
data rows
  - what happens when autofiltered data (some rows hidden) is sorted 
(using usual sorting tool)
  - what happens when you try to filter the autofilter row out (if it's 
treated as data, not in MSO)
+ consider to ask the community in case of more than one good solutions 
(Heiko)
+ mimic the bevahior of Microsoft Excel if there isn't better (Ibrahim)


+ resolved in the bug (mostly comment #29) (Heiko) conclusion in:
+ https://bugs.documentfoundation.org/show_bug.cgi?id=63416#c29
 
+ comparison of office suite behavior
  
https://docs.google.com/document/d/1vW1orR4ZbXHDmQDpbJVH4N2f1w_iYP6GtDLYgJ4pWSk/edit

+ comment from moggi from IRC
  "just a tip for the future (I'm not involved it in anymore): before you 
try to specify some
   calc behavior it might be a good idea to talk to the calc maintainers, 
calc has a few concepts
   that go through the whole program which might not be obvious to everyone"
 
* Icon Updates / Issues (Jay)
 
+ some icons have white instead of black on Windows (Jay)
+ bugreport: https://bugs.documentfoundation.org/show_bug.cgi?id=91432
 
+ Tango (Alex/Adolfo/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing

+ Sifr (Papamatti/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing
 
+ Breeze (Andreas/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/1dpMFgmkQy4BsyRIKH97ZLPTU6NdvXIYk3Yossj6sSQM/edit?usp=sharing
+ More icons were pushed by Andreas (Jay)
 
+ Extra-Large (32x32) Icons for large resolutions
+ Status - 
https://docs.google.com

Minutes of the Design Hangout: 2015-06-03

[Jan Holesovsky]

* Present: Heiko, Kendy, Jay, Steve
 
* Completed Action Items:
 
+ Jay: Make sifr icons fall back on breeze icons as breeze is more complete
  (The styles are quite different and this looks poor in Mac. Adolfo)
 
* Pending Action Items:
 
+ Kendy: Create a CoreHack to modify the tree view to have a 
Proof-of-concept of the Accordion widget
+ Jay: Send a mail to documentat...@global.libreoffice.org with the wiki 
page that collects changes in menus
+ Kendy: Collecting of the user information should be incremental, 
somewhere in the user's profile
+ Ahmed: Push the new Sifr icons he's done recently
+ Kendy: Talk to Milos wrt. 
https://bugs.freedesktop.org/show_bug.cgi?id=48622
+ Samuel: Formulas and Navigator should open in the sidebar, not as a 
special window
  https://bugs.freedesktop.org/show_bug.cgi?id=85897
+ Is that issue for the Navigator too (I dont read it from the issue)
  and in Writer the choice anycase was to allow opening separate too. 
(Cor, after discussion on 20150128)
+ the bug report only discusses the separate formulas sidebar in 
calc (Jay)
+ Kendy: https://bugs.freedesktop.org/show_bug.cgi?id=87794
 + check how the sliders in the Audio/Video toolbar are implemented to 
move them to sidebar
 
* UI changes integrated the last week:
 
+ Lower half of slide transition tab reorganized (Rishabh)
+ Shrink the properties sidebar sections in Calc (Rishabh)
+ Writer menubar reorganized (Jay)
+ Insert row/col before/after in Calc (Philippe)
+ Hide common task toolbar in master slide view (Philippe)
+ Tango updates (Adolfo, Jay)
+ Formatting, Impress and Draw toolbar improvements (Jay)
 
* Icon Updates / Issues (Jay)
 
+ Sifr icons now fall back on breeze icons as breeze is more complete
+ The styles are quite different and this looks poor in Mac. (Adolfo)
+ unfortunately it is so with any fallback (Jay)
+ and breeze is closer than any other fallback (Jay)
+ the best would be to finish the Sifr theme :-) - designers 
appreciated! (Kendy)
+ breeze on mac - 
https://bug-attachments.documentfoundation.org/attachment.cgi?id=116255
+ looks good! (Heiko, Jay, Kendy)
+ let's switch to that for the RC - and if there are complaints, 
revert (Kendy)
+ some general concerns about breeze, but in this case it seems to 
look & work well (Heiko)
+ conclusion: let's switch to that now on OS X, and if there's 
push-back, revert
 
+ some icons have white instead of black on Windows (Jay)
+ bugreport: https://bugs.documentfoundation.org/show_bug.cgi?id=91432
 
+ Tango (Alex/Adolfo/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing
+ Alex: Gnome 2.20-style 'a' icons & Gnome 3-style text line icons 
(Adolfo)

+ Sifr (Papamatti/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing
 
+ Breeze (Andreas/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/1dpMFgmkQy4BsyRIKH97ZLPTU6NdvXIYk3Yossj6sSQM/edit?usp=sharing
 
+ Extra-Large (32x32) Icons for large resolutions
+ Status - 
https://docs.google.com/document/d/1mPqD2gGsMkfVCI6ByUd2XYX1NJm26hcGjRVe6gcCSEU/edit?usp=sharing
 
* UX patches to approve backporting into 5.0 by (Kendy/Jay)

+ https://gerrit.libreoffice.org/16030 (Bubli)
+ pushed
+ https://gerrit.libreoffice.org/16037 (Jay)
  https://gerrit.libreoffice.org/16032
+ pushed
+ https://gerrit.libreoffice.org/16061/ (Phillipe)
+ 2 more reviews needed (Bubli? Jay?)
+ https://gerrit.libreoffice.org/16007 (Phillipe)
  https://gerrit.libreoffice.org/16034
+ Waiting for ESC
 
* Track changes sidebar (Jay)

+ Can we set a smaller size for the 4 buttons, so that the tab's minimum 
size can be smaller
+ asked Rishab fix this (Jay)
+ About the action column icons, it would be good to center it rather than 
having it aligned to the right
  and a formatting change has a plus sign, which should be changed to a 'T' 
icon like from textbox.
  Any possibility to have a tooltip above these action icons.
+ at the design session, did we decide to use text in the end, or not? 
(Kendy)
+ http://user-prompt.com/tracking-changes-with-libreoffice/ - use icons 
in the end
+ sw/source/ui/shells/shells.src IMG_REDLINE_INSERTED .. 
IMG_REDLINE_AUTOFMT
+ the actual icons are in icon-themes/galaxy/sw/res/redline_*
+ will ask Rishab to do the centering (Jay)
+ 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5f363ce8bc563f64271744026cf0e16830cf9b06
+ this implemented the icons (to he

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

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit 4a8a5527b4ab7387866db1f891f34b8f795aa79d
Author: Pranav Kant 
Date:   Thu Jun 4 22:09:57 2015 +0530

lokdocview, tilebuffer: clean up

Improve documentation, style fixes

Change-Id: I5000e32e90cd8e3b75e8df2907673efc303a55fd

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 50ddc76..5e90ca9 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -177,12 +177,12 @@ struct LOKDocView_Impl
 /// Implementation of the timeout handler, invoked by handleTimeout().
 gboolean handleTimeoutImpl();
 /**
- * Renders the document to a number of tiles.
+ * Renders the document to a number of visible tiles.
  *
  * This method is invoked only manually, not when some Gtk signal is
  * emitted.
  *
- * @param pPartial if 0, then the full document is rendered, otherwise only
+ * @param pPartial if 0, then the full visible document is rendered, 
otherwise only
  * the tiles that intersect with pPartial.
  */
 void renderDocument(GdkRectangle* pPartial);
@@ -665,7 +665,7 @@ void LOKDocView_Impl::setTilesInvalid(const GdkRectangle& 
rRectangle)
 
 for (int i = aStart.x; i < aEnd.x; i++)
 for (int j = aStart.y; j < aEnd.y; j++)
-m_pTileBuffer->tile_buffer_set_invalid(i, j);
+m_pTileBuffer->setInvalid(i, j);
 }
 
 void LOKDocView_Impl::renderHandle(cairo_t* pCairo, const GdkRectangle& 
rCursor, cairo_surface_t* pHandle, GdkRectangle& rRectangle)
@@ -801,7 +801,8 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* pPartial)
 GdkRectangle aTileRectangleTwips, aTileRectanglePixels;
 bool bPaint = true;
 
-// Determine size of the tile: the rightmost/bottommost tiles may 
be smaller and we need the size to decide if we need to repaint.
+// Determine size of the tile: the rightmost/bottommost tiles may
+// be smaller, and we need the size to decide if we need to 
repaint.
 if (nColumn == nColumns - 1)
 aTileRectanglePixels.width = nDocumentWidthPixels - nColumn * 
nTileSizePixels;
 else
@@ -811,7 +812,8 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* pPartial)
 else
 aTileRectanglePixels.height = nTileSizePixels;
 
-// Determine size and position of the tile in document 
coordinates, so we can decide if we can skip painting for partial rendering.
+// Determine size and position of the tile in document coordinates,
+// so we can decide if we can skip painting for partial rendering.
 aTileRectangleTwips.x = pixelToTwip(nTileSizePixels, m_fZoom) * 
nColumn;
 aTileRectangleTwips.y = pixelToTwip(nTileSizePixels, m_fZoom) * 
nRow;
 aTileRectangleTwips.width = 
pixelToTwip(aTileRectanglePixels.width, m_fZoom);
@@ -824,12 +826,14 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* 
pPartial)
 
 if (bPaint)
 {
-//g_info("gettile: (%d %d)", nRow, nColumn);
+g_info("tile_buffer_get_tile (%d, %d)", nRow, nColumn);
 
-Tile& currentTile = m_pTileBuffer->tile_buffer_get_tile(nRow, 
nColumn);
-GdkPixbuf* pPixBuf = currentTile.tile_get_buffer();
+Tile& currentTile = m_pTileBuffer->getTile(nRow, nColumn);
+GdkPixbuf* pPixBuf = currentTile.getBuffer();
 
-gdk_cairo_set_source_pixbuf (pcairo, pPixBuf, 
twipToPixel(aTileRectangleTwips.x, m_fZoom), twipToPixel(aTileRectangleTwips.y, 
m_fZoom));
+gdk_cairo_set_source_pixbuf (pcairo, pPixBuf,
+ 
twipToPixel(aTileRectangleTwips.x, m_fZoom),
+ 
twipToPixel(aTileRectangleTwips.y, m_fZoom));
 cairo_paint(pcairo);
 }
 }
@@ -942,7 +946,7 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 }
 else
 {
-m_pTileBuffer->tile_buffer_reset_all_tiles();
+m_pTileBuffer->resetAllTiles();
 renderDocument(0);
 }
 }
@@ -1148,21 +1152,28 @@ static void lok_docview_init( GTypeInstance* pInstance, 
gpointer )
 gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(pDocView),
pDocView->m_pImpl->m_pDrawingArea );
 
-g_signal_connect(GTK_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
+g_signal_connect(G_OBJECT(pDocView->m_pImpl->m_pDrawingArea),
  "expose-event",
- GTK_

Re: test infrastructure ideas appreciated ... - a11y based testing

[Matthew J. Francis]

On 05/06/2015 00:39, Michael Meeks wrote:


On Thu, 2015-06-04 at 16:14 +0200, Noel Grandin wrote:

mjayfrancis(IRC) is doing some interesting automated-UI testing work using
the UNO accessibility API - perhaps get him on contract to finish it up and 
make it nice?


Ah - it'd be great to use our UNO API directly, rather than via some
wrapper - then it can be effortlessly cross-platform ... will split your
ideas up - perhaps into threads ?


The framework I've got so far is based on a "UNO sandwich" - setting up 
a test environment, and the final check of the results of actions are 
done through (Py)UNO, while the manipulation of the UI itself (the 
"filling") is done through Dogtail, a Red Hat project which is itself a 
wrapper around the pyatspi accessibility library (and hence currently 
Linux only)


Replacing the "filling" with more UNO could be done, but it would need 
at least a replacement for the Dogtail convenience layer (which makes a 
lot of the work of finding and interacting with the correct UI elements 
very easy), and possibly some other work on the raw UNO accessibility 
API. Ultimately this is an achievable volume of work, but it will take 
some time to investigate, and I want to get as far as possible through 
some other aspects of making UI testing easier before tackling it - much 
of the rest of the approach/framework will still be applicable.


At present I'm on a side project to improve the usability of PyUNO by 
making UNO collections (the XIndexAccess, XNameAccess, 
XEnumerationAccess family) function as native Python lists, dicts and 
iterators. Hopefully this too should help make it easier to write tests 
for LO. As of today the basic functionality of this all works, and I 
hope to be able to push it for review some time next week.


Regards
Matthew Francis

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - translations

[Andras Timar]

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

New commits:
commit 72bd4796b29cab3e818289af520beca1ae100ede
Author: Andras Timar 
Date:   Thu Jun 4 19:54:03 2015 +0200

Updated core
Project: translations  3eedeaa4db0f95c2df2c00d2b149affaeb50e1df

Updated Slovenian translation

Change-Id: I8b2f1d37e65945873499ac8ba3029fb0b09af8e2

diff --git a/translations b/translations
index fd8a1ee..3eedeaa 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fd8a1ee1c02bf02a0d116b6922b8bb00bc508846
+Subproject commit 3eedeaa4db0f95c2df2c00d2b149affaeb50e1df
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/sl

[Andras Timar]

 source/sl/extras/source/autocorr/emoji.po | 9322 ++
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   13 
 source/sl/sd/source/ui/app.po |   26 
 source/sl/sd/uiconfig/simpress/ui.po  |   51 
 source/sl/sfx2/uiconfig/ui.po |   10 
 source/sl/svtools/source/misc.po  |   15 
 source/sl/svx/inc.po  |4 
 source/sl/svx/source/tbxctrls.po  |   16 
 8 files changed, 9377 insertions(+), 80 deletions(-)

New commits:
commit 3eedeaa4db0f95c2df2c00d2b149affaeb50e1df
Author: Andras Timar 
Date:   Thu Jun 4 19:54:03 2015 +0200

Updated Slovenian translation

Change-Id: I8b2f1d37e65945873499ac8ba3029fb0b09af8e2

diff --git a/source/sl/extras/source/autocorr/emoji.po 
b/source/sl/extras/source/autocorr/emoji.po
new file mode 100644
index 000..d1a9bc4
--- /dev/null
+++ b/source/sl/extras/source/autocorr/emoji.po
@@ -0,0 +1,9322 @@
+#. extracted from extras/source/autocorr/emoji
+msgid ""
+msgstr ""
+"Project-Id-Version: LibreOffice 5.0\n"
+"Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
+"POT-Creation-Date: 2015-06-04 13:43+0200\n"
+"PO-Revision-Date: 2015-06-04 18:29+0200\n"
+"Last-Translator: Martin Srebotnjak \n"
+"Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Accelerator-Marker: ~\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Project-Style: openoffice\n"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"CENT_SIGN\n"
+"LngText.text"
+msgid "cent"
+msgstr "cent"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"POUND_SIGN\n"
+"LngText.text"
+msgid "pound"
+msgstr "funt"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"YEN_SIGN\n"
+"LngText.text"
+msgid "yen"
+msgstr "jen"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"SECTION_SIGN\n"
+"LngText.text"
+msgid "section"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"COPYRIGHT_SIGN\n"
+"LngText.text"
+msgid "copyright"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"NOT_SIGN\n"
+"LngText.text"
+msgid "not"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"REGISTERED_SIGN\n"
+"LngText.text"
+msgid "registered"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"DEGREE_SIGN\n"
+"LngText.text"
+msgid "degree"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"PLUS-MINUS_SIGN\n"
+"LngText.text"
+msgid "+-"
+msgstr "+-"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"MIDDLE_DOT\n"
+"LngText.text"
+msgid "middle dot"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"MULTIPLICATION_SIGN\n"
+"LngText.text"
+msgid "x"
+msgstr "x"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_ALPHA\n"
+"LngText.text"
+msgid "Alpha"
+msgstr "Alfa"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_BETA\n"
+"LngText.text"
+msgid "Beta"
+msgstr "Beta"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_GAMMA\n"
+"LngText.text"
+msgid "Gamma"
+msgstr "Gama"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_DELTA\n"
+"LngText.text"
+msgid "Delta"
+msgstr "Delta"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_EPSILON\n"
+"LngText.text"
+msgid "Epsilon"
+msgstr "Epsilon"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_ZETA\n"
+"LngText.text"
+msgid "Zeta"
+msgstr "Zeta"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_ETA\n"
+"LngText.text"
+msgid "Eta"
+msgstr "Eta"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_THETA\n"
+"LngText.text"
+msgid "Theta"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_IOTA\n"
+"LngText.text"
+msgid "Iota"
+msgstr "Jota"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_KAPPA\n"
+"LngText.text"
+msgid "Kappa"
+msgstr "Kapa"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_LAMDA\n"
+"LngText.text"
+msgid "Lambda"
+msgstr "Lambda"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_MU\n"
+"LngText.text"
+msgid "Mu"
+msgstr "Mu"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_NU\n"
+"LngText.text"
+msgid "Nu"
+msgstr "Nu"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_XI\n"
+"LngText.text"
+msgid "Xi"
+msgstr ""
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_OMICRON\n"
+"LngText.text"
+msgid "Omicron"
+msgstr "Omikron"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_PI\n"
+"LngText.text"
+msgid "Pi"
+msgstr "Pi"
+
+#: emoji.ulf
+msgctxt ""
+"emoji.ulf\n"
+"GREEK_CAPITAL_LETTER_RHO\n"
+"LngText.text"
+msgid "Rho"
+m

Re: test infrastructure ideas appreciated ...

[Michael Stahl]

On 04.06.2015 18:32, Michael Meeks wrote:
> Hi Robert,
> 
> On Wed, 2015-06-03 at 15:44 +0200, Robert Antoni Buj i Gelonch wrote:
>> We could add an automatic validation test for checking the discovery
>> of dynamic library dependencies on OS X & Linux.
>>   * OS X: otool -L file
>>   * Linux: ldd file
> 
>   Sounds interesting - the concern would be having added new
> dependencies ? or what could we check with that ?

that's actually a good idea, as the recent bibisect Linux 5.0 accident
has demonstrated, see also commit
f4844a9abebcb0451161625c42a1e2b48796102d

we could have a test that runs something like readelf -d | grep
"(NEEDED)", filter out our own libraries, and then filters against a
whilelist of known-good system libraries; anything outside the whitelist
shouldn't be required.

it might even be useful on Mac OS X: while you do have a proper SDK
there and not a random collection of -devel packages, it might still be
possible that some bundled library's crazy configure script finds some
random stuff installed via Fink/MacPorts/etc., which would cause the
same issues.


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

Re: test infrastructure ideas appreciated ...

[Robert Antoni Buj i Gelonch]

$ curl -OL
https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/check-depends.pl
$ curl -OL
https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/lib/tools.pm
$ curl -OL
https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/lib/Platform.pm
$ curl -OL
https://llvm.org/svn/llvm-project/openmp/trunk/runtime/tools/lib/Uname.pm
$ chmod +x check-depends.pl
$ ./check-depends.pl
/Applications/LibreOfficeDev.app/Contents/Frameworks/libwpd-0.10.10.dylib
check-depends.pl: (x) Fail to parse otool output:
check-depends.pl: (x)
/Applications/LibreOfficeDev.app/Contents/Frameworks/libwpd-0.10.10.dylib:
check-depends.pl: (x) >>> /usr/local/lib/libwpd-0.10.10.dylib
(compatibility version 11.0.0, current version 11.0.0)
check-depends.pl: (x)
/@.__OOO/lib/librevenge-0.0.0.dylib
(compatibility version 1.0.0, current version 1.2.0)
check-depends.pl: (x) /usr/lib/libc++.1.dylib (compatibility version
1.0.0, current version 120.0.0)
check-depends.pl: (x) /usr/lib/libSystem.B.dylib (compatibility version
1.0.0, current version 1213.0.0)
check-depends.pl: (x) (eof)


2015-06-04 21:04 GMT+02:00 Michael Stahl :

> On 04.06.2015 18:32, Michael Meeks wrote:
> > Hi Robert,
> >
> > On Wed, 2015-06-03 at 15:44 +0200, Robert Antoni Buj i Gelonch wrote:
> >> We could add an automatic validation test for checking the discovery
> >> of dynamic library dependencies on OS X & Linux.
> >>   * OS X: otool -L file
> >>   * Linux: ldd file
> >
> >   Sounds interesting - the concern would be having added new
> > dependencies ? or what could we check with that ?
>
> that's actually a good idea, as the recent bibisect Linux 5.0 accident
> has demonstrated, see also commit
> f4844a9abebcb0451161625c42a1e2b48796102d
>
> we could have a test that runs something like readelf -d | grep
> "(NEEDED)", filter out our own libraries, and then filters against a
> whilelist of known-good system libraries; anything outside the whitelist
> shouldn't be required.
>
> it might even be useful on Mac OS X: while you do have a proper SDK
> there and not a random collection of -devel packages, it might still be
> possible that some bundled library's crazy configure script finds some
> random stuff installed via Fink/MacPorts/etc., which would cause the
> same issues.
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



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

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

[Caolán McNamara]

 svx/source/sidebar/text/TextPropertyPanel.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 85e926ff2ebfb793f4e7852edde50bc6783ed5e3
Author: Caolán McNamara 
Date:   Thu Jun 4 20:23:19 2015 +0100

coverity#1304135 Missing break in switch

from

commit 0e2ef262bea4cbc7cb04cfcd1d47f2a9d6092398
Date:   Thu May 21 13:58:52 2015 +0200

tdf#88276: Add background colour toolbar and sidebar buttons

but they do nothing yet, follow-up commit(s) add real functionality
to them

I take it that bNeedTextSpacing = true where it used to be 
mpToolBoxSpacing->Enable()
so fall-through that happens anyway also sets bNeedTextSpacing so presumably
everything is ok here

Change-Id: I8f1d4137a74fcc2c7ba6959e5b5c4b1f7464643c

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 0166136..a831ab9 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -157,7 +157,6 @@ void TextPropertyPanel::HandleContextChange (
 
 case CombinedEnumContext(Application_Calc, Context_EditCell):
 case CombinedEnumContext(Application_Calc, Context_DrawText):
-bNeedTextSpacing = true;
 
 case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
 case CombinedEnumContext(Application_WriterVariants, 
Context_Annotation):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

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

New commits:
commit 2d3517d8532702386e1215737fe29719c2c3
Author: Takeshi Abe 
Date:   Thu Jun 4 21:52:14 2015 +0900

Fix a regression introduced at 3d30077af27c8a6e91fb91175e6d2ea9a6f03d11

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

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 87661a8..4b46bfc 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1271,8 +1271,8 @@ const SdrObject* SwFEShell::GetBestObject( bool bNext, 
GotoObjFlags eType, bool
 Point aTopPos(  nTmp, nTmp );
 Point aCurPos;
 Point aPos;
-bool bNoDraw(GotoObjFlags::DrawAny & eType);
-bool bNoFly(GotoObjFlags::FlyAny & eType);
+bool bNoDraw((GotoObjFlags::DrawAny & eType) == GotoObjFlags::NONE);
+bool bNoFly((GotoObjFlags::FlyAny & eType) == GotoObjFlags::NONE);
 
 if( !bNoFly && bNoDraw )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrzej Hunt]

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

New commits:
commit a3afa22ba4069212213009fc7304adc3c339b68b
Author: Andrzej Hunt 
Date:   Thu Jun 4 14:02:05 2015 +0100

Fix using /opt/lo/bin/nasm on windows/cygwin

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

diff --git a/configure.ac b/configure.ac
index 85bbd22..c7483a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7458,7 +7458,7 @@ else
 if test -z "$NASM" -a "$build_os" = "cygwin"; then
 if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/nasm"; then
 NASM="$LODE_HOME/opt/bin/nasm"
-elif -x "/opt/lo/bin/nasm"; then
+elif test -x "/opt/lo/bin/nasm"; then
 NASM="/opt/lo/bin/nasm"
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 xmloff/source/text/txtparae.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 804ec2289115a65c74ddff478b7469801debf7e4
Author: Caolán McNamara 
Date:   Wed Apr 22 14:10:38 2015 +0100

fix assert on export of ooo63141-1.doc to odt

if bAutoStyles is true then the mbDoSomething of the SvXMLElementExport is
false, and the ctor/dtor doesn't do anything so any attributes added to the
exporter are not cleared by the SvXMLElementExport dtor

so only add the attribute if bAutoStyles if false and might as well extend 
the
block to cover the use of SvXMLElementExport and use the other ctor which
defaults mbDoSomething on

Change-Id: If35cd35e902372562fd7e78b3f970d91fcec3c16
(cherry picked from commit bd75327c8bc1157036ca11db8c808dc7ceb2109e)
Reviewed-on: https://gerrit.libreoffice.org/16053
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 923b867d9a1ebc4170c567c5836ed172d3cb7435)
Reviewed-on: https://gerrit.libreoffice.org/16054
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index cdc468c..5da84e0 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2208,13 +2208,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 }
 else if ( sType.equals( sAnnotationEnd ) )
 {
-Reference 
xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
-const OUString& rName = xBookmark->getName();
-if ( rName.getLength() > 0 )
+if (!bAutoStyles)
 {
-GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, 
rName);
+Reference 
xBookmark(xPropSet->getPropertyValue(sBookmark), UNO_QUERY);
+const OUString& rName = xBookmark->getName();
+if (!rName.isEmpty())
+{
+GetExport().AddAttribute(XML_NAMESPACE_OFFICE, 
XML_NAME, rName);
+}
+SvXMLElementExport aElem( GetExport(), 
XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false );
 }
-SvXMLElementExport aElem( GetExport(), !bAutoStyles, 
XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false );
 }
 else if( sType.equals( sFrame ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 84483, which changed state.

Bug 84483 Summary: PRINTING: Print dialogue called from print preview causes 
writer to crash
https://bugs.documentfoundation.org/show_bug.cgi?id=84483

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Caolán McNamara]

 sw/source/core/view/vprint.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 01f77389b473a37a7b8e0e46a1e49a56dac478c3
Author: Caolán McNamara 
Date:   Thu Jun 4 11:41:30 2015 +0100

Resolves: tdf#84483 postit layout not available in print preview mode

for the moment don't crash anyway, maybe we can rearrange matters
to make this possible.

Change-Id: I2dc9831e5b026004b2f7603e618330154dbd6d1b
(cherry picked from commit eea5ac7910d61796d77fe2cc03681dd24bb7dd95)
(cherry picked from commit 84c9d54eb3c007066908794a1443dca6670a3922)
Reviewed-on: https://gerrit.libreoffice.org/16084
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 7f2b520..321b1f5 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -535,9 +535,10 @@ bool SwViewShell::PrintOrPDFExport(
 
 SwPaintQueue::Repaint();
 
-if (nPostItMode == POSTITS_INMARGINS)
+SwPostItMgr *pPostItManager = (nPostItMode == POSTITS_INMARGINS) ?
+pShell->GetPostItMgr() : NULL;
+if (pPostItManager)
 {
-SwPostItMgr *pPostItManager = pShell->GetPostItMgr();
 pPostItManager->CalcRects();
 pPostItManager->LayoutPostIts();
 pPostItManager->DrawNotesForPage(pOutDev, nPage-1);
___
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' - config_host/config_extension_update.h.in config_host.mk.in configure.ac desktop/source scp2/source

[Katarina Behrens]

 config_host.mk.in|1 +
 config_host/config_extension_update.h.in |6 ++
 configure.ac |   22 ++
 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   11 +--
 desktop/source/deployment/gui/dp_gui_dialog2.hxx |2 ++
 scp2/source/ooo/common_brand.scp |6 +-
 6 files changed, 45 insertions(+), 3 deletions(-)

New commits:
commit e069404a5382ac0095f64a824ef8dc0a9eae260d
Author: Katarina Behrens 
Date:   Tue Jun 2 11:13:44 2015 +0200

Build time option --disable-extension-update

to disable the possibility to update installed extensions

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

diff --git a/config_host.mk.in b/config_host.mk.in
index ffb2deb..e0e01e3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -156,6 +156,7 @@ export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
 export ENABLE_MARIADBC=@ENABLE_MARIADBC@
 export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@
 export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
+export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
diff --git a/config_host/config_extension_update.h.in 
b/config_host/config_extension_update.h.in
new file mode 100644
index 000..5e12a78
--- /dev/null
+++ b/config_host/config_extension_update.h.in
@@ -0,0 +1,6 @@
+#ifndef CONFIG_EXTENSION_UPDATE
+#define CONFIG_EXTENSION_UPDATE
+
+#define ENABLE_EXTENSION_UPDATE 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index 16f0520..b1aa254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1318,6 +1318,11 @@ AC_ARG_ENABLE(online-update,
  LibreOffice. By default, it is enabled on Windows and Mac, disabled 
on Linux.]),
 ,)
 
+AC_ARG_ENABLE(extension-update,
+AS_HELP_STRING([--disable-extension-update],
+[Disable possibility to update installed extensions.]),
+,)
+
 AC_ARG_ENABLE(release-build,
 AS_HELP_STRING([--enable-release-build],
 [Enable release build.
@@ -11739,6 +11744,22 @@ fi
 AC_SUBST(ENABLE_ONLINE_UPDATE)
 
 dnl ===
+dnl Test whether to enable extension update
+dnl ===
+AC_MSG_CHECKING([whether to enable extension update])
+ENABLE_EXTENSION_UPDATE=
+if test "x$enable_extension_update" = "xno"; then
+AC_MSG_RESULT([no])
+else
+AC_MSG_RESULT([yes])
+ENABLE_EXTENSION_UPDATE="TRUE"
+AC_DEFINE(ENABLE_EXTENSION_UPDATE)
+SCPDEFS="$SCPDEFS -DENABLE_EXTENSION_UPDATE"
+fi
+AC_SUBST(ENABLE_EXTENSION_UPDATE)
+
+
+dnl ===
 dnl Test whether to create MSI with LIMITUI=1 (silent install)
 dnl ===
 AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)])
@@ -12984,6 +13005,7 @@ AC_CONFIG_FILES([config_host.mk
 AC_CONFIG_HEADERS([config_host/config_buildid.h])
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_eot.h])
+AC_CONFIG_HEADERS([config_host/config_extension_update.h])
 AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h])
 AC_CONFIG_HEADERS([config_host/config_cups.h])
 AC_CONFIG_HEADERS([config_host/config_features.h])
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 92b802f..fb98cdd 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -364,7 +364,9 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const 
Point & rPos, const long
 
 PopupMenu aPopup;
 
+#if ENABLE_EXTENSION_UPDATE
 aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( 
RID_CTX_ITEM_CHECK_UPDATE ) );
+#endif
 
 if ( ! GetEntryData( nPos )->m_bLocked )
 {
@@ -700,7 +702,6 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, 
TheExtensionManager *pManager,
 m_pAddBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleAddBtn ) );
 m_pCloseBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleCloseBtn ) );
 
-m_pUpdateBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleUpdateBtn ) );
 m_pGetExtensions->SetClickHdl( LINK( this, ExtMgrDialog, HandleHyperlink ) 
);
 m_pCancelBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleCancelBtn ) );
 
@@ -714,7 +715,12 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, 
TheExtensionManager *pManager,
 
 m_pProgressBar->Hide();
 
+#if ENABLE_EXTENSION_UPDATE
+m_pUpdateBtn->SetClickHdl( LINK( this, ExtMgrDialog, HandleUpdateBtn ) );
 m_pUpdateBtn->Enable(false);
+#else
+m_pUpdateBtn->Hide();
+#endif
 
 m_aIdle.SetPriority(SchedulerPrio

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

[David Tardon]

 RepositoryExternal.mk|   
55 
 configure.ac |
2 
 download.lst |
2 
 external/liborcus/0001-fix-dllexport-decls.patch |  
101 
 external/liborcus/0001-mark-more-symbols-as-public.patch |   
52 
 external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch |   
36 
 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |   
45 
 external/liborcus/ExternalPackage_liborcus.mk|   
22 
 external/liborcus/ExternalProject_liborcus.mk|
4 
 external/liborcus/Library_orcus-parser.mk|   
55 
 external/liborcus/Library_orcus.mk   |  
104 
 external/liborcus/Module_liborcus.mk |   
17 
 external/liborcus/UnpackedTarball_liborcus.mk|   
25 
 external/liborcus/liborcus_0.1.0-configure.patch |   
20 
 external/liborcus/liborcus_0.1.0-dllimport.patch |   
24 
 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0  | 
1800 --
 external/liborcus/visibility.patch   |   
11 
 sc/source/filter/html/htmlpars.cxx   |   
30 
 sc/source/filter/inc/orcusinterface.hxx  |   
10 
 sc/source/filter/orcus/interface.cxx |   
48 
 20 files changed, 572 insertions(+), 1891 deletions(-)

New commits:
commit edb38d702dd5a058ae0702b73a43328318b94649
Author: David Tardon 
Date:   Thu Jun 4 16:09:48 2015 +0200

update to liborcus 0.9.1

Includes switching to dynamic libs.

Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47e4d17..726ef75 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3209,35 +3209,78 @@ endef
 
 else # !SYSTEM_LIBORCUS
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   orcus \
+   orcus-parser \
+))
+
+define gb_LinkTarget__use_orcus
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+   orcus \
+)
+
+endef
+
+define gb_LinkTarget__use_orcus-parser
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+   orcus-parser \
+)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   liborcus \
+))
+
 define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_use_package,$(1),liborcus)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.10 \
 )
 
 $(if $(SYSTEM_BOOST), \
-$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
-$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
+   $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
+   $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
 )
 
 endef
 
 define gb_LinkTarget__use_orcus-parser
-$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_use_package,$(1),liborcus)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.10 \
 )
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_LIBORCUS
 
 else # ENABLE_ORCUS != TRUE
diff --git a/configure.ac b/configure.ac
index c7483a0..ac00539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9012,7 +9012,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
 ENABLE_ORCUS="TRUE"
 AC_DEFINE(ENABLE_ORCUS)
 
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 >= 0.7.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index 86ce10c..7b4bfe4 100644
--- a/d

[Libreoffice-commits] core.git: 4 commits - bin/get-bugzilla-attachments-by-mimetype

[Michael Stahl]

 bin/get-bugzilla-attachments-by-mimetype |   80 +--
 1 file changed, 45 insertions(+), 35 deletions(-)

New commits:
commit 56763e94bf6f59dde3e33e522553eb39b77e81a2
Author: Michael Stahl 
Date:   Thu Jun 4 16:57:59 2015 +0200

get-bugzilla-attachments: actually use the fdo bugzilla

bugs.libreoffice.org redirects to bugs.documentfoundation.org,
which isn't very helpful as it just causes duplicate downloads.

Arguably freedesktop.org could be removed; the are just ~5 interesing
attachments since the TDF bugzilla migration.

Change-Id: I26d2667848582209e382226108c47549e99cee97

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index a5f1570..7f0dfa2 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -339,7 +339,7 @@ def get_launchpad_bugs(prefix):
 
 rss_bugzillas = (
 ( 'abi', 'http://bugzilla.abisource.com/buglist.cgi' ), #added for abiword
-( 'fdo', 'http://bugs.libreoffice.org/buglist.cgi' ),
+( 'fdo', 'http://bugs.freedesktop.org/buglist.cgi' ),
 ( 'gentoo', 'http://bugs.gentoo.org/buglist.cgi' ),
 ( 'gnome', 'http://bugzilla.gnome.org/buglist.cgi' ), # added for gnumeric
 ( 'kde', 'http://bugs.kde.org/buglist.cgi' ), # added for koffice/calligra
commit e5f9ee18476697a64d7ef646a072f8c76cf95b50
Author: Michael Stahl 
Date:   Thu Jun 4 12:56:35 2015 +0200

get-bugzilla-attachments: avoid writing incomplete files

Change-Id: I7d1139ddf8c88626dd716aa537a305c31b5be5d9

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index fbc4031..a5f1570 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -94,9 +94,11 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
 continue
 
 print('downloading as ' + download)
-f = open(download, 'wb')
+tmpfile = download + ".tmp"
+f = open(tmpfile, 'wb')
 f.write(base64.b64decode(node.firstChild.nodeValue))
 f.close()
+os.rename(tmpfile, download)
 break
 
 def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
@@ -138,9 +140,11 @@ def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
 continue
 
 print('downloading as ' + download)
-f = open(download, 'wb')
+tmpfile = download + ".tmp"
+f = open(tmpfile, 'wb')
 f.write(handle.read())
 f.close()
+os.rename(tmpfile, download)
 
 def create_query(mimetype):
 query = dict()
@@ -327,9 +331,11 @@ def get_launchpad_bugs(prefix):
 
 print('mimetype is ' + handle.content_type + ' downloading as 
' + download)
 
-f = open(download, "w")
+tmpfile = download + ".tmp"
+f = open(tmpfile, "wb")
 f.write(handle.read())
 f.close()
+os.rename(tmpfile, download)
 
 rss_bugzillas = (
 ( 'abi', 'http://bugzilla.abisource.com/buglist.cgi' ), #added for abiword
commit bd2eee0bd4ae83ff453522b7cf09b69f1b8b5e1b
Author: Michael Stahl 
Date:   Wed Jun 3 23:41:32 2015 +0200

get-bugzilla-attachments: avoid FDO-TDF duplicates...

... by checking that a file with "fdo" already exists for bugs older
than the migration, instead of just ignoring the old bugs on TDF.

There are > 300 additional attachments not on freedesktop.org.

Change-Id: Ib7ee63041109071cc1241a875ef2cccbddfc699d

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 7e6dc83e..fbc4031 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -86,6 +86,13 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
 print("assuming " + download + " is up to date")
 continue
 
+# prevent re-downloading FDO attachments from TDF
+if prefix == "tdf" and int(id) < 88776:
+fdodownload = download.replace("tdf", "fdo")
+if os.path.isfile(fdodownload):
+print("assuming FDO " + fdodownload + " is up to date")
+continue
+
 print('downloading as ' + download)
 f = open(download, 'wb')
 f.write(base64.b64decode(node.firstChild.nodeValue))
@@ -199,7 +206,7 @@ def get_through_rpc_query(rpcurl, showurl, mimetype, 
prefix, suffix):
 print('looking for all bugs having %s attachment(s)' % mimetype)
 process(query, True, get_file_bz_ids(files, prefix))
 
-def get_through_rss_query(queryurl, mimetype, prefix, suffix, startid):
+def get_through_rss_query(queryurl, mimetype, prefix, suffix):
 try:
 os.mkdir(suffix)

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

[Caolán McNamara]

 sw/source/core/unocore/unochart.cxx |4 ++--
 xmloff/source/core/nmspmap.cxx  |   12 
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 4cc2fb2db34337880393d692d0e9ea8d6496fcbf
Author: Caolán McNamara 
Date:   Thu Jun 4 20:30:21 2015 +0100

coverity#1302607 Logically dead code

also

coverity#1302606 Logically dead code

Change-Id: I510f17e93f7caf5f1c35becdf6b7d626c0160b66

diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 6a97160..b355f03 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -102,10 +102,12 @@ sal_uInt16 SvXMLNamespaceMap::Add( const OUString& 
rPrefix, const OUString& rNam
 if( XML_NAMESPACE_UNKNOWN == nKey )
 nKey = GetKeyByName( rName );
 
-assert(XML_NAMESPACE_NONE != nKey);
-
+#ifdef NDEBUG
 if( XML_NAMESPACE_NONE == nKey )
 return USHRT_MAX;
+#else
+assert(XML_NAMESPACE_NONE != nKey);
+#endif
 
 if ( aNameHash.find ( rPrefix ) == aNameHash.end() )
 nKey = _Add( rPrefix, rName, nKey );
@@ -117,10 +119,12 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString& 
rPrefix, const OUStrin
 {
 sal_uInt16 nKey = GetKeyByName( rName );
 
-assert(nKey != XML_NAMESPACE_NONE);
-
+#ifdef NDEBUG
 if( XML_NAMESPACE_NONE == nKey )
 return XML_NAMESPACE_UNKNOWN;
+#else
+assert(nKey != XML_NAMESPACE_NONE);
+#endif
 
 if( XML_NAMESPACE_UNKNOWN != nKey )
 {
commit a6b6bb2aac59db3b390a3155ee4b25ebfef76ce9
Author: Caolán McNamara 
Date:   Thu Jun 4 20:26:45 2015 +0100

coverity#1302656 Unchecked dynamic_cast

Change-Id: If84fc54892bbe65799b3bc344c700bb43bedc0cd

diff --git a/sw/source/core/unocore/unochart.cxx 
b/sw/source/core/unocore/unochart.cxx
index 33a0b27..bf96c15 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1947,7 +1947,7 @@ SwChartDataSequence::SwChartDataSequence( const 
SwChartDataSequence &rObj ) :
 aColLabelText( SW_RES(STR_CHART2_COL_LABEL_TEXT) ),
 xDataProvider( rObj.pDataProvider ),
 pDataProvider( rObj.pDataProvider ),
-pTableCrsr( dynamic_cast(rObj.pTableCrsr.get())->Clone() 
),
+pTableCrsr( dynamic_cast(*rObj.pTableCrsr.get()).Clone() 
),
 aCursorDepend( this, pTableCrsr.get() ),
 _pPropSet( rObj._pPropSet )
 {
@@ -2032,7 +2032,7 @@ uno::Sequence< uno::Any > SAL_CALL 
SwChartDataSequence::getData()
 // keep original cursor and make copy of it that gets handed
 // over to the SwXCellRange object which takes ownership and
 // thus will destroy the copy later.
-SwXCellRange aRange( 
dynamic_cast(pTableCrsr.get())->Clone(), *pTableFormat, aDesc 
);
+SwXCellRange aRange( 
dynamic_cast(*pTableCrsr.get()).Clone(), *pTableFormat, aDesc 
);
 aRange.GetDataSequence( &aRes, 0, 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' - sw/source

[Caolán McNamara]

 sw/source/core/fields/expfld.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7aeeef6902ee2be4934341072829a6f15a14f3fb
Author: Caolán McNamara 
Date:   Thu Jun 4 21:00:13 2015 +0100

Resolves: tdf#91637 avoid -1 string index

Change-Id: I006040f4589065141310fe2a89b8d2ba3e54ad2c
(cherry picked from commit 4e96b278965875a95f02993590f30ab5859c1fed)

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index b9007ab..e7da510 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -746,8 +746,11 @@ bool SwSeqFieldList::SeekEntry( const _SeqFieldLstElem& 
rNew, size_t* pP ) const
 sal_Int32 nNum1 = sNum1.toInt32();
 nCmp = nNum2 - nNum1;
 if( 0 == nCmp )
-nCmp = rCaseColl.compareString( rTmp2.copy( nFndPos2 ),
-rTmp1.copy( nFndPos1 ));
+{
+OUString aTmp1 = nFndPos1 != -1 ? rTmp1.copy(nFndPos1) : 
OUString();
+OUString aTmp2 = nFndPos2 != -1 ? rTmp2.copy(nFndPos2) : 
OUString();
+nCmp = rCaseColl.compareString(aTmp2, aTmp1);
+}
 }
 else
 nCmp = rColl.compareString( rTmp2, rTmp1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/fields/expfld.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4e96b278965875a95f02993590f30ab5859c1fed
Author: Caolán McNamara 
Date:   Thu Jun 4 21:00:13 2015 +0100

Resolves: tdf#91637 avoid -1 string index

Change-Id: I006040f4589065141310fe2a89b8d2ba3e54ad2c

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index b9007ab..e7da510 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -746,8 +746,11 @@ bool SwSeqFieldList::SeekEntry( const _SeqFieldLstElem& 
rNew, size_t* pP ) const
 sal_Int32 nNum1 = sNum1.toInt32();
 nCmp = nNum2 - nNum1;
 if( 0 == nCmp )
-nCmp = rCaseColl.compareString( rTmp2.copy( nFndPos2 ),
-rTmp1.copy( nFndPos1 ));
+{
+OUString aTmp1 = nFndPos1 != -1 ? rTmp1.copy(nFndPos1) : 
OUString();
+OUString aTmp2 = nFndPos2 != -1 ? rTmp2.copy(nFndPos2) : 
OUString();
+nCmp = rCaseColl.compareString(aTmp2, aTmp1);
+}
 }
 else
 nCmp = rColl.compareString( rTmp2, rTmp1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/fields/expfld.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b36afd1ecd098723e3119cba81e172396bf30f45
Author: Caolán McNamara 
Date:   Thu Jun 4 21:00:13 2015 +0100

Resolves: tdf#91637 avoid -1 string index

Change-Id: I006040f4589065141310fe2a89b8d2ba3e54ad2c
(cherry picked from commit 4e96b278965875a95f02993590f30ab5859c1fed)
Reviewed-on: https://gerrit.libreoffice.org/16089
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 3100363..2fcdc42 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -739,8 +739,11 @@ bool SwSeqFldList::SeekEntry( const _SeqFldLstElem& rNew, 
size_t* pP ) const
 sal_Int32 nNum1 = sNum1.toInt32();
 nCmp = nNum2 - nNum1;
 if( 0 == nCmp )
-nCmp = rCaseColl.compareString( rTmp2.copy( nFndPos2 ),
-rTmp1.copy( nFndPos1 ));
+{
+OUString aTmp1 = nFndPos1 != -1 ? rTmp1.copy(nFndPos1) : 
OUString();
+OUString aTmp2 = nFndPos2 != -1 ? rTmp2.copy(nFndPos2) : 
OUString();
+nCmp = rCaseColl.compareString(aTmp2, aTmp1);
+}
 }
 else
 nCmp = rColl.compareString( rTmp2, rTmp1 );
___
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

[László Németh]

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

New commits:
commit 907f01dc76fe822dd61fcf1463e095a30752db98
Author: László Németh 
Date:   Thu Jun 4 18:01:55 2015 +0200

fix rendercontext rendering of standard toolbar icons

(cherry-picked from 177f8e8bbdc2a554f3f795e4e766c2e184410f81)

Change-Id: I6e0399c16d3e900fbca56fc757f342ea893d0ad4
Reviewed-on: https://gerrit.libreoffice.org/16087
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 8e538da..743b3b8 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -177,7 +177,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
 {
 WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl();
 vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion();
-if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL)
+if (pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL || m_pBuffer)
 {
 pWindowImpl->maInvalidateRegion = *pWinChildClipRegion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zsolt Bölöny]

 basegfx/source/polygon/b3dpolygontools.cxx  |5 -
 chart2/source/view/main/Stripe.cxx  |2 +-
 include/basegfx/polygon/b3dpolygontools.hxx |3 ---
 svx/source/engine3d/polygn3d.cxx|4 ++--
 4 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 8854643a0a964f6aa511013c6ab31ed198c74e86
Author: Zsolt Bölöny 
Date:   Thu Jun 4 10:45:08 2015 +0200

Removed getNormal() from polygontools, it just calls B3DPolygon::getNormal()

Change-Id: I5a59ff8e0db1aee52d0b683c9c64e4b18b64e66b
Reviewed-on: https://gerrit.libreoffice.org/16077
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basegfx/source/polygon/b3dpolygontools.cxx 
b/basegfx/source/polygon/b3dpolygontools.cxx
index 10e3581..62904d6 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -72,11 +72,6 @@ namespace basegfx
 return aRetval;
 }
 
-B3DVector getNormal(const B3DPolygon& rCandidate)
-{
-return rCandidate.getNormal();
-}
-
 double getLength(const B3DPolygon& rCandidate)
 {
 double fRetval(0.0);
diff --git a/chart2/source/view/main/Stripe.cxx 
b/chart2/source/view/main/Stripe.cxx
index c9455a0..2373002 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -131,7 +131,7 @@ drawing::Direction3D Stripe::getNormal() const
 aPolygon3D.append(Position3DToB3DPoint( m_aPoint2 ));
 aPolygon3D.append(Position3DToB3DPoint( m_aPoint3 ));
 aPolygon3D.append(Position3DToB3DPoint( m_aPoint4 ));
-::basegfx::B3DVector aNormal(::basegfx::tools::getNormal(aPolygon3D));
+::basegfx::B3DVector aNormal(aPolygon3D.getNormal());
 aRet = B3DVectorToDirection3D(aNormal);
 }
 
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx 
b/include/basegfx/polygon/b3dpolygontools.hxx
index 0068515..bcee8be 100644
--- a/include/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
@@ -55,9 +55,6 @@ namespace basegfx
 // get size of polygon. Control vectors are included in that ranges.
 BASEGFX_DLLPUBLIC B3DRange getRange(const B3DPolygon& rCandidate);
 
-// get normal vector of polygon
-BASEGFX_DLLPUBLIC B3DVector getNormal(const B3DPolygon& rCandidate);
-
 // get area of polygon
 BASEGFX_DLLPUBLIC double getArea(const ::basegfx::B3DPolygon& 
rCandidate);
 
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 44ea981..7329aa1 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -73,7 +73,7 @@ void E3dPolygonObj::CreateDefaultNormals()
 basegfx::B3DPolygon aNormals;
 
 // Get normal (and invert)
-basegfx::B3DVector aNormal(-basegfx::tools::getNormal(aPolygon));
+basegfx::B3DVector aNormal(-aPolygon.getNormal());
 
 // Fill new polygon
 for(sal_uInt32 b(0L); b < aPolygon.count(); b++)
@@ -104,7 +104,7 @@ void E3dPolygonObj::CreateDefaultTexture()
 basegfx::B3DRange aVolume(basegfx::tools::getRange(aPolygon));
 
 // Get normal
-basegfx::B3DVector aNormal(basegfx::tools::getNormal(aPolygon));
+basegfx::B3DVector aNormal(aPolygon.getNormal());
 aNormal.setX(fabs(aNormal.getX()));
 aNormal.setY(fabs(aNormal.getY()));
 aNormal.setZ(fabs(aNormal.getZ()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[matteocam]

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

New commits:
commit a13b044e00ca78fc1aa46bc169ed184463b202e9
Author: matteocam 
Date:   Thu Jun 4 16:27:40 2015 -0400

Removed reformatting. Using SetOutlinerParaObject instead of the Nbc version

Change-Id: I2d8d75b23e7d76b65b0d7e076074a82450c0f56e

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 804cacb..802863f 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -755,8 +755,8 @@ void SdrTextObj::impLeaveOnlyNonOverflowingText() const
 }
 
 OutlinerParaObject *pNewText = rOutliner.CreateParaObject();
-const_cast(this)->NbcSetOutlinerParaObject(pNewText);
-const_cast(this)->ReformatText();
+const_cast(this)->SetOutlinerParaObject(pNewText);
+//const_cast(this)->ReformatText();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source include/vcl vcl/inc vcl/Library_vcl.mk vcl/quartz vcl/source vcl/win

[Mox Soini]

 canvas/source/cairo/cairo_textlayout.cxx |   97 -
 include/vcl/sysdata.hxx  |   16 +--
 vcl/Library_vcl.mk   |2 
 vcl/inc/quartz/salgdi.h  |6 -
 vcl/inc/salgdi.hxx   |9 ++
 vcl/inc/win/salgdi.h |6 -
 vcl/quartz/salgdi.cxx|   10 --
 vcl/quartz/salgdicommon.cxx  |  118 --
 vcl/source/outdev/font.cxx   |4 
 vcl/source/outdev/outdev.cxx |9 --
 vcl/win/source/gdi/salgdi.cxx|  139 ---
 vcl/win/source/gdi/salgdi3.cxx   |   15 ---
 12 files changed, 29 insertions(+), 402 deletions(-)

New commits:
commit e4d55e8045c99af65a2cae57b26ec076825c9673
Author: Mox Soini 
Date:   Tue Jun 2 23:52:56 2015 +0300

Cleanup crossplatform cairo

Mac / Win cairo is not built / used, this cairo code can be removed to
reduce code bloat.

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

diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index 03d31947..570daaf 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -26,15 +26,6 @@
 
 #include 
 #include 
-
-#ifdef WNT
-#ifdef max
-#undef max
-#endif
-#ifdef min
-#undef min
-#endif
-#endif
 #include 
 
 #include 
@@ -45,21 +36,12 @@
 #include "cairo_textlayout.hxx"
 #include "cairo_spritecanvas.hxx"
 
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
-#include 
-#elif defined CAIRO_HAS_WIN32_SURFACE
-# include "cairo_win32_cairo.hxx"
-# include 
-#elif defined CAIRO_HAS_FT_FONT
+#if defined CAIRO_HAS_FT_FONT
 # include 
 #else
 # error Native API needed.
 #endif
 
-#ifdef IOS
-#include 
-#endif
-
 using namespace ::cairo;
 using namespace ::com::sun::star;
 
@@ -309,7 +291,7 @@ namespace cairocanvas
**/
 bool TextLayout::isCairoRenderable(SystemFontData aSysFontData) const
 {
-#if defined UNX && !defined MACOSX && !defined IOS
+#if defined CAIRO_HAS_FT_FONT
 // is font usable?
 if (!aSysFontData.nFontId)
 return false;
@@ -325,46 +307,6 @@ namespace cairocanvas
 return true;
 }
 
-#ifdef CAIRO_HAS_WIN32_SURFACE
-namespace
-{
-/**
- * cairo::ucs4toindex: Convert ucs4 char to glyph index
- * @param ucs4 an ucs4 char
- * @param hfont current font
- *
- * @return true if successful
- **/
-unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont)
-{
-wchar_t unicode[2];
-WORD glyph_index;
-HDC hdc = NULL;
-
-hdc = CreateCompatibleDC (NULL);
-
-if (!hdc) return 0;
-if (!SetGraphicsMode (hdc, GM_ADVANCED))
-{
-DeleteDC (hdc);
-return 0;
-}
-
-SelectObject (hdc, hfont);
-SetMapMode (hdc, MM_TEXT);
-
-unicode[0] = ucs4;
-unicode[1] = 0;
-if (GetGlyphIndicesW (hdc, unicode, 1, &glyph_index, 0) == 
GDI_ERROR)
-{
-glyph_index = 0;
-}
-
-DeleteDC (hdc);
-return glyph_index;
-}
-}
-#endif
 
   /**
* TextLayout::draw
@@ -385,9 +327,6 @@ namespace cairocanvas
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 SystemTextLayoutData aSysLayoutData;
-#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
-LOGFONTW logfont;
-#endif
 setupLayoutMode( rOutDev, mnTextDirection );
 
 // TODO(P2): cache that
@@ -484,11 +423,6 @@ namespace cairocanvas
 
 cairo_glyph_t aGlyph;
 aGlyph.index = systemGlyph.index;
-#ifdef CAIRO_HAS_WIN32_SURFACE
-// Cairo requires standard glyph indexes (ETO_GLYPH_INDEX), 
while vcl/win/* uses ucs4 chars.
-// Convert to standard indexes
-aGlyph.index = ucs4toindex((unsigned int) aGlyph.index, 
rSysFontData.hFont);
-#endif
 aGlyph.x = systemGlyph.x;
 aGlyph.y = systemGlyph.y;
 cairo_glyphs.push_back(aGlyph);
@@ -502,24 +436,7 @@ namespace cairocanvas
  **/
 cairo_font_face_t* font_face = NULL;
 
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
-# ifdef MACOSX
-// TODO: use cairo_quartz_font_face_create_for_cgfont(cgFont)
-//   when CGFont (Mac OS X 10.5 API) is provided by the AQUA 
VCL backend.
-font_face = 
cairo_quartz_font_face_create_for_atsu_font_id((ATSUFontID) 
rSysFontData.aATSUFontID);
-# else // iOS
-font_face = cairo_quartz_font_face_create_for_cgfont( 
CTFontCopyGraphicsFont( rSysFontData.rCTFont, NULL ) );
-# endif
-
-#elif defined CAIRO_HAS_WIN32_SURFACE
-# if (OSL_DEBUG_L

[Libreoffice-commits] core.git: 2 commits - configure.ac external/liborcus

[Tor Lillqvist]

 configure.ac  |2 --
 external/liborcus/ExternalProject_liborcus.mk |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ea2ed8a1d442d7f0e00b63abdab15fddb0d58233
Author: Tor Lillqvist 
Date:   Fri Jun 5 00:46:26 2015 +0300

Bin superfluous assignments

The variable is assigned an empty value already a few lines above.

Change-Id: I52d2b650d908209421368384e44d95bfe18d93ae

diff --git a/configure.ac b/configure.ac
index ac00539..68242b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5977,10 +5977,8 @@ if test "$COM" = MSC; then
 AC_MSG_CHECKING([whether $CXX supports C++11])
 AC_MSG_RESULT(yes)
 # MSVC supports (a subset of) CXX11 without any switch
-CXXFLAGS_CXX11=
 elif test "$GCC" = "yes"; then
 HAVE_CXX11=
-CXXFLAGS_CXX11=
 AC_MSG_CHECKING([whether $CXX supports C++11])
 for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do
 save_CXXFLAGS=$CXXFLAGS
commit e48bb73b818d1e60b6a7a4389151ae6644805d4a
Author: Tor Lillqvist 
Date:   Fri Jun 5 00:44:12 2015 +0300

Fix weird compilation problem with __float128

Change-Id: I4a7ac5ee7f2f2c9d9d87517c826c1e80bd23477d

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index ff488bf..8a53fa8 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)
+liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) 
$(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11)
 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

Looking for help for clipboard in Math

[Regina Henschel]

Hi all,

I struggle with the clipboard. My goal is to import MathML in module 
Math from clipboard, similar as it is imported from file. But I'm stuck. 
Therefore some questions:


(1)
Has someone tried such already and found, that it is not possible?

(2)
The comments in file exchange.cxx refer to a document "CLIP.SDW". Has 
someone this document and can provide it?


(3)
I have added a .uno command which is executed in 
SmViewShell::Execute(SfxRequest& rReq)


My current attempt looks like this:

TransferableDataHelper aDataHelper( 
TransferableDataHelper::CreateFromSystemClipboard(GetEditWindow()) );

SotFormatStringId nId;
DataFlavorExVector* pFormats;
pFormats = &aDataHelper.GetDataFlavorExVector();
DataFlavorExVector::iterator aIter( 
((DataFlavorExVector&)*pFormats).begin() ),
aEnd( 
((DataFlavorExVector&)*pFormats).end() );

while ( aIter != aEnd )
{
nId = (*aIter).mnSotId;
...
aIter++;
}

I get some nId-values and for some of them I can get a stream and can 
look at the content. But the clipboard content, which is generated by 
the Windows program "Math Input Control" (mip.exe) is not noticed. But I 
see that the clipboard has a content "MathML" and a content "MathML 
Presentation" using the clipboard viewer "Free Clipboard Viewer 2.0". 
Why do I get no nId for it?


(4)
The numbers I get in nId are those from the list in exchange.cxx, and 
for "application/mathml+xml", which is not listed there, I get the next 
one following the list. But how can I get the MimeType or the 
HumanPresentableName for the detected nId? My following try does not 
work, the strings are empty in all cases:


::com::sun::star::datatransfer::DataFlavor aFlavor;
SotExchange::GetFormatDataFlavor( nId, aFlavor ) )
String sHumanPresentableName(aFlavor.HumanPresentableName);
String sMimeType(aFlavor.MimeType);

(5)
I try to use SmViewShell::InsertFrom(SfxMedium &rMedium). It seems to 
work, but when the process arrives at SmXMLImport::endDocument(void), 
the node tree is empty.  Any tips, what I might have missed?


Kind regards
Regina

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

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

[Henry Castro]

 sc/source/ui/unoobj/docuno.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb8c323d94bf13d4a373f88c6b932a97701c283b
Author: Henry Castro 
Date:   Thu Jun 4 20:44:45 2015 -0400

sc tiled editing: EndTracking trigger MouseUp

It does not need to trigger fake MouseUp event

Change-Id: Id90c7787ef3312abe81bce359648aee0dfccd905

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a47b7e0..87d9671 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -591,7 +591,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, 
int nCount)
 // sometimes MouseButtonDown captures mouse and starts tracking, and 
VCL
 // will not take care of releasing that with tiled rendering
 if (pGridWindow->IsTracking())
-pGridWindow->EndTracking();
+pGridWindow->EndTracking(TrackingEventFlags::DontCallHdl);
 
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sc/source/ui/view/gridwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed81eaf2f9ac33912f54a9bfa6a1e3d1aad07dc8
Author: Henry Castro 
Date:   Thu Jun 4 21:10:28 2015 -0400

sc tiled editing: double-click empty cell

Change-Id: I35c43e2a22ac6591a2bcf9857808503c0e111344

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 0c7a5d3..eb1c5af 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2415,7 +2415,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt 
)
 {
 // don't forward the event to an empty cell, causes deselection in
 // case we used the double-click to select the empty cell
-if (bIsTiledRendering)
+if (bIsTiledRendering && bDouble)
 {
 ScRefCellValue aCell;
 aCell.assign(*pViewData->GetDocument(), ScAddress(nPosX, 
nPosY, nTab));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sc/source/ui/view/viewdata.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 856233d2ef20ba0f4118edd475308bd59442068c
Author: Henry Castro 
Date:   Thu Jun 4 21:37:55 2015 -0400

sc tiled editing: Editview register LOKit callback

Change-Id: I5ad07f0f3defacaac0f5dac724e9867bbc011dd6

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 22d46dc..8795afe 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -928,6 +928,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 else
 {
 pEditView[eWhich] = new EditView( pNewEngine, pWin );
+
+if (pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
+{
+
pEditView[eWhich]->registerLibreOfficeKitCallback(pDoc->GetDrawLayer()->getLibreOfficeKitCallback(),
+  
pDoc->GetDrawLayer()->getLibreOfficeKitData());
+pEditView[eWhich]->setTiledRendering(true);
+}
 }
 
 //  bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon 
weg ist (23576)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'moggi/opengl-preparation'

[Henry Castro]

New branch 'moggi/opengl-preparation' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-preparation' - 11 commits - sc/source sw/inc sw/source vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/opengl vcl/Package_opengl_blacklist

[Markus Mohrhard]

Rebased ref, commits from common ancestor:
commit 551fd0ec64c774fa46b177f2a77c59f668645954
Author: Markus Mohrhard 
Date:   Fri Jun 5 03:47:30 2015 +0200

add license header to blacklist file

Change-Id: I19edaf928ab4d99b5d3c399b59e26d515c2265b0

diff --git a/vcl/opengl/opengl_blacklist_windows.xml 
b/vcl/opengl/opengl_blacklist_windows.xml
index 6ff92d0..310bae0 100644
--- a/vcl/opengl/opengl_blacklist_windows.xml
+++ b/vcl/opengl/opengl_blacklist_windows.xml
@@ -1,3 +1,11 @@
+
+
 
 
 
commit a42ff0b771ccdf21ace297f91b372523a97b01da
Author: Markus Mohrhard 
Date:   Fri Jun 5 02:32:01 2015 +0200

install blacklist into user profile

Change-Id: I2571fcdde1689f1a168a5c5d6bd20785ce018927

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 8cb05ba..c278517 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 CustomTarget_afm_hash \
 Library_vcl \
Package_opengl \
+   Package_opengl_blacklist \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
$(if $(ENABLE_HEADLESS),, \
diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_blacklist.mk
new file mode 100644
index 000..b858a56
--- /dev/null
+++ b/vcl/Package_opengl_blacklist.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl))
+
+$(eval $(call 
gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
+   opengl_blacklist_windows.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/opengl/win/blacklist.xml 
b/vcl/opengl/opengl_blacklist_windows.xml
similarity index 100%
rename from vcl/opengl/win/blacklist.xml
rename to vcl/opengl/opengl_blacklist_windows.xml
commit 101e7b12c9a0c725175a5ce79e1e2b30d547a272
Author: Markus Mohrhard 
Date:   Thu Jun 4 17:39:48 2015 +0200

remove all traces of old device code

Change-Id: I792749951f11e99504c708bf27bec56c2d98019e

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx 
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 37779a5..0c60b35 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -47,22 +47,6 @@ enum VersionComparisonOp {
 DRIVER_COMPARISON_IGNORED
 };
 
-enum DeviceFamily {
-IntelGMA500,
-IntelGMA900,
-IntelGMA950,
-IntelGMA3150,
-IntelGMAX3000,
-IntelGMAX4500HD,
-IntelHD3000,
-IntelMobileHDGraphics,
-NvidiaBlockD3D9Layers,
-RadeonX1000,
-Geforce7300GT,
-Nvidia310M,
-DeviceFamilyMax
-};
-
 enum DeviceVendor {
 VendorAll,
 VendorIntel,
@@ -77,15 +61,8 @@ bool ParseDriverVersion(const OUString& rString, uint64_t& 
rVersion);
 
 struct DriverInfo
 {
-typedef std::vector DeviceFamilyVector;
-
-// If |ownDevices| is true, you are transferring ownership of the devices
-// array, and it will be deleted when this GfxDriverInfo is destroyed.
-
-DriverInfo(OperatingSystem os, const OUString& vendor, DeviceFamilyVector* 
devices,
-VersionComparisonOp op,
-uint64_t driverVersion, bool bWhiteListed = false, const char 
*suggestedVersion = nullptr,
-bool ownDevices = false);
+DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp 
op,
+uint64_t driverVersion, bool bWhiteListed = false, const char 
*suggestedVersion = nullptr);
 
 DriverInfo();
 DriverInfo(const DriverInfo&);
@@ -96,8 +73,6 @@ struct DriverInfo
 
 OUString maAdapterVendor;
 
-static DeviceFamilyVector* const allDevices;
-DeviceFamilyVector* mpDevices;
 std::vector maDevices;
 
 // Whether the mDevices array should be deleted when this structure is
@@ -113,9 +88,6 @@ struct DriverInfo
 uint64_t mnDriverVersionMax;
 static uint64_t allDriverVersions;
 
-static const DeviceFamilyVector* GetDeviceFamily(DeviceFamily id);
-static DeviceFamilyVector* mpDeviceFamilies[DeviceFamilyMax];
-
 OUString maSuggestedVersion;
 OUString maMsg;
 };
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index d69ee1a..0479358 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -18,26 +18,6 @@
 OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
 std::vector WinOpenGLDeviceInfo::maDriverInfo;
 
-#define APPEND_TO_DRIVER_BLOCKLIST(os, vendor, devices, driverComparator, 
driverVersion, suggestedVersion) \
-maDriverInfo.push_back(wgl::DriverInfo(os, vendor, devices, 
driverComparator, driverVersion, false, suggestedVersion))
-
-#define APPEND_TO_DRIVER_BLOCKLIST2(os, vendor, 

review of OpenGL blacklist work

[Markus Mohrhard]

Hey,

so as part of my work to integrate glyphy for OpenGL text rendering I
finally managed to implement the last missing piece from my earlier
blacklist work. Currently we have a blacklist based on the old Mozilla
blacklist which has two downsides:

1.) The entries are mostly irrelevant to us (except for the two entries
related to my systems).

2.) The blacklist is in the source code which means that if you discover
combinations that cause issues (crashes, rendering issues, ...) you have no
chance to help users until the next release. Mozilla, despite a much faster
release cycle, has therefore already switched to mostly a xml based
blacklist that is updated from a central server and only a small part (e.g.
for past security issues) stays in the code).

I have implemented something similar now in the feature/opengl-preparation
branch for windows as preparation for the glyphy work (which is expected to
uncover many driver bugs). I'd appreciated if someone would have a look at
it and comment on the general idea (do we want to use that concept, is
there something that I missed, ...).

I'd also like to add one more feature to my xml files to be able to specify
selected features that should be disabled. So it would be possibly to
disable OpenGL text rendering while keeping the other OpenGL features
available.

Please note that the automatic update is not yet implemented as I have no
URL on a TDF server yet.

Is there a need for a similar service on Linux. Mesa is at least as bad as
the Windows OpenGL drivers but I fear that all linux distros would disable
that feature anyway so making it useless.

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

[Libreoffice-commits] core.git: Branch 'private/moggi/opengl-preparation' - 2 commits - vcl/opengl

[Markus Mohrhard]

 vcl/opengl/win/WinDeviceInfo.cxx|   26 ++
 vcl/opengl/win/blocklist_parser.cxx |   10 --
 vcl/opengl/win/blocklist_parser.hxx |1 +
 3 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit 756d7898166ebf40720d2f483ee17669e5841d63
Author: Markus Mohrhard 
Date:   Fri Jun 5 04:40:21 2015 +0200

finally enable the blacklist parser

Change-Id: I8346872a3e5bc7443524e5039f66eea0d3d381cd

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 0479358..670d3c2 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -9,6 +9,8 @@
 
 #include "opengl/win/WinDeviceInfo.hxx"
 
+#include "blocklist_parser.hxx"
+
 #include 
 #include 
 #include 
@@ -884,8 +886,32 @@ OUString 
WinOpenGLDeviceInfo::GetDeviceVendor(wgl::DeviceVendor id)
 return *mpDeviceVendors[id];
 }
 
+namespace {
+
+
+OUString getBlacklistFile()
+{
+OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") 
":UserInstallation}/user/config/opengl_blacklist_windows.xml");
+rtl::Bootstrap::expandMacros(url);
+
+return url;
+}
+
+
+}
+
 void WinOpenGLDeviceInfo::FillBlacklist()
 {
+OUString aURL = getBlacklistFile();
+WinBlocklistParser aParser(aURL, maDriverInfo);
+try {
+aParser.parse();
+}
+catch (...)
+{
+SAL_WARN("vcl.opengl.win", "error parsing blacklist");
+maDriverInfo.clear();
+}
 }
 
 
diff --git a/vcl/opengl/win/blocklist_parser.hxx 
b/vcl/opengl/win/blocklist_parser.hxx
index c34af0a..6f0142b 100644
--- a/vcl/opengl/win/blocklist_parser.hxx
+++ b/vcl/opengl/win/blocklist_parser.hxx
@@ -19,6 +19,7 @@ class InvalidFileException
 
 class WinBlocklistParser
 {
+public:
 WinBlocklistParser(const OUString& rURL, std::vector& 
rDriverList);
 void parse();
 
commit d82eaaec2e1cd4c2def22301b134ece27e93b283
Author: Markus Mohrhard 
Date:   Fri Jun 5 04:39:29 2015 +0200

fix a few bugs in blacklist parser

Change-Id: Iaeaa568c24d6814bb696d040bef02470bd46e8e1

diff --git a/vcl/opengl/win/blocklist_parser.cxx 
b/vcl/opengl/win/blocklist_parser.cxx
index 83bf490..ef4771a 100644
--- a/vcl/opengl/win/blocklist_parser.cxx
+++ b/vcl/opengl/win/blocklist_parser.cxx
@@ -122,6 +122,10 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& 
rDriver, xmlreader::XmlRe
 {
 rDriver.mbWhitelisted = true;
 }
+else if (meBlockType == BlockType::BLACKLIST)
+{
+rDriver.mbWhitelisted = false;
+}
 else if (meBlockType == BlockType::UNKNOWN)
 {
 throw InvalidFileException();
@@ -173,7 +177,8 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& 
rDriver, xmlreader::XmlRe
 }
 else
 {
-SAL_WARN("vcl.opengl.win", "unsupported attribute");
+OString aAttrName(name.begin, name.length);
+SAL_WARN("vcl.opengl.win", "unsupported attribute: " << aAttrName);
 }
 }
 
@@ -185,7 +190,7 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& 
rDriver, xmlreader::XmlRe
 int nsId;
 
 xmlreader::XmlReader::Result res = rReader.nextItem(
-xmlreader::XmlReader::TEXT_NONE, &name, &nsId);
+xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
 
 if (res == xmlreader::XmlReader::RESULT_BEGIN)
 {
@@ -203,6 +208,7 @@ void WinBlocklistParser::handleDevice(wgl::DriverInfo& 
rDriver, xmlreader::XmlRe
 if (!bSuccess || !name.equals("id"))
 throw InvalidFileException();
 
+name = rReader.getAttributeValue(false);
 OString aDeviceId(name.begin, name.length);
 rDriver.maDevices.push_back(OStringToOUString(aDeviceId, 
RTL_TEXTENCODING_UTF8));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 3 commits - sc/source

[Henry Castro]

 sc/source/ui/unoobj/docuno.cxx |2 +-
 sc/source/ui/view/gridwin.cxx  |2 +-
 sc/source/ui/view/viewdata.cxx |7 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 3004be4465b1fcaa3cd6b44cb517fcbf1b067deb
Author: Henry Castro 
Date:   Thu Jun 4 21:37:55 2015 -0400

sc tiled editing: Editview register LOKit callback

Change-Id: I5ad07f0f3defacaac0f5dac724e9867bbc011dd6

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 22d46dc..8795afe 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -928,6 +928,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 else
 {
 pEditView[eWhich] = new EditView( pNewEngine, pWin );
+
+if (pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
+{
+
pEditView[eWhich]->registerLibreOfficeKitCallback(pDoc->GetDrawLayer()->getLibreOfficeKitCallback(),
+  
pDoc->GetDrawLayer()->getLibreOfficeKitData());
+pEditView[eWhich]->setTiledRendering(true);
+}
 }
 
 //  bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon 
weg ist (23576)
commit 08debbc33ca99a25947f3c845b41a58e1706e031
Author: Henry Castro 
Date:   Thu Jun 4 21:10:28 2015 -0400

sc tiled editing: double-click empty cell

Change-Id: I35c43e2a22ac6591a2bcf9857808503c0e111344

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c31d246..cfc0b5e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2415,7 +2415,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt 
)
 {
 // don't forward the event to an empty cell, causes deselection in
 // case we used the double-click to select the empty cell
-if (bIsTiledRendering)
+if (bIsTiledRendering && bDouble)
 {
 ScRefCellValue aCell;
 aCell.assign(*pViewData->GetDocument(), ScAddress(nPosX, 
nPosY, nTab));
commit 126abd9c58a98497bd40a2904a4c7e34264ecfe4
Author: Henry Castro 
Date:   Thu Jun 4 20:44:45 2015 -0400

sc tiled editing: EndTracking trigger MouseUp

It does not need to trigger fake MouseUp event

Change-Id: Id90c7787ef3312abe81bce359648aee0dfccd905

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 73f674ef..36de586 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -591,7 +591,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, 
int nCount)
 // sometimes MouseButtonDown captures mouse and starts tracking, and 
VCL
 // will not take care of releasing that with tiled rendering
 if (pGridWindow->IsTracking())
-pGridWindow->EndTracking();
+pGridWindow->EndTracking(TrackingEventFlags::DontCallHdl);
 
 break;
 default:
___
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' - 3 commits - sc/source

[Henry Castro]

 sc/source/ui/unoobj/docuno.cxx |2 +-
 sc/source/ui/view/gridwin.cxx  |2 +-
 sc/source/ui/view/viewdata.cxx |7 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1b3d17ba7cd45dc0431b9b1809d908a7a066d9a1
Author: Henry Castro 
Date:   Thu Jun 4 21:37:55 2015 -0400

sc tiled editing: Editview register LOKit callback

Change-Id: I5ad07f0f3defacaac0f5dac724e9867bbc011dd6

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 22d46dc..8795afe 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -928,6 +928,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 else
 {
 pEditView[eWhich] = new EditView( pNewEngine, pWin );
+
+if (pDoc->GetDrawLayer() && pDoc->GetDrawLayer()->isTiledRendering())
+{
+
pEditView[eWhich]->registerLibreOfficeKitCallback(pDoc->GetDrawLayer()->getLibreOfficeKitCallback(),
+  
pDoc->GetDrawLayer()->getLibreOfficeKitData());
+pEditView[eWhich]->setTiledRendering(true);
+}
 }
 
 //  bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon 
weg ist (23576)
commit d1ed5b06b2cc7f52b896d6cd4ce0b59e8ceea6b9
Author: Henry Castro 
Date:   Thu Jun 4 21:10:28 2015 -0400

sc tiled editing: double-click empty cell

Change-Id: I35c43e2a22ac6591a2bcf9857808503c0e111344

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c31d246..cfc0b5e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2415,7 +2415,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt 
)
 {
 // don't forward the event to an empty cell, causes deselection in
 // case we used the double-click to select the empty cell
-if (bIsTiledRendering)
+if (bIsTiledRendering && bDouble)
 {
 ScRefCellValue aCell;
 aCell.assign(*pViewData->GetDocument(), ScAddress(nPosX, 
nPosY, nTab));
commit 671787e144345b03a801ede499cc4784e71d6941
Author: Henry Castro 
Date:   Thu Jun 4 20:44:45 2015 -0400

sc tiled editing: EndTracking trigger MouseUp

It does not need to trigger fake MouseUp event

Change-Id: Id90c7787ef3312abe81bce359648aee0dfccd905

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 73f674ef..36de586 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -591,7 +591,7 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, 
int nCount)
 // sometimes MouseButtonDown captures mouse and starts tracking, and 
VCL
 // will not take care of releasing that with tiled rendering
 if (pGridWindow->IsTracking())
-pGridWindow->EndTracking();
+pGridWindow->EndTracking(TrackingEventFlags::DontCallHdl);
 
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sd/source/ui/app/menuids_tmpl.src |8 +-
 sd/source/ui/app/popup2_tmpl.src  |  113 --
 2 files changed, 30 insertions(+), 91 deletions(-)

New commits:
commit ca6997fbb8b1f4b8c039db1c487df0ce8961472c
Author: Yousuf Philips 
Date:   Wed Jun 3 19:52:10 2015 +0400

tdf#86614 Adjusting some text entries and rearranging and removing others

Change-Id: Ic3103e6ed1052fbc292f235e1e3104a61579519d
Reviewed-on: https://gerrit.libreoffice.org/16062
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index 9ed590a..bf30830 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -430,7 +430,7 @@
 Identifier = SID_OBJECT_ALIGN ; \
 Command = ".uno:AlignObjetMenu" ; \
 HelpId = CMD_SID_OBJECT_ALIGN ; \
-Text [ en-US ] = "Al~ignment" ; \
+Text [ en-US ] = "Al~ign" ; \
 SubMenu = Menu\
 {\
 ItemList = \
@@ -653,7 +653,7 @@
 {\
 Identifier = SID_SET_DEFAULT ; \
 HelpId = CMD_SID_SET_DEFAULT ; \
-Text [ en-US ] = "~Default" ; \
+Text [ en-US ] = "~Default Formatting" ; \
 };
 
 #define MN_FONTWORK\
@@ -669,14 +669,14 @@
 {\
 Identifier = SID_ORIGINAL_SIZE ; \
 HelpId = CMD_SID_ORIGINAL_SIZE ; \
-Text [ en-US ] = "~Original Size" ; \
+Text [ en-US ] = "Restore ~Original Size" ; \
 };
 
 #define MN_CROP\
 MenuItem\
 {\
 Identifier = SID_OBJECT_CROP ; \
-Text [ en-US ] = "Crop Image" ; \
+Text [ en-US ] = "Crop I~mage" ; \
 };
 
 #define MN_GLUE_INSERT_POINT\
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index f9a2122..28c858f 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -35,25 +35,19 @@
 {
 MN_SET_DEFAULT
 SEPARATOR
+MN_TRANSFORM
 MN_LINE
 MN_AREA
 MN_TEXTATTR
-MN_TRANSFORM
 MN_FONTWORK
 SEPARATOR
 MN_CHAR_PARAGRAPH
 SEPARATOR
-MN_POSITION
 MN_OBJECT_ALIGN
+MN_POSITION
 MN_DISTRIBUTE
 MNSUB_CONVERT
 
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
 SEPARATOR
 MN_ACTION
@@ -74,26 +68,20 @@
 {
 MN_SET_DEFAULT
 SEPARATOR
+MN_TRANSFORM
 MN_LINE
 MN_AREA
 MN_TEXTATTR
 MN_OUTLINE_TEXT_AUTOFIT
-MN_TRANSFORM
 MN_FONTWORK
 SEPARATOR
 MN_CHAR_PARAGRAPH
 SEPARATOR
-MN_POSITION
 MN_OBJECT_ALIGN
+MN_POSITION
 MN_DISTRIBUTE
 MNSUB_CONVERT
 
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
 SEPARATOR
 MN_ACTION
@@ -112,16 +100,17 @@
 {
 ItemList =
 {
+MN_TRANSFORM
 MN_LINE
 MN_AREA
 MN_TEXTATTR
-MN_TRANSFORM
+SEPARATOR
 MN_EDIT_POINTS
 SEPARATOR
 MN_CHAR_PARAGRAPH
 SEPARATOR
-MN_POSITION
 MN_OBJECT_ALIGN
+MN_POSITION
 MN_DISTRIBUTE
 MNSUB_MIRROR
 MNSUB_CONVERT
@@ -129,12 +118,6 @@
 MN_LEAVE_GROUP
 MN_DISMANTLE
 
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
 SEPARATOR
 MN_ACTION
@@ -157,8 +140,8 @@
 MN_LINE
 MN_AREA
 SEPARATOR
-MN_POSITION
 MN_OBJECT_ALIGN
+MN_POSITION
 MN_DISTRIBUTE
 MNSUB_MIRROR
 // #i37263#
@@ -186,23 +169,18 @@
 {
 ItemList =
 {
+MN_3D_WIN
+SEPARATOR
+MN_TRANSFORM
 MN_LINE
 MN_AREA
-MN_TRANSFORM
 SEPARATOR
-MN_POSITION
 MN_OBJECT_ALIGN
+MN_POSITION
 MN_DISTRIBUTE
 MNSUB_CONVERT
 SEPARATOR
 MN_ENTER_GROUP
-MN_3D_WIN
-
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
 
 #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
 SEPARATOR
@@ -222,12 +200,12 @@
 {
 ItemList =
 {
+MN_TRANSFORM
 MN_LINE
 MN_AREA
-MN_TRANSFORM
 SEPARATOR
-MN_POSITION
 MN_OBJECT_ALIGN
+MN_POSITION
 MN_DISTRIBUTE
 MNSUB_CONVERT
 SEPARATOR
@@ -235,12 +213,6 @@
 MN_LEAVE_GROUP
 MN_3D_WIN
 
-// #i68101#
-SEPARATOR
-MN_OBJECT_TITLE_DESCRIPTION
-MN_NAME_GROUP
-// #i68101#
-
 #if SD_POPUP == RID_DRAW_TEXTO

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

[matteocam]

 include/svx/svdotext.hxx|1 +
 svx/source/svdraw/svdotextdecomposition.cxx |   12 ++--
 svx/source/svdraw/svdotxed.cxx  |5 -
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit c3c510a4cb0bae1e9acf1e2b172540456094202b
Author: matteocam 
Date:   Fri Jun 5 01:54:10 2015 -0400

Non-overflowing text is moved when we exit editing

Change-Id: I4cab6c3363a2e58667599583d28a27cadb5266aa

diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index a93f087..75df5ed 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -606,6 +606,7 @@ public:
 const drawinglayer::geometry::ViewInformation2D& aViewInformation) 
const;
 
 void impMoveChainedTextToNextLink(SdrTextObj *pNextTextObj) const;
+OutlinerParaObject *impGetNonOverflowingParaObject() const;
 void impLeaveOnlyNonOverflowingText() const;
 
 // Handler for Chained Text
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 802863f..6b7b630 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -728,7 +728,7 @@ void SdrTextObj::impDecomposeContourTextPrimitive(
 rTarget = aConverter.getPrimitive2DSequence();
 }
 
-void SdrTextObj::impLeaveOnlyNonOverflowingText() const
+OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject() const
 {
 // Cut non overflowing text
 NonOverflowingText *pNonOverflowingTxt =
@@ -754,7 +754,12 @@ void SdrTextObj::impLeaveOnlyNonOverflowingText() const
 rOutliner.AddText(*pPObj);
 }
 
-OutlinerParaObject *pNewText = rOutliner.CreateParaObject();
+ return rOutliner.CreateParaObject();
+}
+
+void SdrTextObj::impLeaveOnlyNonOverflowingText() const
+{
+OutlinerParaObject *pNewText = impGetNonOverflowingParaObject();
 const_cast(this)->SetOutlinerParaObject(pNewText);
 //const_cast(this)->ReformatText();
 }
@@ -1540,6 +1545,9 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
 assert (pNextTextObj);
 // NOTE: Commented because we do not need to do this anymore (maybe 
and for now)
 //impMoveChainedTextToNextLink(pNextTextObj); // XXX: it actually 
moves the overflowing text currently
+
+// XXX:
+//const_cast(this)->impLeaveOnlyNonOverflowingText();
 // Chaining occurred. Let's reset the status
 const_cast(this)->SetToBeChained( false );
 
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index c0a5164..62e2c01 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -280,7 +280,10 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
 // for now doing the same as below - probably we don't need
 // any more chain checks here but one single default behavior
 sal_Int32 nParaAnz = rOutl.GetParagraphCount();
-pNewText = rOutl.CreateParaObject( 0, nParaAnz );
+// XXX: FRESHLY COMMENTED (5/6/15) // FIXME:matteocam
+//pNewText = rOutl.CreateParaObject( 0, nParaAnz );
+
+pNewText = impGetNonOverflowingParaObject();
 
 // set non overflow part of text to current box
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |7 
+-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |2 -
 sw/uiconfig/swriter/menubar/menubar.xml  |   11 
+-
 3 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit d304dd4db35c79a33bdf118e45e0675d2d86f51d
Author: Yousuf Philips 
Date:   Thu Jun 4 20:10:59 2015 +0400

tdf#91781 Restoring Edit entries under a new submenu and change view names

Change-Id: I5f1bb1ca976a8cbc8c2dcf7986d66cbd8043f9d4
Reviewed-on: https://gerrit.libreoffice.org/16086
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index d53847d..55bccbf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2472,7 +2472,7 @@
   
   
 
-  ~Web Layout
+  ~Web
 
 
   1
@@ -5579,6 +5579,11 @@
   Track Chan~ges
 
   
+  
+
+  ~Entries
+
+  
   
 
   ~Tools
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 34ab217..43e97fa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -13,7 +13,7 @@
   
   
 
-  ~Print Layout
+  ~Normal
 
 
   1
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index cb50434..25fdce2 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -113,6 +113,15 @@
   
   
   
+  
+
+  
+  
+  
+  
+  
+
+  
   
   
   
@@ -170,6 +179,7 @@
   
   
   
+  
   
 
   
@@ -191,7 +201,6 @@
   
 
   
-  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/source/window/status.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d119f4bae4c688ce799f2c5493f345194ca41ab1
Author: Tomaž Vajngerl 
Date:   Fri Jun 5 15:01:02 2015 +0900

Use status offscreen rendering when not in "RecordLayout" mode

Change-Id: I770dc9a91bc1239e64ec8e538be0f6a4b03dd08e

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index c073621..0ea944d 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -728,8 +728,13 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, 
const Rectangle&)
 // draw items
 if (mbVisibleItems)
 {
+// Do offscreen only when we are not recording layout..
+bool bOffscreen = !rRenderContext.ImplIsRecordLayout();
+
 for (sal_uInt16 i = 0; i < nItemCount; i++)
-ImplDrawItem(rRenderContext, false, i, true, true);
+{
+ImplDrawItem(rRenderContext, bOffscreen, i, true, true);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2015-06-05

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ Fix insertion and deletion in IndexedPropertyValuesContainer
  in https://gerrit.libreoffice.org/16073 from Matthew Francis
  about module comphelper, sw
+ tdf#89972: also copy external reference status
  in https://gerrit.libreoffice.org/16066 from Mike Kaganski
  about module sc
+ tdf#91820 Reorganize calc's menu bar
  in https://gerrit.libreoffice.org/16090 from Yousuf Philips
  about module icon-themes, officecfg, sc
+ Removed B{2,3}DTuple's custom treshold equal() and equalZero() methods
  in https://gerrit.libreoffice.org/15807 from Zsolt Bölöny
  about module include
+ tdf#91634: Image hyperlink is not export after roundtrip.
  in https://gerrit.libreoffice.org/15919 from Yogesh Bharate
  about module oox, sc
 End of freshness 

+ loplugin:unnecessaryvirtuals
  in https://gerrit.libreoffice.org/16035 from Noel Grandin
  about module basegfx, compilerplugins, connectivity, dbaccess, extensions, 
include, lotuswordpro, svx, vcl, writerfilter
+ new uno sidebar api tdf#91806
  in https://gerrit.libreoffice.org/15856 from Laurent Godard
  about module dbaccess, include, offapi, sfx2, vcl
+ return and use std::vector from OInterfaceContainerHelper
  in https://gerrit.libreoffice.org/15747 from Noel Grandin
  about module UnoControls, chart2, comphelper, cppuhelper, dbaccess, desktop, 
embedserv, include, sc, sd, sfx2, svx, toolkit, ucb


* Merged changes on master for project core changed in the last 25 hours:

+ tdf#91781 Restoring Edit entries under a new submenu and change view name
  in https://gerrit.libreoffice.org/16086 from Yousuf Philips
+ tdf#86614 Adjusting some text entries and rearranging and removing others
  in https://gerrit.libreoffice.org/16062 from Yousuf Philips
+ Cleanup crossplatform cairo
  in https://gerrit.libreoffice.org/16049 from Mox Soini
+ update to liborcus 0.9.1
  in https://gerrit.libreoffice.org/15822 from Markus Mohrhard
+ Removed getNormal() from polygontools, it just calls B3DPolygon::getNorma
  in https://gerrit.libreoffice.org/16077 from Zsolt Bölöny
+ Fix using /opt/lo/bin/nasm on windows/cygwin
  in https://gerrit.libreoffice.org/16083 from Andrzej Hunt
+ Fix a regression introduced at 3d30077af27c8a6e91fb91175e6d2ea9a6f03d11
  in https://gerrit.libreoffice.org/16082 from Takeshi Abe
+ tdf#91781 Changes based on discussion of heiko suggestions
  in https://gerrit.libreoffice.org/16067 from Yousuf Philips
+ tdf#90996: don't overwrite comments in ScTable::FillFormulaVertical
  in https://gerrit.libreoffice.org/16085 from Mike Kaganski
+ DomainMapper::lcl_attribute: fix missing break
  in https://gerrit.libreoffice.org/16074 from Mike Kaganski
+ tdf#91425 CRASH - Calc Insert Columns Left
  in https://gerrit.libreoffice.org/16063 from Takeshi Abe
+ Fix typo in .gitignore
  in https://gerrit.libreoffice.org/16076 from Zsolt Bölöny
+ replace FLYPROTECT with scoped enum
  in https://gerrit.libreoffice.org/16072 from Noel Grandin
+ convert GOTOOBJ constants to scoped enum
  in https://gerrit.libreoffice.org/16071 from Noel Grandin
+ convert MT_ constants to scoped enum
  in https://gerrit.libreoffice.org/16068 from Noel Grandin
+ uno::Sequence provides now begin and end
  in https://gerrit.libreoffice.org/16057 from Noel Grandin
+ convert SW_DB_SELECT constants to scoped enum
  in https://gerrit.libreoffice.org/16070 from Noel Grandin
+ convert SP_EXTEND_RANGE constants to scoped enum
  in https://gerrit.libreoffice.org/16069 from Noel Grandin


* Abandoned changes on master for project core changed in the last 25 hours:

+ Removed getNormal() from polygontools, it just calls B3DPolygon::getNorma
  in https://gerrit.libreoffice.org/15809 from Zsolt Bölöny


* Open changes needing tweaks, but being untouched for more than a week:

+ writefilter: removed #includes
  in https://gerrit.libreoffice.org/15850 from Andrea Gelmini
+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/15768 from Joren De Cuyper
+ tdf#76334 push viewbox properties to the CustomShapeProperties
  in https://gerrit.libreoffice.org/15753 from Joren De Cuyper
+ Add very initial support for Visual Studio 2015
  in https://gerrit.libreoffice.org/15644 from Jesús Corrius
+ tdf#90494: Change gradient angle diagonally by choosing option.
  in https://gerrit.libreoffice.org/15180 from Heena Gupta
+ Rendering support for  multiStop GradientFill (OOXML LINEAR)
  in https://gerrit.libreoffice.org/12056 from Vinaya Mandke
+ Resolves tdf#83365 Other: Access across spreadsheet returns Err:504
  in https://gerrit.libreoffice.org/15363 from Henry Castro
+ tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri
  in https://gerrit.libreoffice.org/15611 from Marcos Paulo de Souza
+ tdf#90494-Add new Attribute for exporting gradient angle diagonally
  in https://gerrit.libreoffice.org/15323 from Heena Gupta
+ preserve