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

[Noel Grandin]

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

New commits:
commit f89d7692a36cc3c65a27690d7bb9e876dc4644bc
Author: Noel Grandin 
Date:   Tue Jan 10 08:35:35 2017 +0200

fix SfxUShortRangesItem::operator==

broken since

commit 1416669670de6f93b40d8a2f8f001e92ec0bf101
Author: Thomas Arnhold 
Date:   Tue Apr 2 14:21:42 2013 +0200
Revert "Revert "reduce some uglyness""

Change-Id: I41ac489e952f0356976e0a5372953d634d96e690

diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index f6f8c14..2aa9e60 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -132,7 +132,7 @@ bool SfxUShortRangesItem::operator==( const SfxPoolItem 
&rItem ) const
 
 sal_uInt16 n;
 for ( n = 0; _pRanges[n] && rOther._pRanges[n]; ++n )
-if ( *_pRanges != rOther._pRanges[n] )
+if ( _pRanges[n] != rOther._pRanges[n] )
 return false;
 
 return !_pRanges[n] && !rOther._pRanges[n];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sal/osl/w32/backtrace.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f207e13136f4ff211cd1fe0c9703f35655a23d38
Author: Noel Grandin 
Date:   Tue Jan 10 10:46:55 2017 +0200

fix windows build

VS2013 does not like stack-allocated arrays with runtime size

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

diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index e4e71c2..6c24698 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -16,6 +16,7 @@
 #include 
 
 #include 
+#include 
 
 rtl_uString *osl_backtraceAsString(int maxNoStackFramesToDisplay)
 {
@@ -24,8 +25,8 @@ rtl_uString *osl_backtraceAsString(int 
maxNoStackFramesToDisplay)
 HANDLE hProcess = GetCurrentProcess();
 SymInitialize( hProcess, nullptr, true );
 
-void * aStack[ maxNoStackFramesToDisplay ];
-sal_uInt32 nFrames = CaptureStackBackTrace( 0, maxNoStackFramesToDisplay, 
aStack, nullptr );
+std::unique_ptr aStack(new void*[ maxNoStackFramesToDisplay ]);
+sal_uInt32 nFrames = CaptureStackBackTrace( 0, maxNoStackFramesToDisplay, 
aStack.get(), nullptr );
 
 SYMBOL_INFO  * pSymbol;
 pSymbol = static_cast(calloc( sizeof( SYMBOL_INFO ) + 1024 
* sizeof( char ), 1 ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |3 ---
 sc/source/filter/inc/biffcodec.hxx |2 --
 vcl/inc/quartz/salvd.h |6 --
 vcl/inc/salgdi.hxx |2 --
 vcl/inc/win/winlayout.hxx  |2 --
 5 files changed, 15 deletions(-)

New commits:
commit 48c100d7300c73a6501317c553a24adfca2a5f4c
Author: Jochen Nitschke 
Date:   Mon Jan 9 22:10:33 2017 +0100

remove unused typedefs

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

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index c25edcd..a26 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -99,9 +99,6 @@ using com::sun::star::uno::UNO_QUERY_THROW;
 
 namespace pq_sdbc_driver
 {
-typedef std::vector< css::uno::Sequence< css::uno::Any > > SequenceAnyVector;
-
-
 #define QUOTEME(X)  #X
 #define STRINGIFY(X) QUOTEME(X)
 
diff --git a/sc/source/filter/inc/biffcodec.hxx 
b/sc/source/filter/inc/biffcodec.hxx
index fed33b8..5807ae6 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -54,8 +54,6 @@ private:
 boolmbValid;/// True = decoder is correctly 
initialized.
 };
 
-typedef std::shared_ptr< BiffDecoderBase > BiffDecoderRef;
-
 /** Decodes BIFF stream contents that are encoded using the old XOR algorithm. 
*/
 class BiffDecoder_XOR : public BiffDecoderBase
 {
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index a50d25f..ac2a1f2 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -32,12 +32,6 @@
 
 #include "salvd.hxx"
 
-struct SalVirDevData
-{
-};
-
-typedef struct SalVirDevData   SalVirDevData;
-
 class AquaSalGraphics;
 
 class AquaSalVirtualDevice : public SalVirtualDevice
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 90f75b1b..d71098a 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -58,9 +58,7 @@ namespace basegfx {
 }
 
 typedef sal_Unicode sal_Ucs; // TODO: use sal_UCS4 instead of sal_Unicode
-typedef std::map< sal_Ucs, sal_Int32 >Ucs2SIntMap;
 typedef std::map< sal_Ucs, sal_uInt32 >   Ucs2UIntMap;
-typedef std::map< sal_Ucs, OString > Ucs2OStrMap;
 
 // note: if you add any new methods to class SalGraphics using coordinates
 //   make sure they have a corresponding protected pure virtual method
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index ecd25746..a32af75 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -32,8 +32,6 @@
 
 #include "opengl/PackedTextureAtlas.hxx"
 
-typedef std::unordered_map IntMap;
-
 class WinFontInstance;
 
 namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svtools/grfmgr.hxx|1 -
 svtools/source/graphic/grfmgr.cxx |   20 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 8564b5beb1c49104d555e70d3c6134908fc0811f
Author: Caolán McNamara 
Date:   Mon Jan 9 15:48:36 2017 +

first GraphicManager* arg of ImplSetGraphicManager is thus always null

Change-Id: I3da98280d3c1d95663e6e43ce7a5ca82c001c334

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 929fe89..7a8291f 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -203,7 +203,6 @@ private:
 voidSVT_DLLPRIVATE ImplConstruct();
 voidSVT_DLLPRIVATE ImplAssignGraphicData();
 voidSVT_DLLPRIVATE ImplSetGraphicManager(
-const GraphicManager* pMgr,
 const OString* pID = nullptr,
 const GraphicObject* pCopyObj = nullptr
 );
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 0b04656..d0e27c4 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -77,7 +77,7 @@ GraphicObject::GraphicObject() :
 {
 ImplConstruct();
 ImplAssignGraphicData();
-ImplSetGraphicManager( nullptr );
+ImplSetGraphicManager();
 }
 
 GraphicObject::GraphicObject( const Graphic& rGraphic ) :
@@ -87,7 +87,7 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) :
 {
 ImplConstruct();
 ImplAssignGraphicData();
-ImplSetGraphicManager( nullptr );
+ImplSetGraphicManager();
 }
 
 GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) :
@@ -98,7 +98,7 @@ GraphicObject::GraphicObject( const GraphicObject& 
rGraphicObj ) :
 {
 ImplConstruct();
 ImplAssignGraphicData();
-ImplSetGraphicManager( nullptr, nullptr, &rGraphicObj );
+ImplSetGraphicManager(nullptr, &rGraphicObj);
 if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() )
 SetSwapState();
 }
@@ -112,7 +112,7 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) :
 // assign default properties
 ImplAssignGraphicData();
 
-ImplSetGraphicManager( nullptr, &rUniqueID );
+ImplSetGraphicManager(&rUniqueID);
 
 // update properties
 ImplAssignGraphicData();
@@ -161,11 +161,11 @@ void GraphicObject::ImplAssignGraphicData()
 ImplAfterDataChange();
 }
 
-void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const 
OString* pID, const GraphicObject* pCopyObj )
+void GraphicObject::ImplSetGraphicManager(const OString* pID, const 
GraphicObject* pCopyObj)
 {
-if( !mpMgr || ( pMgr != mpMgr ) )
+if (!mpMgr || mpMgr)
 {
-if( !pMgr && mpMgr && ( mpMgr == mpGlobalMgr ) )
+if (mpMgr && mpMgr == mpGlobalMgr)
 return;
 else
 {
@@ -180,7 +180,7 @@ void GraphicObject::ImplSetGraphicManager( const 
GraphicManager* pMgr, const OSt
 }
 }
 
-if( !pMgr )
+if (true)
 {
 if( !mpGlobalMgr )
 {
@@ -208,7 +208,7 @@ void GraphicObject::ImplSetGraphicManager( const 
GraphicManager* pMgr, const OSt
 mpMgr = mpGlobalMgr;
 }
 else
-mpMgr = const_cast(pMgr);
+mpMgr = nullptr;
 
 mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
 }
@@ -473,7 +473,7 @@ void GraphicObject::GraphicManagerDestroyed()
 {
 // we're alive, but our manager doesn't live anymore ==> connect to 
default manager
 mpMgr = nullptr;
-ImplSetGraphicManager( nullptr );
+ImplSetGraphicManager();
 }
 
 bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const 
Size& rSz,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Kim Gwangyeon license statment

[김광연]

Hello, I am a student at Korea. Although my programming is not good, I want to 
participate to you. I don't know it is right that I send to you this message.
If I have a mistake, please correct the step. Thank you.

All of my past & future contributions to LibreOffice may be licensed under 
the MPLv2/LGPLv3+ dual license.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 8 commits - filter/source i18npool/inc i18npool/source linguistic/source scripting/source sw/source vcl/source

[Caolán McNamara]

 filter/source/config/cache/filtercache.cxx |4 -
 filter/source/config/cache/filtercache.hxx |2 
 i18npool/inc/localedata.hxx|2 
 i18npool/source/localedata/localedata.cxx  |2 
 linguistic/source/lngsvcmgr.cxx|2 
 scripting/source/dlgprov/dlgprov.cxx   |2 
 scripting/source/dlgprov/dlgprov.hxx   |2 
 sw/source/uibase/app/apphdl.cxx|   33 +--
 vcl/source/gdi/alpha.cxx   |6 +-
 vcl/source/gdi/pngread.cxx |   83 +
 10 files changed, 63 insertions(+), 75 deletions(-)

New commits:
commit 610d995c3a6aa406ee93052e613a4cfe1ac6
Author: Caolán McNamara 
Date:   Tue Jan 10 09:45:15 2017 +

ofz#395 leak in Bitmap::AcquireWriteAccess

Change-Id: Id67f0b8e82e0730eb35a14a6080bfa5b15d365c8

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 8b00675..c0a0007 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -76,9 +76,11 @@ private:
 std::vector::iterator maDataIter;
 
 std::unique_ptrmpBmp;
-Bitmap::ScopedWriteAccess  mpAcc;
+Bitmap::ScopedWriteAccess  mxAcc;
 std::unique_ptrmpMaskBmp;
+Bitmap::ScopedWriteAccess  mxMaskAcc;
 std::unique_ptr mpAlphaMask;
+AlphaMask::ScopedWriteAccess mxAlphaAcc;
 BitmapWriteAccess* mpMaskAcc;
 
 ZCodec  mpZCodec;
@@ -418,17 +420,10 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& 
rPreviewSizeHint )
 }
 
 // release write access of the bitmaps
-mpAcc.reset();
-
-if ( mpMaskAcc )
-{
-if ( mpAlphaMask )
-mpAlphaMask->ReleaseAccess( mpMaskAcc );
-else if ( mpMaskBmp )
-Bitmap::ReleaseAccess( mpMaskAcc );
-
-mpMaskAcc = nullptr;
-}
+mxAcc.reset();
+mxMaskAcc.reset();
+mxAlphaAcc.reset();
+mpMaskAcc = nullptr;
 
 // return the resulting BitmapEx
 BitmapEx aRet;
@@ -657,16 +652,17 @@ bool PNGReaderImpl::ImplReadHeader( const Size& 
rPreviewSizeHint )
 return false;
 
 mpBmp = o3tl::make_unique( maTargetSize, mnTargetDepth );
-mpAcc = Bitmap::ScopedWriteAccess(*mpBmp);
-if( !mpAcc )
+mxAcc = Bitmap::ScopedWriteAccess(*mpBmp);
+if (!mxAcc)
 return false;
 
 if ( mbAlphaChannel )
 {
 mpAlphaMask = o3tl::make_unique( maTargetSize );
 mpAlphaMask->Erase( 128 );
-mpMaskAcc = mpAlphaMask->AcquireWriteAccess();
-if( !mpMaskAcc )
+mxAlphaAcc = AlphaMask::ScopedWriteAccess(*mpAlphaMask);
+mpMaskAcc = mxAlphaAcc.get();
+if (!mpMaskAcc)
 return false;
 }
 
@@ -691,9 +687,9 @@ void PNGReaderImpl::ImplGetGrayPalette( sal_uInt16 
nBitDepth )
 if( nBitDepth == 2 )
 nPaletteEntryCount = 16;
 
-mpAcc->SetPaletteEntryCount( nPaletteEntryCount );
+mxAcc->SetPaletteEntryCount( nPaletteEntryCount );
 for ( sal_uInt32 i = 0, nStart = 0; nStart < 256; i++, nStart += nAdd )
-mpAcc->SetPaletteColor( (sal_uInt16)i, BitmapColor( mpColorTable[ 
nStart ],
+mxAcc->SetPaletteColor( (sal_uInt16)i, BitmapColor( mpColorTable[ 
nStart ],
 mpColorTable[ nStart ], mpColorTable[ nStart ] ) );
 }
 
@@ -701,17 +697,17 @@ bool PNGReaderImpl::ImplReadPalette()
 {
 sal_uInt16 nCount = static_cast( mnChunkLen / 3 );
 
-if ( ( ( mnChunkLen % 3 ) == 0 ) && ( ( 0 < nCount ) && ( nCount <= 256 ) 
) && mpAcc )
+if ( ( ( mnChunkLen % 3 ) == 0 ) && ( ( 0 < nCount ) && ( nCount <= 256 ) 
) && mxAcc )
 {
 mbPalette = true;
-mpAcc->SetPaletteEntryCount( (sal_uInt16) nCount );
+mxAcc->SetPaletteEntryCount( (sal_uInt16) nCount );
 
 for ( sal_uInt16 i = 0; i < nCount; i++ )
 {
 sal_uInt8 nRed =   mpColorTable[ *maDataIter++ ];
 sal_uInt8 nGreen = mpColorTable[ *maDataIter++ ];
 sal_uInt8 nBlue =  mpColorTable[ *maDataIter++ ];
-mpAcc->SetPaletteColor( i, Color( nRed, nGreen, nBlue ) );
+mxAcc->SetPaletteColor( i, Color( nRed, nGreen, nBlue ) );
 }
 }
 else
@@ -781,12 +777,14 @@ bool PNGReaderImpl::ImplReadTransparent()
 if( bNeedAlpha)
 {
 mpAlphaMask = o3tl::make_unique( maTargetSize );
-mpMaskAcc = mpAlphaMask->AcquireWriteAccess();
+mxAlphaAcc = AlphaMask::ScopedWriteAccess(*mpAlphaMask);
+mpMaskAcc = mxAlphaAcc.get();
 }
 else
 {
 mpMaskBmp = o3tl::make_unique( maTargetSize, 1 );
-mpMaskAcc = mpMaskBmp->AcquireWriteAccess();
+mxMaskAcc = Bitmap::ScopedWriteAccess(*mpMaskBmp);
+mpMaskAcc = mxMaskAcc.get();
 }
 mbTransparent = (mpMaskAcc != nullptr);
 if( !mbTransparent )
@@ -832,9 +830,9 @@ void PNGReaderImpl::ImplGetBackground()
 if ( mnChunkLen == 1 )
 {
 sal_uInt16 nCol = *maD

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit fa886598ccdcb18bdbcf05585beccab0d5c9408d
Author: Adolfo Jayme Barrientos 
Date:   Tue Jan 10 04:14:01 2017 -0600

Updated core
Project: help  69cc05e42df703775a9716d8eb1767b1fd147336

A bit of cleanup in cmis-remote-files-setup.xhp

- One doesn’t need to have all those s included in the
  translatable strings
- Consistently use hyphen-minus as the menu path separator, as in
  the rest of the help files
- Drop hardcoded “LibreOffice” in favor of “%PRODUCTNAME”

Change-Id: I2ed2d4d9516365caa8230bb4cd53d07c610155e1

diff --git a/helpcontent2 b/helpcontent2
index 32c3b48..69cc05e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 32c3b487b2abbfe65282178ba89c2606f71f4c98
+Subproject commit 69cc05e42df703775a9716d8eb1767b1fd147336
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Adolfo Jayme Barrientos]

 source/text/shared/guide/cmis-remote-files-setup.xhp |   42 +--
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 69cc05e42df703775a9716d8eb1767b1fd147336
Author: Adolfo Jayme Barrientos 
Date:   Tue Jan 10 04:14:01 2017 -0600

A bit of cleanup in cmis-remote-files-setup.xhp

- One doesn’t need to have all those s included in the
  translatable strings
- Consistently use hyphen-minus as the menu path separator, as in
  the rest of the help files
- Drop hardcoded “LibreOffice” in favor of “%PRODUCTNAME”

Change-Id: I2ed2d4d9516365caa8230bb4cd53d07c610155e1

diff --git a/source/text/shared/guide/cmis-remote-files-setup.xhp 
b/source/text/shared/guide/cmis-remote-files-setup.xhp
index bbdd14d..bac1a0e 100644
--- a/source/text/shared/guide/cmis-remote-files-setup.xhp
+++ b/source/text/shared/guide/cmis-remote-files-setup.xhp
@@ -28,7 +28,7 @@
 
 Setting up a remote file 
service connection
 
-To 
access remote servers, you must use LibreOffice own Open and Save dialogs. If 
you currently use your operating system dialogs for saving and opening files, 
go to Tools > Options > LibreOffice > 
General and check the option Use %PRODUCTNAME 
dialogs.
+To 
access remote servers, you must use %PRODUCTNAME’s own Open and Save dialogs. 
If you currently use your operating system dialogs for saving and opening 
files, go to Tools - Options - %PRODUCTNAME - 
General and check the option Use %PRODUCTNAME 
dialogs.
 
 
 To 
enable a remote server connection, use one of these methods:
@@ -38,10 +38,10 @@
 Click on the Remote Files button in the Start 
Center.
   
   
-Select File > Open Remote 
Files... 
+Select File - Open Remote Files 

   
   
-Select File > Save to Remote 
Server...
+Select File - Save to Remote 
Server
   
 Then click on the Add Service button in the dialog to open the 
File Services dialog.
 
@@ -84,7 +84,7 @@
 
 
 Connecting to FTP and SSH servers
-
+
 
 
   
@@ -100,15 +100,15 @@
 User, Password: the username and password of the 
FTP service.
   
   
-Remember password: 
Check to store the password in %PRODUCTNAME user profile. The password will be 
secured by the master password in Tools - Options - 
LibreOffice - Security - Internet passwords.
+Remember password: 
Check to store the password in %PRODUCTNAME’s user profile. The password will 
be secured by the master password in Tools - Options - 
%PRODUCTNAME - Security - Internet passwords.
   
   
-
+
   
   
-
+
   
-.
+
 
 Connecting to a Windows share
 
@@ -118,7 +118,7 @@
   remote file service setup;Windows share
 
 
-
+
 
 
   
@@ -131,15 +131,15 @@
 Share: The Windows share.
   
   
-
+
   
   
-
+
   
   
-
+
   
-
+
 
 Connecting to Google Drive
 
@@ -149,7 +149,7 @@
   remote file service setup;Google Drive
 
 
-
+
 
 
   
@@ -159,12 +159,12 @@
 User, Password: the username and password of the 
Google account.
   
   
-
+
   
   
-
+
   
-
+
 
 Connecting to a CMIS server
 
@@ -177,7 +177,7 @@
   remote file service setup;CMIS server
 
 
-
+
 
 
   
@@ -190,7 +190,7 @@
 User, Password: the username and password of the 
CMIS service.
   
   
-
+
   
   
 Repository: select the files repository in the 
drop-down list.
@@ -199,10 +199,10 @@
 Refresh button: click to refresh the contents of 
the repository list.
   
   
-
+
   
   
-
+
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/financial/fods/ipmt.fods  | 1802 +++
 sc/qa/unit/data/functions/financial/fods/irr.fods   |10181 
 sc/qa/unit/data/functions/financial/fods/ispmt.fods | 1938 +++
 3 files changed, 13921 insertions(+)

New commits:
commit a1f37240b7d4d47887135eff1b59ebe4ca6d40b5
Author: Zdeněk Crhonek 
Date:   Sun Jan 8 17:30:02 2017 +0100

add IRR, IPMT, ISPMT test case

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

diff --git a/sc/qa/unit/data/functions/financial/fods/ipmt.fods 
b/sc/qa/unit/data/functions/financial/fods/ipmt.fods
new file mode 100644
index 000..727d77c
--- /dev/null
+++ b/sc/qa/unit/data/functions/financial/fods/ipmt.fods
@@ -0,0 +1,1802 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2017-01-08T17:26:18.147481385P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/92a1ad1f36b6d3cc13135a8c0805508933011577
+ 
+  
+   0
+   0
+   34080
+   18721
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+   false
+  
+  
+   4
+   21
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 90
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £
+   
+   
+  
+  
+   £
+   

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

[Stephan Bergmann]

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

New commits:
commit e7b1aeb2943bf8fb986e712b200ebe346a4b67ad
Author: Stephan Bergmann 
Date:   Tue Jan 10 11:33:42 2017 +0100

-Werror=format=

Change-Id: I690117e6e94af2364cbf2f7bcb0bc44adc264567

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 682dc87..c4c9e69 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1820,7 +1820,7 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, 
const char *fname,
 "0 1 255 {Encoding exch /.notdef put} for\n";
 
 const char * const h16 = "Encoding %d /glyph%d put\n";
-const char * const h17 = "/XUID [103 0 0 16#%08X %d 16#%08X 16#%08X] 
def\n";
+const char * const h17 = "/XUID [103 0 0 16#%08" SAL_PRIXUINT32 " %d 
16#%08" SAL_PRIXUINT32 " 16#%08" SAL_PRIXUINT32 "] def\n";
 
 const char * const h30 = "/CharProcs %d dict def\n";
 const char * const h31 = "  CharProcs begin\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   73 ++
 1 file changed, 35 insertions(+), 38 deletions(-)

New commits:
commit 7aaa217894fad1b3fd5c06cc77a216a87adae93d
Author: Caolán McNamara 
Date:   Mon Jan 9 15:49:10 2017 +

collapse !mpMgr || mpMgr

Change-Id: Id93b2da5665c47b1e8941d2f7428fe078c6227f7

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index d0e27c4..8507c00 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -163,55 +163,52 @@ void GraphicObject::ImplAssignGraphicData()
 
 void GraphicObject::ImplSetGraphicManager(const OString* pID, const 
GraphicObject* pCopyObj)
 {
-if (!mpMgr || mpMgr)
+if (mpMgr && mpMgr == mpGlobalMgr)
+return;
+else
 {
-if (mpMgr && mpMgr == mpGlobalMgr)
-return;
-else
+if( mpMgr )
 {
-if( mpMgr )
-{
-mpMgr->ImplUnregisterObj( *this );
+mpMgr->ImplUnregisterObj( *this );
 
-if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() 
)
-{
-delete mpGlobalMgr;
-mpGlobalMgr = nullptr;
-}
+if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() )
+{
+delete mpGlobalMgr;
+mpGlobalMgr = nullptr;
 }
+}
 
-if (true)
+if (true)
+{
+if( !mpGlobalMgr )
 {
-if( !mpGlobalMgr )
+if (!utl::ConfigManager::IsAvoidConfig())
 {
-if (!utl::ConfigManager::IsAvoidConfig())
-{
-mpGlobalMgr = new GraphicManager(
-(officecfg::Office::Common::Cache::GraphicManager::
- TotalCacheSize::get()),
-(officecfg::Office::Common::Cache::GraphicManager::
- ObjectCacheSize::get()));
-mpGlobalMgr->SetCacheTimeout(
-officecfg::Office::Common::Cache::GraphicManager::
-ObjectReleaseTime::get());
-}
-else
-{
-mpGlobalMgr = new GraphicManager(
-2,
-2);
-mpGlobalMgr->SetCacheTimeout(
-2);
-}
+mpGlobalMgr = new GraphicManager(
+(officecfg::Office::Common::Cache::GraphicManager::
+ TotalCacheSize::get()),
+(officecfg::Office::Common::Cache::GraphicManager::
+ ObjectCacheSize::get()));
+mpGlobalMgr->SetCacheTimeout(
+officecfg::Office::Common::Cache::GraphicManager::
+ObjectReleaseTime::get());
+}
+else
+{
+mpGlobalMgr = new GraphicManager(
+2,
+2);
+mpGlobalMgr->SetCacheTimeout(
+2);
 }
-
-mpMgr = mpGlobalMgr;
 }
-else
-mpMgr = nullptr;
 
-mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
+mpMgr = mpGlobalMgr;
 }
+else
+mpMgr = nullptr;
+
+mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/formulacell.hxx  |9 +++-
 sc/source/core/data/column.cxx  |2 -
 sc/source/core/data/formulacell.cxx |   40 
 sc/source/core/tool/refdata.cxx |4 +++
 4 files changed, 45 insertions(+), 10 deletions(-)

New commits:
commit 439b2a134218b93e6ca9fa23005b89c19498f586
Author: Eike Rathke 
Date:   Mon Jan 9 19:47:06 2017 +0100

Resolves: tdf#104711 adjust range reference constructed of named anchors

A constructed range reference of named anchors (i.e. extended during
expression compilation) forms a range listened at that needs to be
adjusted if the cell is shifted and one or both anchor parts are
individually named relative references.

Currently the resulting range (ScComplexRefData aka DoubleRef) does not
know to distinguish between whether its anchors are the result of a
literal range in a named expression or the result of individually named
anchors, so such RelName DoubleRef needs to be adjusted unconditionally
when shifting or moving the formula cell.

Change-Id: I75e2cc79ac60116671acce7641567337d5f5f7ed

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 960a753..71812a2 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -243,7 +243,14 @@ public:
It is similar to HasOneReference(), but more general.
  */
 bool HasRefListExpressibleAsOneReference(ScRange& rRange) const;
-boolHasRelNameReference() const;
+
+enum class RelNameRef
+{
+NONE,   ///< no relative reference from named expression
+SINGLE, ///< only single cell relative reference
+DOUBLE  ///< at least one range relative reference from named 
expression
+};
+RelNameRef  HasRelNameReference() const;
 
 bool UpdateReference(
 const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr, 
const ScAddress* pUndoCellPos = nullptr );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d143e48..beb758a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2828,7 +2828,7 @@ struct SetDirtyIfPostponedHandler
 {
 void operator() (size_t /*nRow*/, ScFormulaCell* pCell)
 {
-if (pCell->IsPostponedDirty() || pCell->HasRelNameReference())
+if (pCell->IsPostponedDirty() || (pCell->HasRelNameReference() != 
ScFormulaCell::RelNameRef::NONE))
 pCell->SetDirty();
 }
 };
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 9ad3731..839d776 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2906,18 +2906,34 @@ 
ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
 return false;
 }
 
-bool ScFormulaCell::HasRelNameReference() const
+ScFormulaCell::RelNameRef ScFormulaCell::HasRelNameReference() const
 {
+RelNameRef eRelNameRef = RelNameRef::NONE;
 pCode->Reset();
 formula::FormulaToken* t;
 while ( ( t = pCode->GetNextReferenceRPN() ) != nullptr )
 {
-if ( t->GetSingleRef()->IsRelName() ||
-(t->GetType() == formula::svDoubleRef &&
-t->GetDoubleRef()->Ref2.IsRelName()) )
-return true;
+switch (t->GetType())
+{
+case formula::svSingleRef:
+if (t->GetSingleRef()->IsRelName() && eRelNameRef == 
RelNameRef::NONE)
+eRelNameRef = RelNameRef::SINGLE;
+break;
+case formula::svDoubleRef:
+if (t->GetDoubleRef()->Ref1.IsRelName() || 
t->GetDoubleRef()->Ref2.IsRelName())
+// May originate from individual cell names, in which case
+// it needs recompilation.
+return RelNameRef::DOUBLE;
+/* TODO: have an extra flag at ScComplexRefData if range was
+ * extended? or too cumbersome? might narrow recompilation to
+ * only needed cases.
+ * */
+break;
+default:
+;   // nothing
+}
 }
-return false;
+return eRelNameRef;
 }
 
 bool ScFormulaCell::UpdatePosOnShift( const sc::RefUpdateContext& rCxt )
@@ -3122,7 +3138,13 @@ bool ScFormulaCell::UpdateReferenceOnShift(
 bInDeleteUndo = (pChangeTrack && pChangeTrack->IsInDeleteUndo());
 
 // RelNameRefs are always moved
-bool bHasRelName = HasRelNameReference();
+bool bHasRelName = false;
+if (!bRecompile)
+{
+RelNameRef eRelNameRef = HasRelNameReference();
+bHasRelName = (eRelNameRef != RelNameRef::NONE);
+bRecompile = (eRelNameRef == RelNameRef::DOUBLE);
+}
 // Reference changed and new listening needed?
 // Except in Insert/Delete without specialties.
 bNewListening = (bRefModified || bRecompile
@@ -3246,7 +3268,9 @@ b

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   53 --
 1 file changed, 18 insertions(+), 35 deletions(-)

New commits:
commit 6b0ae6c674e0216bc916232e500515f9eb764664
Author: Caolán McNamara 
Date:   Mon Jan 9 15:50:56 2017 +

the only GraphicManager is the mpGlobalMgr, so simplify accordingly

Change-Id: I5b237e27815e138cdcab75b1b9f657882ae8a37b

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 8507c00..2577393 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -163,51 +163,34 @@ void GraphicObject::ImplAssignGraphicData()
 
 void GraphicObject::ImplSetGraphicManager(const OString* pID, const 
GraphicObject* pCopyObj)
 {
-if (mpMgr && mpMgr == mpGlobalMgr)
+if (mpMgr)
 return;
 else
 {
-if( mpMgr )
+if( !mpGlobalMgr )
 {
-mpMgr->ImplUnregisterObj( *this );
-
-if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() )
+if (!utl::ConfigManager::IsAvoidConfig())
 {
-delete mpGlobalMgr;
-mpGlobalMgr = nullptr;
+mpGlobalMgr = new GraphicManager(
+(officecfg::Office::Common::Cache::GraphicManager::
+ TotalCacheSize::get()),
+(officecfg::Office::Common::Cache::GraphicManager::
+ ObjectCacheSize::get()));
+mpGlobalMgr->SetCacheTimeout(
+officecfg::Office::Common::Cache::GraphicManager::
+ObjectReleaseTime::get());
 }
-}
-
-if (true)
-{
-if( !mpGlobalMgr )
+else
 {
-if (!utl::ConfigManager::IsAvoidConfig())
-{
-mpGlobalMgr = new GraphicManager(
-(officecfg::Office::Common::Cache::GraphicManager::
- TotalCacheSize::get()),
-(officecfg::Office::Common::Cache::GraphicManager::
- ObjectCacheSize::get()));
-mpGlobalMgr->SetCacheTimeout(
-officecfg::Office::Common::Cache::GraphicManager::
-ObjectReleaseTime::get());
-}
-else
-{
-mpGlobalMgr = new GraphicManager(
-2,
-2);
-mpGlobalMgr->SetCacheTimeout(
-2);
-}
+mpGlobalMgr = new GraphicManager(
+2,
+2);
+mpGlobalMgr->SetCacheTimeout(
+2);
 }
-
-mpMgr = mpGlobalMgr;
 }
-else
-mpMgr = nullptr;
 
+mpMgr = mpGlobalMgr;
 mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   46 ++
 1 file changed, 22 insertions(+), 24 deletions(-)

New commits:
commit 9d138866d269eea262b22497af62b09570bd7a05
Author: Caolán McNamara 
Date:   Mon Jan 9 15:51:58 2017 +

unfold and unindent else cause

Change-Id: I22131a477547ac08b0c6b762353c9796f80c3666

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 2577393..f480537 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -165,34 +165,32 @@ void GraphicObject::ImplSetGraphicManager(const OString* 
pID, const GraphicObjec
 {
 if (mpMgr)
 return;
-else
+
+if (!mpGlobalMgr)
 {
-if( !mpGlobalMgr )
+if (!utl::ConfigManager::IsAvoidConfig())
 {
-if (!utl::ConfigManager::IsAvoidConfig())
-{
-mpGlobalMgr = new GraphicManager(
-(officecfg::Office::Common::Cache::GraphicManager::
- TotalCacheSize::get()),
-(officecfg::Office::Common::Cache::GraphicManager::
- ObjectCacheSize::get()));
-mpGlobalMgr->SetCacheTimeout(
-officecfg::Office::Common::Cache::GraphicManager::
-ObjectReleaseTime::get());
-}
-else
-{
-mpGlobalMgr = new GraphicManager(
-2,
-2);
-mpGlobalMgr->SetCacheTimeout(
-2);
-}
+mpGlobalMgr = new GraphicManager(
+(officecfg::Office::Common::Cache::GraphicManager::
+ TotalCacheSize::get()),
+(officecfg::Office::Common::Cache::GraphicManager::
+ ObjectCacheSize::get()));
+mpGlobalMgr->SetCacheTimeout(
+officecfg::Office::Common::Cache::GraphicManager::
+ObjectReleaseTime::get());
+}
+else
+{
+mpGlobalMgr = new GraphicManager(
+2,
+2);
+mpGlobalMgr->SetCacheTimeout(
+2);
 }
-
-mpMgr = mpGlobalMgr;
-mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
 }
+
+mpMgr = mpGlobalMgr;
+mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
 }
 
 void GraphicObject::ImplAutoSwapIn()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - test/httpwstest.cpp

[Tor Lillqvist]

 test/httpwstest.cpp |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9a8d9f1531a2e73581f42fb3a7a093b5a6a159fd
Author: Tor Lillqvist 
Date:   Tue Dec 27 12:10:17 2016 +0200

Drop the .uno:MergeCells= thing from HTTPWSTest::testStateUnoCommand

It always failed. No idea why, or what this stuff is. See also
6bd899f3fa44f2d78092333a399e141889b43dca in cp-5.1 which might be
related, or not.

Change-Id: I95f964e3f99c681ec9eefd092e523babd919a5c0
(cherry picked from commit 023bde69dc905d07aa12c95f0e32988285347c9f)

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index d180820..d04724e 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -1513,7 +1513,6 @@ void HTTPWSTest::testStateUnoCommand()
 ".uno:InsertColumnsAfter=",
 ".uno:DeleteRows=",
 ".uno:DeleteColumns=",
-".uno:MergeCells=",
 ".uno:StatusDocPos=",
 ".uno:RowColSelCount=",
 ".uno:StatusPageStyle=",
@@ -1572,7 +1571,6 @@ void HTTPWSTest::testStateUnoCommand()
 ".uno:EntireRow=",
 ".uno:EntireColumn=",
 ".uno:EntireCell=",
-".uno:MergeCells=",
 ".uno:InsertMode=",
 ".uno:StateTableCell=",
 ".uno:StatePageNumber=",
@@ -1624,7 +1622,6 @@ void HTTPWSTest::testStateUnoCommand()
 ".uno:SelectTable=",
 ".uno:EntireRow=",
 ".uno:EntireColumn=",
-".uno:MergeCells=",
 ".uno:AssignLayout=",
 ".uno:PageStatus=",
 ".uno:LayoutStatus=",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - test/TileCacheTests.cpp

[Tor Lillqvist]

 test/TileCacheTests.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7c4485a7431122d663b63db3e65a59e77fe4a8b
Author: Tor Lillqvist 
Date:   Mon Dec 5 11:02:26 2016 +0200

The part number we get here seems to be always 1, not 0

No deeper understanding of what is going on... This is when running
against cp-5.1

(cherry picked from commit dc18ccfd560c65ba8184d970db1aba05593b635e)

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 64780a6..edc22d5 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -693,7 +693,7 @@ void TileCacheTests::testTileInvalidateWriterPage()
 int part = -1;
 CPPUNIT_ASSERT_MESSAGE("No part# in invalidatetiles message.",
LOOLProtocol::getTokenIntegerFromMessage(res, 
"part", part));
-CPPUNIT_ASSERT_EQUAL(0, part);
+CPPUNIT_ASSERT_EQUAL(1, part);
 }
 
 // This isn't yet used
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svtools/grfmgr.hxx |1 -
 svtools/source/graphic/grfmgr.cxx  |7 ---
 svtools/source/graphic/grfmgr2.cxx |4 +---
 3 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 3a44ef1d5de57022ad2f5339dbcbfa534174eb9f
Author: Caolán McNamara 
Date:   Mon Jan 9 15:58:45 2017 +

GraphicManagerDestroyed would just set the default manager again

which is the only one that could already be set. Seeing
as the manager is always there if a Graphic exists then
the maObjList must be empty at the dtor time

Change-Id: Id447d1e62a4b94b0ef986edf3cc05629c90e511b

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 7a8291f..9c3ddc9 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -315,7 +315,6 @@ private:
 void SVT_DLLPRIVATE ImplAfterDataChange();
 protected:
 
-voidGraphicManagerDestroyed();
 SvStream*   GetSwapStream() const;
 voidSetSwapState();
 
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index f480537..2682e95 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -447,13 +447,6 @@ void GraphicObject::FireSwapOutRequest()
 ImplAutoSwapOutHdl( nullptr );
 }
 
-void GraphicObject::GraphicManagerDestroyed()
-{
-// we're alive, but our manager doesn't live anymore ==> connect to 
default manager
-mpMgr = nullptr;
-ImplSetGraphicManager();
-}
-
 bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const 
Size& rSz,
   const GraphicAttr* pAttr, 
GraphicManagerDrawFlags nFlags ) const
 {
diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index e2608bb..f71c67a 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -49,9 +49,7 @@ GraphicManager::GraphicManager( sal_uLong nCacheSize, 
sal_uLong nMaxObjCacheSize
 
 GraphicManager::~GraphicManager()
 {
-for(GraphicObject* i : maObjList)
-i->GraphicManagerDestroyed();
-
+assert(maObjList.empty());
 delete mpCache;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Resizable wizards

[Eike Rathke]

Hi Heiko,

On Sunday, 2017-01-08 11:10:13 +0100, Heiko Tietze wrote:

> We decided [1] to go with non-resizable dialogs by default. However wizards 
> such as Calc > Insert > Form Controls > List box (sabpilot) are still 
> resizable. So I suggest to unset the resizable flag at 
> svtools/uiconfig/ui/wizarddialog.ui. This would affect a lot of dialogs and 
> maybe have unexpected results. Any thoughts?
> 
> [1] https://listarchives.libreoffice.org/global/design/msg07373.html

Make sure that derived dialogs
a) do not contain edit fields or list boxes or tabular grids, or
b) adjust those to be resizable again

  Eike

P.S.: for some reason your PGP signature doesn't verify for the mail you wrote.

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit f0ab4138ca30690c4779c6a440826de3bd6fc8e7
Author: Caolán McNamara 
Date:   Mon Jan 9 16:01:41 2017 +

ImplSetGraphicManager only called from ctors now where mpMgr is nullptr

Change-Id: Ib275f4c803d74eaf45409e78a6c786dac159af6b

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 2682e95..9c5b89f 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -163,9 +163,6 @@ void GraphicObject::ImplAssignGraphicData()
 
 void GraphicObject::ImplSetGraphicManager(const OString* pID, const 
GraphicObject* pCopyObj)
 {
-if (mpMgr)
-return;
-
 if (!mpGlobalMgr)
 {
 if (!utl::ConfigManager::IsAvoidConfig())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to retrieve a backtrace when there's no stack (case tdf#105182)

[Eike Rathke]

Hi julien2412,

On Sunday, 2017-01-08 15:12:44 -0700, julien2412 wrote:

> I wanted to give a try to tdf#105182 but the popup error seems to prevent
> from having a stacktrace.
> Is it possible to disable manually this popup mechanism?
> Indeed, in the quoted bugtracker, we know there's something with a vector
> but don't know which file or which method.

Blindly assuming that the popup is somehow related to an exception
thrown, you could try in gdb

catch throw

or if that doesn't work maybe

break __cxa_throw

before executing the failing code path. Enable only immediately before,
as various exceptions can be thrown for legitimate reasons and are
caught as well so you could hit the breakpoint several times without the
context you're actually interested in.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Caolán McNamara]

 include/svtools/grfmgr.hxx|5 +
 svtools/source/graphic/grfmgr.cxx |   15 +--
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 8065e33626b8b9cf02caaa12b345b538535a8acf
Author: Caolán McNamara 
Date:   Mon Jan 9 16:05:35 2017 +

move the ImplRegisterObj outside ImplSetGraphicManager and rename it

Change-Id: I1eded3ee41787b9a3339e01cf6e1157724bba1a6

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 9c3ddc9..247b036 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -202,10 +202,7 @@ private:
 
 voidSVT_DLLPRIVATE ImplConstruct();
 voidSVT_DLLPRIVATE ImplAssignGraphicData();
-voidSVT_DLLPRIVATE ImplSetGraphicManager(
-const OString* pID = nullptr,
-const GraphicObject* pCopyObj = nullptr
-);
+voidSVT_DLLPRIVATE ImplEnsureGraphicManager();
 voidSVT_DLLPRIVATE ImplAutoSwapIn();
 boolSVT_DLLPRIVATE ImplGetCropParams(
 OutputDevice* pOut,
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 9c5b89f..003063d 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -77,7 +77,8 @@ GraphicObject::GraphicObject() :
 {
 ImplConstruct();
 ImplAssignGraphicData();
-ImplSetGraphicManager();
+ImplEnsureGraphicManager();
+mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
 }
 
 GraphicObject::GraphicObject( const Graphic& rGraphic ) :
@@ -87,7 +88,8 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) :
 {
 ImplConstruct();
 ImplAssignGraphicData();
-ImplSetGraphicManager();
+ImplEnsureGraphicManager();
+mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
 }
 
 GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) :
@@ -98,7 +100,8 @@ GraphicObject::GraphicObject( const GraphicObject& 
rGraphicObj ) :
 {
 ImplConstruct();
 ImplAssignGraphicData();
-ImplSetGraphicManager(nullptr, &rGraphicObj);
+ImplEnsureGraphicManager();
+mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, &rGraphicObj);
 if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() )
 SetSwapState();
 }
@@ -112,7 +115,8 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) :
 // assign default properties
 ImplAssignGraphicData();
 
-ImplSetGraphicManager(&rUniqueID);
+ImplEnsureGraphicManager();
+mpMgr->ImplRegisterObj(*this, maGraphic, &rUniqueID, nullptr);
 
 // update properties
 ImplAssignGraphicData();
@@ -161,7 +165,7 @@ void GraphicObject::ImplAssignGraphicData()
 ImplAfterDataChange();
 }
 
-void GraphicObject::ImplSetGraphicManager(const OString* pID, const 
GraphicObject* pCopyObj)
+void GraphicObject::ImplEnsureGraphicManager()
 {
 if (!mpGlobalMgr)
 {
@@ -187,7 +191,6 @@ void GraphicObject::ImplSetGraphicManager(const OString* 
pID, const GraphicObjec
 }
 
 mpMgr = mpGlobalMgr;
-mpMgr->ImplRegisterObj( *this, maGraphic, pID, pCopyObj );
 }
 
 void GraphicObject::ImplAutoSwapIn()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd5ec81c78df81fb85a036d07cc4d60d01575fd0
Author: Caolán McNamara 
Date:   Mon Jan 9 16:06:47 2017 +

mpGlobalMgr is the only manager possible

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

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 003063d..3ca4c73 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -128,7 +128,7 @@ GraphicObject::~GraphicObject()
 {
 mpMgr->ImplUnregisterObj( *this );
 
-if( ( mpMgr == mpGlobalMgr ) && !mpGlobalMgr->ImplHasObjects() )
+if (!mpGlobalMgr->ImplHasObjects())
 {
 delete mpGlobalMgr;
 mpGlobalMgr = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 11e5668f12565ad9b1acb5c0085653c7a22ca329
Author: Caolán McNamara 
Date:   Mon Jan 9 16:07:33 2017 +

mpGlobalMgr has to exist at GraphicObject dtor time

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

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 3ca4c73..1826e5f 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -124,15 +124,12 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) :
 
 GraphicObject::~GraphicObject()
 {
-if( mpMgr )
-{
-mpMgr->ImplUnregisterObj( *this );
+mpMgr->ImplUnregisterObj( *this );
 
-if (!mpGlobalMgr->ImplHasObjects())
-{
-delete mpGlobalMgr;
-mpGlobalMgr = nullptr;
-}
+if (!mpGlobalMgr->ImplHasObjects())
+{
+delete mpGlobalMgr;
+mpGlobalMgr = nullptr;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-collect.py esc-reporting/esc-report.py

[jan Iversen]

 esc-reporting/esc-analyze.py |9 -
 esc-reporting/esc-collect.py |   12 ++--
 esc-reporting/esc-report.py  |3 ++-
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit f38b77f5046c5566eb8a77231a897e8af469b7db
Author: jan Iversen 
Date:   Tue Jan 10 13:56:27 2017 +0100

esc-mentoring update to match new gitdm-config

gitdm-config have been changed to use lowercase
email addr only (converted), and as a consequence
the mail search algorithms have been updated

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index c28667b..eabbd64 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -70,8 +70,6 @@ def util_load_csv(fileName, split):
 global statList
 rawData = {}
 with open(fileName, 'r', encoding='utf-8') as fp:
-  fp.readline()
-  fp.readline()
   for line in fp:
 line = line[:-1]
 if len(line) == 0:
@@ -150,7 +148,7 @@ def util_create_person_gerrit(person, email):
  '1month': {'owner': 0, 'reviewer': 0},
  '1week':  {'owner': 0, 'reviewer': 0},
  'total':  0,
- 'userName': '*DUMMY*'},
+ 'userName': '*dummy*'},
  'ui':  {'1year':  {'commented': 0, 'history': 0},
  '3month': {'commented': 0, 'history': 0},
  '1month': {'commented': 0, 'history': 0},
@@ -223,14 +221,15 @@ def util_create_statList():
 
 
 
-def util_check_mail(name, mail):
+def util_check_mail(name, xmail):
 global statList
 
+mail = xmail.lower()
 if mail in statList['aliases']:
   mail = statList['aliases'][mail]
 if not mail in statList['people']:
   statList['people'][mail] = util_create_person_gerrit(name, mail)
-  if mail == '*DUMMY*':
+  if mail == '*dummy*':
 statList['people'][mail]['licenseOK'] = True
 else:
   if name and name != '*UNKNOWN*' and statList['people'][mail]['name'] == 
'*UNKNOWN*':
diff --git a/esc-reporting/esc-collect.py b/esc-reporting/esc-collect.py
index e222485..49aadb7 100755
--- a/esc-reporting/esc-collect.py
+++ b/esc-reporting/esc-collect.py
@@ -184,7 +184,7 @@ def get_gerrit(cfg):
 for row in tmp:
   for i in 'username', 'email':
 if not i in row:
-  row[i] = '*DUMMY*'
+  row[i] = '*dummy*'
   rawList['committers'].append(row)
 
 url = urlBase + 'changes/?q=after:' + searchDate.strftime("%Y-%m-%d") + \
@@ -197,13 +197,13 @@ def get_gerrit(cfg):
   for row in tmp:
 for i in 'email', 'username', 'name':
   if not i in row['owner']:
-row['owner'][i] = '*DUMMY*'
+row['owner'][i] = '*dummy*'
 for x in row['messages']:
   if not 'author' in x:
 x['author'] = {}
   for i in 'email', 'username', 'name':
 if not i in x['author']:
-  x['author'][i] = '*DUMMY*'
+  x['author'][i] = '*dummy*'
 for i in 'Verified', 'Code-Review':
   if not i in row['labels']:
 row['labels'][i] = {}
@@ -211,11 +211,11 @@ def get_gerrit(cfg):
 row['labels'][i]['all'] = []
   for x in row['labels'][i]['all']:
 if 'name' not in x:
-  x['name'] = '*DUMMY*'
+  x['name'] = '*dummy*'
 if 'email' not in x:
-  x['email'] = '*DUMMY*'
+  x['email'] = '*dummy*'
 if 'username' not in x:
-  x['username'] = '*DUMMY*'
+  x['username'] = '*dummy*'
 if 'value' not in x:
   x['value'] = 0
 
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 46899c7..c018dfe 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -52,8 +52,9 @@ def util_load_data_file(fileName):
 
 
 
-def util_check_mail(mail):
+def util_check_mail(xmail):
 global statList
+mail = xmail.lower()
 if mail in statList['aliases']:
   mail = statList['aliases'][mail]
 if not mail in statList['people']:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - common/Protocol.hpp

[Tor Lillqvist]

 common/Protocol.hpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9436d2b00b957b1a94984f0487b6275246793edd
Author: Tor Lillqvist 
Date:   Wed Dec 14 17:23:42 2016 +0200

Add 'userinactive' to messages that don't indicate user interaction

In fact, it is more or less the opposite;)

Change-Id: I34eca0ed6b7d4ce369ae803eac542f0996d193eb
(cherry picked from commit 0bdac17fa6a5e7bf730b736af99d70fa0650b4a1)

diff --git a/common/Protocol.hpp b/common/Protocol.hpp
index 67f7ec7..6f2b50b 100644
--- a/common/Protocol.hpp
+++ b/common/Protocol.hpp
@@ -192,7 +192,8 @@ namespace LOOLProtocol
 
 return (token.find("tile") == std::string::npos &&
 token.find("status") == std::string::npos &&
-token.find("state") == std::string::npos);
+token.find("state") == std::string::npos &&
+token != "userinactive");
 }
 
 /// Returns the first line of a message.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: how to make resource file

[jaeseok]

thanks your kindness, I read in website.

I knew the fact that installed the program not Libreoffice but Openoffice.
so I looked around 'AllLangResTarget_for.mk' in libreoffice opengrok and I
studied gb_macro.

but I don't know well yet. 

In AllLangResTarget_for.mk, I can assign the resource name and generation
path through gb_SrsTarget_add_files. but I think the gb_macro is only assign
name and the path. 

for example,

gb_SrsTarget_add_files is used in AllLangResTarget_for.mk
 25 $(eval $(call gb_SrsTarget_add_files,formula/res,\
 26 formula/source/core/resource/core_resource.src \

gb_SrsTarget_add_files is define in AllLangResTarget.mk
214 define gb_SrsTarget_add_files
215 $(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
216 
217 endef

In alllangres.mk, SrsTarget class inheritanced from types.mk and add_files
function is define

In mk files, I found the command such as mkdir, dir, echo, rm, but, that's
all. nowhere not exist convert code. 

where is the code convert src to binary?


and I want to convert my src file to binary file for some reasons. Improve
Korean localisation, change UI strings, add functions.


best regards.




--
View this message in context: 
http://nabble.documentfoundation.org/how-to-make-resource-file-tp4204083p4204848.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: how to make resource file

[Jan Iversen]

> 
> I knew the fact that installed the program not Libreoffice but Openoffice.

Well if you work on openoffice, it would be natural to ask the questions on 
their list, as written earlier, the build systems are very different and it is 
very difficult to look at the LibreOffice build system and learn how things are 
done in the openoffice build system.

You will also see that the translation process is quite different. The 
LibreOffice community have spent lots of hours to streamline both the build 
system and the translation process to make contributing more efficient, 
something we are very proud of.

So why not work on LibreOffice directly ?
https://wiki.documentfoundation.org/Development/GetInvolved 


rgds
jan I.

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

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

[Markus Mohrhard]

 basctl/source/basicide/iderdll.cxx  |2 -
 framework/inc/services/desktop.hxx  |2 +
 framework/source/services/desktop.cxx   |   29 
 include/comphelper/unique_disposing_ptr.hxx |   40 +++-
 sw/source/uibase/app/swdll.cxx  |2 -
 5 files changed, 66 insertions(+), 9 deletions(-)

New commits:
commit ad915fafd54f9115faea7147f82d80a942af2d68
Author: Markus Mohrhard 
Date:   Mon Jan 9 05:58:00 2017 +0100

tdf#104830, need an own termination listener for lib objects

The destruction of the SwDLL object happens already through the normal
termination listener but the other termination listeners might still
depend on it. Also the outstanding events might need the SwDLL instance
to be still around.

This makes the destruction of the instance explicit and at a time when
it should be safe. We should use the same code for calc, impress, math
and base as well.

Change-Id: I50b8f30426f5a4a54e362e748fe962839abca73e
Reviewed-on: https://gerrit.libreoffice.org/32856
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/basctl/source/basicide/iderdll.cxx 
b/basctl/source/basicide/iderdll.cxx
index b301ef7..1faeb46 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -61,7 +61,7 @@ public:
 class DllInstance : public 
comphelper::unique_disposing_solar_mutex_reset_ptr
 {
 public:
-DllInstance() : 
comphelper::unique_disposing_solar_mutex_reset_ptr(Reference(
 frame::Desktop::create(comphelper::getProcessComponentContext()), 
UNO_QUERY_THROW), new Dll)
+DllInstance() : 
comphelper::unique_disposing_solar_mutex_reset_ptr(Reference(
 frame::Desktop::create(comphelper::getProcessComponentContext()), 
UNO_QUERY_THROW), new Dll, true)
 { }
 };
 
diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index 8aa56ef..2c88e32 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -455,6 +455,8 @@ class Desktop : private cppu::BaseMutex,
 
 css::uno::Reference< css::frame::XUntitledNumbers > 
m_xTitleNumberGenerator;
 
+std::vector> 
m_xComponentDllListeners;
+
 };  //  class Desktop
 
 }   //  namespace framework
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 9ab71a9..22a8360 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -347,6 +347,14 @@ sal_Bool SAL_CALL Desktop::terminate()
 if ( xPipeTerminator.is() )
 xPipeTerminator->notifyTermination( aEvent );
 
+// we need a copy here as the notifyTermination call might cause a 
removeTerminateListener call
+std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
+for (auto& xListener : xComponentDllListeners)
+{
+xListener->notifyTermination(aEvent);
+}
+m_xComponentDllListeners.clear();
+
 // Must be really the last listener to be called.
 // Because it shutdown the whole process asynchronous !
 if ( xSfxTerminator.is() )
@@ -424,6 +432,11 @@ void SAL_CALL Desktop::addTerminateListener( const 
css::uno::Reference< css::fra
 m_xSWThreadManager = xListener;
 return;
 }
+else if ( sImplementationName == 
"com.sun.star.comp.ComponentDLLListener" )
+{
+m_xComponentDllListeners.push_back(xListener);
+return;
+}
 }
 
 // No lock required ... container is threadsafe by itself.
@@ -471,6 +484,13 @@ void SAL_CALL Desktop::removeTerminateListener( const 
css::uno::Reference< css::
 m_xSWThreadManager.clear();
 return;
 }
+else if (sImplementationName == 
"com.sun.star.comp.ComponentDLLListener")
+{
+m_xComponentDllListeners.erase(
+std::remove(m_xComponentDllListeners.begin(), 
m_xComponentDllListeners.end(), xListener),
+m_xComponentDllListeners.end());
+return;
+}
 }
 
 // No lock required ... container is threadsafe by itself.
@@ -1100,6 +1120,15 @@ void SAL_CALL Desktop::disposing()
 m_xQuickLauncher.clear();
 m_xStarBasicQuitGuard.clear();
 m_xSWThreadManager.clear();
+
+// we need a copy because the notifyTermination might call the 
removeEventListener method
+std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
+for (auto& xListener: xComponentDllListeners)
+{
+xListener->notifyTermination(aEvent);
+}
+xComponentDllListeners.clear();
+m_xComponentDllListeners.clear();
 m_xSfxTerminator.clear();
 m_xCommandOptions.reset();
 
diff --git a/include/comphelper/unique_disposing_ptr.hxx 
b/include/comphelper/unique_disposing_ptr.hxx
index 75b

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

[Caolán McNamara]

 vcl/source/filter/ixbm/xbmread.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e0eee341997e372e2e07638c1b8a5d2e42bd7bbf
Author: Caolán McNamara 
Date:   Mon Jan 9 09:05:12 2017 +

ofz#394 xbm ParseDefine problem

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

diff --git a/vcl/source/filter/ixbm/xbmread.cxx 
b/vcl/source/filter/ixbm/xbmread.cxx
index 5b0741f..15931a6 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -165,11 +165,11 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
 cTmp = *pTmp--;
 
 // search last digit
-while( pHexTable[ cTmp ] == -1 )
+while (pHexTable[ cTmp ] == -1 && pTmp >= pDefine)
 cTmp = *pTmp--;
 
 // move before number
-while( pHexTable[ cTmp ] != -1 )
+while (pHexTable[ cTmp ] != -1 && pTmp >= pDefine)
 cTmp = *pTmp--;
 
 // move to start of number
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Kim Gwangyeon license statment

[Jan Iversen]

WELCOME
Thanks for your license statement.

We suggest you add yourself to our wiki (remark this is not a demand)
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 compilerplugins/clang/conststringvar.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 629765804a9d416c022697c1d0ae9493127d3efe
Author: Stephan Bergmann 
Date:   Tue Jan 10 14:35:05 2017 +0100

Work around problems with isCXX11ConstantExpr in template code

> template
> bool checkOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* 
aOutputCheck[][Size], const char* pCaption)
> {
> ...
> const char* p = aOutputCheck[nRow][nCol];

in sc/qa/unit/helper/qahelper.hxx caused

>assert(E->isRValue() && E->getType()->hasPointerRepresentation());

in Clang's EvaluatePointer (lib/AST/ExprConstant.cpp) to fire.  In the 
template
definition itself, Clang doesn't introduce ArrayToPointerDecay 
ImplicitCastExpr
into the subscripting operations (while in any implicit specializations 
that it
instantiates, it does).

This is interesting:  Up to C++11, [expr.sub] requires the operator to have
pointer type (so array-to-pointer decay is clearly asked for).  In C++14
(CWG1213), the operator can also be of array type but it is not explicitly
specified whether array-to-pointer decay is to be performed.  In upcoming 
C++17
(P0135R1), it specifies further that an operator of array type must be a 
glvalue
but still does not explicitly specify whether array-to-pointer decay is to 
be
performed.  Maybe the definition of the subscripting operation in terms of
*((E1)+(E2)) is meant to imply that, however.

Change-Id: I67c7b0f34002387dbf746288630371877c6261ef

diff --git a/compilerplugins/clang/conststringvar.cxx 
b/compilerplugins/clang/conststringvar.cxx
index 58a94e5..a6d348a 100644
--- a/compilerplugins/clang/conststringvar.cxx
+++ b/compilerplugins/clang/conststringvar.cxx
@@ -104,6 +104,10 @@ public:
 if (init == nullptr) {
 return true;
 }
+if (init->isInstantiationDependent()) {
+// avoid problems with isCXX11ConstantExpr in template code
+return true;
+}
 APValue v;
 if (!init->isCXX11ConstantExpr(compiler.getASTContext(), &v)) {
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svtools/grfmgr.hxx|   10 -
 svtools/source/graphic/grfmgr.cxx |   64 --
 2 files changed, 34 insertions(+), 40 deletions(-)

New commits:
commit a1d3dc1cbd1ca8b61e717c8ef8c7fdfe3ec33045
Author: Caolán McNamara 
Date:   Mon Jan 9 16:16:38 2017 +

post ctor, pre dtor there is always a mpMgr and its mpGlobalMgr

move the ImplEnsureGraphicManager calls to be the first thing
in the ctor to ensure that its also always available during
the ctoring, this is hopefully a good change

Change-Id: Iccddee7cac152df66dec0039df207a7575e1fa54

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 247b036..ac8bdea 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -181,7 +181,6 @@ private:
 MapMode maPrefMapMode;
 sal_uLong   mnSizeBytes;
 GraphicType meType;
-GraphicManager* mpMgr;
 OUStringmaLink;
 Link maSwapStreamHdl;
 OUStringmaUserData;
@@ -202,7 +201,7 @@ private:
 
 voidSVT_DLLPRIVATE ImplConstruct();
 voidSVT_DLLPRIVATE ImplAssignGraphicData();
-voidSVT_DLLPRIVATE ImplEnsureGraphicManager();
+static void SVT_DLLPRIVATE ImplEnsureGraphicManager();
 voidSVT_DLLPRIVATE ImplAutoSwapIn();
 boolSVT_DLLPRIVATE ImplGetCropParams(
 OutputDevice* pOut,
@@ -332,7 +331,12 @@ public:
 voidFireSwapInRequest();
 voidFireSwapOutRequest();
 
-GraphicManager& GetGraphicManager() const { return *mpMgr; }
+GraphicManager& GetGraphicManager() const
+{
+(void)this; // avoid loplugin:staticmethods because first 
GraphicManager ctor creates
+// mpGlobalMgr and the last GraphicManager dtor destroys it
+return *mpGlobalMgr;
+}
 
 boolIsCached(
 OutputDevice* pOut,
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 1826e5f..91c7265 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -67,18 +67,17 @@ void GraphicObject::ImplAfterDataChange()
 mnDataChangeTimeStamp = aIncrementingTimeOfLastDataChange++;
 
 // check memory footprint of all GraphicObjects managed and evtl. take 
action
-if (mpMgr)
-mpMgr->ImplCheckSizeOfSwappedInGraphics(this);
+mpGlobalMgr->ImplCheckSizeOfSwappedInGraphics(this);
 }
 
 GraphicObject::GraphicObject() :
 maLink  (),
 maUserData  ()
 {
+ImplEnsureGraphicManager();
 ImplConstruct();
 ImplAssignGraphicData();
-ImplEnsureGraphicManager();
-mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
+mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
 }
 
 GraphicObject::GraphicObject( const Graphic& rGraphic ) :
@@ -86,10 +85,10 @@ GraphicObject::GraphicObject( const Graphic& rGraphic ) :
 maLink  (),
 maUserData  ()
 {
+ImplEnsureGraphicManager();
 ImplConstruct();
 ImplAssignGraphicData();
-ImplEnsureGraphicManager();
-mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
+mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, nullptr);
 }
 
 GraphicObject::GraphicObject( const GraphicObject& rGraphicObj ) :
@@ -98,10 +97,10 @@ GraphicObject::GraphicObject( const GraphicObject& 
rGraphicObj ) :
 maLink  ( rGraphicObj.maLink ),
 maUserData  ( rGraphicObj.maUserData )
 {
+ImplEnsureGraphicManager();
 ImplConstruct();
 ImplAssignGraphicData();
-ImplEnsureGraphicManager();
-mpMgr->ImplRegisterObj(*this, maGraphic, nullptr, &rGraphicObj);
+mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, &rGraphicObj);
 if( rGraphicObj.HasUserData() && rGraphicObj.IsSwappedOut() )
 SetSwapState();
 }
@@ -110,13 +109,14 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) :
 maLink  (),
 maUserData  ()
 {
+ImplEnsureGraphicManager();
+
 ImplConstruct();
 
 // assign default properties
 ImplAssignGraphicData();
 
-ImplEnsureGraphicManager();
-mpMgr->ImplRegisterObj(*this, maGraphic, &rUniqueID, nullptr);
+mpGlobalMgr->ImplRegisterObj(*this, maGraphic, &rUniqueID, nullptr);
 
 // update properties
 ImplAssignGraphicData();
@@ -124,7 +124,7 @@ GraphicObject::GraphicObject( const OString& rUniqueID ) :
 
 GraphicObject::~GraphicObject()
 {
-mpMgr->ImplUnregisterObj( *this );
+mpGlobalMgr->ImplUnregisterObj( *this );
 
 if (!mpGlobalMgr->ImplHasObjects())
 {
@@ -135,7 +135,6 @@ GraphicObject::~GraphicObject()
 
 void GraphicObject::ImplConstruct()
 {
-mpMgr = nullptr;
 maSwapStreamHdl = Link();
 mnAnimationLoopCount = 0;
 mbAutoSwapped = f

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

[Khaled Hosny]

 chart2/qa/extras/xshape/chart2xshape.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b885db5dbd9f61d75bed258660731d61a18fd2b7
Author: Khaled Hosny 
Date:   Tue Jan 10 16:26:54 2017 +0200

loplugin:nullptr

Change-Id: Iaf69f87564ff0f9f8aab6fafb833714426c8bc30

diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx 
b/chart2/qa/extras/xshape/chart2xshape.cxx
index af218b9..1bbda45 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -66,7 +66,7 @@ bool checkDumpAgainstFile( const OUString& rDump, const 
OUString& aFilePath)
 
 OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
 return doXMLDiff(aOFile.getStr(), aDump.getStr(),
-static_cast(rDump.getLength()), NULL);
+static_cast(rDump.getLength()), nullptr);
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a68e364faa0d384f1e3bf397f5decaadecf9b3b
Author: Stephan Bergmann 
Date:   Tue Jan 10 15:31:53 2017 +0100

tdf#105199: Keep URL intact

Change-Id: I85681fcc81246414332f88dc46ce4a4b60896c97

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 4f4011e..83dfd54 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void)
 // Store full path, show filename only. Use INetURLObject to 
display spaces in filename correctly
 INetURLObject aUrl = INetURLObject(aFilesArr[i]);
 sal_Int16 nPos = pImagesLst->InsertEntry( 
aUrl.GetLastName(INetURLObject::DecodeMechanism::WithCharset) );
-pImagesLst->SetEntryData(nPos, new 
OUString(aUrl.GetMainURL(INetURLObject::DecodeMechanism::WithCharset)));
+pImagesLst->SetEntryData(nPos, new 
OUString(aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE)));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/ui/misc/TokenWriter.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6c2725038b627535ba97ead89dadb96e0ff69c3c
Author: Caolán McNamara 
Date:   Tue Jan 10 14:40:07 2017 +

Resolves: rhbz#1409634 crash on close storing clipboard of database table

Change-Id: I8e692314b4ef278f7881780d51bcecb60ca80c3f

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 242a9ae..9399f1e 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -921,8 +921,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, 
sal_Int32 nWidthPixel, sal
 aStrTD = aStrTD + "=";
 aStrTD = aStrTD + pChar;
 
-Reference< css::util::XNumberFormatsSupplier >  xSupplier = 
m_xFormatter->getNumberFormatsSupplier();
-SvNumberFormatsSupplierObj* pSupplierImpl = 
SvNumberFormatsSupplierObj::getImplementation( xSupplier );
+SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ? 
SvNumberFormatsSupplierObj::getImplementation(m_xFormatter->getNumberFormatsSupplier())
 : nullptr;
 SvNumberFormatter* pFormatter = pSupplierImpl ? 
pSupplierImpl->GetNumberFormatter() : nullptr;
 if(pFormatter)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/ui/misc/TokenWriter.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3299aa32bb58b556bd1ef33f3f33bc831ed4b1bb
Author: Caolán McNamara 
Date:   Tue Jan 10 14:40:07 2017 +

Resolves: rhbz#1409634 crash on close storing clipboard of database table

Change-Id: I8e692314b4ef278f7881780d51bcecb60ca80c3f
(cherry picked from commit 6c2725038b627535ba97ead89dadb96e0ff69c3c)

diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx 
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 242a9ae..9399f1e 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -921,8 +921,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, 
sal_Int32 nWidthPixel, sal
 aStrTD = aStrTD + "=";
 aStrTD = aStrTD + pChar;
 
-Reference< css::util::XNumberFormatsSupplier >  xSupplier = 
m_xFormatter->getNumberFormatsSupplier();
-SvNumberFormatsSupplierObj* pSupplierImpl = 
SvNumberFormatsSupplierObj::getImplementation( xSupplier );
+SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ? 
SvNumberFormatsSupplierObj::getImplementation(m_xFormatter->getNumberFormatsSupplier())
 : nullptr;
 SvNumberFormatter* pFormatter = pSupplierImpl ? 
pSupplierImpl->GetNumberFormatter() : nullptr;
 if(pFormatter)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svtools/source/graphic/grfmgr.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit adea1891e5d195a450a2ed0906e0af7424902146
Author: Caolán McNamara 
Date:   Tue Jan 10 14:21:56 2017 +

mpGlobalMgr must already exist if we're copying from another GraphicObject

Change-Id: I7befa3bf8c80ed71d13a1481569bb046036cbd21

diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index 91c7265..a42ab8f 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -97,7 +97,6 @@ GraphicObject::GraphicObject( const GraphicObject& 
rGraphicObj ) :
 maLink  ( rGraphicObj.maLink ),
 maUserData  ( rGraphicObj.maUserData )
 {
-ImplEnsureGraphicManager();
 ImplConstruct();
 ImplAssignGraphicData();
 mpGlobalMgr->ImplRegisterObj(*this, maGraphic, nullptr, &rGraphicObj);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 ucb/source/cacher/cachedcontentresultset.cxx  |   83 +++---
 ucb/source/cacher/contentresultsetwrapper.cxx |   34 --
 ucb/source/cacher/contentresultsetwrapper.hxx |   39 
 ucb/source/ucp/cmis/cmis_datasupplier.cxx |   10 +--
 4 files changed, 82 insertions(+), 84 deletions(-)

New commits:
commit b6b0194661303d12e9c73ffadbe82afe77c862e2
Author: Michael Stahl 
Date:   Mon Jan 9 18:42:22 2017 +0100

ucb: cmis::DataSupplier::queryContent() looks rather questionable

It's not immediately obvious if the caller is responsible for
checking the index validity here, but all the other sub-classes of
ResultSetDataSupplier that i looked at do check the index so do
the same here.

Change-Id: Ib0c5c38cb28282f08752cdb03202e4d6f3566693
(cherry picked from commit 84de69638362c7b575560e0da3efbc709b7ac476)
Reviewed-on: https://gerrit.libreoffice.org/32906
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 
Reviewed-by: Michael Stahl 

diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx 
b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
index 19754f8..14b3385 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx
@@ -68,18 +68,20 @@ namespace cmis
 
 OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
 {
-return queryContentIdentifier( nIndex )->getContentIdentifier( );
+auto const xTemp(queryContentIdentifier(nIndex));
+return (xTemp.is()) ? xTemp->getContentIdentifier() : OUString();
 }
 
 uno::Reference< ucb::XContentIdentifier > 
DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
 {
-return queryContent( nIndex )->getIdentifier( );
+auto const xTemp(queryContent(nIndex));
+return (xTemp.is()) ? xTemp->getIdentifier() : 
uno::Reference();
 }
 
 uno::Reference< ucb::XContent > DataSupplier::queryContent( sal_uInt32 
nIndex )
 {
-if ( nIndex > maResults.size() )
-getData( );
+if (!getResult(nIndex))
+return uno::Reference();
 
 return maResults[ nIndex ]->xContent;
 }
commit 5bbae1a8bc5a321f5855a50c2a98ae9128061786
Author: Michael Stahl 
Date:   Mon Jan 9 17:35:32 2017 +0100

ucb: ReacquireableGuard::reacquire() is a no-op

So remove this junk and use osl::ResettableGuard instead which actually
works.

Change-Id: Ieb49fab16c94f0a2847ee5a1b95b52f2c141c674
(cherry picked from commit a5a94537d804f20a0d6472ef2e5995cee2d5b2fe)
Reviewed-on: https://gerrit.libreoffice.org/32907
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 
Reviewed-by: Michael Stahl 

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx 
b/ucb/source/cacher/cachedcontentresultset.cxx
index 06e9b5b..584d975 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -53,12 +53,13 @@ template T CachedContentResultSet::rowOriginGet(
 T (SAL_CALL css::sdbc::XRow::* f)(sal_Int32), sal_Int32 columnIndex)
 {
 impl_EnsureNotDisposed();
-ReacquireableGuard aGuard( m_aMutex );
+osl::ResettableMutexGuard aGuard(m_aMutex);
 sal_Int32 nRow = m_nRow;
 sal_Int32 nFetchSize = m_nFetchSize;
 sal_Int32 nFetchDirection = m_nFetchDirection;
 if( !m_aCache.hasRow( nRow ) )
 {
+bool isCleared = false;
 if( !m_aCache.hasCausedException( nRow ) )
 {
 if( !m_xFetchProvider.is() )
@@ -67,12 +68,16 @@ template T CachedContentResultSet::rowOriginGet(
 throw SQLException();
 }
 aGuard.clear();
+isCleared = true;
 if( impl_isForwardOnly() )
 applyPositionToOrigin( nRow );
 
 impl_fetchData( nRow, nFetchSize, nFetchDirection );
 }
-aGuard.reacquire();
+if (isCleared)
+{
+aGuard.reset();
+}
 if( !m_aCache.hasRow( nRow ) )
 {
 m_bLastReadWasFromCache = false;
@@ -718,7 +723,7 @@ bool SAL_CALL CachedContentResultSet
 the result set.
 */
 
-ReacquireableGuard aGuard( m_aMutex );
+osl::ResettableMutexGuard aGuard(m_aMutex);
 OSL_ENSURE( nRow >= 0, "only positive values supported" );
 if( !m_xResultSetOrigin.is() )
 {
@@ -749,7 +754,7 @@ bool SAL_CALL CachedContentResultSet
 break;
 }
 
-aGuard.reacquire();
+aGuard.reset();
 m_nLastAppliedPos += nM;
 m_bAfterLastApplied = nRow != m_nLastAppliedPos;
 return nRow == m_nLastAppliedPos;
@@ -759,7 +764,7 @@ bool SAL_CALL CachedContentResultSet
 {
 m_xResultSetOrigin->beforeFirst();
 
-aGuard.reacquire();
+aGuard.reset();
 m_nLastAppliedPos = 0;
 m_bAfterLastApplied = false;
 return false;
@@ -772,7 +777,7 @@ bool SAL_C

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

[Rosemary Sebastian]

 sd/source/filter/eppt/pptx-epptooxml.cxx |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 54490d9322dfeb97142885de043d5710dad673ed
Author: Rosemary Sebastian 
Date:   Tue Jan 10 10:17:37 2017 +0530

replace namespace url strings with function calls

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

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 5f1b8e1..702dc58 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -67,12 +68,12 @@
 #include 
 
 // presentation namespaces
-#define PNMSS FSNS(XML_xmlns, XML_a),   
"http://schemas.openxmlformats.org/drawingml/2006/main";, \
-  FSNS(XML_xmlns, XML_p),   
"http://schemas.openxmlformats.org/presentationml/2006/main";, \
-  FSNS(XML_xmlns, XML_r),   
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";, \
-  FSNS(XML_xmlns, XML_p14), 
"http://schemas.microsoft.com/office/powerpoint/2010/main";, \
-  FSNS(XML_xmlns, XML_p15), 
"http://schemas.microsoft.com/office/powerpoint/2012/main";, \
-  FSNS(XML_xmlns, XML_mc),  
"http://schemas.openxmlformats.org/markup-compatibility/2006";
+#define PNMSS FSNS(XML_xmlns, XML_a),   
OUStringToOString(this->getNamespaceURL(OOX_NS(dml)), 
RTL_TEXTENCODING_UTF8).getStr(), \
+  FSNS(XML_xmlns, XML_p),   
OUStringToOString(this->getNamespaceURL(OOX_NS(ppt)), 
RTL_TEXTENCODING_UTF8).getStr(), \
+  FSNS(XML_xmlns, XML_r),   
OUStringToOString(this->getNamespaceURL(OOX_NS(officeRel)), 
RTL_TEXTENCODING_UTF8).getStr(), \
+  FSNS(XML_xmlns, XML_p14), 
OUStringToOString(this->getNamespaceURL(OOX_NS(p14)), 
RTL_TEXTENCODING_UTF8).getStr(), \
+  FSNS(XML_xmlns, XML_p15), 
OUStringToOString(this->getNamespaceURL(OOX_NS(p15)), 
RTL_TEXTENCODING_UTF8).getStr(), \
+  FSNS(XML_xmlns, XML_mc),  
OUStringToOString(this->getNamespaceURL(OOX_NS(mce)), 
RTL_TEXTENCODING_UTF8).getStr()
 
 
 using namespace ::com::sun::star;
@@ -1406,7 +1407,7 @@ void PowerPointExport::WriteAuthors()
  "commentAuthors.xml" );
 
 pFS->startElementNS( XML_p, XML_cmAuthorLst,
- FSNS( XML_xmlns, XML_p ), 
"http://schemas.openxmlformats.org/presentationml/2006/main";,
+ FSNS( XML_xmlns, XML_p ), 
OUStringToOString(this->getNamespaceURL(OOX_NS(ppt)), RTL_TEXTENCODING_UTF8),
  FSEND );
 
 for( const AuthorsMap::value_type& i : maAuthors ) {
@@ -1455,7 +1456,7 @@ bool PowerPointExport::WriteComments( sal_uInt32 nPageNum 
)
 
"application/vnd.openxmlformats-officedocument.presentationml.comments+xml" );
 
 pFS->startElementNS( XML_p, XML_cmLst,
- FSNS( XML_xmlns, XML_p ), 
"http://schemas.openxmlformats.org/presentationml/2006/main";,
+ FSNS( XML_xmlns, XML_p ), 
OUStringToOString(this->getNamespaceURL(OOX_NS(ppt)), RTL_TEXTENCODING_UTF8),
  FSEND );
 
 do {
@@ -2179,7 +2180,7 @@ void PowerPointExport::WriteTheme( sal_Int32 nThemeNum )
 
"application/vnd.openxmlformats-officedocument.theme+xml" );
 
 pFS->startElementNS( XML_a, XML_theme,
- FSNS( XML_xmlns, XML_a), 
"http://schemas.openxmlformats.org/drawingml/2006/main";,
+ FSNS( XML_xmlns, XML_a), 
OUStringToOString(this->getNamespaceURL(OOX_NS(dml)), RTL_TEXTENCODING_UTF8),
  XML_name, "Office Theme",
  FSEND );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - 3 commits - loleaflet/admin.strings.js loleaflet/dist loleaflet/src wsd/Admin.cpp wsd/Admin.hpp wsd/AdminModel.cpp ws

[Tor Lillqvist]

 loleaflet/admin.strings.js |1 
 loleaflet/dist/admin/admin.html|1 
 loleaflet/src/admin/AdminSocketOverview.js |   35 +++-
 loleaflet/src/admin/Util.js|   12 ++
 loleaflet/src/map/Map.js   |  122 +++--
 wsd/Admin.cpp  |5 +
 wsd/Admin.hpp  |2 
 wsd/AdminModel.cpp |   16 +++
 wsd/AdminModel.hpp |   10 ++
 wsd/ClientSession.cpp  |1 
 wsd/DocumentBroker.cpp |5 +
 wsd/DocumentBroker.hpp |2 
 wsd/protocol.txt   |9 +-
 13 files changed, 171 insertions(+), 50 deletions(-)

New commits:
commit 90a86850e8249afad1565e2cb814427a01b6b163
Author: Tor Lillqvist 
Date:   Wed Dec 14 18:02:10 2016 +0200

Grey-out ("dim") after 10 minutes if idle even while having focus

(The greying-out without focus happens, as before, already after 30
seconds.)

Factor out the dimming code to a separate function _dim. When we have
focus, check once a minute if ten minutes has passed without user
activity. Keep track of when last user activity happened.

Change-Id: I19160a82f5de860fc609dad391b168acfba560ce
(cherry picked from commit 8f98206926e49fcf563b4c4f2dc171d04c01bd69)

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6c2e504..d699a73 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -20,6 +20,8 @@ L.Map = L.Evented.extend({
urlPrefix: 'lool'
},
 
+   lastActiveTime: Date.now(),
+
initialize: function (id, options) { // (HTMLElement or String, Object)
options = L.setOptions(this, options);
 
@@ -737,17 +739,20 @@ L.Map = L.Evented.extend({
},
 
_activate: function () {
+   // console.log('_activate:');
clearTimeout(vex.timer);
 
if (!this._active) {
// Only activate when we are connected.
if (this._socket.connected()) {
+   // console.log('  sending useractive');
this._socket.sendMessage('useractive');
this._active = true;
this._docLayer._onMessage('invalidatetiles: 
EMPTY', null);
if (vex.dialogID > 0) {
var id = vex.dialogID;
vex.dialogID = -1;
+   this._startInactiveTimer();
return vex.close(id);
}
} else {
@@ -755,10 +760,81 @@ L.Map = L.Evented.extend({
}
}
 
+   this._startInactiveTimer();
return false;
},
 
+   _dim: function() {
+   // console.log('_dim:');
+   if (window.devtools.open || !map._socket.connected()) {
+   return;
+   }
+
+   // console.log('  cont');
+   map._active = false;
+   clearTimeout(vex.timer);
+
+   var options = $.extend({}, vex.defaultOptions, {
+   contentCSS: {'background':'rgba(0, 0, 0, 0)',
+'font-size': 'xx-large',
+'color': '#fff',
+'text-align': 'center'},
+   content: _('Inactive document - please click to resume 
editing')
+   });
+   options.id = vex.globalID;
+   vex.dialogID = options.id;
+   vex.globalID += 1;
+   options.$vex = 
$('').addClass(vex.baseClassNames.vex).addClass(options.className).css(options.css).data({
+   vex: options
+   });
+   options.$vexOverlay = 
$('').addClass(vex.baseClassNames.overlay).addClass(options.overlayClassName).css(options.overlayCSS).data({
+   vex: options
+   });
+
+   options.$vexOverlay.bind('click.vex', function(e) {
+   // console.log('click.vex function');
+   if (e.target !== this) {
+   // console.log('  early return');
+   return 0;
+   }
+   // console.log('  calling _activate');
+   return map._activate();
+   });
+   options.$vex.append(options.$vexOverlay);
+
+   options.$vexContent = 
$('').addClass(vex.baseClassNames.content).addClass(options.contentClassName).css(options.contentCSS).text(options.content).data({
+   vex: options
+   });
+

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[jan Iversen]

 bin/gbuild-to-ide |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4b6c3b2f9dc579c278b47a777fb57def9e0df1f
Author: jan Iversen 
Date:   Tue Jan 10 18:03:57 2017 +0100

gbuild-to-ide, solved vs2013 generation problem.

mikekaganski reported a problem with the vs2013 class, due to the
latest changes. Problem solved:

.name() -> .name

Change-Id: Idb3e063bee93041dd010ed0c0b5bb71ac7efcd57

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index c1022b4..d4eb5e9 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -831,7 +831,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 dependency_libs = {}
 for linked_lib in linked_libs:
 for library_project in library_projects:
-if library_project.target.name() == linked_lib:
+if library_project.target.name == linked_lib:
 dependency_libs[library_project.guid] = library_project
 return dependency_libs
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - sal/osl

[Samuel Mehrbrodt]

 sal/osl/all/log.cxx |   52 +++-
 1 file changed, 43 insertions(+), 9 deletions(-)

New commits:
commit 870857cc3b76259e8dcaaa42b33a990e167b0106
Author: Samuel Mehrbrodt 
Date:   Tue Jan 10 18:25:18 2017 +0100

Allow to set log level/path in file

Expects a file logging.txt in the program/ directory
with the keys LogFilePath and LogLevel, e.g.:

LogFilePath=C:\\log.txt
LogLevel=info

Change-Id: I35c730469e4079139da908aa287b989dc98e0f9d

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 8380d3c..91ca512 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -100,28 +100,62 @@ char const * getEnvironmentVariable_(const char* env) {
 return p2;
 }
 
+bool getValueFromLoggingIniFile(const char* key, char* value) {
+OUString programDirectoryURL;
+OUString programDirectoryPath;
+osl_getProcessWorkingDir(&(programDirectoryURL.pData));
+osl_getSystemPathFromFileURL(programDirectoryURL.pData, 
&programDirectoryPath.pData);
+OUString aLogFile(programDirectoryPath + "/" + "logging.ini");
+std::ifstream logFileStream(OUStringToOString( aLogFile, 
RTL_TEXTENCODING_ASCII_US).getStr());
+if (!logFileStream.good())
+return false;
+
+std::size_t n;
+std::string aKey;
+std::string aValue;
+std::string sWantedKey(key);
+std::string sLine;
+while (std::getline(logFileStream, sLine)) {
+if (sLine.find('#') == 0)
+continue;
+if ( ( n = sLine.find('=') ) != std::string::npos) {
+aKey = sLine.substr(0, n);
+if (aKey != sWantedKey)
+continue;
+aValue = sLine.substr(n+1, sLine.length());
+sprintf(value, "%s", aValue.c_str());
+return true;
+}
+}
+return false;
+}
+
 char const * getLogLevel() {
-// First check the environment variable, then the bootstrap setting
+// First check the environment variable, then the setting in logging.ini
 static char const * env = getEnvironmentVariable_("SAL_LOG");
 if (env != nullptr)
 return env;
 
-OUString sLogLevel;
-if (rtl::Bootstrap::get("LogLevel", sLogLevel) && !sLogLevel.isEmpty())
-return  OUStringToOString( sLogLevel, 
RTL_TEXTENCODING_ASCII_US).getStr();
-return nullptr;
+static char logLevel[1024];
+if (getValueFromLoggingIniFile("LogLevel", logLevel)) {
+return logLevel;
+}
 
+return nullptr;
 }
 
 char const * getLogFile() {
-// First check the environment variable, then the bootstrap setting
+// First check the environment variable, then the setting in logging.ini
 static char const * logFile = getEnvironmentVariable_("SAL_LOG_FILE");
 if (logFile != nullptr)
 return logFile;
 
-OUString sLogFilePath;
-if (rtl::Bootstrap::get("LogFilePath", sLogFilePath) && 
!sLogFilePath.isEmpty())
-return  OUStringToOString( sLogFilePath, 
RTL_TEXTENCODING_ASCII_US).getStr();
+
+static char logFilePath[1024];
+if (getValueFromLoggingIniFile("LogFilePath", logFilePath)) {
+return logFilePath;
+}
+
 return nullptr;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

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

New commits:
commit d4034a461f1e6e22adc26ce2a3c84916f85abeaa
Author: Christian Lohmaier 
Date:   Tue Jan 10 17:52:03 2017 +0100

Updated core
Project: translations  c9a77fe62307ba509ff3b66d8ad06c1385d17a11

update translations for 5.2.5 rc1

and force-fix errors using pocheck

Change-Id: I0660f62ea515fc4c672f19a5dce747245f4fa12e

diff --git a/translations b/translations
index c11aab0..c9a77fe6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c11aab0b76ae0d9ea5627fedfda8a96657728faf
+Subproject commit c9a77fe62307ba509ff3b66d8ad06c1385d17a11
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'private/pranavk/mobilify'

[Pranav Kant]

New branch 'private/pranavk/mobilify' available with the following commits:
commit 2973d044f4036018896d3b09f7060cc2c98c413a
Author: Pranav Kant 
Date:   Tue Jan 10 23:54:04 2017 +0530

loleaflet: No min-width, we want to mobilify

Change-Id: Ifa52f03683c32939369f0ab97e456f10b954ccf9

commit f3114cddf2d93ac323c17c25be38ea1e38e708f2
Author: Pranav Kant 
Date:   Tue Jan 10 23:38:06 2017 +0530

wip: responsive menubar floating on left

Change-Id: I6089ed44a7920a79de7e89f1b0d884c2881d4c7c

commit e12788741749d7b1d64778ffc02373472d7cc1a2
Author: Pranav Kant 
Date:   Tue Jan 10 22:50:42 2017 +0530

squash with ae6792a

FIXME - when fontsizes select2 combobox is shown again, then it
is shown as empty. The solution is to store all the data first
and then feed it to select2 combobox everytime toolbar refreshes

Change-Id: If256d8ccba8e67698867f464dcc73b0b9b75d036

commit 0c2f307d00653c93b39e4d00fdb6cf6fcde9a398
Author: Pranav Kant 
Date:   Tue Jan 10 22:11:56 2017 +0530

Revert "loleaflet: Wrap calc related toolbar"

This reverts commit ceb3895f922e58c0b25d07b8616ffbde45541a0c.

commit ceb3895f922e58c0b25d07b8616ffbde45541a0c
Author: Pranav Kant 
Date:   Tue Jan 10 21:50:03 2017 +0530

loleaflet: Wrap calc related toolbar

Change-Id: I7ec6160377758f03ebdd7c6835ea010df3393cdd

commit b540f0f50f42a5f957dabf3b134f6e38a54e
Author: Pranav Kant 
Date:   Tue Jan 10 21:49:15 2017 +0530

Remove irrelevant toolbars

Change-Id: Ib8a8ea4fb597a5aaee802cb7ad04e893cd6eab75

commit d9a185257eb3dd891e5217fea77699d68ea46024
Author: Pranav Kant 
Date:   Tue Jan 10 21:42:23 2017 +0530

squash with d04c05

Change-Id: I3445e48a7f59ddc8b6976d1e90e449b5fe3a0de5

commit d877616b057ab32ef5061f636f7c81b49b9b4091
Author: Pranav Kant 
Date:   Tue Jan 10 21:37:25 2017 +0530

squash with d04c05

Change-Id: Id2eece33a3062321db8df16d0a63bac2aed81aaf

commit 5d6592de6aaa1c053d54b263e80db11103be38f0
Author: Pranav Kant 
Date:   Tue Jan 10 21:30:25 2017 +0530

squash with a3eee

Change-Id: Id50e35611f6fb323b288159fedb1cf9b81e19f24

commit d04c05e6ad94487746e29631b4fc2dffa59065b3
Author: Pranav Kant 
Date:   Tue Jan 10 21:18:05 2017 +0530

loleaflet: Get rid of all fixed position

Change-Id: I104882d995722c14ddefeecf579d1233f37371d6

commit a3eeefca9a6c01a6a08ce4877bf9db1800e88c5d
Author: Pranav Kant 
Date:   Tue Jan 10 20:56:08 2017 +0530

loleaflet: Introduce div wrappers

Change-Id: I19ae5daaa11e810b23a1d12b81c510ce96527ac7

commit ae6792afba3093e5171629514cf1a503593a6669
Author: Pranav Kant 
Date:   Tue Jan 10 20:48:48 2017 +0530

loleaflet: Hide some toolbar buttons when screen width is low

Most of these can easily be accessed from the menu bar

Change-Id: If9ad379c6491b907a980e0ef5b4a46a60266fafe

commit 803ccac0ef57b14d884ea68f7de1d700b918269d
Author: Pranav Kant 
Date:   Mon Jan 9 14:15:24 2017 +0530

loleaflet: New class lo-menu to override sm-simple theme

We can now directly use sm-simple.css from node_modules in its
pristine form and then use custom css rules to override to make
it look like LO menu bar instead of directly making changes in
sm-simple.css

Change-Id: I0773ca27fdf549d5c7df0bc781dfc019225d7cb6

commit 36d27eaeae3f1eb682ec0e31ab408e014068c151
Author: Pranav Kant 
Date:   Mon Jan 9 13:20:23 2017 +0530

loleaflet: Different css file for menubar

Change-Id: Ic7cf8445c52d3a87de0631d6317674d959d60cf4

commit 36806a3d80f86f2291779f85576f106a7621c388
Author: Pranav Kant 
Date:   Mon Jan 9 13:19:03 2017 +0530

loleaflet: Set mobile mode if width < 768px

Change-Id: I4732208d354b574218185c2693fd92d8e071307a

commit 513cc1ef495cc8824462904f49d14404e4c4a036
Author: Pranav Kant 
Date:   Mon Jan 9 12:58:54 2017 +0530

loleaflet: Add main-menu to main html rather than dynamically

Change-Id: I3f3a8709104ee0805f509f2c1b5eae2194c5de72

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 256 commits - accessibility/inc accessibility/source android/Bootstrap apple_remote/Library_AppleRemote.mk apple_remote/source avmedi

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit a3953fee8bd0f5c76dbea08fbfc53df936863893
Author: Douglas Mencken 
Date:   Mon Apr 4 20:58:01 2016 -0400

vcl.osx: make panes of tabs look Jaguarish

plus turn off excessive borders for elements of interface

Change-Id: Ief2718eafc8b6a8a12d281ad2988ace0977d9741

diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 2c3ce4d..7e0e40d 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -490,8 +490,10 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 aComboInfo.value = kThemeButtonOn;
 aComboInfo.adornment = kThemeAdornmentNone;
 
+# if ( MACOSX_SDK_VERSION > 1060 )
 if( nState & ControlState::FOCUSED )
 aComboInfo.adornment |= kThemeAdornmentFocus;
+# endif
 
 HIThemeDrawButton(&rc, &aComboInfo, mrContext, 
kHIThemeOrientationNormal,&rc);
 bOK = true;
@@ -667,8 +669,10 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 aPushInfo.adornment = ( nState & ControlState::DEFAULT ) ?
kThemeAdornmentDefault :
kThemeAdornmentNone;
+# if ( MACOSX_SDK_VERSION > 1060 )
 if( nState & ControlState::FOCUSED )
 aPushInfo.adornment |= kThemeAdornmentFocus;
+# endif
 
 HIThemeDrawButton( &rc, &aPushInfo, mrContext, 
kHIThemeOrientationNormal, nullptr );
 bOK = true;
@@ -696,11 +700,14 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 ButtonValue aButtonValue = aValue.getTristateVal();
 aInfo.value = ImplGetButtonValue( aButtonValue );
 
-aInfo.adornment = ( nState & ControlState::DEFAULT ) ?
-  kThemeAdornmentDefault :
-  kThemeAdornmentNone;
+aInfo.adornment = ( nState & ControlState::DEFAULT ) ? 
kThemeAdornmentDefault : kThemeAdornmentNone;
+# if ( MACOSX_SDK_VERSION > 1060 )
 if( nState & ControlState::FOCUSED )
 aInfo.adornment |= kThemeAdornmentFocus;
+# else
+rc.origin.y -= 1;
+# endif
+
 HIThemeDrawButton( &rc, &aInfo, mrContext, 
kHIThemeOrientationNormal, nullptr );
 bOK = true;
 }
@@ -881,20 +888,28 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 case ControlType::TabPane:
 {
 HIThemeTabPaneDrawInfo aTabPaneDrawInfo;
-aTabPaneDrawInfo.version = 1;
+# if ( MACOSX_SDK_VERSION <= 1060 )
+aTabPaneDrawInfo.version = 0;  // 0 for Jaguar-era tabs
+# else
+aTabPaneDrawInfo.version = 1;  // 1 for "modern" tabs
+# endif
 aTabPaneDrawInfo.state = kThemeStateActive;
-aTabPaneDrawInfo.direction=kThemeTabNorth;
-aTabPaneDrawInfo.size=kHIThemeTabSizeNormal;
-aTabPaneDrawInfo.kind=kHIThemeTabKindNormal;
-
-//the border is outside the rect rc for Carbon
-//but for VCL it should be inside
-rc.origin.x+=1;
-rc.origin.y-=TAB_HEIGHT_NORMAL/2;
-rc.size.height+=TAB_HEIGHT_NORMAL/2;
-rc.size.width-=2;
+aTabPaneDrawInfo.direction = kThemeTabNorth;
+aTabPaneDrawInfo.size = kHIThemeTabSizeNormal;
+aTabPaneDrawInfo.kind = kHIThemeTabKindNormal;
+aTabPaneDrawInfo.adornment = kThemeAdornmentNone;
+
+// the border is outside the rect rc for Carbon
+// but for VCL it is inside
+rc.origin.x += 1;
+rc.size.width -= 2;
+if ( aTabPaneDrawInfo.version == 1 )
+{
+rc.origin.y -= TAB_HEIGHT_NORMAL >> 1;
+rc.size.height += TAB_HEIGHT_NORMAL >> 1;
+}
 
-HIThemeDrawTabPane(&rc, &aTabPaneDrawInfo, mrContext, 
kHIThemeOrientationNormal);
+HIThemeDrawTabPane( &rc, &aTabPaneDrawInfo, mrContext, 
kHIThemeOrientationNormal );
 
 bOK = true;
 }
@@ -903,52 +918,66 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 case ControlType::TabItem:
 {
 HIThemeTabDrawInfo aTabItemDrawInfo;
-aTabItemDrawInfo.version=1;
-aTabItemDrawInfo.style=kThemeTabNonFront;
-aTabItemDrawInfo.direction=kThemeTabNorth;
-aTabItemDrawInfo.size=kHIThemeTabSizeNormal;
-aTabItemDrawInfo.adornment=kHIThemeTabAdornmentTrailingSeparator;
-//State
-if(nState & ControlState::SELECTED) {
-aTabItemDrawInfo.style=kThemeTabFront;
+# if ( MACOSX_SDK_VERSION <= 1060 )
+aTabItemDrawInfo.version = 0;  // 0 for Jaguar-era tabs
+# else
+aTabItemDrawInfo.version = 1;  // 1 for "modern" tabs
+# endif
+aTabItemDrawInfo.direction = kThemeTabNorth;
+aTabItemDrawInfo.size = kHIThemeTabSizeNormal;
+aTabItemDrawInfo.style = kThemeTabNonFront;
+
+if( nS

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

[Eike Rathke]

 sc/inc/formulacell.hxx  |9 +++-
 sc/source/core/data/column.cxx  |2 -
 sc/source/core/data/formulacell.cxx |   40 
 sc/source/core/tool/refdata.cxx |4 +++
 4 files changed, 45 insertions(+), 10 deletions(-)

New commits:
commit 540e9f5f290b5801c10fa3a6e3ad9046607dcd9c
Author: Eike Rathke 
Date:   Mon Jan 9 19:47:06 2017 +0100

Resolves: tdf#104711 adjust range reference constructed of named anchors

A constructed range reference of named anchors (i.e. extended during
expression compilation) forms a range listened at that needs to be
adjusted if the cell is shifted and one or both anchor parts are
individually named relative references.

Currently the resulting range (ScComplexRefData aka DoubleRef) does not
know to distinguish between whether its anchors are the result of a
literal range in a named expression or the result of individually named
anchors, so such RelName DoubleRef needs to be adjusted unconditionally
when shifting or moving the formula cell.

Change-Id: I75e2cc79ac60116671acce7641567337d5f5f7ed
(cherry picked from commit 439b2a134218b93e6ca9fa23005b89c19498f586)
Reviewed-on: https://gerrit.libreoffice.org/32923
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 960a753..71812a2 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -243,7 +243,14 @@ public:
It is similar to HasOneReference(), but more general.
  */
 bool HasRefListExpressibleAsOneReference(ScRange& rRange) const;
-boolHasRelNameReference() const;
+
+enum class RelNameRef
+{
+NONE,   ///< no relative reference from named expression
+SINGLE, ///< only single cell relative reference
+DOUBLE  ///< at least one range relative reference from named 
expression
+};
+RelNameRef  HasRelNameReference() const;
 
 bool UpdateReference(
 const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr, 
const ScAddress* pUndoCellPos = nullptr );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7ffafda..ac65f8a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2834,7 +2834,7 @@ struct SetDirtyIfPostponedHandler
 {
 void operator() (size_t /*nRow*/, ScFormulaCell* pCell)
 {
-if (pCell->IsPostponedDirty() || pCell->HasRelNameReference())
+if (pCell->IsPostponedDirty() || (pCell->HasRelNameReference() != 
ScFormulaCell::RelNameRef::NONE))
 pCell->SetDirty();
 }
 };
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index bf6fc4e..b19bfba 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2906,18 +2906,34 @@ 
ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const
 return false;
 }
 
-bool ScFormulaCell::HasRelNameReference() const
+ScFormulaCell::RelNameRef ScFormulaCell::HasRelNameReference() const
 {
+RelNameRef eRelNameRef = RelNameRef::NONE;
 pCode->Reset();
 formula::FormulaToken* t;
 while ( ( t = pCode->GetNextReferenceRPN() ) != nullptr )
 {
-if ( t->GetSingleRef()->IsRelName() ||
-(t->GetType() == formula::svDoubleRef &&
-t->GetDoubleRef()->Ref2.IsRelName()) )
-return true;
+switch (t->GetType())
+{
+case formula::svSingleRef:
+if (t->GetSingleRef()->IsRelName() && eRelNameRef == 
RelNameRef::NONE)
+eRelNameRef = RelNameRef::SINGLE;
+break;
+case formula::svDoubleRef:
+if (t->GetDoubleRef()->Ref1.IsRelName() || 
t->GetDoubleRef()->Ref2.IsRelName())
+// May originate from individual cell names, in which case
+// it needs recompilation.
+return RelNameRef::DOUBLE;
+/* TODO: have an extra flag at ScComplexRefData if range was
+ * extended? or too cumbersome? might narrow recompilation to
+ * only needed cases.
+ * */
+break;
+default:
+;   // nothing
+}
 }
-return false;
+return eRelNameRef;
 }
 
 bool ScFormulaCell::UpdatePosOnShift( const sc::RefUpdateContext& rCxt )
@@ -3122,7 +3138,13 @@ bool ScFormulaCell::UpdateReferenceOnShift(
 bInDeleteUndo = (pChangeTrack && pChangeTrack->IsInDeleteUndo());
 
 // RelNameRefs are always moved
-bool bHasRelName = HasRelNameReference();
+bool bHasRelName = false;
+if (!bRecompile)
+{
+RelNameRef eRelNameRef = HasRelNameReference();
+bHasRelName = (eRelNameRef != RelNameRef::NONE);
+bRecompile = (eRelNameRef == RelNameRef::DOUBLE);
+}

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

[Christian Lohmaier]

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

New commits:
commit a4fa9619fb1b4c1fac31095be2ce5a76f62fb7b3
Author: Christian Lohmaier 
Date:   Tue Jan 10 20:44:23 2017 +0100

Updated core
Project: translations  86d6efcc43918d0c1252b02e808f921cbc4f5a34

update translations for 5.3.0 rc2

and force-fix errors using pocheck

Change-Id: Iaa074827e5f9e841a2f013a7de4e5e902fe88824

diff --git a/translations b/translations
index c54ca62..86d6efc 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c54ca62057567513359adf7d7dce38167b54eb29
+Subproject commit 86d6efcc43918d0c1252b02e808f921cbc4f5a34
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp

[Tor Lillqvist]

 wsd/DocumentBroker.cpp |2 ++
 wsd/DocumentBroker.hpp |4 
 wsd/LOOLWSD.cpp|   27 +++
 3 files changed, 33 insertions(+)

New commits:
commit 47e5fb48eb982e8b65241b2de5b1424c4ab59c56
Author: Tor Lillqvist 
Date:   Wed Dec 14 18:12:57 2016 +0200

Bluntly close sessions that have been idle for more than an hour

By that time the loleaflet code has already done the greying-out (this
happens at the latest after 10 minutes of inactivity) and marked them
as 'inactive'. Bluntly closing the session seems to work out fine, no
new horribly alarming message is displayed by the loleaflet code in
addition to the already visible 'Inactive document ...' one.

Change-Id: I420f0d7530194e6c8d6f34d7985ab810cde5a76a
(cherry picked from commit 36f3dece7c6ecc8bd0ccb8caacbe8e7c31ab47f7)

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 21baad3..96ec511 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -11,6 +11,7 @@
 #include "config.h"
 
 #include 
+#include 
 #include 
 #include 
 
@@ -1038,6 +1039,7 @@ void DocumentBroker::closeDocument(const std::string& 
reason)
 
 void DocumentBroker::updateLastActivityTime()
 {
+_lastActivity = std::time(nullptr);
 Admin::instance().updateLastActivityTime(_docKey);
 }
 
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 0ea84b8..27298e9 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -301,6 +301,8 @@ public:
 
 void updateLastActivityTime();
 
+std::time_t getIdleTime() const { return std::time(nullptr) - 
_lastActivity; }
+
 private:
 /// Sends the .uno:Save command to LoKit.
 bool sendUnoSave(const bool dontSaveIfUnmodified);
@@ -343,6 +345,8 @@ private:
 
 int _debugRenderedTileCount;
 
+std::time_t _lastActivity;
+
 static constexpr auto IdleSaveDurationMs = 30 * 1000;
 static constexpr auto AutoSaveDurationMs = 300 * 1000;
 };
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b5b45bd..2eb77ae 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2045,6 +2045,7 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 #endif
 
 time_t last30SecCheck = time(nullptr);
+time_t lastOneHourCheck = time(nullptr);
 int status = 0;
 while (!TerminationFlag && !SigUtil::isShuttingDown())
 {
@@ -2135,6 +2136,32 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 }
 else
 {
+// Every 15 minutes
+if (time(nullptr) >= lastOneHourCheck + 900)
+{
+// Bluntly close documents that have been idle over an 
hour. (By that time
+// loleaflet's greying-out has already also kicked in.)
+try
+{
+std::unique_lock 
docBrokersLock(DocBrokersMutex);
+for (auto& pair : DocBrokers)
+{
+auto docLock = pair.second->getLock();
+if (pair.second->getIdleTime() >= 3600)
+{
+LOG_INF("Terminating idle document " + 
pair.second->getDocKey());
+pair.second->terminateChild(docLock);
+}
+}
+}
+catch (const std::exception& exc)
+{
+LOG_ERR("Exception: " << exc.what());
+}
+
+lastOneHourCheck = time(nullptr);
+}
+
 // Don't wait if we had been saving, which takes a while 
anyway.
 
std::this_thread::sleep_for(std::chrono::milliseconds(CHILD_REBALANCE_INTERVAL_MS));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - basctl/source framework/inc framework/source include/comphelper sw/source

[Markus Mohrhard]

 basctl/source/basicide/iderdll.cxx  |2 -
 framework/inc/services/desktop.hxx  |2 +
 framework/source/services/desktop.cxx   |   29 
 include/comphelper/unique_disposing_ptr.hxx |   40 +++-
 sw/source/uibase/app/swdll.cxx  |2 -
 5 files changed, 66 insertions(+), 9 deletions(-)

New commits:
commit d1b8074ffe4b945a41e3ad9e1fb43332d78d73fb
Author: Markus Mohrhard 
Date:   Mon Jan 9 05:58:00 2017 +0100

tdf#104830, need an own termination listener for lib objects

The destruction of the SwDLL object happens already through the normal
termination listener but the other termination listeners might still
depend on it. Also the outstanding events might need the SwDLL instance
to be still around.

This makes the destruction of the instance explicit and at a time when
it should be safe. We should use the same code for calc, impress, math
and base as well.

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

diff --git a/basctl/source/basicide/iderdll.cxx 
b/basctl/source/basicide/iderdll.cxx
index eb0e6dd..1be7cb3 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -61,7 +61,7 @@ public:
 class DllInstance : public 
comphelper::unique_disposing_solar_mutex_reset_ptr
 {
 public:
-DllInstance() : 
comphelper::unique_disposing_solar_mutex_reset_ptr(Reference(
 frame::Desktop::create(comphelper::getProcessComponentContext()), 
UNO_QUERY_THROW), new Dll)
+DllInstance() : 
comphelper::unique_disposing_solar_mutex_reset_ptr(Reference(
 frame::Desktop::create(comphelper::getProcessComponentContext()), 
UNO_QUERY_THROW), new Dll, true)
 { }
 };
 
diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index 8aa56ef..2c88e32 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -455,6 +455,8 @@ class Desktop : private cppu::BaseMutex,
 
 css::uno::Reference< css::frame::XUntitledNumbers > 
m_xTitleNumberGenerator;
 
+std::vector> 
m_xComponentDllListeners;
+
 };  //  class Desktop
 
 }   //  namespace framework
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 2ee7336..20afab1 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -347,6 +347,14 @@ sal_Bool SAL_CALL Desktop::terminate()
 if ( xPipeTerminator.is() )
 xPipeTerminator->notifyTermination( aEvent );
 
+// we need a copy here as the notifyTermination call might cause a 
removeTerminateListener call
+std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
+for (auto& xListener : xComponentDllListeners)
+{
+xListener->notifyTermination(aEvent);
+}
+m_xComponentDllListeners.clear();
+
 // Must be really the last listener to be called.
 // Because it shutdown the whole process asynchronous !
 if ( xSfxTerminator.is() )
@@ -424,6 +432,11 @@ void SAL_CALL Desktop::addTerminateListener( const 
css::uno::Reference< css::fra
 m_xSWThreadManager = xListener;
 return;
 }
+else if ( sImplementationName == 
"com.sun.star.comp.ComponentDLLListener" )
+{
+m_xComponentDllListeners.push_back(xListener);
+return;
+}
 }
 
 // No lock required ... container is threadsafe by itself.
@@ -471,6 +484,13 @@ void SAL_CALL Desktop::removeTerminateListener( const 
css::uno::Reference< css::
 m_xSWThreadManager.clear();
 return;
 }
+else if (sImplementationName == 
"com.sun.star.comp.ComponentDLLListener")
+{
+m_xComponentDllListeners.erase(
+std::remove(m_xComponentDllListeners.begin(), 
m_xComponentDllListeners.end(), xListener),
+m_xComponentDllListeners.end());
+return;
+}
 }
 
 // No lock required ... container is threadsafe by itself.
@@ -1100,6 +1120,15 @@ void SAL_CALL Desktop::disposing()
 m_xQuickLauncher.clear();
 m_xStarBasicQuitGuard.clear();
 m_xSWThreadManager.clear();
+
+// we need a copy because the notifyTermination might call the 
removeEventListener method
+std::vector< css::uno::Reference > 
xComponentDllListeners = m_xComponentDllListeners;
+for (auto& xListener: xComponentDllListeners)
+{
+xListener->notifyTermination(aEvent);
+}
+xComponentDllListeners.clear();
+m_xComponentDllListeners.clear();
 m_xSfxTerminator.clear();
 m_xCommandOptions.reset();
 
diff --git a/include/comphelper/unique_disposing_ptr.hxx 
b/include/comphelper/unique_disposing_ptr.hxx
index 75be7d6..c986b12 100644
--

[Libreoffice-commits] online.git: 2 commits - loleaflet/dist test/data test/httpwstest.cpp

[Tomaž Vajngerl]

 dev/null |binary
 loleaflet/dist/images/lc26049.svg|1 
 loleaflet/dist/images/lc_accepttrackedchanges.svg|1 
 loleaflet/dist/images/lc_alignblock.svg  |1 
 loleaflet/dist/images/lc_alignhorizontalcenter.svg   |1 
 loleaflet/dist/images/lc_alignleft.svg   |1 
 loleaflet/dist/images/lc_alignright.svg  |1 
 loleaflet/dist/images/lc_autosum.svg |1 
 loleaflet/dist/images/lc_backcolor.svg   |1 
 loleaflet/dist/images/lc_backward.svg|1 
 loleaflet/dist/images/lc_bold.svg|1 
 loleaflet/dist/images/lc_cancel.svg  |1 
 loleaflet/dist/images/lc_checkbox.svg|1 
 loleaflet/dist/images/lc_closedoc.svg|1 
 loleaflet/dist/images/lc_color.svg   |1 
 loleaflet/dist/images/lc_currencyfield.svg   |1 
 loleaflet/dist/images/lc_datefield.svg   |1 
 loleaflet/dist/images/lc_decrementindent.svg |1 
 loleaflet/dist/images/lc_decrementlevel.svg  |1 
 loleaflet/dist/images/lc_defaultbullet.svg   |1 
 loleaflet/dist/images/lc_defaultnumbering.svg|1 
 loleaflet/dist/images/lc_deletepage.svg  |1 
 loleaflet/dist/images/lc_dia.svg |1 
 loleaflet/dist/images/lc_downsearch.svg  |1 
 loleaflet/dist/images/lc_duplicatepage.svg   |1 
 loleaflet/dist/images/lc_editdoc.svg |1 
 loleaflet/dist/images/lc_firstrecord.svg |1 
 loleaflet/dist/images/lc_gallery.svg |1 
 loleaflet/dist/images/lc_helpindex.svg   |1 
 loleaflet/dist/images/lc_insertfootnote.svg  |1 
 loleaflet/dist/images/lc_insertpage.svg  |1 
 loleaflet/dist/images/lc_insertsymbol.svg|1 
 loleaflet/dist/images/lc_inserttable.svg |1 
 loleaflet/dist/images/lc_italic.svg  |1 
 loleaflet/dist/images/lc_lastrecord.svg  |1 
 loleaflet/dist/images/lc_nextrecord.svg  |1 
 loleaflet/dist/images/lc_numberformatdecdecimals.svg |1 
 loleaflet/dist/images/lc_numberformatdecimal.svg |1 
 loleaflet/dist/images/lc_numberformatincdecimals.svg |1 
 loleaflet/dist/images/lc_numberformatpercent.svg |1 
 loleaflet/dist/images/lc_ok.svg  |1 
 loleaflet/dist/images/lc_prevrecord.svg  |1 
 loleaflet/dist/images/lc_print.svg   |1 
 loleaflet/dist/images/lc_radiobutton.svg |1 
 loleaflet/dist/images/lc_redo.svg|1 
 loleaflet/dist/images/lc_save.svg|1 
 loleaflet/dist/images/lc_saveas.svg  |1 
 loleaflet/dist/images/lc_showannotations.svg |1 
 loleaflet/dist/images/lc_sortascending.svg   |1 
 loleaflet/dist/images/lc_sortdescending.svg  |1 
 loleaflet/dist/images/lc_strikeout.svg   |1 
 loleaflet/dist/images/lc_togglemergecells.svg|1 
 loleaflet/dist/images/lc_underline.svg   |1 
 loleaflet/dist/images/lc_undo.svg|1 
 loleaflet/dist/images/lc_upsearch.svg|1 
 loleaflet/dist/images/lc_view100.svg |1 
 loleaflet/dist/images/lc_wraptext.svg|1 
 loleaflet/dist/images/minus.svg  |1 
 loleaflet/dist/images/plus.svg   |1 
 loleaflet/dist/toolbar.css   |  114 +--
 test/data/password-protected.doc |binary
 test/data/password-protected.docx|binary
 test/httpwstest.cpp  |   46 +++
 63 files changed, 161 insertions(+), 57 deletions(-)

New commits:
commit d24fb462d7ba91c278a86fef989f31c607af5528
Author: Tomaž Vajngerl 
Date:   Mon Jan 9 11:38:08 2017 +0100

Test password protected OOXML and Binary MSO documents

Change-Id: Ie871ea72f2670bcb23c25697bb669128ded851d9

diff --git a/test/data/password-protected.doc b/test/data/password-protected.doc
new file mode 100644
index 000..0f0c853
Binary files /dev/null and b/test/data/password-protected.doc differ
diff --git a/test/data/password-protected.docx 
b/test/data/password-protected.docx
new file mode 100644
index 000..0e99d1b
Binary files /dev/null and b/test/data/password-protected.docx differ
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index e533959..c64cc9c 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -78,6 +78,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testPasswordProtectedDocumentWithWrongPassword);
 CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPassword);
 CPPUNIT_TEST(testPasswordPr

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit cbebea151b9ba907e9ff69fd48996fee38c1f22d
Author: Christian Lohmaier 
Date:   Tue Jan 10 21:49:09 2017 +0100

Updated core
Project: translations  930afa6de2cfae15db9af9574f6e0997f69955d8

update translations

and force-fix errors using pocheck

Change-Id: I22c4f2470c82a226f332c5af79dadcc33e50d79a

diff --git a/translations b/translations
index ef59b48..930afa6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ef59b48c9927301075cff0e2729b5d0a7ea214ed
+Subproject commit 930afa6de2cfae15db9af9574f6e0997f69955d8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx   |   15 +++
 sc/source/filter/inc/scenariobuffer.hxx  |3 ++-
 sc/source/filter/oox/scenariobuffer.cxx  |   23 +++
 4 files changed, 24 insertions(+), 17 deletions(-)

New commits:
commit dfc6f4c1be58b088dd099f6f8bb6103bf962e144
Author: Justin Luth 
Date:   Mon Dec 26 14:59:21 2016 +0300

tdf#97598 xlsx import: do not apply any scenarios

Excel does not automatically apply scenarios, so neither should LO.

Scenarios appear to first be supported in 2009 and this section that
applies the "mnShown" scenario comes from
> commit 0851da4d8a0a557f1e9a31af652a530c615c2989
> CWS-TOOLING: integrate CWS dr68

mnShown should only mean the last scenario that was shown, so
mark it as active, but don't apply it.
In Excel, mnCurrent tracks and auto-selects a scenario in the dialog box,
so that is irrelevant to us.

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

diff --git a/sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx 
b/sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx
new file mode 100755
index 000..ba3f43f
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf97598_scenarios.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 910334e..7306a4a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -233,6 +233,7 @@ public:
 
 void testTdf100458();
 void testTdf100709XLSX();
+void testTdf97598XLSX();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -347,6 +348,7 @@ public:
 
 CPPUNIT_TEST(testTdf100458);
 CPPUNIT_TEST(testTdf100709XLSX);
+CPPUNIT_TEST(testTdf97598XLSX);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -3814,6 +3816,19 @@ void ScFiltersTest::testTdf100709XLSX()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testTdf97598XLSX()
+{
+ScDocShellRef xDocSh = loadDoc("tdf97598_scenarios.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf97598_secenarios.xlsx", 
xDocSh.Is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+OUString aStr = rDoc.GetString(0, 0, 0); // A1
+CPPUNIT_ASSERT_EQUAL(OUString("Cell A1"), aStr);
+
+xDocSh->DoClose();
+}
+
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
diff --git a/sc/source/filter/inc/scenariobuffer.hxx 
b/sc/source/filter/inc/scenariobuffer.hxx
index cfe18f7..ddfbee5 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -44,6 +44,7 @@ struct ScenarioModel
 OUString maUser; /// Name of user created the scenario.
 boolmbLocked;   /// True = input cell values 
locked.
 boolmbHidden;   /// True = scenario is hidden.
+boolmbActive;
 
 explicitScenarioModel();
 };
@@ -51,7 +52,7 @@ struct ScenarioModel
 class Scenario : public WorkbookHelper
 {
 public:
-explicitScenario( const WorkbookHelper& rHelper, sal_Int16 
nSheet );
+explicitScenario( const WorkbookHelper& rHelper, sal_Int16 
nSheet, bool bIsActive );
 
 /** Imports a scenario definition from a scenario element. */
 voidimportScenario( const AttributeList& rAttribs );
diff --git a/sc/source/filter/oox/scenariobuffer.cxx 
b/sc/source/filter/oox/scenariobuffer.cxx
index 0060adf..1ae9bec 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -50,14 +50,16 @@ ScenarioCellModel::ScenarioCellModel() :
 
 ScenarioModel::ScenarioModel() :
 mbLocked( false ),
-mbHidden( false )
+mbHidden( false ),
+mbActive( false )
 {
 }
 
-Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet ) :
+Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet, bool 
bIsActive ) :
 WorkbookHelper( rHelper ),
 mnSheet( nSheet )
 {
+maModel.mbActive = bIsActive;
 }
 
 void Scenario::importScenario( const AttributeList& rAttribs )
@@ -138,7 +140,7 @@ void Scenario::finalizeImport()
 
 // scenario properties
 PropertySet aPropSet( xScenarios->getByName( aScenName ) );
-aPropSet.setProperty( PROP_IsActive, false );
+aPropSet.setProperty( PROP_IsActive, maModel.mbActive );
 aPropSet.setProperty( PROP_CopyBack, false );
 aPropSet.setProperty( PROP_CopyStyles, false );
 aPropSet.setProperty( PROP_CopyFormulas, false );
@@ -178,7 +180,8 @@ void SheetScenarios::importScenarios( SequenceInputStream& 
rStrm )
 
 Scenario& SheetScenarios::createScenario()
 {
-ScenarioVector::value_type xScenario( new Scenario( *this, mnSheet ) );
+bool bIsActive = maScenarios.

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

[Jochen Nitschke]

 sc/source/filter/excel/xelink.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ebadc6017827edef2bca7ed389d1af9ebffb96e9
Author: Jochen Nitschke 
Date:   Tue Jan 10 13:31:59 2017 +0100

fix interchanged parameters

first one found by cppcheck
> sc/source/filter/excel/xelink.cxx 637
> funcArgOrderDifferent
>  warning  Function 'InsertExtName' argument order different:
>  declaration 'rnExtSheet, rnExtName, rUrl, rName, rArray'
>  definition 'rnExtSheet, rnExtName, rName, rUrl, rArray'

Change-Id: I6b9bdbf58a8eb271e873bf8dfc30041a72419f59
Reviewed-on: https://gerrit.libreoffice.org/32927
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index d26cc5d..183185e 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2461,7 +2461,7 @@ bool XclExpLinkManagerImpl8::InsertDde(
 }
 
 bool XclExpLinkManagerImpl8::InsertExtName( sal_uInt16& rnExtSheet, 
sal_uInt16& rnExtName,
-const OUString& rName, const OUString& rUrl, const 
ScExternalRefCache::TokenArrayRef& rArray )
+const OUString& rUrl, const OUString& rName, const 
ScExternalRefCache::TokenArrayRef& rArray )
 {
 sal_uInt16 nSupbook;
 if( maSBBuffer.InsertExtName( nSupbook, rnExtName, rUrl, rName, rArray ) )
@@ -2608,7 +2608,7 @@ bool XclExpLinkManager::InsertDde(
 }
 
 bool XclExpLinkManager::InsertExtName(
-sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rName, 
const OUString& rUrl,
+sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, const 
OUString& rName,
 const ScExternalRefCache::TokenArrayRef& rArray )
 {
 return mxImpl->InsertExtName(rnExtSheet, rnExtName, rUrl, rName, rArray);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

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

New commits:
commit db4badfc971b9cc60809c3408f579bae04a77c34
Author: Michael Stahl 
Date:   Tue Jan 10 23:25:47 2017 +0100

tdf#105077 sw: fix wrong assert corner-case in SwRegHistory::InsertItems

There is a tricky corner-case when an item set is inserted that
contains items that are all identical to what's in the node's item set.

In this case a SwHistorySetText will be created for an overwritten hint,
but no new AUTOFMT hint will be inserted so there is no
SwHistoryResetText.

So it looks like AUTOFMT can't be checked at all here.

(regression from b44e70e3d17c79eaf78f9bfe8bd0275d7ed9325f)

Change-Id: I83a241588cef6a9ec074d4f0e39322987394ca86

diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 1435736..c6fdd3c 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -1317,8 +1317,10 @@ bool SwRegHistory::InsertItems( const SfxItemSet& rSet,
 (isCHRATR(nWhich) || RES_TXTATR_UNKNOWN_CONTAINER == nWhich)
 ? RES_TXTATR_AUTOFMT
 : static_cast(nWhich));
-if (RES_TXTATR_AUTOFMT == nExpected && 0 == nStart && 
pTextNode->Len() == nEnd)
+if (RES_TXTATR_AUTOFMT == nExpected)
 continue; // special case, may get set on text node itself
+  // tdf#105077 even worse, node's set could cause
+  // nothing at all to be inserted
 assert(std::find_if(
 m_pHistory->m_SwpHstry.begin(), m_pHistory->m_SwpHstry.end(),
 [nExpected](SwHistoryHint *const pHint) -> bool {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 88 commits - accessibility/inc accessibility/source android/Bootstrap apple_remote/Library_AppleRemote.mk apple_remote/source avmedia

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit 62689675994493bf6068514e07192c143c293c85
Author: Douglas Mencken 
Date:   Tue Jan 10 17:56:39 2017 -0500

( don’t squash ~ yet? ) more about panes with tabs

No Change-Id, sorry

diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index e9a9dc8..6b9200e 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -116,9 +116,8 @@ public:
 voidSetTabPageSizePixel( const Size& rSize );
 SizeGetTabPageSizePixel() const;
 
-//  pixel offset for the tab items, default is (0,0)
-voidSetItemsOffset( const Point& rOffs );
-Point   GetItemsOffset() const;
+//  pixel offset for the tab items with ( zero, zero ) by default
+Point   GetOffsetOfItems() const;
 
 voidInsertPage( sal_uInt16 nPageId, const OUString& rText,
 sal_uInt16 nPos = TAB_APPEND );
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index e82108e..c415934 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -89,9 +89,6 @@ ViewTabBar::ViewTabBar (
 mpTabPage.reset(VclPtr::Create(mpTabControl.get()));
 mpTabPage->Hide();
 
-// add some space before the tabitems
-mpTabControl->SetItemsOffset(Point(5, 3));
-
 // Tunnel through the controller and use the ViewShellBase to obtain the
 // view frame.
 try
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index fb39272..62287cc 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -367,8 +367,8 @@ bool TabControl::ImplPlaceTabs( long nWidth )
 if ( nWidth <= 0 )
 return false;
 
-const long nOffsetX = 2 + GetItemsOffset().X();
-const long nOffsetY = 2 + GetItemsOffset().Y();
+const long nOffsetX = 2; /// + GetItemsOffset().X();
+const long nOffsetY = 2; /// + GetItemsOffset().Y();
 
 // fdo#66435 throw Knuth/Tex minimum raggedness algorithm at the problem
 // of single bare tab on lines of their own
@@ -388,7 +388,7 @@ bool TabControl::ImplPlaceTabs( long nWidth )
 if ( ( mnMaxPageWidth > 0 ) && ( mnMaxPageWidth < nWidth ) )
 nWidth = mnMaxPageWidth;
 
-nWidth -= GetItemsOffset().X();
+//nWidth -= GetItemsOffset().X();
 
 const size_t magicMaxLines = 100; // magic number of maximum lines
 
@@ -401,10 +401,9 @@ bool TabControl::ImplPlaceTabs( long nWidth )
 long nX = nOffsetX;
 long nY = nOffsetY;
 
-sal_uInt16 nLines = 0; // number of lines
-sal_uInt16 nChosenLine = 0; // line which is active now
+size_t nLines = 0; // number of lines
 
-sal_uInt16 nIndex = 0;
+size_t nIndex = 0;
 for( std::vector< ImplTabItem >::iterator it = 
mpTabCtrlData->maItemList.begin() ;
  it != mpTabCtrlData->maItemList.end() ;
  ++it, ++nIndex )
@@ -439,30 +438,24 @@ bool TabControl::ImplPlaceTabs( long nWidth )
 it->mbFullVisible = true;
 
 nLineWidths[ nLines ] += aSize.Width();
-if ( ( !maxLineWidth ) || ( nLineWidths[ nLines ] > maxLineWidth ) )
+if ( ( maxLineWidth == 0 ) || ( nLineWidths[ nLines ] > maxLineWidth ) 
)
 maxLineWidth = nLineWidths[ nLines ];
 
 nX += aSize.Width();
-
-if ( it->mnId == mnCurPageId )
-nChosenLine = nLines;
 }
 
 nLineFirstTabNums[ nLines + 1 ] = static_cast< sal_uInt16 >( 
mpTabCtrlData->maItemList.size() );
 
 const long firstTabXWhenAlignedLeft = 1 + ( ( origWidth - nWidth ) >> 1 );
 
-if ( nLines )
+if ( nLines > 0 )
 {   // two or more lines
 const long tabHeight = mpTabCtrlData->maItemList[0].maRect.Bottom() - 
2;
-long nLineHeights[ nLines + 1 ];
+long nLineTops[ nLines + 1 ];
 
-for ( sal_uInt16 line = 0; line < nLines + 1; line++ )
+for ( size_t line = 0; line < nLines + 1; line++ )
 {
-if ( line <= nChosenLine )
-nLineHeights[ line ] = tabHeight * ( nLines - ( nChosenLine - 
line ) ) + GetItemsOffset().Y();
-else
-nLineHeights[ line ] = tabHeight * ( line - nChosenLine - 1 ) 
+ GetItemsOffset().Y();
+nLineTops[ line ] = tabHeight * ( line + 1 ); // + 
GetItemsOffset().Y();
 }
 
 sal_uInt32 item = 0;
@@ -482,8 +475,8 @@ bool TabControl::ImplPlaceTabs( long nWidth )
 bNewLine = true;
 }
 
-it->maRect.Top() = nLineHeights[ lineN - 1 ];
-it->maRect.Bottom() = nLineHeights[ lineN - 1 ] + tabHeight;
+it->maRect.Top() = nLineTops[ lineN - 1 ];
+it->maRect.Bottom() = nLineTops[ lineN - 1 ] + tabHeight;
 
 long lastTabOnPreviousLine = 0;
 if ( lineN > 0 )
@@ -517,7 +510,7 @@ bool TabControl::ImplPlaceTabs( long nWidth )
 }
 }
 else
-{   // only one line
+{   // t

how to operate gb_macro(solenv/gbuild)

[jaeseok]

hello, I am tracing code. but until now I studied c++ so it is first time
that I saw gnu make file such as gb_macro. so I needs some help.

this is related code. 

$(eval $(call gb_SrsTarget_add_files,formula/res,
formula/source/core/resource/core_resource.src ))

I know [gb_SrsTarget_add_files] is function and [formula/res],
[formula/source/core/resource/core_resource.src] is parameter.

where is the call this code and how to operation?

best regards,



--
View this message in context: 
http://nabble.documentfoundation.org/how-to-operate-gb-macro-solenv-gbuild-tp4204905.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Rosemary Sebastian]

 sw/source/filter/ww8/docxattributeoutput.cxx |   21 ---
 sw/source/filter/ww8/docxexport.cxx  |   37 +--
 sw/source/filter/ww8/docxexport.hxx  |2 -
 sw/source/filter/ww8/docxsdrexport.cxx   |   13 +
 4 files changed, 38 insertions(+), 35 deletions(-)

New commits:
commit 28f50d7e387864bd41a67b2fb78b9c98a708a00e
Author: Rosemary Sebastian 
Date:   Mon Jan 9 11:47:19 2017 +0530

replace namespace url strings with function calls

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

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ff0c60c..8ac45b2 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3774,9 +3775,9 @@ void DocxAttributeOutput::TableRowEnd( sal_uInt32 
/*nDepth*/ )
 void DocxAttributeOutput::StartStyles()
 {
 m_pSerializer->startElementNS( XML_w, XML_styles,
-FSNS( XML_xmlns, XML_w ),   
"http://schemas.openxmlformats.org/wordprocessingml/2006/main";,
-FSNS( XML_xmlns, XML_w14 ), 
"http://schemas.microsoft.com/office/word/2010/wordml";,
-FSNS( XML_xmlns, XML_mc ),  
"http://schemas.openxmlformats.org/markup-compatibility/2006";,
+FSNS( XML_xmlns, XML_w ),   
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(doc)), 
RTL_TEXTENCODING_UTF8).getStr(),
+FSNS( XML_xmlns, XML_w14 ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(w14)), 
RTL_TEXTENCODING_UTF8).getStr(),
+FSNS( XML_xmlns, XML_mc ),  
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(mce)), 
RTL_TEXTENCODING_UTF8).getStr(),
 FSNS( XML_mc, XML_Ignorable ), "w14",
 FSEND );
 
@@ -4291,20 +4292,20 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 FSEND );
 // TODO change aspect?
 m_pSerializer->singleElementNS( XML_a, XML_graphicFrameLocks,
-FSNS( XML_xmlns, XML_a ), 
"http://schemas.openxmlformats.org/drawingml/2006/main";,
+FSNS( XML_xmlns, XML_a ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(dml)), 
RTL_TEXTENCODING_UTF8).getStr(),
 XML_noChangeAspect, "1",
 FSEND );
 m_pSerializer->endElementNS( XML_wp, XML_cNvGraphicFramePr );
 
 m_pSerializer->startElementNS( XML_a, XML_graphic,
-FSNS( XML_xmlns, XML_a ), 
"http://schemas.openxmlformats.org/drawingml/2006/main";,
+FSNS( XML_xmlns, XML_a ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(dml)), 
RTL_TEXTENCODING_UTF8).getStr(),
 FSEND );
 m_pSerializer->startElementNS( XML_a, XML_graphicData,
 XML_uri, 
"http://schemas.openxmlformats.org/drawingml/2006/picture";,
 FSEND );
 
 m_pSerializer->startElementNS( XML_pic, XML_pic,
-FSNS( XML_xmlns, XML_pic ), 
"http://schemas.openxmlformats.org/drawingml/2006/picture";,
+FSNS( XML_xmlns, XML_pic ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(dmlPicture)), 
RTL_TEXTENCODING_UTF8).getStr(),
 FSEND );
 
 m_pSerializer->startElementNS( XML_pic, XML_nvPicPr,
@@ -4509,7 +4510,7 @@ void DocxAttributeOutput::WritePostponedChart()
 FSEND );
 
 m_pSerializer->startElementNS( XML_a, XML_graphic,
-FSNS( XML_xmlns, XML_a ), 
"http://schemas.openxmlformats.org/drawingml/2006/main";,
+FSNS( XML_xmlns, XML_a ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(dml)), 
RTL_TEXTENCODING_UTF8).getStr(),
 FSEND );
 
 m_pSerializer->startElementNS( XML_a, XML_graphicData,
@@ -4522,8 +4523,8 @@ void DocxAttributeOutput::WritePostponedChart()
 aRelId = m_rExport.OutputChart( xModel, m_nChartCount, m_pSerializer );
 
 m_pSerializer->singleElementNS( XML_c, XML_chart,
-FSNS( XML_xmlns, XML_c ), 
"http://schemas.openxmlformats.org/drawingml/2006/chart";,
-FSNS( XML_xmlns, XML_r ), 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
+FSNS( XML_xmlns, XML_c ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(dmlChart)), 
RTL_TEXTENCODING_UTF8).getStr(),
+FSNS( XML_xmlns, XML_r ), 
OUStringToOString(GetExport().GetFilter().getNamespaceURL(OOX_NS(officeRel)), 
RTL_TEXTENCODING_UTF8).getStr(),
 FSNS( XML_r, XML_id ), aRelId.getStr(),
 FSEND );
 
@@ -6886,7 +6887,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool 
bFootnotes )
 sal_Int32 nBody = bFootnotes? XML_footnotes: XML_endnotes;
 sal_Int32 nItem = bFootnotes? XML_footnote:  XML

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

[Julien Nabet]

 sd/source/ui/slideshow/slideshowimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73316bbc92b264f84c68c96460e262a5dd6e0d04
Author: Julien Nabet 
Date:   Mon Jan 9 18:24:35 2017 +0100

Related tdf#100151: use disposeAndClear for mpShowWindow (sd)

See https://bugs.documentfoundation.org/show_bug.cgi?id=100151#c33

Change-Id: I81e483189eacee086b680367148f8dd3ca2d3493
Reviewed-on: https://gerrit.libreoffice.org/32904
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit bce35b8e13b0d82ba54bf3d380f448dad0ee13bb)
Reviewed-on: https://gerrit.libreoffice.org/32947

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index dd430e2..80b8dd5 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -716,7 +716,7 @@ void SAL_CALL SlideshowImpl::disposing()
 
 if( mpShowWindow )
 {
-mpShowWindow.clear();
+mpShowWindow.disposeAndClear();
 }
 
 setActiveXToolbarsVisible( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: how to operate gb_macro(solenv/gbuild)

[Jan Iversen]

> 
> hello, I am tracing code.
Why are you tracing code ? Normally people do that to solve a problem, but you 
have not told yet what problem you want to solve.

We can only help you, if we understand what you really try to do, until then 
you will only get very generic answers.


> where is the call this code and how to operation?
use
http://opengrok.libreoffice.org 
That tool is (as documented in the getInvolved page) is used to search for 
symbols/variables/functions etc, both where they are defined and where they are 
called.

rgds
jan I.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[aleksandar-stefanovic]

 android/source/build.gradle |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ca48c612120d2f0351e198c581fcfde746837243
Author: aleksandar-stefanovic 
Date:   Thu Dec 29 14:56:17 2016 +0100

Bumped version numbers in Gradle

It builds correctly.
Note that the target version remained the same (22) instead of the current 
25.

Change-Id: Ic14fc5b2e5aa04d621e86249d33c1d6d9bdce3c2
Reviewed-on: https://gerrit.libreoffice.org/32495
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 3d0041a..f3ed892 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 jcenter()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:2.2.2'
+classpath 'com.android.tools.build:gradle:2.2.3'
 }
 }
 
@@ -24,13 +24,13 @@ dependencies {
 ])
 compile files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
 compile 
files("${liboWorkdir}/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar")
-compile 'com.android.support:appcompat-v7:23.4.0'
-compile 'com.android.support:design:23.4.0'
+compile 'com.android.support:appcompat-v7:25.1.0'
+compile 'com.android.support:design:25.1.0'
 }
 
 android {
-compileSdkVersion 23
-buildToolsVersion "23.0.3"
+compileSdkVersion 25
+buildToolsVersion "25.0.1"
 compileOptions {
 // silence some java-language features hints
 sourceCompatibility 6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/Bootstrap android/source

[aleksandar-stefanovic]

 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java  
|1 
 android/source/src/java/org/libreoffice/FontController.java
|1 
 android/source/src/java/org/libreoffice/FormattingController.java  
|3 --
 android/source/src/java/org/libreoffice/ToolbarController.java 
|   15 --
 android/source/src/java/org/libreoffice/canvas/ImageUtils.java 
|2 -
 android/source/src/java/org/libreoffice/storage/IOUtils.java   
|3 --
 
android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java
 |1 
 7 files changed, 26 deletions(-)

New commits:
commit 11e443bfe1166939df4836f2e41c79fb7032089f
Author: aleksandar-stefanovic 
Date:   Thu Dec 29 15:25:33 2016 +0100

Removed unnecessary imports

Import redundancy reported by Android Studio.

Change-Id: If46a43bb18268877d41d4957094acc543c4588fd
Reviewed-on: https://gerrit.libreoffice.org/32496
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java 
b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index 1590fd9..487d647 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -14,7 +14,6 @@ import android.content.pm.ApplicationInfo;
 import android.content.res.AssetManager;
 import android.util.Log;
 
-import java.io.File;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 
diff --git a/android/source/src/java/org/libreoffice/FontController.java 
b/android/source/src/java/org/libreoffice/FontController.java
index 46110db..d6ec185 100644
--- a/android/source/src/java/org/libreoffice/FontController.java
+++ b/android/source/src/java/org/libreoffice/FontController.java
@@ -1,7 +1,6 @@
 package org.libreoffice;
 
 import android.app.Activity;
-import android.content.Context;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
diff --git a/android/source/src/java/org/libreoffice/FormattingController.java 
b/android/source/src/java/org/libreoffice/FormattingController.java
index b5534c2..0cbc488 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -1,10 +1,7 @@
 package org.libreoffice;
 
-import android.content.Context;
-import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.view.Menu;
 import android.view.View;
 import android.widget.ImageButton;
 
diff --git a/android/source/src/java/org/libreoffice/ToolbarController.java 
b/android/source/src/java/org/libreoffice/ToolbarController.java
index ec00abb..0ebe72b 100644
--- a/android/source/src/java/org/libreoffice/ToolbarController.java
+++ b/android/source/src/java/org/libreoffice/ToolbarController.java
@@ -8,28 +8,13 @@
  */
 package org.libreoffice;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.ImageButton;
 import android.widget.Toast;
 
-import org.libreoffice.canvas.ImageUtils;
-import org.libreoffice.kit.Document;
-
-import java.sql.SQLOutput;
-import java.util.Arrays;
-
 /**
  * Controls the changes to the toolbar.
  */
diff --git a/android/source/src/java/org/libreoffice/canvas/ImageUtils.java 
b/android/source/src/java/org/libreoffice/canvas/ImageUtils.java
index b99d425..e41e6eb 100644
--- a/android/source/src/java/org/libreoffice/canvas/ImageUtils.java
+++ b/android/source/src/java/org/libreoffice/canvas/ImageUtils.java
@@ -2,8 +2,6 @@ package org.libreoffice.canvas;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
 public class ImageUtils {
diff --git a/android/source/src/java/org/libreoffice/storage/IOUtils.java 
b/android/source/src/java/org/libreoffice/storage/IOUtils.java
index 0cb7b2e..f345f5c 100644
--- a/android/source/src/java/org/libreoffice/storage/IOUtils.java
+++ b/android/source/src/java/org/libreoffice/storage/IOUtils.java
@@ -1,10 +1,7 @@
 package org.libreoffice.storage;
 
-import android.content.Context;
 import android.util.Log;
 
-import org.libreoffice.R;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git 
a/android/source/src/java/org/libreoffice/

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

[aleksandar-stefanovic]

 android/source/res/layout/toolbar.xml |7 +
 android/source/res/values/arrays.xml  |   10 +-
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |   46 
++
 3 files changed, 40 insertions(+), 23 deletions(-)

New commits:
commit d976f9151af53319819c6adb77bc819c460c1bb5
Author: aleksandar-stefanovic 
Date:   Thu Dec 29 20:29:41 2016 +0100

Updated toolbar spinner to newer implementation

Lowered all-caps navigation labels to something more professional.
Added a Spinner to the Toolbar in XML.
Reworked many lines of LibreOfficeUIActivity to remove possible NPE's, and 
also
removed redundant lines, which were mostly deprecated, as well as switching 
to
a newer implementation of a toolbar-spinner navigation pattern. There are 
more
deprecated methods, but I wanted them in a separate commit.

Change-Id: I15d5365ed7c00880873bf7874bc794008436bb99
Reviewed-on: https://gerrit.libreoffice.org/32497
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/android/source/res/layout/toolbar.xml 
b/android/source/res/layout/toolbar.xml
index 42136ce..bbeb62a 100644
--- a/android/source/res/layout/toolbar.xml
+++ b/android/source/res/layout/toolbar.xml
@@ -4,11 +4,18 @@
 android:id="@+id/toolbar"
 xmlns:app="http://schemas.android.com/apk/res-auto";
 xmlns:android="http://schemas.android.com/apk/res/android";
+xmlns:tools="http://schemas.android.com/tools";
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:elevation="3dp"
 android:background="@color/toolbar_background"
 app:theme="@style/LibreOfficeTheme.Toolbar"
+tools:theme="@style/LibreOfficeTheme.Toolbar"
 app:popupTheme="@style/LibreOfficeTheme">
 
+
+
 
diff --git a/android/source/res/values/arrays.xml 
b/android/source/res/values/arrays.xml
index 28849af..0467baa 100644
--- a/android/source/res/values/arrays.xml
+++ b/android/source/res/values/arrays.xml
@@ -33,11 +33,11 @@
 
 
-EVERYTHING
-DOCUMENTS
-SPREADSHEETS
-PRESENTATIONS
-DRAWINGS
+Everything
+Documents
+Spreadsheets
+Presentations
+Drawings
 
 
 
diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 148a98c..d0681bd 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -24,6 +24,7 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.AppCompatSpinner;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -66,7 +67,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-public class LibreOfficeUIActivity extends AppCompatActivity implements 
ActionBar.OnNavigationListener {
+public class LibreOfficeUIActivity extends AppCompatActivity {
 private String LOGTAG = LibreOfficeUIActivity.class.getSimpleName();
 private SharedPreferences prefs;
 private int filterMode = FileUtilities.ALL;
@@ -128,19 +129,34 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements ActionBa
 Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
 setSupportActionBar(toolbar);
 ActionBar actionBar = getSupportActionBar();
-actionBar.setDisplayShowTitleEnabled(false); //This should show 
current directory if anything
-actionBar.setDisplayHomeAsUpEnabled(true);
 
-//make the navigation spinner
-Context context = actionBar.getThemedContext();
-ArrayAdapter list = 
ArrayAdapter.createFromResource(context, R.array.file_view_modes, 
android.R.layout.simple_spinner_item);
-
list.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+if (actionBar != null) {
+actionBar.setDisplayShowTitleEnabled(false);
+actionBar.setDisplayHomeAsUpEnabled(true);
+
+//make the navigation spinner
+Context context = actionBar.getThemedContext();
+AppCompatSpinner toolbarSpinner = (AppCompatSpinner) 
findViewById(R.id.toolbar_spinner);
+ArrayAdapter spinnerAdapter = 
ArrayAdapter.createFromResource(context, R.array.file_view_modes, 
android.R.layout.simple_spinner_item);
+
spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+toolbarSpinner.setAdapter(spinnerAdapter);
+toolbarSpinner.setOnItemSelectedListener(new 
AdapterView.OnItemSelectedListener() {
+@Override
+p

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

[aleksandar-stefanovic]

 android/source/res/drawable/ic_folder_black_24dp.xml  |5 
+
 android/source/res/layout/file_explorer_grid_item.xml |3 
++-
 android/source/res/layout/file_list_item.xml  |3 
++-
 android/source/src/java/org/libreoffice/ui/GridItemAdapter.java   |8 
+++-
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |7 
++-
 dev/null  |binary
 6 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit a940c8280d26be030dd7a53cf7b4077430597e8d
Author: aleksandar-stefanovic 
Date:   Thu Dec 29 20:55:55 2016 +0100

Folder icon redesign

Replaced old and busted icon design, with Google's generic app icon.
It is now a vector drawable, which means it will be sharp at any resolution,
while we only need to keep one tiny xml file for it. No folder thumbnail
support, but this a welcomed change nontheless.

Change-Id: Ie6e38a6ac8e6cf1bc2d22247c11b5de0bd0d8478
Reviewed-on: https://gerrit.libreoffice.org/32498
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/android/source/res/drawable/folder.png 
b/android/source/res/drawable/folder.png
deleted file mode 100644
index 40a6598..000
Binary files a/android/source/res/drawable/folder.png and /dev/null differ
diff --git a/android/source/res/drawable/ic_folder_black_24dp.xml 
b/android/source/res/drawable/ic_folder_black_24dp.xml
new file mode 100644
index 000..1a9a16f
--- /dev/null
+++ b/android/source/res/drawable/ic_folder_black_24dp.xml
@@ -0,0 +1,5 @@
+http://schemas.android.com/apk/res/android";>
+
+
diff --git a/android/source/res/layout/file_explorer_grid_item.xml 
b/android/source/res/layout/file_explorer_grid_item.xml
index 8dfb9ed..69e3c0c 100644
--- a/android/source/res/layout/file_explorer_grid_item.xml
+++ b/android/source/res/layout/file_explorer_grid_item.xml
@@ -14,7 +14,8 @@
 
 
 https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 starmath/inc/view.hxx|   18 +--
 starmath/source/view.cxx |   74 +++
 2 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 0e911397c9bbd0334345ee2f881381ec2271f6a5
Author: Takeshi Abe 
Date:   Fri Jan 6 18:30:37 2017 +0900

starmath: Prefix members of SmViewShell

Change-Id: I256b251b6aaad487ab0afeb56ee67a4a33769e8f
Reviewed-on: https://gerrit.libreoffice.org/32777
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 840b6d2..76ea809 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -219,13 +219,13 @@ struct SmViewShell_Impl;
 
 class SmViewShell: public SfxViewShell
 {
-std::unique_ptr pImpl;
+std::unique_ptr mpImpl;
 
-VclPtr aGraphic;
-SmGraphicController aGraphicController;
-OUString aStatusText;
+VclPtr mpGraphic;
+SmGraphicController maGraphicController;
+OUString maStatusText;
 
-bool bPasteState;
+bool mbPasteState;
 
 DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void );
 virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint 
) override;
@@ -234,7 +234,7 @@ class SmViewShell: public SfxViewShell
  * should be inserted into SmEditWindow or directly into the SmDocShell as 
done if the
  * visual editor was last to have focus.
  */
-bool bInsertIntoEditWindow;
+bool mbInsertIntoEditWindow;
 protected:
 
 static Size GetTextLineSize(OutputDevice& rDevice,
@@ -282,11 +282,11 @@ public:
 
 SmGraphicWindow& GetGraphicWindow()
 {
-return *aGraphic.get();
+return *mpGraphic.get();
 }
 const SmGraphicWindow& GetGraphicWindow() const
 {
-return *aGraphic.get();
+return *mpGraphic.get();
 }
 
 voidSetStatusText(const OUString& rText);
@@ -316,7 +316,7 @@ public:
  * insert for the visual editor, or the text editor.
  */
 void SetInsertIntoEditWindow(bool bEditWindowHadFocusLast){
-bInsertIntoEditWindow = bEditWindowHadFocusLast;
+mbInsertIntoEditWindow = bEditWindowHadFocusLast;
 }
 bool IsInlineEditEnabled() const;
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 0311b1b..0da5ee3 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -887,7 +887,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default")
 
 void SmViewShell::AdjustPosSizePixel(const Point &rPos, const Size &rSize)
 {
-aGraphic->SetPosSizePixel(rPos, rSize);
+mpGraphic->SetPosSizePixel(rPos, rSize);
 }
 
 void SmViewShell::InnerResizePixel(const Point &rOfs, const Size &rSize, bool)
@@ -1297,7 +1297,7 @@ SmEditWindow *SmViewShell::GetEditWindow()
 
 void SmViewShell::SetStatusText(const OUString& rText)
 {
-aStatusText = rText;
+maStatusText = rText;
 GetViewFrame()->GetBindings().Invalidate(SID_TEXTSTATUS);
 }
 
@@ -1439,16 +1439,16 @@ void SmViewShell::Execute(SfxRequest& rReq)
 break;
 
 case SID_ZOOM_OPTIMAL:
-aGraphic->ZoomToFitInWindow();
+mpGraphic->ZoomToFitInWindow();
 break;
 
 case SID_ZOOMIN:
-aGraphic->SetZoom(aGraphic->GetZoom() + 25);
+mpGraphic->SetZoom(mpGraphic->GetZoom() + 25);
 break;
 
 case SID_ZOOMOUT:
-SAL_WARN_IF( aGraphic->GetZoom() < 25, "starmath", "incorrect 
sal_uInt16 argument" );
-aGraphic->SetZoom(aGraphic->GetZoom() - 25);
+SAL_WARN_IF( mpGraphic->GetZoom() < 25, "starmath", "incorrect 
sal_uInt16 argument" );
+mpGraphic->SetZoom(mpGraphic->GetZoom() - 25);
 break;
 
 case SID_COPYOBJECT:
@@ -1559,9 +1559,9 @@ void SmViewShell::Execute(SfxRequest& rReq)
 const SfxInt16Item& rItem =
 static_cast(rReq.GetArgs()->Get(SID_INSERTCOMMAND));
 
-if (pWin && (bInsertIntoEditWindow || !IsInlineEditEnabled()))
+if (pWin && (mbInsertIntoEditWindow || !IsInlineEditEnabled()))
 pWin->InsertCommand(rItem.GetValue());
-if (IsInlineEditEnabled() && (GetDoc() && !bInsertIntoEditWindow)) 
{
+if (IsInlineEditEnabled() && (GetDoc() && 
!mbInsertIntoEditWindow)) {
 GetDoc()->GetCursor().InsertCommand(rItem.GetValue());
 GetGraphicWindow().GrabFocus();
 }
@@ -1572,11 +1572,11 @@ void SmViewShell::Execute(SfxRequest& rReq)
 {
 const SfxStringItem& rItem = static_cast(rReq.GetArgs()->Get(SID_INSERTCOMMANDTEXT));
 
-if (pWin && (bInsertIntoEditWindow || !IsInlineEditEnabled()))
+if (pWin && (mbInsertIntoEditWindow || !IsInlineEditEnabled()))
 {
 pWin->InsertText(rItem.GetValue());
 }
-if (IsInlineEditEnabled() && (GetDoc() && !bInsertIntoEditWindow))
+if (IsInlineEditEnabled() && (GetDoc() && !mb

Re: Minutes of the Design Hangout: 2017-Jan-05

[Jan Iversen]

> If my impression is not wrong, what difference does it make to
> developers how many Notebook Bars are out there?
> 
If they are made as proper extensions, and added to our extension site, it does 
not matter at all. But the instructions only told how to create/modify a 
notebar not the rest.

rgds
jan I.


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

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

[Jochen Nitschke]

 sc/inc/rangelst.hxx |4 ++--
 sc/source/core/tool/rangelst.cxx|   30 +-
 sc/source/filter/excel/xehelper.cxx |2 +-
 sc/source/ui/miscdlgs/crnrdlg.cxx   |3 ---
 sc/source/ui/unoobj/nameuno.cxx |6 +-
 5 files changed, 17 insertions(+), 28 deletions(-)

New commits:
commit 6139bca62399286bec70cbec4c7c10b2297ff22a
Author: Jochen Nitschke 
Date:   Thu Jan 5 20:13:31 2017 +0100

don't emit objects on ScRange*List::Remove

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

diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 18eb33d..3fe510c 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -75,7 +75,7 @@ public:
 
 ScRangeList GetIntersectedRange(const ScRange& rRange) const;
 
-ScRange*Remove(size_t nPos);
+voidRemove(size_t nPos);
 voidRemoveAll();
 
 ScRange Combine() const;
@@ -123,7 +123,7 @@ public:
 ScRangePair**   CreateNameSortedArray( size_t& nCount, ScDocument* ) 
const;
 
 voidRemove(size_t nPos);
-ScRangePair*Remove(ScRangePair* pAdr);
+voidRemove(ScRangePair* pAdr);
 
 size_t  size() const;
 ScRangePair*operator[](size_t idx);
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 2081352..8c40bf4f 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -330,7 +330,6 @@ void ScRangeList::Join( const ScRange& r, bool bIsInList )
 {   // innerhalb der Liste Range loeschen
 Remove(nOldPos);
 i--;
-delete pOver;
 pOver = nullptr;
 if ( nOldPos )
 nOldPos--;  // Seek richtig aufsetzen
@@ -948,8 +947,7 @@ bool ScRangeList::DeleteArea( SCCOL nCol1, SCROW nRow1, 
SCTAB nTab1,
 {
 if(FindRangeIn< ScRange >(aRange)(maRanges[i]))
 {
-ScRange* pRange = Remove(i);
-delete pRange;
+Remove(i);
 bChanged = true;
 }
 else
@@ -1079,17 +1077,16 @@ size_t ScRangeList::GetCellCount() const
 return for_each(maRanges.begin(), maRanges.end(), func).getCellCount();
 }
 
-ScRange* ScRangeList::Remove(size_t nPos)
+void ScRangeList::Remove(size_t nPos)
 {
 if (maRanges.size() <= nPos)
 // Out-of-bound condition.  Bail out.
-return nullptr;
+return;
 
 iterator itr = maRanges.begin();
 advance(itr, nPos);
-ScRange* p = *itr;
+delete *itr;
 maRanges.erase(itr);
-return p;
 }
 
 void ScRangeList::RemoveAll()
@@ -1237,24 +1234,25 @@ void ScRangePairList::Remove(size_t nPos)
 
 vector::iterator itr = maPairs.begin();
 advance(itr, nPos);
+delete *itr;
 maPairs.erase(itr);
 }
 
-ScRangePair* ScRangePairList::Remove( ScRangePair* Adr)
+void ScRangePairList::Remove( ScRangePair* Adr)
 {
-ScRangePair* p = nullptr;
-
-if (Adr == nullptr) return nullptr;
+if (Adr == nullptr)
+return;
 
-for ( vector::iterator itr = maPairs.begin(); itr < 
maPairs.end(); ++itr )
+for ( vector::iterator itr = maPairs.begin(); itr != 
maPairs.end(); ++itr )
 {
-if ( Adr == (p = *itr) )
+if (Adr == *itr)
 {
+delete *itr;
 maPairs.erase( itr );
-break;
+return;
 }
 }
-return p;
+assert(false);
 }
 
 ScRangePair* ScRangePairList::operator [](size_t idx)
@@ -1323,7 +1321,6 @@ void ScRangePairList::DeleteOnTab( SCTAB nTab )
 if ( aRange.aStart.Tab() == nTab && aRange.aEnd.Tab() == nTab )
 {
 Remove( nPos );
-delete pR;
 nListCount = maPairs.size();
 }
 else
@@ -1544,7 +1541,6 @@ void ScRangePairList::Join( const ScRangePair& r, bool 
bIsInList )
 {   // innerhalb der Liste RangePair loeschen
 Remove( nOldPos );
 i--;
-delete pOver;
 pOver = nullptr;
 if ( nOldPos )
 nOldPos--;  // Seek richtig aufsetzen
diff --git a/sc/source/filter/excel/xehelper.cxx 
b/sc/source/filter/excel/xehelper.cxx
index ba13ae2..22d3ebb 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -252,7 +252,7 @@ void XclExpAddressConverter::ValidateRangeList( 
ScRangeList& rScRanges, bool bWa
 {
 ScRange* pScRange = rScRanges[ --nRange ];
 if( !CheckRange( *pScRange, bWarn ) )
-delete rScRanges.Remove(nRange);
+rScRanges.Remove(nRange);
 }
 }
 
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx 
b/sc/source/ui/miscdlgs/crnrdlg.cxx
index d8c3bee..953f105 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++