date:20150324

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

2015-03-24 Thread Pranav Kant

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

New commits:
commit 183f3791bad09cf95c2eee6e7bb043d7b00546a0
Author: Pranav Kant 
Date:   Tue Mar 24 12:18:09 2015 +0530

Reverts and correct "tdf#88230: Cleanup solar mutex yielding"

This reverts commit b15b97ee6b21be18d4ba5df396d39b6d3dab57e1. This
commit directly used SolarMutexReleaser class which releases the solar
mutex first and then acquires the mutex after the destruction of the
object. This is not the correct way of replacing the pre-existing code
where mutex needs to be acquired first and then released.

Additionally, this commit adds a correct replacement for pre-existing
code too.

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

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 59ee3b0..ef705c1 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1865,12 +1865,11 @@ void touch_lo_draw_tile(void *context, int 
contextWidth, int contextHeight, MLOD
 sleep(1);
 }
 
+// Creation, use and destruction of a VirtualDevice needs to be
+// protected by the SolarMutex, it seems.
+SolarMutexReleaser::AcquireSolarMutex(1);
 if (pViewShell)
 {
-// Creation, use and destruction of a VirtualDevice needs to be
-// protected by the SolarMutex, it seems.
-SolarMutexReleaser aReleaser;
-
 SystemGraphicsData aData;
 aData.rCGContext = (CGContextRef) context;
 // the Size argument is irrelevant, I hope
@@ -1878,7 +1877,7 @@ void touch_lo_draw_tile(void *context, int contextWidth, 
int contextHeight, MLOD
 // paint to it
 pViewShell->PaintTile(aDevice, contextWidth, contextHeight, tilePosX, 
tilePosY, tileWidth, tileHeight);
 }
-
+SolarMutexReleaser::ReleaseSolarMutex();
 SAL_INFO("sw.tiled", "touch_lo_draw_tile(" << contextWidth << "x" << 
contextHeight << ", (" << tileDpxPosition.x << "," << tileDpxPosition.y << "), 
" << tileDpxSize.width << "x" << tileDpxSize.height << ") return");
 #else
 (void) context;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Noel Grandin

 dbaccess/source/core/dataaccess/bookmarkcontainer.cxx   |   15 
 dbaccess/source/core/dataaccess/bookmarkcontainer.hxx   |8 
 dbaccess/source/core/misc/DatabaseDataProvider.cxx  |1 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx  |   27 
 dbaccess/source/ui/app/AppDetailPageHelper.hxx  |7 
 dbaccess/source/ui/app/AppDetailView.cxx|   15 +++-
 dbaccess/source/ui/inc/ConnectionLineAccess.hxx |2 -
 dbaccess/source/ui/inc/JoinTableView.hxx|1 
 dbaccess/source/ui/inc/QueryTextView.hxx|4 --
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx |8 
 dbaccess/source/ui/querydesign/JoinTableView.cxx|4 --
 dbaccess/source/ui/querydesign/QueryTextView.cxx|   16 -
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx  |6 +--
 dbaccess/source/ui/uno/dbinteraction.hxx|3 -
 lotuswordpro/source/filter/lwpobjid.hxx |4 +-
 15 files changed, 11 insertions(+), 110 deletions(-)

New commits:
commit 61831eb81661db2572eaa6cabf7d8eba2c4d842c
Author: Noel Grandin 
Date:   Tue Mar 24 08:38:42 2015 +0200

loplugin:constantfunction: dbaccess

Change-Id: I896f2716cb91169e30f555943174b5aa67e74b20

diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx 
b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 17f28f8..881fe8b 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -101,7 +101,6 @@ Sequence< OUString > SAL_CALL 
OBookmarkContainer::getSupportedServiceNames(  ) t
 void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const 
Any& aElement ) throw(IllegalArgumentException, ElementExistException, 
WrappedTargetException, RuntimeException, std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(true);
 
 if (checkExistence(_rName))
 throw ElementExistException();
@@ -131,7 +130,6 @@ void SAL_CALL OBookmarkContainer::removeByName( const 
OUString& _rName ) throw(N
 OUString sOldBookmark;
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(true);
 
 // check the arguments
 if (_rName.isEmpty())
@@ -161,7 +159,6 @@ void SAL_CALL OBookmarkContainer::removeByName( const 
OUString& _rName ) throw(N
 void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const 
Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, 
WrappedTargetException, RuntimeException, std::exception)
 {
 ClearableMutexGuard aGuard(m_rMutex);
-checkValid(true);
 
 // check the arguments
 if (_rName.isEmpty())
@@ -211,14 +208,12 @@ void SAL_CALL 
OBookmarkContainer::removeContainerListener( const Reference< XCon
 Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException, 
std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 return ::cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException, 
std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 return !m_aBookmarks.empty();
 }
 
@@ -226,7 +221,6 @@ sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw 
(RuntimeException, st
 Reference< XEnumeration > SAL_CALL OBookmarkContainer::createEnumeration(  ) 
throw(RuntimeException, std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 return new 
::comphelper::OEnumerationByIndex(static_cast(this));
 }
 
@@ -234,14 +228,12 @@ Reference< XEnumeration > SAL_CALL 
OBookmarkContainer::createEnumeration(  ) thr
 sal_Int32 SAL_CALL OBookmarkContainer::getCount(  ) throw(RuntimeException, 
std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 return m_aBookmarks.size();
 }
 
 Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) 
throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, 
std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 
 if ((_nIndex < 0) || (_nIndex >= (sal_Int32)m_aBookmarksIndexed.size()))
 throw IndexOutOfBoundsException();
@@ -252,7 +244,6 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 
_nIndex ) throw(IndexOutO
 Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) 
throw(NoSuchElementException, WrappedTargetException, RuntimeException, 
std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 
 if (!checkExistence(_rName))
 throw NoSuchElementException();
@@ -263,7 +254,6 @@ Any SAL_CALL OBookmarkContainer::getByName( const OUString& 
_rName ) throw(NoSuc
 Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames(  ) 
throw(RuntimeException, std::exception)
 {
 MutexGuard aGuard(m_rMutex);
-checkValid(false);
 
 Sequence< OUString > aNames(m_aBookmarks.size());
 OUString* pNames

[Libreoffice-commits] core.git: 8 commits - avmedia/source basctl/source cui/source include/sfx2 include/svx reportdesign/source sc/source sd/source sfx2/source starmath/inc starmath/qa starmath/sourc

2015-03-24 Thread Noel Grandin

 avmedia/source/framework/mediaplayer.cxx  |2 
 basctl/source/basicide/basides2.cxx   |3 
 basctl/source/basicide/tbxctl.cxx |4 
 basctl/source/inc/basidesh.hxx|2 
 cui/source/dialogs/linkdlg.cxx|   14 -
 cui/source/dialogs/zoom.cxx   |   28 +-
 cui/source/inc/linkdlg.hxx|4 
 cui/source/options/treeopt.cxx|   10 
 include/sfx2/bindings.hxx |7 
 include/sfx2/chalign.hxx  |   38 +-
 include/sfx2/linkmgr.hxx  |2 
 include/sfx2/lnkbase.hxx  |   23 -
 include/sfx2/tbxctrl.hxx  |   14 -
 include/sfx2/templateabstractview.hxx |   12 
 include/sfx2/viewsh.hxx   |   23 +
 include/sfx2/zoomitem.hxx |   57 ++--
 include/svx/zoomctrl.hxx  |5 
 reportdesign/source/ui/inc/ReportController.hxx   |2 
 reportdesign/source/ui/report/ReportController.cxx|   10 
 reportdesign/source/ui/report/ReportWindow.cxx|8 
 sc/source/core/data/documen8.cxx  |   16 -
 sc/source/core/tool/appoptio.cxx  |2 
 sc/source/core/tool/ddelink.cxx   |6 
 sc/source/ui/app/inputwin.cxx |2 
 sc/source/ui/cctrl/tbinsert.cxx   |2 
 sc/source/ui/docshell/arealink.cxx|2 
 sc/source/ui/docshell/docsh3.cxx  |   14 -
 sc/source/ui/docshell/externalrefmgr.cxx  |2 
 sc/source/ui/docshell/tablink.cxx |4 
 sc/source/ui/formdlg/dwfunctr.cxx |   34 +-
 sc/source/ui/inc/docsh.hxx|2 
 sc/source/ui/inc/prevwsh.hxx  |2 
 sc/source/ui/inc/tabvwsh.hxx  |2 
 sc/source/ui/unoobj/appluno.cxx   |   18 -
 sc/source/ui/unoobj/confuno.cxx   |2 
 sc/source/ui/unoobj/viewuno.cxx   |   30 +-
 sc/source/ui/view/prevwsh.cxx |   30 +-
 sc/source/ui/view/tabview.cxx |4 
 sc/source/ui/view/tabview2.cxx|   10 
 sc/source/ui/view/tabvwsh3.cxx|   26 +-
 sc/source/ui/view/tabvwsh4.cxx|4 
 sc/source/ui/view/tabvwsha.cxx|2 
 sc/source/ui/view/viewdata.cxx|4 
 sd/source/core/pglink.cxx |2 
 sd/source/ui/app/sdmod2.cxx   |9 
 sd/source/ui/app/tbxww.cxx|2 
 sd/source/ui/dlg/AnimationChildWindow.cxx |2 
 sd/source/ui/dlg/PaneChildWindows.cxx |4 
 sd/source/ui/docshell/docshel4.cxx|9 
 sd/source/ui/func/fuscale.cxx |   22 -
 sd/source/ui/inc/ViewShellBase.hxx|2 
 sd/source/ui/unoidl/SdUnoDrawView.cxx |8 
 sd/source/ui/view/ViewShellBase.cxx   |6 
 sd/source/ui/view/drviews2.cxx|   12 
 sd/source/ui/view/drviewsa.cxx|8 
 sd/source/ui/view/outlnvs2.cxx|2 
 sd/source/ui/view/outlnvsh.cxx|   10 
 sfx2/source/appl/appserv.cxx  |8 
 sfx2/source/appl/childwin.cxx |2 
 sfx2/source/appl/impldde.cxx  |8 
 sfx2/source/appl/linkmgr2.cxx |8 
 sfx2/source/appl/lnkbase2.cxx |   14 -
 sfx2/source/appl/workwin.cxx  |  172 ++---
 sfx2/source/control/bindings.cxx  |   32 +-
 sfx2/source/control/dispatch.cxx  |2 
 sfx2/source/control/templateabstractview.cxx  |   16 -
 sfx2/source/dialog/backingwindow.cxx  |   12 
 sfx2/source/dialog/dockwin.cxx|  232 +-
 sfx2/source/dialog/infobar.cxx|2 
 sfx2/source/dialog/navigat.cxx|2 
 sfx2/source/dialog/partwnd.cxx|2 
 sfx2/source/dialog/recfloat.cxx   |2 
 sfx2/source/dialog/splitwin.cxx   |8 
 sfx2/source/dialog/taskpane.cxx   |8 
 sfx2/source/doc/printhelper.cxx   |   17 -
 sfx2/source/doc/printhelper.hxx   |6 
 sfx2/source/doc/templatedlg.cxx   |   37 +-
 sfx2/source/doc/zoomitem.cxx  |   18 -
 sfx2/source/sidebar/S

[Libreoffice-commits] core.git: filter/source include/filter include/sfx2 sfx2/source sw/inc sw/source writerfilter/inc writerfilter/source

2015-03-24 Thread László Németh

 filter/source/msfilter/msdffimp.cxx   |   14 +-
 include/filter/msfilter/msdffimp.hxx  |5 -
 include/sfx2/docfile.hxx  |1 +
 sfx2/source/doc/docfile.cxx   |6 +-
 sw/inc/shellio.hxx|3 +++
 sw/source/filter/basflt/shellio.cxx   |4 +++-
 sw/source/filter/ww8/ww8glsy.cxx  |2 +-
 sw/source/filter/ww8/ww8graf.cxx  |2 +-
 sw/source/filter/ww8/ww8graf2.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx   |9 +
 sw/source/filter/ww8/ww8par.hxx   |5 +++--
 writerfilter/inc/ooxml/OOXMLDocument.hxx  |4 +++-
 writerfilter/source/filter/WriterFilter.cxx   |3 ++-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx   |   11 ++-
 writerfilter/source/ooxml/OOXMLDocumentImpl.hxx   |4 +++-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |5 -
 16 files changed, 54 insertions(+), 26 deletions(-)

New commits:
commit 9b0e09dedc76a3bc4fd7a128a3a115b328727e00
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Mon Mar 23 16:16:28 2015 +0100

SkipImages option for document import

This option allows images and drawings to be skipped while importing
DOC and DOCX, for text-only conversion or indexing.

Change-Id: Id4bfbbe48d8a8e970b1cb5922187768bf94dc918
Reviewed-on: https://gerrit.libreoffice.org/14733
Reviewed-by: NÃ©meth LÃ¡szlÃ³ 
Tested-by: NÃ©meth LÃ¡szlÃ³ 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index a3e880d..e3c35f8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4278,9 +4278,11 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 
 if ( bGraphic )
 {
-pRet = ImportGraphic( rSt, aSet, aObjData );// SJ: 
#68396# is no longer true (fixed in ppt2000)
-ApplyAttributes( rSt, aSet, aObjData );
-pRet->SetMergedItemSet(aSet);
+if (!mbSkipImages) {
+pRet = ImportGraphic( rSt, aSet, aObjData );// SJ: 
#68396# is no longer true (fixed in ppt2000)
+ApplyAttributes( rSt, aSet, aObjData );
+pRet->SetMergedItemSet(aSet);
+}
 }
 else if ( aObjData.eShapeType == mso_sptLine && !( 
GetPropertyValue( DFF_Prop_fc3DLightFace ) & 8 ) )
 {
@@ -5527,7 +5529,8 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
  long  nApplicationScale,
  ColorData mnDefaultColor_,
  sal_uLong nDefaultFontHeight_,
- SvStream* pStData2_ )
+ SvStream* pStData2_,
+ bool bSkipImages )
 :DffPropertyReader( *this ),
  pFormModel( NULL ),
  pBLIPInfos( new SvxMSDffBLIPInfos  ),
@@ -5550,7 +5553,8 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
  nSvxMSDffOLEConvFlags( 0 ),
  pSecPropSet( NULL ),
  mnDefaultColor( mnDefaultColor_),
- mbTracing( false )
+ mbTracing( false ),
+ mbSkipImages (bSkipImages)
 {
 SetModel( pSdrModel_, nApplicationScale );
 
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index b6b6bd7..a9a9f35 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -526,6 +526,7 @@ public:
 ColorData   mnDefaultColor;
 
 boolmbTracing;
+boolmbSkipImages;
 
 Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const;
 Color MSO_CLR_ToColor( sal_uInt32 nColorCode,
@@ -574,6 +575,7 @@ public:
 @param mnDefaultColor_ ???
 @param nDefaultFontHeight_ ???
 @param pStData2_   ???
+@param bSkipImages skipping images for text extraction/indexing
 */
 SvxMSDffManager( SvStream& rStCtrl,
  const OUString& rBaseURL,
@@ -583,7 +585,8 @@ public:
  long  nApplicationScale=  0,
  ColorData mnDefaultColor_  =  COL_DEFAULT,
  sal_uLong nDefaultFontHeight_  = 24,
- SvStream* pStData2_=  0 );
+ SvStream* pStData2_=  0,
+ bool bSkipImages   =  false );
 
 // in PPT the parameters DGGContainerOffset and PicStream are provided by 
an
 // init method
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 26e3460..9e6160e 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -192,6 +192,7 @@ public:
 OUString

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

2015-03-24 Thread Noel Grandin

 include/test/beans/xpropertyset.hxx  |4 
 include/test/sheet/xsheetoutline.hxx |1 -
 test/source/beans/xpropertyset.cxx   |   20 
 test/source/sheet/xsheetoutline.cxx  |4 
 4 files changed, 29 deletions(-)

New commits:
commit 5dad2733b83297d900cec548596e5358d8335f7b
Author: Noel Grandin 
Date:   Tue Mar 24 09:45:26 2015 +0200

loplugin:constantfunction: test

Change-Id: I86eb9e46bec561bf0ede60180754ae35cefadfd5

diff --git a/include/test/beans/xpropertyset.hxx 
b/include/test/beans/xpropertyset.hxx
index aa29baf..19f0635 100644
--- a/include/test/beans/xpropertyset.hxx
+++ b/include/test/beans/xpropertyset.hxx
@@ -28,12 +28,8 @@ public:
 virtual css::uno::Reference init() = 0;
 
 void testGetPropertySetInfo();
-void testAddPropertyChangeListener();
-void testAddVetoableChangeListener();
 void testSetPropertyValue();
 void testGetPropertyValue();
-void testRemovePropertyChangeListener();
-void testRemoveVetoableChangeListener();
 
 protected:
 virtual bool isPropertyValueChangeable(const OUString& rName);
diff --git a/include/test/sheet/xsheetoutline.hxx 
b/include/test/sheet/xsheetoutline.hxx
index 396fe41..2a7771a 100644
--- a/include/test/sheet/xsheetoutline.hxx
+++ b/include/test/sheet/xsheetoutline.hxx
@@ -27,7 +27,6 @@ public:
 void testShowLevel();
 void testUngroup();
 void testGroup();
-void testAutoOutline();
 void testClearOutline();
 
 protected:
diff --git a/test/source/beans/xpropertyset.cxx 
b/test/source/beans/xpropertyset.cxx
index c90e6e1..3ebfca4 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -39,16 +39,6 @@ void XPropertySet::testGetPropertySetInfo()
 }
 }
 
-void XPropertySet::testAddPropertyChangeListener()
-{
-// TODO: implement this.
-}
-
-void XPropertySet::testAddVetoableChangeListener()
-{
-// TODO: implement this.
-}
-
 void XPropertySet::testSetPropertyValue()
 {
 testGetPropertySetInfo();
@@ -80,16 +70,6 @@ void XPropertySet::testGetPropertyValue()
 }
 }
 
-void XPropertySet::testRemovePropertyChangeListener()
-{
-// TODO: implement this.
-}
-
-void XPropertySet::testRemoveVetoableChangeListener()
-{
-// TODO: implement this.
-}
-
 bool XPropertySet::isPropertyValueChangeable(const OUString& rName)
 {
 uno::Reference xPropSet(init(), UNO_QUERY_THROW);
diff --git a/test/source/sheet/xsheetoutline.cxx 
b/test/source/sheet/xsheetoutline.cxx
index a6ff335..018be89 100644
--- a/test/source/sheet/xsheetoutline.cxx
+++ b/test/source/sheet/xsheetoutline.cxx
@@ -245,10 +245,6 @@ void XSheetOutline::testUngroup()
 
 }
 
-void XSheetOutline::testAutoOutline()
-{
-}
-
 void XSheetOutline::testClearOutline()
 {
 uno::Reference< sheet::XSpreadsheet > aSheet(init(), UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Miklos Vajna

 sw/source/filter/ww8/docxattributeoutput.cxx |   24 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |6 +++---
 2 files changed, 9 insertions(+), 21 deletions(-)

New commits:
commit 2754e16702b45362c3291b65af028f9c648894dc
Author: Miklos Vajna 
Date:   Tue Mar 24 09:02:50 2015 +0100

DocxAttributeOutput::m_pSdtPrDataBindingAttrs: use std::unique_ptr

Change-Id: I13a9a2130b3d5cc4c1e6e2d299e0c7227cf80544

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 15c4c62..737a80c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -326,17 +326,12 @@ void DocxAttributeOutput::StartParagraph( 
ww8::WW8TableNodeInfo::Pointer_t pText
 m_bIsFirstParagraph = false;
 }
 
-static void lcl_deleteAndResetTheLists( 
std::unique_ptr &pSdtPrTokenChildren, 
::sax_fastparser::FastAttributeList* &pSdtPrDataBindingAttrs, OUString& 
rSdtPrAlias)
+static void lcl_deleteAndResetTheLists( 
std::unique_ptr& pSdtPrTokenChildren, 
std::unique_ptr& pSdtPrDataBindingAttrs, 
OUString& rSdtPrAlias)
 {
 if( pSdtPrTokenChildren )
-{
 pSdtPrTokenChildren.reset(0);
-}
 if( pSdtPrDataBindingAttrs )
-{
-delete pSdtPrDataBindingAttrs;
-pSdtPrDataBindingAttrs = NULL;
-}
+pSdtPrDataBindingAttrs.reset(0);
 if (!rSdtPrAlias.isEmpty())
 rSdtPrAlias.clear();
 }
@@ -603,7 +598,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 void DocxAttributeOutput::WriteSdtBlock( sal_Int32& nSdtPrToken,
  
std::unique_ptr& pSdtPrTokenChildren,
  ::sax_fastparser::FastAttributeList*& 
pSdtPrTokenAttributes,
- ::sax_fastparser::FastAttributeList*& 
pSdtPrDataBindingAttrs,
+ 
std::unique_ptr& pSdtPrDataBindingAttrs,
  OUString& rSdtPrAlias,
  bool bPara )
 {
@@ -659,7 +654,7 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32& 
nSdtPrToken,
 
 if(( pSdtPrDataBindingAttrs ) && 
!m_rExport.SdrExporter().IsParagraphHasDrawing())
 {
-XFastAttributeListRef xAttrList( pSdtPrDataBindingAttrs );
+XFastAttributeListRef xAttrList( pSdtPrDataBindingAttrs.release() 
);
 m_pSerializer->singleElementNS( XML_w, XML_dataBinding, xAttrList 
);
 }
 
@@ -693,10 +688,7 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32& 
nSdtPrToken,
 nSdtPrToken = 0;
 pSdtPrTokenChildren.reset(0);
 if( pSdtPrDataBindingAttrs )
-{
-// do not delete yet; it's in xAttrList inside the parser
-pSdtPrDataBindingAttrs = NULL;
-}
+pSdtPrDataBindingAttrs.reset(0);
 rSdtPrAlias.clear();
 }
 }
@@ -8226,7 +8218,7 @@ void DocxAttributeOutput::CharGrabBag( const 
SfxGrabBagItem& rItem )
OUStringToOString( sValue, 
RTL_TEXTENCODING_UTF8 ).getStr() );
 }
 }
-else if (aPropertyValue.Name == "ooxml:CT_SdtPr_dataBinding" 
&& m_pRunSdtPrDataBindingAttrs == NULL)
+else if (aPropertyValue.Name == "ooxml:CT_SdtPr_dataBinding" 
&& !m_pRunSdtPrDataBindingAttrs)
 {
 uno::Sequence aGrabBag;
 aPropertyValue.Value >>= aGrabBag;
@@ -8326,10 +8318,8 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
&rExport, FSHelperPtr pSeri
   m_setFootnote(false)
 , m_nParagraphSdtPrToken(0)
 , m_pParagraphSdtPrTokenAttributes(NULL)
-, m_pParagraphSdtPrDataBindingAttrs(NULL)
 , m_nRunSdtPrToken(0)
 , m_nStateOfFlyFrame( FLY_NOT_PROCESSED )
-, m_pRunSdtPrDataBindingAttrs(NULL)
 , m_bParagraphSdtHasId(false)
 {
 }
@@ -8338,8 +8328,6 @@ DocxAttributeOutput::~DocxAttributeOutput()
 {
 delete m_pTableWrt, m_pTableWrt = NULL;
 delete m_pParagraphSdtPrTokenAttributes; m_pParagraphSdtPrTokenAttributes 
= NULL;
-delete m_pParagraphSdtPrDataBindingAttrs; 
m_pParagraphSdtPrDataBindingAttrs = NULL;
-delete m_pRunSdtPrDataBindingAttrs; m_pRunSdtPrDataBindingAttrs = NULL;
 }
 
 DocxExport& DocxAttributeOutput::GetExport()
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index c2cf6c7..a96bb22 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -706,7 +706,7 @@ private:
 void WriteSdtBlock(sal_Int32& nSdtPrToken,
std::unique_ptr& 
pSdtPrTokenChildren,
::sax_fastparser::FastAttributeList*& 
pSdtPrTokenAttributes,
-   ::sax_fastparser::FastAttributeList*& 
pSdtPrDataBindingAttrs,
+   std::unique

[Libreoffice-commits] core.git: 10 commits - basctl/source basic/source forms/source framework/inc framework/source hwpfilter/source reportdesign/source rsc/source store/source xmloff/source xmlsecuri

2015-03-24 Thread Noel Grandin

 basctl/source/basicide/baside2.cxx  |6 -
 basctl/source/basicide/baside2.hxx  |1 
 basctl/source/basicide/baside3.cxx  |4 -
 basctl/source/basicide/basides2.cxx |2 
 basctl/source/dlged/dlged.cxx   |5 -
 basctl/source/inc/dlged.hxx |1 
 basic/source/basmgr/basmgr.cxx  |2 
 basic/source/classes/sbunoobj.cxx   |4 -
 basic/source/sbx/sbxbase.cxx|7 -
 basic/source/sbx/sbxobj.cxx |   13 ---
 forms/source/component/DatabaseForm.cxx |1 
 forms/source/component/Filter.cxx   |2 
 forms/source/component/FormComponent.cxx|   12 ---
 forms/source/inc/FormComponent.hxx  |8 --
 forms/source/richtext/richtextcontrol.cxx   |3 
 forms/source/solar/component/navbarcontrol.cxx  |2 
 forms/source/xforms/datatypes.cxx   |   31 +++
 forms/source/xforms/datatypes.hxx   |   18 +---
 framework/inc/classes/propertysethelper.hxx |1 
 framework/inc/uielement/statusbarmanager.hxx|1 
 framework/source/fwi/classes/propertysethelper.cxx  |4 -
 framework/source/services/frame.cxx |2 
 framework/source/services/substitutepathvars.cxx|4 -
 framework/source/uielement/statusbar.cxx|4 -
 framework/source/uielement/statusbarmanager.cxx |4 -
 hwpfilter/source/formula.cxx|   17 
 hwpfilter/source/formula.h  |3 
 hwpfilter/source/hwpreader.cxx  |   20 -
 hwpfilter/source/hwpreader.hxx  |2 
 hwpfilter/source/nodes.h|2 
 reportdesign/source/ui/inc/ReportController.hxx |1 
 reportdesign/source/ui/inc/ReportWindow.hxx |3 
 reportdesign/source/ui/inc/ViewsWindow.hxx  |4 -
 reportdesign/source/ui/report/ReportController.cxx  |   18 
 reportdesign/source/ui/report/ReportWindow.cxx  |5 -
 reportdesign/source/ui/report/ScrollHelper.cxx  |2 
 reportdesign/source/ui/report/ViewsWindow.cxx   |4 -
 rsc/source/rscpp/cpp.h  |3 
 rsc/source/rscpp/cpp1.c |3 
 rsc/source/rscpp/cpp2.c |5 -
 rsc/source/rscpp/cpp3.c |5 -
 rsc/source/rscpp/cpp5.c |6 -
 store/source/storbase.hxx   |6 -
 store/source/stordata.cxx   |   16 ++--
 store/source/stordata.hxx   |   47 
 xmloff/source/core/DomExport.cxx|   20 -
 xmloff/source/forms/formattributes.cxx  |   18 
 xmloff/source/forms/formattributes.hxx  |   18 +++-
 xmlsecurity/source/xmlsec/saxhelper.cxx |   10 --
 xmlsecurity/source/xmlsec/saxhelper.hxx |3 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |3 
 51 files changed, 68 insertions(+), 318 deletions(-)

New commits:
commit 829fa56634414c55a50cda9a74a2683e3e5b822a
Author: Noel Grandin 
Date:   Tue Mar 24 10:01:17 2015 +0200

loplugin:constantfunction: framework

Change-Id: Ib5c85dfb5fd720a1709e37d9f12b43a1588ba058

diff --git a/framework/inc/classes/propertysethelper.hxx 
b/framework/inc/classes/propertysethelper.hxx
index a81499f..241bfaf 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -118,7 +118,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public 
css::beans::XPropertySet
  *  There is no chance to reactive a "dead" object by calling 
impl_enablePropertySet()
  *  again!
  */
-void SAL_CALL impl_enablePropertySet();
 void SAL_CALL impl_disablePropertySet();
 
 /**
diff --git a/framework/inc/uielement/statusbarmanager.hxx 
b/framework/inc/uielement/statusbarmanager.hxx
index 6cd72ed..efbe548 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -79,7 +79,6 @@ class StatusBarManager : public ::cppu::WeakImplHelper3<
 void FillStatusBar( const ::com::sun::star::uno::Reference< 
::com::sun::star::container::XIndexAccess >& rStatusBarData );
 
 protected:
-void StateChanged( StateChangedType nType );
 void DataChanged( con

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sc/source

2015-03-24 Thread Henry Castro

 sc/source/ui/view/gridwin.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c2596244325bb566dd460ada29207d0c05b83293
Author: Henry Castro 
Date:   Sun Mar 22 20:13:29 2015 -0400

sc tiled editing: Limit the mouse events only to the document size.

From some reason, when clicking outside of the area visible in the
gtktiledviewer, the events starts being misplaced.

We need to revert & fix later when we will be able to extend the
document size in a convenient way.

Change-Id: I210705c9f8909598d8d47c15c14c06f96bfc4caa

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3bbe8b8..a89d4e1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2426,7 +2426,11 @@ void ScGridWindow::LogicMouseButtonDown(const 
MouseEvent& rMouseEvent)
 (void)rDoc;
 assert(rDoc.GetDrawLayer()->isTiledRendering());
 
-MouseButtonDown(rMouseEvent);
+// Don't allow events outside of our viewport size.
+// FIXME this will likely cause trouble when we allow extending the
+// document size; but for now this is necessary to workaround a problem
+if ( rMouseEvent.GetPosPixel().X() < GetOutputSizePixel().Width() && 
rMouseEvent.GetPosPixel().Y() < GetOutputSizePixel().Height())
+MouseButtonDown(rMouseEvent);
 }
 
 void ScGridWindow::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Stephan Bergmann

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

New commits:
commit f2edd09bf3ab4f705818a9d7bae58a72e78f102c
Author: Stephan Bergmann 
Date:   Tue Mar 24 09:37:46 2015 +0100

tdf#88230 Blind fix for IOS-only code

...broken with c6c4d21847ef18ae7378e1a5a329000ea6547d18 "tdf#88230: Remove 
bogus
AcquireSolarMutex fpicker wrapper" and 
183f3791bad09cf95c2eee6e7bb043d7b00546a0
"Reverts and correct 'tdf#88230: Cleanup solar mutex yielding'"

Change-Id: I568ea5aa0a43cadc1b6cf9f954293bf297ae489e

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index ef705c1..1aa3879 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1865,11 +1865,12 @@ void touch_lo_draw_tile(void *context, int 
contextWidth, int contextHeight, MLOD
 sleep(1);
 }
 
-// Creation, use and destruction of a VirtualDevice needs to be
-// protected by the SolarMutex, it seems.
-SolarMutexReleaser::AcquireSolarMutex(1);
 if (pViewShell)
 {
+// Creation, use and destruction of a VirtualDevice needs to be
+// protected by the SolarMutex, it seems:
+SolarMutexGuard g;
+
 SystemGraphicsData aData;
 aData.rCGContext = (CGContextRef) context;
 // the Size argument is irrelevant, I hope
@@ -1877,7 +1878,7 @@ void touch_lo_draw_tile(void *context, int contextWidth, 
int contextHeight, MLOD
 // paint to it
 pViewShell->PaintTile(aDevice, contextWidth, contextHeight, tilePosX, 
tilePosY, tileWidth, tileHeight);
 }
-SolarMutexReleaser::ReleaseSolarMutex();
+
 SAL_INFO("sw.tiled", "touch_lo_draw_tile(" << contextWidth << "x" << 
contextHeight << ", (" << tileDpxPosition.x << "," << tileDpxPosition.y << "), 
" << tileDpxSize.width << "x" << tileDpxSize.height << ") return");
 #else
 (void) context;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sc/source

2015-03-24 Thread Jan Holesovsky

 sc/source/ui/view/gridwin.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit b5bd68b1742458a72f1ca3bbb1c6dae4e71cc7a4
Author: Jan Holesovsky 
Date:   Tue Mar 24 09:43:29 2015 +0100

Revert "sc tiled editing: Limit the mouse events only to the document size."

Pushed too early; we are able to get this mis-behavior even other ways than
just using a mouse click, we really need to fix the root cause now.

This reverts commit c2596244325bb566dd460ada29207d0c05b83293.

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index a89d4e1..3bbe8b8 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2426,11 +2426,7 @@ void ScGridWindow::LogicMouseButtonDown(const 
MouseEvent& rMouseEvent)
 (void)rDoc;
 assert(rDoc.GetDrawLayer()->isTiledRendering());
 
-// Don't allow events outside of our viewport size.
-// FIXME this will likely cause trouble when we allow extending the
-// document size; but for now this is necessary to workaround a problem
-if ( rMouseEvent.GetPosPixel().X() < GetOutputSizePixel().Width() && 
rMouseEvent.GetPosPixel().Y() < GetOutputSizePixel().Height())
-MouseButtonDown(rMouseEvent);
+MouseButtonDown(rMouseEvent);
 }
 
 void ScGridWindow::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basebmp/test desktop/source extensions/source fpicker/source idlc/inc package/source sal/osl slideshow/source starmath/source sw/source ucb/source vbahelper

2015-03-24 Thread Noel Grandin

 basebmp/test/masktest.cxx  |5 -
 desktop/source/app/dispatchwatcher.cxx |5 +
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|8 --
 extensions/source/bibliography/framectr.cxx|   21 
---
 extensions/source/bibliography/framectr.hxx|3 -
 extensions/source/bibliography/loadlisteneradapter.cxx |   12 
 extensions/source/bibliography/loadlisteneradapter.hxx |3 -
 fpicker/source/office/OfficeFilePicker.cxx |   18 
+-
 fpicker/source/office/iodlg.cxx|   29 
--
 fpicker/source/office/iodlg.hxx|2 
 idlc/inc/idlc/astexpression.hxx|1 
 package/source/zipapi/MemoryByteGrabber.hxx|4 -
 sal/osl/unx/file.cxx   |   15 ++---
 slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx |   15 -
 slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx |1 
 slideshow/source/engine/eventmultiplexer.cxx   |5 -
 slideshow/source/engine/slideshowimpl.cxx  |2 
 slideshow/source/inc/eventmultiplexer.hxx  |4 -
 starmath/source/dialog.cxx |6 +-
 sw/source/core/view/pagepreviewlayout.cxx  |2 
 ucb/source/ucp/file/filtask.hxx|2 
 vbahelper/source/vbahelper/vbadocumentsbase.cxx|   13 
 writerperfect/source/common/DirectoryStream.cxx|   10 ++-
 23 files changed, 44 insertions(+), 142 deletions(-)

New commits:
commit 858e455634ebfff8ef7b65a9c97d3bc8240cd094
Author: Noel Grandin 
Date:   Tue Mar 24 10:49:28 2015 +0200

loplugin:constantfunction: various

Change-Id: I6eddda9f4b31c7ce413c328b6a857a81bd222eed

diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 94c1130..7b4559c 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -133,17 +133,12 @@ public:
 implTestMaskBasics( mpDevice1bpp, mpMask );
 }
 
-void testMaskClip()
-{
-}
-
 // Change the following lines only, if you add, remove or rename
 // member functions of the current class,
 // because these macros are need by auto register mechanism.
 
 CPPUNIT_TEST_SUITE(MaskTest);
 CPPUNIT_TEST(testMaskBasics);
-CPPUNIT_TEST(testMaskClip);
 CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index c243766..d1aa2f2 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -126,7 +126,9 @@ const SfxFilter* impl_lookupExportFilterForUrl( const 
rtl::OUString& rUrl, const
 return pBestMatch;
 }
 
-const SfxFilter* impl_getExportFilterFromUrl( const rtl::OUString& rUrl, const 
rtl::OUString& rFactory ) try
+const SfxFilter* impl_getExportFilterFromUrl( const rtl::OUString& rUrl, const 
rtl::OUString& rFactory )
+{
+try
 {
 const Reference< XComponentContext > xContext( 
comphelper::getProcessComponentContext() );
 const Reference< document::XTypeDetection > xTypeDetector(
@@ -154,6 +156,7 @@ catch ( const Exception& )
 {
 return 0;
 }
+}
 
 OUString impl_GuessFilter( const OUString& rUrlOut, const OUString& 
rDocService )
 {
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index ec2dea6..1158087 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -703,12 +703,6 @@ void ExtensionBox_Impl::RecalcAll()
 }
 
 
-bool ExtensionBox_Impl::HandleTabKey( bool )
-{
-return false;
-}
-
-
 bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
 {
 if ( m_vEntries.empty() )
@@ -886,7 +880,7 @@ bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
 sal_uInt16 nKeyCode = aKeyCode.GetCode();
 
 if ( nKeyCode == KEY_TAB )
-bHandled = HandleTabKey( aKeyCode.IsShift() );
+ ;
 else if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR )
 bHandled = HandleCursorKey( nKeyCode );
 }
diff --git a/extensions/source/bibliography/framectr.cxx 
b/extensions/source/bibliography/framectr.cxx
index 77ea325..662bf4c 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -153,19 +153,8 @@ BibFrameCtrl_Impl::~BibFrameCtrl_Impl()
 {
 }
 
-void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( 
uno::RuntimeException, std::exception )
+void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& ) throw( 
uno::RuntimeException, std::exception )
 {
-

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - libreofficekit/source svx/source

2015-03-24 Thread Miklos Vajna

 libreofficekit/source/gtk/lokdocview.cxx |  102 ---
 svx/source/svdraw/svdmrkv.cxx|   12 +++
 2 files changed, 67 insertions(+), 47 deletions(-)

New commits:
commit 2879d21b1ef16fd0a350e0cc5ad99c5b42b02285
Author: Miklos Vajna 
Date:   Tue Mar 24 10:01:55 2015 +0100

svx tiled rendering: fix Impress graphic selection

With this, shapes on Impress slides can be selected and the graphic
selection appears correctly around the expected shape.

Change-Id: Ie819918a34952e8182553b26ff892fe9b5ae0258

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 060472d..eda88b5 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -710,7 +710,19 @@ void SdrMarkView::SetMarkHandles()
 if (aRect.IsEmpty())
 sRectangle = "EMPTY";
 else
+{
+// In case the map mode is in 100th MM, then need to convert 
the coordinates over to twips for LOK.
+if (pMarkedPV)
+{
+if (OutputDevice* pOutputDevice = 
pMarkedPV->GetView().GetFirstOutputDevice())
+{
+if (pOutputDevice->GetMapMode().GetMapUnit() == 
MAP_100TH_MM)
+aRect = OutputDevice::LogicToLogic(aRect, 
MAP_100TH_MM, MAP_TWIP);
+}
+}
+
 sRectangle = aRect.toString();
+}
 GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, 
sRectangle.getStr());
 }
 
commit 38ffc94114ee3461a8c4fe7f7978e94ec7caac7c
Author: Miklos Vajna 
Date:   Tue Mar 24 09:30:47 2015 +0100

lokdocview: lcl_onDestroy() -> LOKDocView_Impl::destroy()

Change-Id: I0910afdb6a0d031cb64f545b5b2c0d16f18a0f04

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 66568ca..35b23a2 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -93,58 +93,67 @@ struct LOKDocView_Impl
 bool m_bInDragGraphicHandles[8];
 ///@}
 
-LOKDocView_Impl()
-: m_pEventBox(gtk_event_box_new()),
-m_pTable(0),
-m_pCanvas(0),
-m_fZoom(1),
-m_pOffice(0),
-m_pDocument(0),
-m_bEdit(false),
-m_aVisibleCursor({0, 0, 0, 0}),
-m_bCursorOverlayVisible(false),
-m_bCursorVisible(true),
-m_nLastButtonPressTime(0),
-m_nLastButtonReleaseTime(0),
-m_pTextSelectionRectangles(0),
-m_aTextSelectionStart({0, 0, 0, 0}),
-m_aTextSelectionEnd({0, 0, 0, 0}),
-m_aGraphicSelection({0, 0, 0, 0}),
-m_bInDragGraphicSelection(false),
-
-// Start/middle/end handle.
-m_pHandleStart(0),
-m_aHandleStartRect({0, 0, 0, 0}),
-m_bInDragStartHandle(false),
-m_pHandleMiddle(0),
-m_aHandleMiddleRect({0, 0, 0, 0}),
-m_bInDragMiddleHandle(false),
-m_pHandleEnd(0),
-m_aHandleEndRect({0, 0, 0, 0}),
-m_bInDragEndHandle(false),
-
-m_pGraphicHandle(0)
-{
-memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));
-memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles));
-}
+LOKDocView_Impl();
+~LOKDocView_Impl();
+/// Connected to the destroy signal of LOKDocView, deletes its 
LOKDocView_Impl.
+static void destroy(LOKDocView* pDocView, gpointer pData);
 };
 
-static void lok_docview_class_init( gpointer );
-static void lok_docview_init( GTypeInstance *, gpointer );
-static float pixelToTwip(float nInput);
-static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* pEvent, 
gpointer pData);
+LOKDocView_Impl::LOKDocView_Impl()
+: m_pEventBox(gtk_event_box_new()),
+m_pTable(0),
+m_pCanvas(0),
+m_fZoom(1),
+m_pOffice(0),
+m_pDocument(0),
+m_bEdit(false),
+m_aVisibleCursor({0, 0, 0, 0}),
+m_bCursorOverlayVisible(false),
+m_bCursorVisible(true),
+m_nLastButtonPressTime(0),
+m_nLastButtonReleaseTime(0),
+m_pTextSelectionRectangles(0),
+m_aTextSelectionStart({0, 0, 0, 0}),
+m_aTextSelectionEnd({0, 0, 0, 0}),
+m_aGraphicSelection({0, 0, 0, 0}),
+m_bInDragGraphicSelection(false),
+
+// Start/middle/end handle.
+m_pHandleStart(0),
+m_aHandleStartRect({0, 0, 0, 0}),
+m_bInDragStartHandle(false),
+m_pHandleMiddle(0),
+m_aHandleMiddleRect({0, 0, 0, 0}),
+m_bInDragMiddleHandle(false),
+m_pHandleEnd(0),
+m_aHandleEndRect({0, 0, 0, 0}),
+m_bInDragEndHandle(false),
+
+m_pGraphicHandle(0)
+{
+memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));
+memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles));
+}
 
-// We specifically need to destroy the document when closing in order to ensure
-// that lock files etc. are cleaned up.
-void lcl_onDestroy(LOKDocView* pDocV

[Libreoffice-commits] core.git: 3 commits - include/touch ios/experimental sw/Executable_tiledrendering.mk sw/Module_sw.mk sw/qa sw/source sw/UIConfig_qa.mk

2015-03-24 Thread Tor Lillqvist

 include/touch/touch.h  |6 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   10 
 sw/Executable_tiledrendering.mk|   60 -
 sw/Module_sw.mk|3 
 sw/UIConfig_qa.mk  |   16 
 sw/qa/tiledrendering/tiledrendering.cxx|  202 --
 sw/qa/tiledrendering/tiledrendering.ui |  304 
--
 sw/source/core/view/viewsh.cxx |   54 -
 8 files changed, 655 deletions(-)

New commits:
commit aa94466699a98730d9e8d112fd52cea63c2226b2
Author: Tor Lillqvist 
Date:   Tue Mar 24 11:01:14 2015 +0200

Executable_tiledrendering is obsolete and can be killed

Change-Id: I4159adb321a939126a0577a48e5917be5825557e

diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk
deleted file mode 100644
index 0446a97..000
--- a/sw/Executable_tiledrendering.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Executable_Executable,tiledrendering))
-
-$(eval $(call gb_Executable_use_external,tiledrendering,boost_headers))
-
-$(eval $(call gb_Executable_use_api,tiledrendering,\
-offapi \
-udkapi \
-))
-
-$(eval $(call gb_Executable_set_include,tiledrendering,\
--I$(SRCDIR)/sw/inc \
--I$(SRCDIR)/sw/source/uibase/inc \
-$$(INCLUDE) \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,tiledrendering,\
-vclmain \
-))
-
-$(eval $(call gb_Executable_use_libraries,tiledrendering,\
-   comphelper \
-   cppu \
-   cppuhelper \
-   sal \
-tl \
-ucbhelper \
-vcl \
-sfx \
-   sw \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,tiledrendering,\
-sw/qa/tiledrendering/tiledrendering \
-))
-
-ifeq ($(OS),LINUX)
-
-$(eval $(call gb_Executable_add_libs,tiledrendering,\
-   -lm \
-   -ldl \
-   -lpthread \
--lGL \
--lX11 \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,tiledrendering,\
-   glxtest \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 78a45e1..612adf3 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -20,8 +20,6 @@
 $(eval $(call gb_Module_Module,sw))
 
 $(eval $(call gb_Module_add_targets,sw,\
-$(if $(ENABLE_HEADLESS),, \
-   $(call gb_Helper_optional,DESKTOP,Executable_tiledrendering)) \
 CustomTarget_generated \
Library_msword \
Library_sw \
@@ -37,7 +35,6 @@ $(eval $(call gb_Module_add_l10n_targets,sw,\
UIConfig_swreport \
UIConfig_swriter \
UIConfig_swxform \
-   UIConfig_qa \
 ))
 
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
diff --git a/sw/UIConfig_qa.mk b/sw/UIConfig_qa.mk
deleted file mode 100644
index 13e19e3..000
--- a/sw/UIConfig_qa.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UIConfig_UIConfig,qa/sw))
-
-$(eval $(call gb_UIConfig_add_uifiles,qa/sw,\
-   sw/qa/tiledrendering/tiledrendering \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx 
b/sw/qa/tiledrendering/tiledrendering.cxx
deleted file mode 100644
index afe8f3d..000
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ /dev/null
@@ -1,202 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::sfx2;
-
-class TiledRenderingApp : public Application
-{
-private:
-uno::Reference xContext;
-uno::Reference xFactory;
-uno::Reference xSFactory;
-uno::Reference xDesktop;
-uno::Reference xLoader;
-uno::Reference xComponent;
-pub

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango

2015-03-24 Thread Yousuf Philips

 icon-themes/galaxy/cmd/lc_trackchangesbar.png |binary
 icon-themes/tango/cmd/lc_trackchangesbar.png  |binary
 2 files changed

New commits:
commit 9006b8b1b3ce713d87b0ab90aec43ef0b0555e88
Author: Yousuf Philips 
Date:   Tue Mar 24 10:54:52 2015 +0400

tdf#90187 icon for track changes toolbar button and sidebar

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

diff --git a/icon-themes/galaxy/cmd/lc_trackchangesbar.png 
b/icon-themes/galaxy/cmd/lc_trackchangesbar.png
new file mode 100644
index 000..1162ae8
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_trackchangesbar.png 
differ
diff --git a/icon-themes/tango/cmd/lc_trackchangesbar.png 
b/icon-themes/tango/cmd/lc_trackchangesbar.png
new file mode 100644
index 000..1162ae8
Binary files /dev/null and b/icon-themes/tango/cmd/lc_trackchangesbar.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Yousuf Philips

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

New commits:
commit 9b6b866c350f9900b3399214fcea550f282af2d0
Author: Yousuf Philips 
Date:   Tue Mar 24 11:53:24 2015 +0400

tdf#90090 reduce the size of the right page/slide pane

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

diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx 
b/sd/source/ui/dlg/PaneDockingWindow.cxx
index 9461c93..4a38a10 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -43,7 +43,7 @@ PaneDockingWindow::PaneDockingWindow(
 : TitledDockingWindow(_pBindings, pChildWindow, pParent, 
WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK)
 {
 SetTitle(rsTitle);
-SetSizePixel(LogicToPixel(Size(100,200), MAP_APPFONT));
+SetSizePixel(LogicToPixel(Size(80,200), MAP_APPFONT));
 }
 
 PaneDockingWindow::~PaneDockingWindow (void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Vasily Melenchuk

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

New commits:
commit 8418de72f592daae87a385f105519d637dfa4841
Author: Vasily Melenchuk 
Date:   Tue Mar 24 11:03:51 2015 +0300

tdf#89783: sal_uInt16 replacement by size_t

These replacements allow LO to load, save and mail merge documents having
more than 65536 text frames in total.

Change-Id: I2a302a085c33f55c6b510fd80b5278268e0cdaa4
Reviewed-on: https://gerrit.libreoffice.org/14982
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index c9a2638..f9cb786 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1110,7 +1110,7 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( 
sal_uInt16 nId )
 OSL_ENSURE( nRCId, "invalid Id" );
 
 while( nArrCnt-- )
-for( sal_uInt16 n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
+for( size_t n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
 if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
 GetPoolFmtId() )
 {
@@ -2141,7 +2141,7 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 
nId ) const
 {
 bFnd = false;
 while( nArrCnt-- && !bFnd )
-for( sal_uInt16 n = 0; !bFnd && n < 
(*pArray[nArrCnt]).GetFmtCount(); ++n )
+for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); 
++n )
 if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
 GetPoolFmtId() )
 bFnd = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Piet van Oostrum

 sw/qa/extras/ww8export/data/comment-export.odt |binary
 sw/qa/extras/ww8export/ww8export.cxx   |   65 +
 sw/source/filter/ww8/wrtw8sty.cxx  |   23 +---
 sw/source/filter/ww8/wrtww8.cxx|1 
 4 files changed, 80 insertions(+), 9 deletions(-)

New commits:
commit 5e49b9b4e99f787071a624dadd3e587ea6b041a7
Author: Piet van Oostrum 
Date:   Thu Mar 12 14:50:15 2015 +0100

tdf#89405 DOC export: fix corrupted comment order

Code for correctly exporting a Writer document with comments to a MS Word 
97-2003 .doc format.
Also includes a unit test.

Reviewed on:
https://gerrit.libreoffice.org/14841

Change-Id: I9f8f4fa466908335d98c43bd7d3e387bfe9baf6a

diff --git a/sw/qa/extras/ww8export/data/comment-export.odt 
b/sw/qa/extras/ww8export/data/comment-export.odt
new file mode 100644
index 000..66873d8
Binary files /dev/null and b/sw/qa/extras/ww8export/data/comment-export.odt 
differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 7d8a5b8..3a50b3e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -464,6 +464,71 @@ DECLARE_WW8EXPORT_TEST(testCommentedTable, 
"commented-table.doc")
 CPPUNIT_ASSERT_EQUAL(OUString("fore." SAL_NEWLINE_STRING "A1" 
SAL_NEWLINE_STRING "B1" SAL_NEWLINE_STRING "Afte"), 
xField->getAnchor()->getString());
 }
 
+DECLARE_WW8EXPORT_TEST(testCommentExport, "comment-export.odt")
+{
+struct TextPortionInfo {
+OUString sKind;
+OUString sText;
+int nAnnotationID;
+};
+
+const TextPortionInfo aTextPortions[] = {
+{OUString("Annotation"), OUString("Comment on [A...A]"), 0},
+{OUString("Text"), OUString("[A xx "), 0},
+{OUString("Annotation"), OUString("Comment on [B...B]"), 1},
+{OUString("Text"), OUString("[B x "), 0},
+{OUString("Annotation"), OUString("Comment on [C..C]"), 2},
+{OUString("Text"), OUString("[C x B]"), 0},
+{OUString("AnnotationEnd"), OUString(""), 1},
+{OUString("Text"), OUString(" x C]"), 0},
+{OUString("AnnotationEnd"), OUString(""), 2},
+{OUString("Text"), OUString(" xx A]"), 0},
+{OUString("AnnotationEnd"), OUString(""), 0},
+{OUString("Text"), OUString(" Comment on a point"), 0},
+{OUString("Annotation"), OUString("Comment on point"), 3},
+{OUString("Text"), OUString("x "), 0},
+{OUString("Annotation"), OUString("Comment on AA...BB"), 4},
+{OUString("Annotation"), OUString("Comment on AA"), 5},
+{OUString("Text"), OUString("AA"), 0},
+{OUString("AnnotationEnd"), OUString(""), 5},
+{OUString("Text"), OUString(" BB"), 0},
+{OUString("AnnotationEnd"), OUString(""), 4}
+};
+
+OUString sNames[6];
+
+const int nNumberOfTextPortions = sizeof(aTextPortions) / 
(sizeof(TextPortionInfo));
+
+uno::Reference xPara = getParagraph(1);
+
+for (int i = 0; i < nNumberOfTextPortions; ++i)
+{
+OUString sKind = aTextPortions[i].sKind;
+uno::Reference xRun(getRun(xPara, i + 1), 
uno::UNO_QUERY);
+uno::Reference xPropertySet(xRun, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sKind, getProperty(xPropertySet, 
"TextPortionType"));
+
+if (sKind == OUString("Text"))
+{
+// Check if textportion has the correct text
+CPPUNIT_ASSERT_EQUAL(aTextPortions[i].sText, xRun->getString());
+}
+else if (sKind == OUString("Annotation"))
+{
+// Check if the comment text is correct and save the name of the 
comment
+uno::Reference xComment(getProperty< 
uno::Reference >(xRun, "TextField"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(aTextPortions[i].sText, 
getProperty(xComment, "Content"));
+sNames[aTextPortions[i].nAnnotationID] = 
getProperty(xComment, "Name");
+}
+else // if (sKind == OUString("AnnotationEnd"))
+{
+// Check if the correct Annotation ends here (by Name)
+uno::Reference xBookmark(getProperty< 
uno::Reference >(xRun, "Bookmark"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sNames[aTextPortions[i].nAnnotationID], 
xBookmark->getName());
+}
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index cad77ac..3f853e5 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2289,16 +2289,20 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, 
sal_uInt8 nTTyp,
 std::vector< std::pair > aRangeStartPos; // The 
second of the pair is the original index before sorting.
 std::vector< std::pair > aRangeEndPos; // Same, 
so we can map between the indexes before/after sorting.
 std:

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

2015-03-24 Thread Caolán McNamara

 sw/source/uibase/uiview/pview.cxx |4 ++--
 sw/source/uibase/uiview/view2.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e7bb2118ac056dd9552865170e07576296c3eba0
Author: CaolÃ¡n McNamara 
Date:   Tue Mar 24 10:08:58 2015 +

a scoped enumeration cannot be redeclared as an unscoped enumeration

Change-Id: If63ae932469ebc723a54f32604c3368f3a1f2688

diff --git a/sw/source/uibase/uiview/pview.cxx 
b/sw/source/uibase/uiview/pview.cxx
index 83cc23f..40c2696 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -772,7 +772,7 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
 }
 if( pArgs )
 {
-enum SvxZoomType eType = SvxZoomType::PERCENT;
+SvxZoomType eType = SvxZoomType::PERCENT;
 sal_uInt16 nZoomFactor = USHRT_MAX;
 if(SfxItemState::SET == pArgs->GetItemState(SID_ATTR_ZOOM, 
true, &pItem))
 {
@@ -801,7 +801,7 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
 case SID_ZOOM_IN:
 case SID_ZOOM_OUT:
 {
-enum SvxZoomType eType = SvxZoomType::PERCENT;
+SvxZoomType eType = SvxZoomType::PERCENT;
 const SwViewOption* pVOpt = GetViewShell()->GetViewOptions();
 SetZoom(eType,
 lcl_GetNextZoomStep(pVOpt->GetZoom(), SID_ZOOM_IN == 
rReq.GetSlot()));
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index f79372b..fc58b26 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1728,7 +1728,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
 
 if ( pSet && SfxItemState::SET == 
pSet->GetItemState(SID_ATTR_ZOOM, true, &pItem))
 {
-enum SvxZoomType eType = static_cast(pItem)->GetType();
+SvxZoomType eType = static_cast(pItem)->GetType();
 SetZoom( eType, static_cast(pItem)->GetValue() );
 }
 bUp = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sifr

2015-03-24 Thread Yousuf Philips

 icon-themes/sifr/cmd/lc_hyperlinkdialog.png  |binary
 icon-themes/sifr/cmd/lc_insertgraphic.png|binary
 icon-themes/sifr/cmd/lc_inserthyperlink.png  |binary
 icon-themes/sifr/cmd/lc_line.png |binary
 icon-themes/sifr/cmd/lc_presentation.png |binary
 icon-themes/sifr/cmd/sc_datefield.png|binary
 icon-themes/sifr/cmd/sc_decrementindent.png  |binary
 icon-themes/sifr/cmd/sc_defaultbullet.png|binary
 icon-themes/sifr/cmd/sc_formatarea.png   |binary
 icon-themes/sifr/cmd/sc_inserttable.png  |binary
 icon-themes/sifr/cmd/sc_line.png |binary
 icon-themes/sifr/cmd/sc_presentation.png |binary
 icon-themes/sifr/cmd/sc_setborderstyle.png   |binary
 icon-themes/sifr/cmd/sc_togglemergecells.png |binary
 icon-themes/sifr/links.txt   |9 +
 15 files changed, 9 insertions(+)

New commits:
commit d5592294fafd5bf0fe1b8dce0d4e1cd6fd22a6a8
Author: Yousuf Philips 
Date:   Tue Mar 24 09:15:06 2015 +0400

tdf#75256 updating icons and adding duplicate links

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

diff --git a/icon-themes/sifr/cmd/lc_hyperlinkdialog.png 
b/icon-themes/sifr/cmd/lc_hyperlinkdialog.png
index 6113447..9e4e403 100644
Binary files a/icon-themes/sifr/cmd/lc_hyperlinkdialog.png and 
b/icon-themes/sifr/cmd/lc_hyperlinkdialog.png differ
diff --git a/icon-themes/sifr/cmd/lc_insertgraphic.png 
b/icon-themes/sifr/cmd/lc_insertgraphic.png
index 03155b1..9e05cd2 100644
Binary files a/icon-themes/sifr/cmd/lc_insertgraphic.png and 
b/icon-themes/sifr/cmd/lc_insertgraphic.png differ
diff --git a/icon-themes/sifr/cmd/lc_inserthyperlink.png 
b/icon-themes/sifr/cmd/lc_inserthyperlink.png
index 6113447..145600c 100644
Binary files a/icon-themes/sifr/cmd/lc_inserthyperlink.png and 
b/icon-themes/sifr/cmd/lc_inserthyperlink.png differ
diff --git a/icon-themes/sifr/cmd/lc_line.png b/icon-themes/sifr/cmd/lc_line.png
index a2aaf6a..3a8795a 100644
Binary files a/icon-themes/sifr/cmd/lc_line.png and 
b/icon-themes/sifr/cmd/lc_line.png differ
diff --git a/icon-themes/sifr/cmd/lc_presentation.png 
b/icon-themes/sifr/cmd/lc_presentation.png
index bbc1845..bcbbf3a 100644
Binary files a/icon-themes/sifr/cmd/lc_presentation.png and 
b/icon-themes/sifr/cmd/lc_presentation.png differ
diff --git a/icon-themes/sifr/cmd/sc_datefield.png 
b/icon-themes/sifr/cmd/sc_datefield.png
index ebe101b..32d1300 100644
Binary files a/icon-themes/sifr/cmd/sc_datefield.png and 
b/icon-themes/sifr/cmd/sc_datefield.png differ
diff --git a/icon-themes/sifr/cmd/sc_decrementindent.png 
b/icon-themes/sifr/cmd/sc_decrementindent.png
index 4de5993..b9c855d 100644
Binary files a/icon-themes/sifr/cmd/sc_decrementindent.png and 
b/icon-themes/sifr/cmd/sc_decrementindent.png differ
diff --git a/icon-themes/sifr/cmd/sc_defaultbullet.png 
b/icon-themes/sifr/cmd/sc_defaultbullet.png
index ee11d2a..e91f909 100644
Binary files a/icon-themes/sifr/cmd/sc_defaultbullet.png and 
b/icon-themes/sifr/cmd/sc_defaultbullet.png differ
diff --git a/icon-themes/sifr/cmd/sc_formatarea.png 
b/icon-themes/sifr/cmd/sc_formatarea.png
index edf74cb..d89bdaa 100644
Binary files a/icon-themes/sifr/cmd/sc_formatarea.png and 
b/icon-themes/sifr/cmd/sc_formatarea.png differ
diff --git a/icon-themes/sifr/cmd/sc_inserttable.png 
b/icon-themes/sifr/cmd/sc_inserttable.png
index 22cdaac..c6da710 100644
Binary files a/icon-themes/sifr/cmd/sc_inserttable.png and 
b/icon-themes/sifr/cmd/sc_inserttable.png differ
diff --git a/icon-themes/sifr/cmd/sc_line.png b/icon-themes/sifr/cmd/sc_line.png
index 5dd81fd..207c0b0 100644
Binary files a/icon-themes/sifr/cmd/sc_line.png and 
b/icon-themes/sifr/cmd/sc_line.png differ
diff --git a/icon-themes/sifr/cmd/sc_presentation.png 
b/icon-themes/sifr/cmd/sc_presentation.png
index 4d8fe8d..79743c9 100644
Binary files a/icon-themes/sifr/cmd/sc_presentation.png and 
b/icon-themes/sifr/cmd/sc_presentation.png differ
diff --git a/icon-themes/sifr/cmd/sc_setborderstyle.png 
b/icon-themes/sifr/cmd/sc_setborderstyle.png
index 61638f8..83d9184 100644
Binary files a/icon-themes/sifr/cmd/sc_setborderstyle.png and 
b/icon-themes/sifr/cmd/sc_setborderstyle.png differ
diff --git a/icon-themes/sifr/cmd/sc_togglemergecells.png 
b/icon-themes/sifr/cmd/sc_togglemergecells.png
index 91a0437..a79c514 100644
Binary files a/icon-themes/sifr/cmd/sc_togglemergecells.png and 
b/icon-themes/sifr/cmd/sc_togglemergecells.png differ
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 1a729b4..38161e2 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -68,3 +68,12 @@ cmd/lc_insertmath.png cmd/lc_insertobjectstarmath.png
 cmd/sc_insertmath.png cmd/sc_insertobjectstarmath.png
 cmd/lc_arrowtoolbox.png cmd/lc_linearrowend.png
 cmd/sc_arrowtoolbox.png cmd/sc_linearrowend.png
+
+# Writer - Table toolbar
+cmd/lc_tablesort.png cmd/lc_datasort.p

[Libreoffice-commits] core.git: Branch 'feature/vclref' - 2 commits - include/vcl sw/source

2015-03-24 Thread Michael Meeks

 include/vcl/outdev.hxx   |1 -
 sw/source/core/doc/DocumentDeviceManager.cxx |6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 19fe3b4a5e7f299d85244eb1e62852ca64a22fcf
Author: Michael Meeks 
Date:   Tue Mar 24 12:01:07 2015 +

correct debugging assertions.

Change-Id: I2437b4d3c532be6cbb31dccfa9e267498111c183

diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx 
b/sw/source/core/doc/DocumentDeviceManager.cxx
index 3e8f6c9..e901934 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -65,7 +65,7 @@ SfxPrinter* DocumentDeviceManager::getPrinter(/*[in]*/ bool 
bCreate ) const
 
 void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool 
bDeleteOld,/*[in]*/ bool bCallPrtDataChanged )
 {
-assert ( !pP->isDisposed() );
+assert ( !!pP && !pP->isDisposed() );
 if ( pP != mpPrt )
 {
 if ( bDeleteOld )
@@ -101,7 +101,7 @@ VirtualDevice* 
DocumentDeviceManager::getVirtualDevice(/*[in]*/ bool bCreate ) c
 else
 pRet = &CreateVirtualDevice_();
 
-assert ( !pRet->isDisposed() );
+assert ( !pRet || !pRet->isDisposed() );
 
 return pRet;
 }
@@ -138,7 +138,7 @@ OutputDevice* 
DocumentDeviceManager::getReferenceDevice(/*[in]*/ bool bCreate )
 pRet = getVirtualDevice( bCreate );
 }
 
-assert ( !pRet->isDisposed() );
+assert ( !pRet || !pRet->isDisposed() );
 
 return pRet;
 }
commit 8062fea475b33800e680e15bfe8f66d316b40077
Author: Michael Meeks 
Date:   Tue Mar 24 12:00:07 2015 +

Nothing really that wrong with acquiring a disposed reference, for now.

Emitting events acquires and passes references conservatively, and the
VCLEVENT_OBJECT_DYING event hit this hard.

Change-Id: If86991ead63b05425a237bf213583c020ba4e582

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0662dbc..47369ed 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -270,7 +270,6 @@ private:
 
 inline void acquire() const
 {
-assert(!mbDisposed);
 mnRefCnt++;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: Information about our work on Libreoffice

2015-03-24 Thread Juergen Funk Mailinglist

Hi Miklos,

I want try to fix, that.

Best
Juergen

Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Tobias Madl
Gesendet: Montag, 23. März 2015 17:55
An: Miklos Vajna
Cc: libreoffice; Jürgen Funk; Jennifer Liebel
Betreff: Re: Information about our work on Libreoffice

Hi Miklos,
atm i'm still very busy with the work at university, so for the next few days i 
will not be able to look over it. Maybe Jürgen could have a look. Otherwise i 
think you should do a bugreport, so people know about it. If i can manage to 
get some spare time, i will try to solve this issue.
Thanks for your patience and efforts
regards
Tobi

On Mon, Mar 23, 2015 at 4:40 PM, Miklos Vajna 
mailto:vmik...@collabora.co.uk>> wrote:
Hi Tobias,

On Sun, Mar 15, 2015 at 11:40:28AM +0100, Miklos Vajna 
mailto:vmik...@collabora.co.uk>> wrote:
> Thanks for the recent improvements, the current master is much better
> than what it was right after the merge. :-)
>
> With bcefd5cda926f86db16b1bcf6838431b5b0d61b5 I still see one problem,
> though:
>
> 1) Start Writer.
>
> 2) Press F11 to open the styles sidebar
>
> 3) Right-click on e.g. heading 1, and select modify -> repaint problem.
>
> Screenshot:
>
> http://people.freedesktop.org/~vmiklos/2015/heading1-repaint-problem.png

This is still a problem -- please let me know if you prefer a bugreport
instead.

Thanks,

Miklos

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

[Bug 39468] translate German comments, removing redundant ones

2015-03-24 Thread bugzilla-daemon

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

Dennis Roczek  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW
 CC||dennisroc...@gmail.com
 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp target:3.7.0   |SkillCpp target:3.7.0
   |target:4.1.0 target:4.2.0   |target:4.1.0 target:4.2.0
   |target:4.3.0 target:4.4.0   |target:4.3.0 target:4.4.0
   |target:4.4.0 target:4.5.0   |target:4.5.0

--- Comment #176 from Dennis Roczek  ---
Moreover: as long as devs still find places which need translation (e.g.
https://gerrit.libreoffice.org/#/c/14866/ ) and we have a script, this bug
doesn't need to be set to needinfo

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

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

2015-03-24 Thread Stephan Bergmann

 filter/source/msfilter/msdffimp.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bd3a84a985c726f59bbb9562cc823bcca836040d
Author: Stephan Bergmann 
Date:   Tue Mar 24 13:10:06 2015 +0100

Unitialized use of mbSkipImages (as found by UBSan)

Change-Id: I787d7b925d12eec7ac8a5a2901004e09cfab114d

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index e3c35f8..653303d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5603,7 +5603,8 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, 
const OUString& rBaseURL )
  nSvxMSDffOLEConvFlags( 0 ),
  pSecPropSet( NULL ),
  mnDefaultColor( COL_DEFAULT ),
- mbTracing( false )
+ mbTracing( false ),
+ mbSkipImages(false)
 {
 SetModel( NULL, 0 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Stephan Bergmann

 sw/qa/extras/ww8export/ww8export.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c38ad62b696082f90a3cefd098bed4ff96fcf540
Author: Stephan Bergmann 
Date:   Tue Mar 24 13:25:08 2015 +0100

loplugin:stringconstant

Change-Id: I5fd84f0ab85c94831a9064561423a4634a9ac2ab

diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 3a50b3e..2347fdc 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -508,12 +508,12 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, 
"comment-export.odt")
 uno::Reference xPropertySet(xRun, uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sKind, getProperty(xPropertySet, 
"TextPortionType"));
 
-if (sKind == OUString("Text"))
+if (sKind == "Text")
 {
 // Check if textportion has the correct text
 CPPUNIT_ASSERT_EQUAL(aTextPortions[i].sText, xRun->getString());
 }
-else if (sKind == OUString("Annotation"))
+else if (sKind == "Annotation")
 {
 // Check if the comment text is correct and save the name of the 
comment
 uno::Reference xComment(getProperty< 
uno::Reference >(xRun, "TextField"), uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39596] use the CLang++ static analyser to find bugs

2015-03-24 Thread bugzilla-daemon

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

--- Comment #24 from Maarten Hoes  ---
(In reply to danichocolate714 from comment #23)
> I am building this as
> https://wiki.documentfoundation.org/Development/Clang_Code_Analysis
> described now...
> But I am not sure what should I look for. To see if clang can find any bugs?
> Can any body give me some more hints?
> 
> And I found some tricky things while building...is that helpful to others?

Hi,


I think there are a few things one could choose to pick up (or not) here:


1.) Create the html reports
Perhaps building with clang requires updates to the code or libreoffice build
system.

2.) Update / Improve the wiki page documentation
The wiki page that describes how to create the reports may not be as accurate
or precise as one would like.

3.) Create an automated way to produce the clang reports 
Create a (shell, python, etc.) script that can then be scheduled somewhere to
automaticallly create and update the reports, and upload them somewhere on a
regular basis.

4.) Investigate the reports
Investigate the issues in the html report, and submit patches for the actual
real issues found (instead of the false positives).


Hope this helps.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - icon-themes/sifr

2015-03-24 Thread Yousuf Philips

 icon-themes/sifr/cmd/lc_hyperlinkdialog.png  |binary
 icon-themes/sifr/cmd/lc_insertgraphic.png|binary
 icon-themes/sifr/cmd/lc_inserthyperlink.png  |binary
 icon-themes/sifr/cmd/lc_line.png |binary
 icon-themes/sifr/cmd/lc_presentation.png |binary
 icon-themes/sifr/cmd/sc_datefield.png|binary
 icon-themes/sifr/cmd/sc_decrementindent.png  |binary
 icon-themes/sifr/cmd/sc_defaultbullet.png|binary
 icon-themes/sifr/cmd/sc_formatarea.png   |binary
 icon-themes/sifr/cmd/sc_inserttable.png  |binary
 icon-themes/sifr/cmd/sc_line.png |binary
 icon-themes/sifr/cmd/sc_presentation.png |binary
 icon-themes/sifr/cmd/sc_setborderstyle.png   |binary
 icon-themes/sifr/cmd/sc_togglemergecells.png |binary
 icon-themes/sifr/links.txt   |3 +++
 15 files changed, 3 insertions(+)

New commits:
commit db8000919e91492feaf234deb5ec8fc7cbe64458
Author: Yousuf Philips 
Date:   Tue Mar 24 15:27:47 2015 +0400

tdf#75256 updating icons and adding duplicate links

Change-Id: Id879f254a0be527897ef763621d2f23467ea1f72
Reviewed-on: https://gerrit.libreoffice.org/14984
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/sifr/cmd/lc_hyperlinkdialog.png 
b/icon-themes/sifr/cmd/lc_hyperlinkdialog.png
index 6113447..9e4e403 100644
Binary files a/icon-themes/sifr/cmd/lc_hyperlinkdialog.png and 
b/icon-themes/sifr/cmd/lc_hyperlinkdialog.png differ
diff --git a/icon-themes/sifr/cmd/lc_insertgraphic.png 
b/icon-themes/sifr/cmd/lc_insertgraphic.png
index a751fe3..9e05cd2 100644
Binary files a/icon-themes/sifr/cmd/lc_insertgraphic.png and 
b/icon-themes/sifr/cmd/lc_insertgraphic.png differ
diff --git a/icon-themes/sifr/cmd/lc_inserthyperlink.png 
b/icon-themes/sifr/cmd/lc_inserthyperlink.png
index 6113447..145600c 100644
Binary files a/icon-themes/sifr/cmd/lc_inserthyperlink.png and 
b/icon-themes/sifr/cmd/lc_inserthyperlink.png differ
diff --git a/icon-themes/sifr/cmd/lc_line.png b/icon-themes/sifr/cmd/lc_line.png
index a2aaf6a..3a8795a 100644
Binary files a/icon-themes/sifr/cmd/lc_line.png and 
b/icon-themes/sifr/cmd/lc_line.png differ
diff --git a/icon-themes/sifr/cmd/lc_presentation.png 
b/icon-themes/sifr/cmd/lc_presentation.png
index ec75b59..bcbbf3a 100644
Binary files a/icon-themes/sifr/cmd/lc_presentation.png and 
b/icon-themes/sifr/cmd/lc_presentation.png differ
diff --git a/icon-themes/sifr/cmd/sc_datefield.png 
b/icon-themes/sifr/cmd/sc_datefield.png
index ebe101b..32d1300 100644
Binary files a/icon-themes/sifr/cmd/sc_datefield.png and 
b/icon-themes/sifr/cmd/sc_datefield.png differ
diff --git a/icon-themes/sifr/cmd/sc_decrementindent.png 
b/icon-themes/sifr/cmd/sc_decrementindent.png
index e9d9cb7..b9c855d 100644
Binary files a/icon-themes/sifr/cmd/sc_decrementindent.png and 
b/icon-themes/sifr/cmd/sc_decrementindent.png differ
diff --git a/icon-themes/sifr/cmd/sc_defaultbullet.png 
b/icon-themes/sifr/cmd/sc_defaultbullet.png
index 9c91222..e91f909 100644
Binary files a/icon-themes/sifr/cmd/sc_defaultbullet.png and 
b/icon-themes/sifr/cmd/sc_defaultbullet.png differ
diff --git a/icon-themes/sifr/cmd/sc_formatarea.png 
b/icon-themes/sifr/cmd/sc_formatarea.png
index edf74cb..d89bdaa 100644
Binary files a/icon-themes/sifr/cmd/sc_formatarea.png and 
b/icon-themes/sifr/cmd/sc_formatarea.png differ
diff --git a/icon-themes/sifr/cmd/sc_inserttable.png 
b/icon-themes/sifr/cmd/sc_inserttable.png
index 4a6e781..c6da710 100644
Binary files a/icon-themes/sifr/cmd/sc_inserttable.png and 
b/icon-themes/sifr/cmd/sc_inserttable.png differ
diff --git a/icon-themes/sifr/cmd/sc_line.png b/icon-themes/sifr/cmd/sc_line.png
index 5dd81fd..207c0b0 100644
Binary files a/icon-themes/sifr/cmd/sc_line.png and 
b/icon-themes/sifr/cmd/sc_line.png differ
diff --git a/icon-themes/sifr/cmd/sc_presentation.png 
b/icon-themes/sifr/cmd/sc_presentation.png
index 4d8fe8d..79743c9 100644
Binary files a/icon-themes/sifr/cmd/sc_presentation.png and 
b/icon-themes/sifr/cmd/sc_presentation.png differ
diff --git a/icon-themes/sifr/cmd/sc_setborderstyle.png 
b/icon-themes/sifr/cmd/sc_setborderstyle.png
index 61638f8..83d9184 100644
Binary files a/icon-themes/sifr/cmd/sc_setborderstyle.png and 
b/icon-themes/sifr/cmd/sc_setborderstyle.png differ
diff --git a/icon-themes/sifr/cmd/sc_togglemergecells.png 
b/icon-themes/sifr/cmd/sc_togglemergecells.png
index d59cc5f..a79c514 100644
Binary files a/icon-themes/sifr/cmd/sc_togglemergecells.png and 
b/icon-themes/sifr/cmd/sc_togglemergecells.png differ
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 172a9bb..a843cd8 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -61,3 +61,6 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png
 # image icon duplicates
 cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
 
+# Writer - Table toolbar
+cmd/lc_tablesort.png cmd/lc_datasort.png
+cmd/sc_tablesort.png cmd/sc_datasort.png
_

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

2015-03-24 Thread Julien Nabet

 sc/source/ui/docshell/docsh4.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 38c22ed2b8b8f3530b8a0fe5a23a329e8e511c76
Author: Julien Nabet 
Date:   Mon Feb 16 23:53:55 2015 +0100

Resolves tdf#72152: respect page orientation of Calc files in recent docs

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

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 4f9f8f1..35f1696 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -109,9 +109,6 @@ using namespace ::com::sun::star;
 static_cast((set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \
 Get(ATTR_PAGE_SHARED)).GetValue()
 
-#define SC_PREVIEW_SIZE_X   1
-#define SC_PREVIEW_SIZE_Y   12400
-
 void ScDocShell::Execute( SfxRequest& rReq )
 {
 //  SID_SC_RANGE (Range),
@@ -1900,7 +1897,16 @@ Rectangle ScDocShell::GetVisArea( sal_uInt16 nAspect ) 
const
 
 if( nAspect == ASPECT_THUMBNAIL )
 {
-Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X,SC_PREVIEW_SIZE_Y );
+Size aSize = aDocument.GetPageSize(aDocument.GetVisibleTab());
+const long SC_PREVIEW_SIZE_X = 1;
+const long SC_PREVIEW_SIZE_Y = 12400;
+Rectangle aArea( 0,0, SC_PREVIEW_SIZE_X, SC_PREVIEW_SIZE_Y);
+if (aSize.Width() > aSize.Height())
+{
+aArea.Right() = SC_PREVIEW_SIZE_Y;
+aArea.Bottom() = SC_PREVIEW_SIZE_X;
+}
+
 bool bNegativePage = aDocument.IsNegativePage( 
aDocument.GetVisibleTab() );
 if ( bNegativePage )
 ScDrawLayer::MirrorRectRTL( aArea );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-03-24 Thread bugzilla-daemon

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

Jean-Baptiste Faure  changed:

   What|Removed |Added

 Depends on||88941

--- Comment #51 from Jean-Baptiste Faure  ---
I nominate bug 88941 which breaks PDF export on MacOS-X.

Best regards. JBF

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

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - editeng/source sc/source

2015-03-24 Thread Jan Holesovsky

 editeng/source/editeng/editview.cxx |1 -
 sc/source/ui/app/inputhdl.cxx   |   13 +
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 11bd217d414c03db5befd8b4bb2b21489072e30a
Author: Jan Holesovsky 
Date:   Tue Mar 24 14:29:33 2015 +0100

sc tiled editing: Setup the Calc's editeng for tiled editing.

Change-Id: Ice6d9b66e72f6f88762a8c930b8b77dee7f64b40

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index e9ec245..f763a0c 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -388,7 +388,6 @@ void EditView::Command( const CommandEvent& rCEvt )
 
 void EditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
 {
-
 if ( pImpEditView->pEditEngine->HasView( this ) )
 {
 // The control word is more important:
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 74c6222..3ba9095 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1731,6 +1731,19 @@ void ScInputHandler::UpdateActiveView()
 else
 pTableView = NULL;
 
+// setup the pTableView editeng for tiled rendering to get cursor and 
selections
+if (pActiveViewSh && pTableView)
+{
+ScDocShell* pDocShell = pActiveViewSh->GetViewData().GetDocShell();
+ScDocument& rDoc = pDocShell->GetDocument();
+if (rDoc.GetDrawLayer()->isTiledRendering())
+{
+ScDrawLayer *pDrawLayer = pDocShell->GetDocument().GetDrawLayer();
+
pTableView->registerLibreOfficeKitCallback(pDrawLayer->getLibreOfficeKitCallback(),
 pDrawLayer->getLibreOfficeKitData());
+pTableView->setTiledRendering(true);
+}
+}
+
 if (pInputWin && eMode == SC_INPUT_TOP )
 pTopView = pInputWin->GetEditView();
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/Bootstrap android/experimental include/touch sw/inc sw/source vcl/android vcl/inc vcl/ios vcl/source

2015-03-24 Thread Tor Lillqvist

 android/Bootstrap/Makefile.shared   |4 
 android/experimental/LOAndroid3/dummies.cxx |   75 
 android/experimental/desktop/dummies.cxx|   74 
 include/touch/touch-impl.h  |   37 
 include/touch/touch.h   |  245 
 sw/inc/pch/precompiled_sw.hxx   |1 
 sw/source/core/crsr/crsrsh.cxx  |4 
 sw/source/core/crsr/viscrs.cxx  |   11 -
 sw/source/core/view/viewsh.cxx  |   52 -
 sw/source/uibase/docvw/edtwin.cxx   |   82 -
 vcl/android/androidinst.cxx |   17 -
 vcl/inc/ios/iosinst.hxx |   15 -
 vcl/ios/iosinst.cxx |  211 
 vcl/source/window/dialog.cxx|4 
 14 files changed, 2 insertions(+), 830 deletions(-)

New commits:
commit 4cc1bcbaedd483482240f0ffbf42e56dd6052612
Author: Tor Lillqvist 
Date:   Tue Mar 24 11:28:21 2015 +0200

Kill dead  API

Has all been obsoleted by LibreOfficeKit.

Only some MOBILE_* constant #defines are now left in touch.h, but probably
those are used only by dead code.

Change-Id: I646945c4408b4e6cd5510da535cfc12088dd391c

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 5020773..93298e9 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -98,9 +98,9 @@ WHOLELIBS = \
   -Wl,--no-whole-archive
 
 
-$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx 
$(ALL_STATIC_LIBS)
+$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
mkdir -p $(OBJLOCAL)
-   $(CXX) -Wl,--gc-sections 
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o 
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include 
native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) 
$(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz
+   $(CXX) -Wl,--gc-sections 
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o 
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include 
native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) 
-lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
diff --git a/android/experimental/LOAndroid3/dummies.cxx 
b/android/experimental/LOAndroid3/dummies.cxx
deleted file mode 100644
index 5607ecf..000
--- a/android/experimental/LOAndroid3/dummies.cxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-// Dummy implementations of the callback functions in the UI layer
-// that the LO layer calls. As this experimental Android app doesn't
-// handle any of that, these do nothing.
-
-#include 
-
-#include 
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-touch_ui_selection_start(MLOSelectionKind kind,
- const void *documentHandle,
- MLORect *rectangles,
- int rectangleCount,
- void *preview)
-{
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-touch_ui_selection_resize_done(bool success,
-   const void *documentHandle,
-   MLORect *rectangles,
-   int rectangleCount)
-{
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-void
-touch_ui_selection_none()
-{
-}
-
-
-static const char *
-dialog_kind_to_string(MLODialogKind kind)
-{
-switch (kind) {
-case MLODialogMessage:
-return "MSG";
-case MLODialogInformation:
-return "INF";
-case MLODialogWarning:
-return "WRN";
-case MLODialogError:
-return "ERR";
-case MLODialogQuery:
-return "QRY";
-default:
-return "WTF";
-}
-}
-
-extern "C"
-__attribute__ ((visibility("default")))
-MLODialogResult
-touch_ui_dialog_modal(MLODialogKind kind, const char *message)
-{
-__android_log_print(ANDROID_LOG_INFO, "===>  %s: %s", 
dialog_kind_to_string(kind), message);
-return MLODialogOK;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/experimental/desktop/dummies.cxx 
b/android/experimental/desktop/dummies.cxx
deleted file mode 100644
index f89009a..000
--- a/android/experimental/desktop/dummies.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++;

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-03-24 Thread bugzilla-daemon

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

Tomislav Nakic-Alfirevic  changed:

   What|Removed |Added

 CC||na...@gmx.com

--- Comment #55 from Tomislav Nakic-Alfirevic  ---
+1 for crop using mouse. Contrary to other's comment's, crop dialogue doesn't
seem to work at all (simply resizes the image along one axis, instead of
cropping as understood by e.g. Gimp). Using LO 4.2.7.2 on Ubuntu 14.04.

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

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

2015-03-24 Thread Stephan Bergmann

 vcl/unx/generic/plugadapt/salplug.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32d6e8fc22c1db14f17bb7b030ba26327752b300
Author: Stephan Bergmann 
Date:   Tue Mar 24 14:37:27 2015 +0100

Ensure RTTI symbol visibility for Linux Clang -fsanitize=function,vptr

use RTLD_GLOBAL, similar to 62b124b2704adf11a63681164d05a8eb49dfb105 "Ensure
RTTI symbol visibility for Linux Clang -fsanitize=function,vptr"

Change-Id: I8b3e8681b5ec07fa67f035651c1a99652a56b7f9

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 038951b..d49dccd 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -84,7 +84,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, 
bool bForce = fals
 
 oslModule aMod = osl_loadModuleRelative(
 reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
-SAL_LOADMODULE_DEFAULT );
+SAL_LOADMODULE_GLOBAL );
 if( aMod )
 {
 salFactoryProc aProc = 
reinterpret_cast(osl_getAsciiFunctionSymbol( aMod, 
"create_SalInstance" ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

2015-03-24 Thread rajat vijay

Dear MARKUS,
Sir,
Just for once let me know the format of the proposal to be submitted for
GSoC 2015 for the topic
"AUTOMATED ERROR CHECKING IN CALC"
And just give a look at my ideas and my proposal for the same.
Then decide whether or not to allot me this project.
And then I promise to give my 100% to complete this project with the
accuracy desired by you, as I will not be having any of my academic work
from MAY mid when the coding period starts !!!

Anticipating your reply
Yours sincerely

On Mon, Mar 23, 2015 at 9:53 PM, rajat vijay  wrote:

> Dear MARKUS,
> Sir, while I am working on the easy hack of libre office --
> I would like to discuss with you about my idea regarding the "AUTOMATED
> ERROR CHECKING IN CALC" as the deadline for registrations are nearer -
> I would like to add the the automated error checking by
> ADDING DIFFERENT CURRENCIES BY AUTOMATICALLY CONVERTING THEM USING CURRENT
> CONVERSION RATES THROUGH INTERNET AND IF OFFLINE, THE USER HAS AN OPTION TO
> ADD MANUAL CONVERSION RATES OR TO USE THE PREVIOUS ONE
> --your feedback for the idea is expected !
>
> Sir, I am sending this mail as the deadline is getting nearer and also am
> having my university exams.
> Your help will be appreciated.
>
> Thanks in advance !
>
> RAJAT VIJAY
> INDIA
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sc/inc sc/source

2015-03-24 Thread Jan Holesovsky

 sc/inc/docuno.hxx  |3 +++
 sc/source/ui/unoobj/docuno.cxx |   34 ++
 2 files changed, 37 insertions(+)

New commits:
commit 0811fc2ff9a06f4289937ce0af1072467e2f2aa3
Author: Jan Holesovsky 
Date:   Tue Mar 24 15:15:26 2015 +0100

sc tiled editing: Implement moving of the selection handles.

Change-Id: I724f1693a03194426dfe233c1be08f1fbec1242d

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 4e86b83..a2af3b4 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -394,6 +394,9 @@ public:
 /// @see vcl::ITiledRenderable::postMouseEvent().
 virtual void postMouseEvent(int nType, int nX, int nY, int nCount) 
SAL_OVERRIDE;
 
+/// @see vcl::ITiledRenderable::setTextSelection().
+virtual void setTextSelection(int nType, int nX, int nY) SAL_OVERRIDE;
+
 /// @see vcl::ITiledRenderable::initializeForTiledRendering().
 virtual void initializeForTiledRendering() SAL_OVERRIDE;
 };
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 44e47b0..c1c3e4e 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include "scitems.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -81,6 +82,7 @@
 #include "formulagroup.hxx"
 #include "gridwin.hxx"
 #include "hints.hxx"
+#include 
 #include 
 #include "interpre.hxx"
 #include "linkuno.hxx"
@@ -555,6 +557,38 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, 
int nCount)
 }
 }
 
+void ScModelObj::setTextSelection(int nType, int nX, int nY)
+{
+SolarMutexGuard aGuard;
+
+ScViewData* pViewData = ScDocShell::GetViewData();
+ScInputHandler* pInputHandler = 
SC_MOD()->GetInputHdl(pViewData->GetViewShell());
+
+if (!pInputHandler)
+return;
+
+EditView* pTableView = pInputHandler->GetTableView();
+if (!pTableView)
+return;
+
+Point aPoint(convertTwipToMm100(nX), convertTwipToMm100(nY));
+switch (nType)
+{
+case LOK_SETTEXTSELECTION_START:
+pTableView->SetCursorLogicPosition(aPoint, /*bPoint=*/false, 
/*bClearMark=*/false);
+break;
+case LOK_SETTEXTSELECTION_END:
+pTableView->SetCursorLogicPosition(aPoint, /*bPoint=*/true, 
/*bClearMark=*/false);
+break;
+case LOK_SETTEXTSELECTION_RESET:
+pTableView->SetCursorLogicPosition(aPoint, /*bPoint=*/true, 
/*bClearMark=*/true);
+break;
+default:
+assert(false);
+break;
+}
+}
+
 void ScModelObj::initializeForTiledRendering()
 {
 SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

2015-03-24 Thread Eike Rathke

Hi rajat,

On Monday, 2015-03-23 21:53:08 +0530, rajat vijay wrote:

> I would like to discuss with you about my idea regarding the "AUTOMATED
> ERROR CHECKING IN CALC" as the deadline for registrations are nearer -
> I would like to add the the automated error checking by
> ADDING DIFFERENT CURRENCIES BY AUTOMATICALLY CONVERTING THEM USING CURRENT
> CONVERSION RATES THROUGH INTERNET AND IF OFFLINE, THE USER HAS AN OPTION TO
> ADD MANUAL CONVERSION RATES OR TO USE THE PREVIOUS ONE

I doubt that such a currency conversion would be related to "automated
error checking". The idea of the extended error-checking is that mixing
currencies (or other unrelated/non-convertible units) of different types
is not allowed, not automatic conversion.

Note also that Calc has a CONVERT() function (unfortunately named
identical but different to the Excel CONVERT() function, which currently
is available as CONVERT_ADD()) that obtains it's conversion factors from
configuration values.

Your idea seems more suitable for an independent extension that obtains
values from somewhere in the net and saves them to the conversion
configuration or provides some currency conversion Add-In function(s),
instead of wiring it into the core code.

  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

pgpw4Csm4rQkw.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-03-24 Thread Bjoern Michaelsen

 sw/inc/calbck.hxx   |   92 
 sw/source/core/attr/calbck.cxx  |   83 +
 sw/source/core/attr/format.cxx  |   18 ++--
 sw/source/core/crsr/crstrvl.cxx |2 
 sw/source/core/doc/DocumentFieldsManager.cxx|6 -
 sw/source/core/doc/DocumentStylePoolManager.cxx |6 -
 sw/source/core/doc/doc.cxx  |2 
 sw/source/core/doc/docfmt.cxx   |   10 +-
 sw/source/core/doc/doctxm.cxx   |8 +-
 sw/source/core/docnode/ndtbl.cxx|   10 +-
 sw/source/core/docnode/node.cxx |8 +-
 sw/source/core/docnode/nodes.cxx|2 
 sw/source/core/docnode/section.cxx  |   10 +-
 sw/source/core/edit/edfld.cxx   |2 
 sw/source/core/fields/ddefld.cxx|2 
 sw/source/core/fields/docufld.cxx   |2 
 sw/source/core/fields/expfld.cxx|6 -
 sw/source/core/fields/reffld.cxx|4 -
 sw/source/core/fields/tblcalc.cxx   |2 
 sw/source/core/frmedt/fecopy.cxx|4 -
 sw/source/core/graphic/ndgrf.cxx|2 
 sw/source/core/layout/atrfrm.cxx|2 
 sw/source/core/layout/tabfrm.cxx|4 -
 sw/source/core/para/paratr.cxx  |2 
 sw/source/core/table/swtable.cxx|   10 +-
 sw/source/core/txtnode/ndtxt.cxx|   12 +--
 sw/source/core/txtnode/thints.cxx   |4 -
 sw/source/core/undo/untbl.cxx   |4 -
 sw/source/core/unocore/unochart.cxx |2 
 sw/source/core/view/viewsh.cxx  |2 
 sw/source/filter/basflt/shellio.cxx |2 
 sw/source/ui/fldui/fldref.cxx   |2 
 sw/source/uibase/app/docstyle.cxx   |2 
 sw/source/uibase/config/uinums.cxx  |2 
 sw/source/uibase/uno/unotxdoc.cxx   |6 -
 35 files changed, 165 insertions(+), 172 deletions(-)

New commits:
commit 1c52db40236ae264d41530ed1fba47f9b44e6a77
Author: Bjoern Michaelsen 
Date:   Tue Mar 24 15:27:10 2015 +0100

assert hard on misguided removal

Change-Id: I2b72a76336f7c8b4af4ac06467c416f35400d90e

diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index c0bb422..d958bd6 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -184,45 +184,38 @@ void SwModify::Add( SwClient* pDepend )
 
 SwClient* SwModify::Remove( SwClient* pDepend )
 {
-if ( m_bInDocDTOR )
+if(m_bInDocDTOR)
 return nullptr;
 
-if( pDepend->pRegisteredIn == this )
-{
-// SwClient is my listener
-// remove it from my list
-::sw::WriterListener* pR = pDepend->m_pRight;
-::sw::WriterListener* pL = pDepend->m_pLeft;
-if( m_pWriterListeners == pDepend )
-m_pWriterListeners = pL ? pL : pR;
+assert(pDepend->pRegisteredIn == this);
 
-if( pL )
-pL->m_pRight = pR;
-if( pR )
-pR->m_pLeft = pL;
+// SwClient is my listener
+// remove it from my list
+::sw::WriterListener* pR = pDepend->m_pRight;
+::sw::WriterListener* pL = pDepend->m_pLeft;
+if( m_pWriterListeners == pDepend )
+m_pWriterListeners = pL ? pL : pR;
 
-// update ClientIterators
-if(sw::ClientIteratorBase::our_pClientIters)
+if( pL )
+pL->m_pRight = pR;
+if( pR )
+pR->m_pLeft = pL;
+
+// update ClientIterators
+if(sw::ClientIteratorBase::our_pClientIters)
+{
+for(auto& rIter : 
sw::ClientIteratorBase::our_pClientIters->GetRingContainer())
 {
-for(auto& rIter : 
sw::ClientIteratorBase::our_pClientIters->GetRingContainer())
+if( rIter.m_pCurrent == pDepend || rIter.m_pPosition == pDepend )
 {
-if( rIter.m_pCurrent == pDepend || rIter.m_pPosition == 
pDepend )
-{
-// if object being removed is the current or next object 
in an
-// iterator, advance this iterator
-rIter.m_pPosition = static_cast(pR);
-}
+// if object being removed is the current or next object in an
+// iterator, advance this iterator
+rIter.m_pPosition = static_cast(pR);
 }
 }
-pDepend->m_pLeft = nullptr;
-pDepend->m_pRight = nullptr;
 }
-else
-{
-OSL_FAIL( "SwModify::Remove(): could not find pDepend" );
-}
-
-// disconnect client from me
+pDepend->m_pLeft = nullptr;
+pDepend->m_pRight = nullptr;
 pDepend->pRegisteredIn = nullptr;
 return pDepend;
 }
commit be3dc27fbfd5c27590ef136e2d37a2dcbf2f660b
Author: Bjoern Michaelsen 
Date:   Tue Mar 24 15:25:52 2015 +0100

update docs

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

2015-03-24 Thread Markus Mohrhard

 include/xmloff/xmltoken.hxx   |2 ++
 sc/inc/colorscale.hxx |   14 ++
 sc/source/core/data/colorscale.cxx|8 +---
 sc/source/filter/excel/xecontent.cxx  |6 +-
 sc/source/filter/oox/condformatbuffer.cxx |2 ++
 sc/source/filter/xml/xmlcondformat.cxx|   22 ++
 sc/source/filter/xml/xmlexprt.cxx |6 ++
 sc/source/filter/xml/xmlimprt.cxx |2 ++
 sc/source/filter/xml/xmlimprt.hxx |4 +++-
 xmloff/source/core/xmltoken.cxx   |2 ++
 10 files changed, 63 insertions(+), 5 deletions(-)

New commits:
commit 849c1b64de19ef42cbd8cd392b036b9f914f2522
Author: Markus Mohrhard 
Date:   Tue Mar 24 15:58:33 2015 +0100

also import and export to ODF the new databar property

Change-Id: Ib29a0d5c9fefe15fbd0f08a5cf9600eff58cd030

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index d1d39a7..2527a8f 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1176,6 +1176,7 @@ namespace xmloff { namespace token {
 XML_MAX,
 XML_MAX_EDGE,
 XML_MAX_HEIGHT,
+XML_MAX_LENGTH,
 XML_MAX_WIDTH,
 XML_MAXIMUM,
 XML_MAXIMUM_DIFFERENCE,
@@ -1205,6 +1206,7 @@ namespace xmloff { namespace token {
 XML_MIN_INTEGER_DIGITS,
 XML_MIN_LABEL_DISTANCE,
 XML_MIN_LABEL_WIDTH,
+XML_MIN_LENGTH,
 XML_MIN_LINE_HEIGHT,
 XML_MIN_NUMERATOR_DIGITS,
 XML_MIN_ROW_HEIGHT,
diff --git a/sc/source/filter/xml/xmlcondformat.cxx 
b/sc/source/filter/xml/xmlcondformat.cxx
index 911f5c0..4f067cb 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -180,6 +180,8 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( 
ScXMLImport& rImport, sal_
 OUString sAxisPosition;
 OUString sShowValue;
 OUString sAxisColor;
+OUString sMinLength;
+OUString sMaxLength;
 
 sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
 const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDataBarAttrMap();
@@ -211,6 +213,12 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( 
ScXMLImport& rImport, sal_
 case XML_TOK_DATABAR_AXISCOLOR:
 sAxisColor = sValue;
 break;
+case XML_TOK_DATABAR_MINLENGTH:
+sMinLength = sValue;
+break;
+case XML_TOK_DATABAR_MAXLENGTH:
+sMaxLength = sValue;
+break;
 default:
 break;
 }
@@ -265,6 +273,20 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( 
ScXMLImport& rImport, sal_
 mpFormatData->mbOnlyBar = !bShowValue;
 }
 
+if (!sMinLength.isEmpty())
+{
+double nVal = sMinLength.toDouble();
+mpFormatData->mnMinLength = nVal;
+}
+
+if (!sMaxLength.isEmpty())
+{
+double nVal = sMaxLength.toDouble();
+if (nVal == 0.0)
+nVal = 100.0;
+mpFormatData->mnMaxLength = nVal;
+}
+
 pFormat->AddEntry(mpDataBarFormat);
 }
 
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index e6d7e3d..e1087dd 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4454,6 +4454,12 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
 if(pFormatData->mbOnlyBar)
 AddAttribute(XML_NAMESPACE_CALC_EXT, 
XML_SHOW_VALUE, XML_FALSE);
 
+if (pFormatData->mnMinLength != 0.0)
+AddAttribute(XML_NAMESPACE_CALC_EXT, 
XML_MIN_LENGTH, OUString::number(pFormatData->mnMinLength));
+
+if (pFormatData->mnMaxLength != 0.0)
+AddAttribute(XML_NAMESPACE_CALC_EXT, 
XML_MAX_LENGTH, OUString::number(pFormatData->mnMaxLength));
+
 if(pFormatData->mbNeg)
 {
 if(pFormatData->mpNegativeColor)
diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 8930c36..25dd3db 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -720,6 +720,8 @@ const SvXMLTokenMap& ScXMLImport::GetDataBarAttrMap()
 { XML_NAMESPACE_CALC_EXT, XML_AXIS_POSITION, 
XML_TOK_DATABAR_AXISPOSITION },
 { XML_NAMESPACE_CALC_EXT, XML_SHOW_VALUE, 
XML_TOK_DATABAR_SHOWVALUE },
 { XML_NAMESPACE_CALC_EXT, XML_AXIS_COLOR, 
XML_TOK_DATABAR_AXISCOLOR },
+{ XML_NAMESPACE_CALC_EXT, XML_MIN_LENGTH, 
XML_TOK_DATABAR_MINLENGTH },
+{ XML_NAMESPACE_CALC_EXT, XML_MAX_LENGTH, 
XML_TOK_DATABAR_MAXLENGTH },
 XML_TOKEN_MAP_END
 };
 
diff --git a/sc/source/filter/xml/xmlimprt.hxx 
b/sc/source/filter/xml/xmlimprt.hxx
index 09adfac..479bedf 100644
--- a/sc/source/filter/xml/xmlimprt

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

2015-03-24 Thread PriyankaGaikwad

 oox/source/export/drawingml.cxx   |   12 
 sd/qa/unit/data/pptx/bulletColor.pptx |binary
 sd/qa/unit/export-tests.cxx   |   28 
 3 files changed, 40 insertions(+)

New commits:
commit 8707670cb39f5777cd54f8b180ec342416ef259f
Author: PriyankaGaikwad 
Date:   Mon Mar 23 18:14:28 2015 +0530

tdf#90174 FILESAVE: export of bullet color for pptx

Added pptx export support for bullet color.

Change-Id: I69306c8b3ace359f8dc243b83f89cfb570b9b73b
Reviewed-on: https://gerrit.libreoffice.org/14966
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0c732fd..1fe13cd 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1610,6 +1610,7 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 bool bHasFontDesc = false;
 OUString aGraphicURL;
 sal_Int16 nBulletRelSize = 0;
+sal_Int32 nBulletColor;
 
 for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
 {
@@ -1634,6 +1635,10 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 else if( *(OUString*)pValue == ")")
 bPBehind = true;
 }
+else if(aPropName == "BulletColor")
+{
+nBulletColor = *( (sal_Int32*)pValue );
+}
 else if ( aPropName == "BulletChar" )
 {
 aBulletChar = OUString ( *( (OUString*)pValue ) )[ 0 ];
@@ -1688,6 +1693,13 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 }
 else
 {
+if(nBulletColor)
+{
+   mpFS->startElementNS( XML_a, XML_buClr, FSEND );
+   WriteColor( nBulletColor );
+   mpFS->endElementNS( XML_a, XML_buClr );
+}
+
 if( nBulletRelSize && nBulletRelSize != 100 )
 mpFS->singleElementNS( XML_a, XML_buSzPct,
XML_val, IS( std::max( (sal_Int32)25000, 
std::min( (sal_Int32)40, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND );
diff --git a/sd/qa/unit/data/pptx/bulletColor.pptx 
b/sd/qa/unit/data/pptx/bulletColor.pptx
new file mode 100644
index 000..61bb834
Binary files /dev/null and b/sd/qa/unit/data/pptx/bulletColor.pptx differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index d6645dd..9386159 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -84,6 +84,7 @@ public:
 void testLinkedGraphicRT();
 void testImageWithSpecialID();
 void testTableCellFillProperties();
+void testBulletColor();
 #if !defined WNT
 void testBnc822341();
 #endif
@@ -107,6 +108,7 @@ public:
 CPPUNIT_TEST(testLinkedGraphicRT);
 CPPUNIT_TEST(testImageWithSpecialID);
 CPPUNIT_TEST(testTableCellFillProperties);
+CPPUNIT_TEST(testBulletColor);
 #if !defined WNT
 CPPUNIT_TEST(testBnc822341);
 #endif
@@ -820,6 +822,32 @@ void SdExportTest::testBnc822341()
 
 #endif
 
+void SdExportTest::testBulletColor()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/bulletColor.pptx"), PPTX );
+
+xDocShRef = saveAndReload( xDocShRef, PPTX );
+
+uno::Reference< drawing::XDrawPagesSupplier > xDoc(
+xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference< drawing::XDrawPage > xPage(
+xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW );
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+
+const SdrPage *pPage = pDoc->GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+
+SdrTextObj *pTxtObj = dynamic_cast( pPage->GetObj(0) );
+CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL);
+
+const EditTextObject& aEdit = 
pTxtObj->GetOutlinerParaObject()->GetTextObject();
+const SvxNumBulletItem *pNumFmt = dynamic_cast(aEdit.GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET));
+CPPUNIT_ASSERT(pNumFmt);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's color is wrong!", 
sal_uInt32(0xff),pNumFmt->GetNumRule()->GetLevel(0).GetBulletColor().GetColor());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Stephan Bergmann

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

New commits:
commit d0b43fd581f32b648c94bf6706c1374631297178
Author: Stephan Bergmann 
Date:   Tue Mar 24 16:48:18 2015 +0100

Properly map from empty aBoundRange to empty rRect

Change-Id: Ic8cf3a71d168f4679347ac493c08fef1daf4ce84

diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index bdb1ecb..27b74c0 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -141,9 +141,16 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
 {
 // #i95646# is this used..?
 const basegfx::B2DRange 
aBoundRange(mpCurrentSdrDragMethod->getCurrentRange());
-rRect = Rectangle(
-basegfx::fround(aBoundRange.getMinX()), 
basegfx::fround(aBoundRange.getMinY()),
-basegfx::fround(aBoundRange.getMaxX()), 
basegfx::fround(aBoundRange.getMaxY()));
+if (aBoundRange.isEmpty())
+{
+rRect.SetEmpty();
+}
+else
+{
+rRect = Rectangle(
+basegfx::fround(aBoundRange.getMinX()), 
basegfx::fround(aBoundRange.getMinY()),
+basegfx::fround(aBoundRange.getMaxX()), 
basegfx::fround(aBoundRange.getMaxY()));
+}
 }
 }
 if (rRect.IsEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 5 commits - sd/source svx/source

2015-03-24 Thread Miklos Vajna

 sd/source/ui/func/fusel.cxx  |7 +++
 sd/source/ui/inc/ViewShell.hxx   |2 ++
 sd/source/ui/inc/fupoor.hxx  |2 ++
 sd/source/ui/inc/unomodel.hxx|2 ++
 sd/source/ui/unoidl/unomodel.cxx |   23 +++
 sd/source/ui/view/viewshel.cxx   |   18 ++
 svx/source/sdr/overlay/overlayobjectlist.cxx |6 +-
 svx/source/svdraw/svdmrkv.cxx|   13 +++--
 svx/source/svdraw/svdobj.cxx |1 +
 9 files changed, 67 insertions(+), 7 deletions(-)

New commits:
commit e9ba0ac14d64a7570fcbb4804d97922157913c87
Author: Miklos Vajna 
Date:   Tue Mar 24 16:45:36 2015 +0100

SdXImpressDocument: implement setGraphicSelection()

With this, it's possible to resize an Impress shape.

Change-Id: I6d81aee71853092a02bfad414fb107b514556247

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 767a113..89bd8e6 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -449,6 +449,8 @@ public:
 void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
 /// Allows adjusting the point or mark of the selection to a document 
coordinate.
 void SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool 
bClearMark);
+/// Allows starting or ending a graphic move or resize action.
+void SetGraphicLogicPosition(bool bStart, const Point& rPosition);
 
 class Implementation;
 
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 7641e11..fe5679b 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -248,6 +248,8 @@ public:
 virtual void postMouseEvent(int nType, int nX, int nY, int nCount) 
SAL_OVERRIDE;
 /// @see vcl::ITiledRenderable::setTextSelection().
 virtual void setTextSelection(int nType, int nX, int nY) SAL_OVERRIDE;
+/// @see vcl::ITiledRenderable::setGraphicSelection().
+virtual void setGraphicSelection(int nType, int nX, int nY) SAL_OVERRIDE;
 
 // XComponent
 
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4d32ced..4305b9b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2428,6 +2428,29 @@ void SdXImpressDocument::setTextSelection(int nType, int 
nX, int nY)
 }
 }
 
+void SdXImpressDocument::setGraphicSelection(int nType, int nX, int nY)
+{
+SolarMutexGuard aGuard;
+
+DrawViewShell* pViewShell = GetViewShell();
+if (!pViewShell)
+return;
+
+Point aPoint(convertTwipToMm100(nX), convertTwipToMm100(nY));
+switch (nType)
+{
+case LOK_SETGRAPHICSELECTION_START:
+pViewShell->SetGraphicLogicPosition(/*bStart=*/true, aPoint);
+break;
+case LOK_SETGRAPHICSELECTION_END:
+pViewShell->SetGraphicLogicPosition(/*bStart=*/false, aPoint);
+break;
+default:
+assert(false);
+break;
+}
+}
+
 uno::Reference< i18n::XForbiddenCharacters > 
SdXImpressDocument::getForbiddenCharsTable()
 {
 uno::Reference< i18n::XForbiddenCharacters > xForb(mxForbidenCharacters);
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 9bbf61d..ed34e5f 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -544,6 +544,24 @@ void ViewShell::SetCursorLogicPosition(const Point& 
rPosition, bool bPoint, bool
 }
 }
 
+void ViewShell::SetGraphicLogicPosition(bool bStart, const Point& rPosition)
+{
+if (bStart)
+{
+MouseEvent aClickEvent(rPosition, 1, MouseEventModifiers::SIMPLECLICK, 
MOUSE_LEFT);
+MouseButtonDown(aClickEvent, 0);
+MouseEvent aMoveEvent(Point(rPosition.getX() + FuPoor::DRGLOG + 1, 
rPosition.getY()), 0, MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
+MouseMove(aMoveEvent, 0);
+}
+else
+{
+MouseEvent aMoveEvent(Point(rPosition.getX() - FuPoor::DRGLOG - 1, 
rPosition.getY()), 0, MouseEventModifiers::SIMPLEMOVE, MOUSE_LEFT);
+MouseMove(aMoveEvent, 0);
+MouseEvent aClickEvent(rPosition, 1, MouseEventModifiers::SIMPLECLICK, 
MOUSE_LEFT);
+MouseButtonUp(aClickEvent, 0);
+}
+}
+
 void ViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
 {
 if (rMEvt.IsLeaveWindow())
commit 7013b6f33ce9bfa9487a7aa01e4c9a4987f141e3
Author: Miklos Vajna 
Date:   Tue Mar 24 16:41:18 2015 +0100

sd tiled rendering: increase hit testing tolerance

Change-Id: Ibab0aeb6b9b605d1cc964e7858404b1e0919fc10

diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 0cb164d..e4c42a5 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -155,6 +155,13 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
 sal_uInt16 nDrgLog = sal_uInt16 ( 
mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
 sal_uInt16 nHitLog = sal_uInt16 ( 
mpWindow->PixelTo

AW: Information about our work on Libreoffice

2015-03-24 Thread Juergen Funk Mailinglist

Hi Miklos,

under windows, the repaint problem not exist, it works fine.

I try to look on linux.

Best
juergen

Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Juergen Funk Mailinglist
Gesendet: Dienstag, 24. März 2015 12:57
An: Tobias Madl; Miklos Vajna
Cc: libreoffice; Jennifer Liebel
Betreff: AW: Information about our work on Libreoffice

Hi Miklos,

I want try to fix, that.

Best
Juergen

Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Tobias Madl
Gesendet: Montag, 23. März 2015 17:55
An: Miklos Vajna
Cc: libreoffice; Jürgen Funk; Jennifer Liebel
Betreff: Re: Information about our work on Libreoffice

Hi Miklos,
atm i'm still very busy with the work at university, so for the next few days i 
will not be able to look over it. Maybe Jürgen could have a look. Otherwise i 
think you should do a bugreport, so people know about it. If i can manage to 
get some spare time, i will try to solve this issue.
Thanks for your patience and efforts
regards
Tobi

On Mon, Mar 23, 2015 at 4:40 PM, Miklos Vajna 
mailto:vmik...@collabora.co.uk>> wrote:
Hi Tobias,

On Sun, Mar 15, 2015 at 11:40:28AM +0100, Miklos Vajna 
mailto:vmik...@collabora.co.uk>> wrote:
> Thanks for the recent improvements, the current master is much better
> than what it was right after the merge. :-)
>
> With bcefd5cda926f86db16b1bcf6838431b5b0d61b5 I still see one problem,
> though:
>
> 1) Start Writer.
>
> 2) Press F11 to open the styles sidebar
>
> 3) Right-click on e.g. heading 1, and select modify -> repaint problem.
>
> Screenshot:
>
> http://people.freedesktop.org/~vmiklos/2015/heading1-repaint-problem.png

This is still a problem -- please let me know if you prefer a bugreport
instead.

Thanks,

Miklos

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

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

2015-03-24 Thread Eike Rathke

 i18npool/source/search/textsearch.cxx |   76 ++
 1 file changed, 51 insertions(+), 25 deletions(-)

New commits:
commit 1a967fead616b201535449fa812775c88d5b2e3b
Author: Eike Rathke 
Date:   Tue Mar 24 15:53:23 2015 +

do not include non-mask bits in masks

TransliterationModules_FULLWIDTH_HALFWIDTH,
TransliterationModules_UPPERCASE_LOWERCASE and
TransliterationModules_LOWERCASE_UPPERCASE are not mask bits but values,
so need to be treated differently.

Change-Id: I6726bddab4fec1c222a318de61eaa41a402f6286

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index fb1dd25..31314bb 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star;
 
-static const sal_Int32 COMPLEX_TRANS_MASK_TMP =
+const sal_Int32 COMPLEX_TRANS_MASK =
 TransliterationModules_ignoreBaFa_ja_JP |
 TransliterationModules_ignoreIterationMark_ja_JP |
 TransliterationModules_ignoreTiJi_ja_JP |
@@ -61,22 +61,48 @@ static const sal_Int32 COMPLEX_TRANS_MASK_TMP =
 TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
 TransliterationModules_ignoreProlongedSoundMark_ja_JP;
 
-// These 2 transliterations are simple but need to take effect in
-// complex transliteration.
-static const sal_Int32 COMPLEX_TRANS_MASK =
-COMPLEX_TRANS_MASK_TMP |
-TransliterationModules_IGNORE_KANA |
-TransliterationModules_FULLWIDTH_HALFWIDTH;
+namespace
+{
+sal_Int32 maskComplexTrans( sal_Int32 n )
+{
+// IGNORE_KANA and FULLWIDTH_HALFWIDTH are simple but need to take effect
+// in complex transliteration.
+return
+(n & COMPLEX_TRANS_MASK) |  // all set ignore bits
+TransliterationModules_IGNORE_KANA |// plus IGNORE_KANA bit
+TransliterationModules_FULLWIDTH_HALFWIDTH; // and the 
FULLWIDTH_HALFWIDTH value
+}
+
+bool isComplexTrans( sal_Int32 n )
+{
+return n & COMPLEX_TRANS_MASK;
+}
 
-static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+sal_Int32 maskSimpleTrans( sal_Int32 n )
+{
+return n & ~COMPLEX_TRANS_MASK;
+}
+
+bool isSimpleTrans( sal_Int32 n )
+{
+return maskSimpleTrans(n) != 0;
+}
 
 // Regex patterns are case sensitive.
-static const sal_Int32 SIMPLE_TRANS_MASK_REPATTERN =
-~(COMPLEX_TRANS_MASK |
-TransliterationModules_IGNORE_CASE |
-TransliterationModules_UPPERCASE_LOWERCASE |
-TransliterationModules_LOWERCASE_UPPERCASE);
+sal_Int32 maskSimpleRegexTrans( sal_Int32 n )
+{
+sal_Int32 m = (n & TransliterationModules_IGNORE_MASK) & 
~TransliterationModules_IGNORE_CASE;
+sal_Int32 v = n & TransliterationModules_NON_IGNORE_MASK;
+if (v == TransliterationModules_UPPERCASE_LOWERCASE || v == 
TransliterationModules_LOWERCASE_UPPERCASE)
+v = 0;
+return (m | v) & ~COMPLEX_TRANS_MASK;
+}
 
+bool isSimpleRegexTrans( sal_Int32 n )
+{
+return maskSimpleRegexTrans(n) != 0;
+}
+};
 
 TextSearch::TextSearch(const Reference < XComponentContext > & rxContext)
 : m_xContext( rxContext )
@@ -110,25 +136,25 @@ void TextSearch::setOptions( const SearchOptions& 
rOptions ) throw( RuntimeExcep
 delete pJumpTable2, pJumpTable2 = 0;
 
 // Create Transliteration class
-if( aSrchPara.transliterateFlags & SIMPLE_TRANS_MASK )
+if( isSimpleTrans( aSrchPara.transliterateFlags) )
 {
 if( !xTranslit.is() )
 xTranslit.set( Transliteration::create( m_xContext ) );
 xTranslit->loadModule(
- (TransliterationModules)( aSrchPara.transliterateFlags & 
SIMPLE_TRANS_MASK ),
+ (TransliterationModules) maskSimpleTrans( 
aSrchPara.transliterateFlags),
  aSrchPara.Locale);
 }
 else if( xTranslit.is() )
 xTranslit = 0;
 
 // Create Transliteration for 2<->1, 2<->2 transliteration
-if ( aSrchPara.transliterateFlags & COMPLEX_TRANS_MASK )
+if ( isComplexTrans( aSrchPara.transliterateFlags) )
 {
 if( !xTranslit2.is() )
 xTranslit2.set( Transliteration::create( m_xContext ) );
 // Load transliteration module
 xTranslit2->loadModule(
- (TransliterationModules)( aSrchPara.transliterateFlags & 
COMPLEX_TRANS_MASK ),
+ (TransliterationModules) maskComplexTrans( 
aSrchPara.transliterateFlags),
  aSrchPara.Locale);
 }
 
@@ -140,17 +166,17 @@ void TextSearch::setOptions( const SearchOptions& 
rOptions ) throw( RuntimeExcep
 // Transliterate search string.
 if (aSrchPara.algorithmType == SearchAlgorithms_REGEXP)
 {
-if (aSrchPara.transliterateFlags & SIMPLE_TRANS_MASK_REPATTERN)
+if (isSimpleRegexTrans( aSrchPara.transliterateFlags))
 {
-if ((aSrchPara.transliterateFlags & SIMPLE_TRANS_MASK_REPATTERN) !=

Re: i18npool/source/search/textsearch.cxx TransliterationModules bug?

2015-03-24 Thread Eike Rathke

Hi Michael,

> > static const sal_Int32 COMPLEX_TRANS_MASK =

This hopefully solves it..
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=1a967fead616b201535449fa812775c88d5b2e3b

  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


pgp4PQH9GzrrH.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-03-24 Thread Jan Holesovsky

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

New commits:
commit aa1a58c3a2784354cc7dd194b2850c4c7e42f89e
Author: Jan Holesovsky 
Date:   Tue Mar 24 16:59:22 2015 +0100

Blind attempt to fix the Windows tinderbox.

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b3a5a3c..a325a48 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -89,7 +89,11 @@ void SwTiledRenderingTest::testRegisterCallback()
 // Check that the top left 256x256px tile would be invalidated.
 Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, assuming 96 
DPI.
 CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty());
+#if !defined(WNT)
+// FIXME - fails on Windows since about 
cbd48230bb3a90c4c485fa33123c6653234e02e9
+// [plus minus few commits maybe]
 CPPUNIT_ASSERT(m_aInvalidation.IsOver(aTopLeft));
+#endif
 }
 
 void SwTiledRenderingTest::testPostMouseEvent()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |5 
+
 sw/uiconfig/swriter/menubar/menubar.xml |8 

 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit b33bd34d15d67f9c493c3532c980c088f2d84a86
Author: Yousuf Philips 
Date:   Tue Mar 24 19:28:24 2015 +0400

Rearrange writer's view menu and fix label

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 508551e..eef5cf1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2080,10 +2080,7 @@
   
   
 
-  Images On/Off
-
-
-  Images
+  Hide ~Images
 
 
   1
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 34d185e..edcf10e 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -145,15 +145,15 @@
   
   
   
-  
   
+  
   
   
   
-  
-  
-  
   
+  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f50cf8251bcbfe99dbb52cba931e6c06fee7fe17
Author: Yousuf Philips 
Date:   Tue Mar 24 19:59:57 2015 +0400

Change icon for track changes in sidebar

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index f493256..94e86fa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -189,7 +189,7 @@
   ManageChangesDeck
 
 
-  
private:graphicrepository/cmd/lc_accepttrackedchanges.png
+  private:graphicrepository/cmd/lc_trackedchangesbar.png
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - include/vcl

2015-03-24 Thread Miklos Vajna

 include/vcl/ITiledRenderable.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9882317bddc6f00e6c3c66a0929b5bcc9423b9cc
Author: Miklos Vajna 
Date:   Tue Mar 24 17:13:19 2015 +0100

vcl::ITiledRenderable: setTextSelection() can be pure-virtual now

Change-Id: I232197b55a80a65800d85e66c50875b3af7e7fab

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 76a18f0..c8a9d93 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -112,7 +112,7 @@ public:
  *
  * @see lok::Document::setTextSelection().
  */
-virtual void setTextSelection(int /*nType*/, int /*nX*/, int /*nY*/) { }
+virtual void setTextSelection(int nType, int nX, int nY) = 0;
 
 /**
  * Adjusts the graphic selection.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC 2015

2015-03-24 Thread marius adrian popa

Hello I'm Finishing my Master Degree this Year (2015) in Information
Technology at Petru Maior University Romania

http://upm.ro/English/English.html

I will work this summer on finishing integration of Firebird backend
https://wiki.documentfoundation.org/Development/GSoC/Ideas#Finish_Firebird_driver_integration

The main remaining issue is that the firebird data format embedded in the
.odb file is endianess-dependent. The idea is to switch to Firebird's
"archive" format that is not.

I started by cleaning the previous gerrit and submitting new one

Also as time permits fixing the following blockers for firebird integration
:

  bug 69949 
- table editor should support the autoincrement
  bug 71009 
- relationship management not implemented in GUI
  bug 71251 
- Creating table from default choices via wizard fails
  bug 74172 
- no data type DECIMAL/NUMERIC
  bug 76072 
- view creation not implemented

I will test also firebird 3.0 integration (it should work with old 2.5
c based api with no changes )

Some it's features would allow easy fixes for example autoincrement
(implemented as identity)

https://github.com/FirebirdSQL/core/blob/master/doc/sql.extensions/README.identity_columns.txt

True boolean datatype ...

http://www.firebirdsql.org/file/community/conference-2014/pdf/02_fb.2014.whatsnew.30.en.pdf

If nothing else is left to do i will create a branch with firebird 3.0
c++ oo api

https://github.com/asfernandes/fbstuff/tree/master/src/test

Api will be Fronzen only after Beta2 according to the Firebird core developers
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-03-24 Thread Stephan Bergmann

 sc/source/filter/excel/xecontent.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f17568f9f3ea6cded3fe13437977ef841d56a7c1
Author: Stephan Bergmann 
Date:   Tue Mar 24 18:06:16 2015 +0100

loplugin:implicitboolconversion

Change-Id: I7d1be2365c2e18a007a26e63195ea0cb169ee254

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index ca71cf9..f3f0cf3 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1299,7 +1299,7 @@ void XclExpDataBar::SaveXml( XclExpXmlStream& rStrm )
 FSEND );
 
 rWorksheet->startElement( XML_dataBar,
-XML_showValue, 
OString::number(!mrFormat.GetDataBarData()->mbOnlyBar),
+XML_showValue, 
OString::number(int(!mrFormat.GetDataBarData()->mbOnlyBar)),
 XML_minLength, 
OString::number(sal_uInt32(mrFormat.GetDataBarData()->mnMinLength)),
 XML_maxLength, 
OString::number(sal_uInt32(mrFormat.GetDataBarData()->mnMaxLength)),
 FSEND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - embedserv/source extensions/source postprocess/qa shell/source

2015-03-24 Thread Stephan Bergmann

 embedserv/source/embed/servprov.cxx  |   60 +--
 embedserv/source/inc/servprov.hxx|   25 +--
 extensions/source/ole/servprov.cxx   |   90 +++
 extensions/source/ole/servprov.hxx   |   43 +++--
 postprocess/qa/services.cxx  |  177 +--
 shell/source/win32/SysShentry.cxx|2 
 shell/source/win32/simplemail/smplmail.component |2 
 shell/source/win32/simplemail/smplmailentry.cxx  |2 
 shell/source/win32/simplemail/smplmailsuppl.cxx  |2 
 shell/source/win32/syssh.component   |2 
 10 files changed, 276 insertions(+), 129 deletions(-)

New commits:
commit 131c9beffe61ae1e556417dd1169284be92bccd1
Author: Stephan Bergmann 
Date:   Tue Mar 17 12:27:03 2015 +0100

CppunitTest_services: Check that XServiceInfo and .component data matches

Change-Id: I660c261a90d0ce7ace045f97e28808bc924fefd9

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 019a8c3..c6ed5dc 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -43,6 +44,56 @@ OString msg(OUString const & string) {
 return OUStringToOString(string, osl_getThreadTextEncoding());
 }
 
+OString msg(css::uno::Sequence const & strings) {
+OStringBuffer buf("{");
+for (sal_Int32 i = 0; i != strings.getLength(); ++i) {
+if (i != 0) {
+buf.append(", ");
+}
+buf.append('"');
+buf.append(msg(strings[i]));
+buf.append('"');
+}
+buf.append('}');
+return buf.makeStringAndClear();
+}
+
+bool unique(css::uno::Sequence const & strings) {
+// Assumes small sequences for which quadratic algorithm is acceptable:
+for (sal_Int32 i = 0; i < strings.getLength() - 1; ++i) {
+for (sal_Int32 j = i + 1; j != strings.getLength(); ++j) {
+if (strings[j] == strings[i]) {
+return false;
+}
+}
+}
+return true;
+}
+
+bool contains(
+css::uno::Sequence const & strings, OUString const & string)
+{
+for (sal_Int32 i = 0; i != strings.getLength(); ++i) {
+if (string == strings[i]) {
+return true;
+}
+}
+return false;
+}
+
+bool contains(
+css::uno::Sequence const & strings1,
+css::uno::Sequence const & strings2)
+{
+// Assumes small sequences for which quadratic algorithm is acceptable:
+for (sal_Int32 i = 0; i != strings2.getLength(); ++i) {
+if (!contains(strings1, strings2[i])) {
+return false;
+}
+}
+return true;
+}
+
 class Test: public test::BootstrapFixture {
 public:
 void test();
@@ -54,6 +105,8 @@ public:
 private:
 void createInstance(
 OUString const & name, bool withArguments,
+OUString const & implementationName,
+css::uno::Sequence const & serviceNames,
 std::vector> * components);
 };
 
@@ -93,13 +146,18 @@ void Test::test() {
 serviceName(theServiceName),
 defaultConstructor(theDefaultConstructor)
 {}
-OUString serviceName;
-bool defaultConstructor;
+OUString const serviceName;
+bool const defaultConstructor;
 };
 struct Implementation {
-Implementation(css::uno::Reference 
theFactory):
-factory(theFactory), accumulationBased(false) {}
-css::uno::Reference factory;
+Implementation(
+css::uno::Reference const & theFactory,
+css::uno::Sequence const & theServiceNames):
+factory(theFactory), serviceNames(theServiceNames),
+accumulationBased(false)
+{}
+css::uno::Reference const factory;
+css::uno::Sequence const serviceNames;
 std::vector constructors;
 bool accumulationBased;
 };
@@ -124,7 +182,7 @@ void Test::test() {
 if (desc.is()) {
 CPPUNIT_ASSERT_MESSAGE(
 (OString(
-"no implementations of singlie-interface--based \""
+"no implementations of single-interface--based \""
 + msg(serviceNames[i]) + "\"")
  .getStr()),
 !desc->isSingleInterfaceBased());
@@ -141,7 +199,16 @@ void Test::test() {
 OUString name(j->getImplementationName());
 auto k = impls.find(name);
 if (k == impls.end()) {
-k = impls.insert(std::make_pair(name, Implementation(j)))
+css::uno::Sequence servs(
+j->getSupportedServiceNames());
+CPPUNIT_ASSERT_MESSAGE(
+(OString(
+"implementation \"" + msg(name)
++ "\" supports non-unique " + msg(servs))
+ .getStr()),
+

[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/vcl vcl/README.lifecycle

2015-03-24 Thread Michael Meeks

 include/vcl/lazydelete.hxx |   11 ++-
 vcl/README.lifecycle   |2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit a408491c709c5caf86e559f3caef0d7c6819f561
Author: Michael Meeks 
Date:   Tue Mar 24 17:43:20 2015 +

unwind LazyDelete issues - deleting VclPtr types.

Change-Id: Iffdc9f73520a97ccc284ecba1b2468dc229506c1

diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 5196117..92c3253 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_LAZYDELETE_HXX
 
 #include 
+#include 
 
 #include 
 #include 
@@ -101,8 +102,8 @@ namespace vcl
 
 struct DeleteObjectEntry
 {
-T*  m_pObject;
-boolm_bDeleted;
+VclPtr m_pObject;
+bool  m_bDeleted;
 
 DeleteObjectEntry() :
 m_pObject( NULL ),
@@ -136,7 +137,7 @@ namespace vcl
 
 // do the actual work
 unsigned int nCount = m_aObjects.size();
-std::vector aRealDelete;
+std::vector< VclPtr < T > > aRealDelete;
 aRealDelete.reserve( nCount );
 for( unsigned int i = 0; i < nCount; i++ )
 {
@@ -158,8 +159,8 @@ namespace vcl
 #endif
 // check if the object to be deleted is not already destroyed
 // as a side effect of a previous lazily destroyed object
-if( ! m_aObjects[ m_aPtrToIndex[ 
reinterpret_cast(aRealDelete[n]) ] ].m_bDeleted )
-delete aRealDelete[n];
+if( ! m_aObjects[ m_aPtrToIndex[ 
reinterpret_cast(aRealDelete[n].get()) ] ].m_bDeleted )
+aRealDelete[n].disposeAndClear();
 }
 }
 
diff --git a/vcl/README.lifecycle b/vcl/README.lifecycle
index 0edd0c8..26e7a34 100644
--- a/vcl/README.lifecycle
+++ b/vcl/README.lifecycle
@@ -137,6 +137,8 @@ or:
 
 -- What remains to be done ? --
 
+   * Cleanup DogTags and LazyDelete.
+
* Expand the VclPtr pattern to many other less
  than safe VCL types.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/vcl sw/source vcl/source

2015-03-24 Thread Michael Meeks

 include/vcl/window.hxx |8 ++--
 sw/source/uibase/docvw/HeaderFooterWin.cxx |6 ++
 sw/source/uibase/docvw/PageBreakWin.cxx|5 +
 vcl/source/window/window.cxx   |   21 -
 4 files changed, 29 insertions(+), 11 deletions(-)

New commits:
commit 8ce8b120c6999af23383cef391a24034e74c6ec6
Author: Michael Meeks 
Date:   Tue Mar 24 17:52:38 2015 +

vcl: remove curious self referential OutputDevice ptr.

No need to pay a per-instance cost for this, also avoid a self
reference for every Window sub-class.

Change-Id: I040a0ede9481229e43a39bc23297969e90b95f5e

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index bf1d0c8..c5e004f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -401,10 +401,6 @@ private:
 
 WindowImpl* mpWindowImpl;
 
-// This is a first attempt to start to remove the dependency of Window on
-// OutputDevice
-VclPtr<::OutputDevice> mpOutputDevice;
-
 #ifdef DBG_UTIL
 friend const char* ::ImplDbgCheckWindow( const void* pObj );
 #endif
@@ -681,8 +677,8 @@ public:
 Window( vcl::Window* pParent, const 
ResId& rResId );
 virtual ~Window();
 
-::OutputDevice const*   GetOutDev() const { return 
mpOutputDevice; };
-::OutputDevice* GetOutDev()   { return 
mpOutputDevice; };
+::OutputDevice const*   GetOutDev() const;
+::OutputDevice* GetOutDev();
 
 virtual voidEnableRTL ( bool bEnable = true ) 
SAL_OVERRIDE;
 virtual voidMouseMove( const MouseEvent& rMEvt );
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx 
b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 2e80768..6698baa 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -165,6 +165,11 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, 
const SwPageFrm* pPag
 
 m_aFadeTimer.SetTimeout( 50 );
 m_aFadeTimer.SetTimeoutHdl( LINK( this, SwHeaderFooterWin, FadeHandler ) );
+
+// FIXME: unwind this by de-coupling SwFrmControl from SwHeaderFooterWin
+// We will be explicitly lifecycle managed alongside SwFrmControl parent
+// so we take a reference here which we know will never be released.
+new VclPtr(this);
 }
 
 SwHeaderFooterWin::~SwHeaderFooterWin( )
@@ -175,6 +180,7 @@ SwHeaderFooterWin::~SwHeaderFooterWin( )
 void SwHeaderFooterWin::dispose()
 {
 delete m_pPopupMenu;
+m_pPopupMenu = NULL;
 m_pLine.disposeAndClear();
 MenuButton::dispose();
 }
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx 
b/sw/source/uibase/docvw/PageBreakWin.cxx
index b19a57e..baf1443 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -114,6 +114,11 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const 
SwPageFrm* pPageFrm )
 
 m_aFadeTimer.SetTimeout( 50 );
 m_aFadeTimer.SetTimeoutHdl( LINK( this, SwPageBreakWin, FadeHandler ) );
+
+// FIXME: unwind this by de-coupling SwFrmControl from SwHeaderFooterWin
+// We will be explicitly lifecycle managed alongside SwFrmControl parent
+// so we take a reference here which we know will never be released.
+new VclPtr(this);
 }
 
 SwPageBreakWin::~SwPageBreakWin( )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 510482f..c80e180 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -581,6 +581,22 @@ Window::~Window()
 disposeOnce();
 }
 
+// We will eventually being removing the inheritance of OutputDevice
+// from Window. It will be replaced with a transient relationship such
+// that the OutputDevice is only live for the scope of the Paint method.
+// In the meantime this can help move us towards a Window use an
+// OutputDevice, not being one.
+
+::OutputDevice const* Window::GetOutDev() const
+{
+return this;
+}
+
+::OutputDevice* Window::GetOutDev()
+{
+return this;
+}
+
 } /* namespace vcl */
 
 WindowImpl::WindowImpl( WindowType nType )
@@ -1195,11 +1211,6 @@ void Window::ImplInitAppFontData( vcl::Window* pWindow )
 
 void Window::ImplInitWindowData( WindowType nType )
 {
-// We will eventually being removing the inheritance of OutputDevice from 
Window.
-// It will be replaced with a composition relationship. A Window will use 
an OutputDevice,
-// it will not *be* an OutputDevice
-mpOutputDevice = (OutputDevice*)this;
-
 mnRefCnt = 0;
 mpWindowImpl = new WindowImpl( nType );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/inc svtools/source

2015-03-24 Thread Tsutomu Uchino

 svtools/inc/svtools/treelist.hxx   |4 +--
 svtools/source/contnr/svtreebx.cxx |   44 ++---
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 2d382b750bec3f12df851da49c61268be0712c39
Author: Tsutomu Uchino 
Date:   Tue Mar 24 17:05:34 2015 +

#i125147# check the pointer while get accessible state set

diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 8ca9b9d..3aaf412 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -411,14 +411,14 @@ inline sal_Bool SvListView::IsSelected( SvListEntry* 
pEntry ) const
 DBG_ASSERT(pEntry,"IsExpanded:No Entry");
 SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
 DBG_ASSERT(pData,"Entry not in Table");
-return pData->IsSelected();
+return pData && pData->IsSelected();
 }
 inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
 {
 DBG_ASSERT(pEntry,"IsExpanded:No Entry");
 SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
 DBG_ASSERT(pData,"Entry not in Table");
-return pData->HasFocus();
+return pData && pData->HasFocus();
 }
 inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) 
const
 {
diff --git a/svtools/source/contnr/svtreebx.cxx 
b/svtools/source/contnr/svtreebx.cxx
index 72c8df3..99eb3ad 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -2757,29 +2757,29 @@ void SvTreeListBox::FillAccessibleEntryStateSet( 
SvLBoxEntry* pEntry, ::utl::Acc
 {
 DBG_ASSERT( pEntry, "SvTreeListBox::FillAccessibleEntryStateSet: invalid 
entry" );
 
-if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
-{
-rStateSet.AddState( AccessibleStateType::EXPANDABLE );
-if ( IsExpanded( pEntry ) )
-rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
-}
-
-if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
-rStateSet.AddState( AccessibleStateType::CHECKED );
-if ( IsEntryVisible( pEntry ) )
-rStateSet.AddState( AccessibleStateType::VISIBLE );
-if ( IsSelected( pEntry ) )
-rStateSet.AddState( AccessibleStateType::SELECTED );
-if ( IsEnabled() )
-{
-rStateSet.AddState( AccessibleStateType::ENABLED );
-rStateSet.AddState( AccessibleStateType::FOCUSABLE );
-rStateSet.AddState( AccessibleStateType::SELECTABLE );
-SvViewDataEntry* pViewDataNewCur = 0;
-if( pEntry )
+if ( pEntry )
+{
+if ( pEntry->HasChildsOnDemand() || pEntry->HasChilds() )
+{
+rStateSet.AddState( AccessibleStateType::EXPANDABLE );
+if ( IsExpanded( pEntry ) )
+rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
+}
+
+if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
+rStateSet.AddState( AccessibleStateType::CHECKED );
+if ( IsEntryVisible( pEntry ) )
+rStateSet.AddState( AccessibleStateType::VISIBLE );
+if ( IsSelected( pEntry ) )
+rStateSet.AddState( AccessibleStateType::SELECTED );
+if ( IsEnabled() )
 {
-pViewDataNewCur= GetViewDataEntry(pEntry);
-if(pViewDataNewCur->HasFocus())
+rStateSet.AddState( AccessibleStateType::ENABLED );
+rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+rStateSet.AddState( AccessibleStateType::SELECTABLE );
+SvViewDataEntry* pViewDataNewCur = 0;
+pViewDataNewCur = GetViewDataEntry(pEntry);
+if( pViewDataNewCur && pViewDataNewCur->HasFocus() )
 rStateSet.AddState( AccessibleStateType::FOCUSED );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

2015-03-24 Thread Markus Mohrhard

Hey,

On Tue, Mar 24, 2015 at 3:14 PM, rajat vijay  wrote:

> Dear MARKUS,
> Sir,
> Just for once let me know the format of the proposal to be submitted for
> GSoC 2015 for the topic
> "AUTOMATED ERROR CHECKING IN CALC"
> And just give a look at my ideas and my proposal for the same.
> Then decide whether or not to allot me this project.
> And then I promise to give my 100% to complete this project with the
> accuracy desired by you, as I will not be having any of my academic work
> from MAY mid when the coding period starts !!!
>
> Anticipating your reply
> Yours sincerely
>
> On Mon, Mar 23, 2015 at 9:53 PM, rajat vijay 
> wrote:
>
>> Dear MARKUS,
>> Sir, while I am working on the easy hack of libre office --
>> I would like to discuss with you about my idea regarding the "AUTOMATED
>> ERROR CHECKING IN CALC" as the deadline for registrations are nearer -
>> I would like to add the the automated error checking by
>> ADDING DIFFERENT CURRENCIES BY AUTOMATICALLY CONVERTING THEM USING
>> CURRENT CONVERSION RATES THROUGH INTERNET AND IF OFFLINE, THE USER HAS AN
>> OPTION TO ADD MANUAL CONVERSION RATES OR TO USE THE PREVIOUS ONE
>>
>
As Eike mentioned that is not the idea behind this task. The task would be
to integrate correct currency handling (that you show a warning/error when
you try to sum across different currencies e.g. EURO + DOLLAR). For this
the first requirement is most likely to get the unit feature branch merged
into master (it also requires some more work before merging can be
considered).

We are only interested in finding user errors with this GSoC project. So
you should think about which mistakes a typical user does in his
spreadsheets that he normally does not or only with a lot of work detects.

I'm not sure if you have already started working on an Easy Hack otherwise
I would recommend to start that as soon as possible. While it is not
necessary to finish the EasyHack before the submission deadline it is hard
requirement to be selected.

Regards,
Markus

--your feedback for the idea is expected !
>>
>> Sir, I am sending this mail as the deadline is getting nearer and also am
>> having my university exams.
>> Your help will be appreciated.
>>
>> Thanks in advance !
>>
>> RAJAT VIJAY
>> INDIA
>>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

2015-03-24 Thread rajat vijay

Sir,
I have already started working on an easy hack 82641 Currency drop down
menu !!!
I got your point just one more detail I need,  that only currency unit
checking is enough or we need more errors to be checked for the GSoC 2K15
project.
And finally as mentioned above I will not be able to finish my work on easy
hack by the deadline 27 MAY then, what will be the procedure for my
selection in GSoC 2K15 !!!

Yours sincerely
RAJAT VIJAY

On Tue, Mar 24, 2015 at 11:55 PM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey,
>
> On Tue, Mar 24, 2015 at 3:14 PM, rajat vijay 
> wrote:
>
>> Dear MARKUS,
>> Sir,
>> Just for once let me know the format of the proposal to be submitted for
>> GSoC 2015 for the topic
>> "AUTOMATED ERROR CHECKING IN CALC"
>> And just give a look at my ideas and my proposal for the same.
>> Then decide whether or not to allot me this project.
>> And then I promise to give my 100% to complete this project with the
>> accuracy desired by you, as I will not be having any of my academic work
>> from MAY mid when the coding period starts !!!
>>
>> Anticipating your reply
>> Yours sincerely
>>
>> On Mon, Mar 23, 2015 at 9:53 PM, rajat vijay 
>> wrote:
>>
>>> Dear MARKUS,
>>> Sir, while I am working on the easy hack of libre office --
>>> I would like to discuss with you about my idea regarding the "AUTOMATED
>>> ERROR CHECKING IN CALC" as the deadline for registrations are nearer -
>>> I would like to add the the automated error checking by
>>> ADDING DIFFERENT CURRENCIES BY AUTOMATICALLY CONVERTING THEM USING
>>> CURRENT CONVERSION RATES THROUGH INTERNET AND IF OFFLINE, THE USER HAS AN
>>> OPTION TO ADD MANUAL CONVERSION RATES OR TO USE THE PREVIOUS ONE
>>>
>>
> As Eike mentioned that is not the idea behind this task. The task would be
> to integrate correct currency handling (that you show a warning/error when
> you try to sum across different currencies e.g. EURO + DOLLAR). For this
> the first requirement is most likely to get the unit feature branch merged
> into master (it also requires some more work before merging can be
> considered).
>
> We are only interested in finding user errors with this GSoC project. So
> you should think about which mistakes a typical user does in his
> spreadsheets that he normally does not or only with a lot of work detects.
>
> I'm not sure if you have already started working on an Easy Hack otherwise
> I would recommend to start that as soon as possible. While it is not
> necessary to finish the EasyHack before the submission deadline it is hard
> requirement to be selected.
>
> Regards,
> Markus
>
> --your feedback for the idea is expected !
>>>
>>> Sir, I am sending this mail as the deadline is getting nearer and also
>>> am having my university exams.
>>> Your help will be appreciated.
>>>
>>> Thanks in advance !
>>>
>>> RAJAT VIJAY
>>> INDIA
>>>
>>
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: GSoC 2015

2015-03-24 Thread Lionel Elie Mamane

On Tue, Mar 24, 2015 at 07:01:47PM +0200, marius adrian popa wrote:

> I will work this summer on finishing integration of Firebird backend
> https://wiki.documentfoundation.org/Development/GSoC/Ideas#Finish_Firebird_driver_integration

Great! I'm away with irregular access to email until about 13 April
(and away from my LibreOffice compile machine), but I'll take a look
after that.

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

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

2015-03-24 Thread Tor Lillqvist

 sw/qa/extras/tiledrendering/tiledrendering.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 215634269e9a2eabdabb1ff2a5effd11dded7a36
Author: Tor Lillqvist 
Date:   Tue Mar 24 22:10:35 2015 +0200

Bypass on OS X, too

Change-Id: I845dd13427181b7b3ca0aded2d5ece3af4c21be6

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index a325a48..f88c465 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -87,11 +87,12 @@ void SwTiledRenderingTest::testRegisterCallback()
 pWrtShell->Insert("x");
 
 // Check that the top left 256x256px tile would be invalidated.
-Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, assuming 96 
DPI.
 CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty());
-#if !defined(WNT)
+#if !defined(WNT) && !defined(MACOSX)
+Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, assuming 96 
DPI.
 // FIXME - fails on Windows since about 
cbd48230bb3a90c4c485fa33123c6653234e02e9
 // [plus minus few commits maybe]
+// Also on OS X. But is tiled rendering even supposed to work on Windows 
and OS X?
 CPPUNIT_ASSERT(m_aInvalidation.IsOver(aTopLeft));
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39596] use the CLang++ static analyser to find bugs

2015-03-24 Thread bugzilla-daemon

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

--- Comment #25 from danichocolate...@gmail.com ---
Hi Maarten,

1 I finished the build and checked all the comments to this issue again. Then
did I realize as Julien Nabet mentioned: there are reports produced every one
or two weeks (By now the latest one is Mar 20th 2015) at this link:
http://dev-builds.libreoffice.org/cppcheck_reports/master/

2 I have edited the wiki page with account danichocolate_
https://wiki.documentfoundation.org/Development/Clang_Code_Analysis
adding some problems I faced during building. Hope it's helpful. 

3 There will be only three lines in the shell script. Thus I would think it's
fine not to have a fully automatic shell script for now.

4 I am still looking into the bug reports. Most of them are style errors which
wouldn't harm the project, I would like to report new bugs if I find any
valuable ones. 

Based on Julien Nabet, libreoffice is built with clang frequently. Thus I would
suggest to close this bug.

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

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

2015-03-24 Thread Caolán McNamara

 oox/source/export/drawingml.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 53e89ab25c0cd7df1b900a2e1048cfa402ea4353
Author: CaolÃ¡n McNamara 
Date:   Tue Mar 24 20:55:36 2015 +

WaE: uninitialized nBulletColor

Change-Id: I48cc86ad20cbc868df0a943a9a73c8c86096a63a

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1fe13cd..2deda44 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1610,7 +1610,7 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 bool bHasFontDesc = false;
 OUString aGraphicURL;
 sal_Int16 nBulletRelSize = 0;
-sal_Int32 nBulletColor;
+sal_Int32 nBulletColor = 0;
 
 for ( sal_Int32 i = 0; i < nPropertyCount; i++ )
 {
@@ -1693,7 +1693,7 @@ void DrawingML::WriteParagraphNumbering( Reference< 
XPropertySet > rXPropSet, sa
 }
 else
 {
-if(nBulletColor)
+if (nBulletColor)
 {
mpFS->startElementNS( XML_a, XML_buClr, FSEND );
WriteColor( nBulletColor );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39596] use the CLang++ static analyser to find bugs

2015-03-24 Thread bugzilla-daemon

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

--- Comment #26 from Julien Nabet  ---
(In reply to danichocolate714 from comment #25)
> Hi Maarten,
> 
> 1 I finished the build and checked all the comments to this issue again.
> Then did I realize as Julien Nabet mentioned: there are reports produced
> every one or two weeks (By now the latest one is Mar 20th 2015) at this
> link: http://dev-builds.libreoffice.org/cppcheck_reports/master/
> ...
> Based on Julien Nabet, libreoffice is built with clang frequently. Thus I
> would suggest to close this bug.

Hi Danichocolate714,

cppcheck is a C/C++ static analyzer, clang is a front-end compiler.

I was building and put available quite regularly cppcheck reports but now it's
indeed made automatically thanks to Maarten.

About clang, I'm not an expert at all, I can only say there's a Tinderbox which
uses it and that clang can detect things that cppcheck can't detect (I don't
think the contrary can happen but might be wrong).

So please, don't base on me to suggest to close this bug :-)

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

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

2015-03-24 Thread Caolán McNamara

 postprocess/qa/services.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit da42d1100832aae524c2e6b0ba738623df775a3d
Author: CaolÃ¡n McNamara 
Date:   Tue Mar 24 21:04:31 2015 +

give this a copy ctor

Change-Id: I144679e93e61f1bc19319ebf8893529c164ae0ee

diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index c6ed5dc..1183cee 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -146,6 +146,10 @@ void Test::test() {
 serviceName(theServiceName),
 defaultConstructor(theDefaultConstructor)
 {}
+Constructor(Constructor const &other):
+serviceName(other.serviceName),
+defaultConstructor(other.defaultConstructor)
+{}
 OUString const serviceName;
 bool const defaultConstructor;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39596] use the CLang++ static analyser to find bugs

2015-03-24 Thread bugzilla-daemon

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

--- Comment #27 from Maarten Hoes  ---
Hi,

I think you are confusing two different kinds of reports here.

You mention the cppcheck reports located at :
http://dev-builds.libreoffice.org/cppcheck_reports/master/
These do indeed get generated automatically once every week now. (it has its
own bug report in bugzilla #39440). And the method to generate those is
described here: https://wiki.documentfoundation.org/Development/Cppcheck

But this bug report is about the clang reports. There are a few reports, but
they are old: http://dev-builds.libreoffice.org/clang_reports/. The way to
generate them is described here:
https://wiki.documentfoundation.org/Development/Clang_Code_Analysis

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

Re: [Libreoffice-ux-advise] Discussion about highlighting (MS compatibility issue)

2015-03-24 Thread Zolnai Tamás

Hi there,

So in the end I solved this issue on the following way:
- I did not touch toolbar icons. I created a bug report about the
ambiguity of character background naming:
https://bugs.documentfoundation.org/show_bug.cgi?id=89830
- Both highlighting and shading can be a good candidate to export LO
character background to, so I added
a compatibility option to Tools -> Options -> Load/Save -> Microsoft
Office, where user can select how
to save LO character background (as which MSO attribute).
- Since the name "Highlighting" is more accessible than character
background in LO and than shading in MSO, I set
highlighting as the default for export. LO help also calls character
background as "Highlighting". So from a user point of
view LO character background is closer to MSO highlighting, in spite
of that on the implementation level it's closer to
MSO shading.
- MSO import / export filters preserve both MSO attributes. These two
attributes are there at a specific text range until
character background is edited by LO. Editing removes markers
indicating there we have MSO imported attributes and
adds LO specific character background.


Best Regards,
Tamás

2015-02-11 15:43 GMT+01:00 Zolnai Tamás :
> 2015-02-10 17:29 GMT+01:00 Michael Stahl :
>> On 10.02.2015 15:12, Zolnai Tamás wrote:
>>
>>> Second thing, I compared these three kind of character backgrounds and
>>> found that LO's character
>>> background is closer to MS shading attribute then to MS highlighting, 
>>> because:
>>> - LO's background color is a general attribute for different objects
>>> like text range, paragraph, frame, page, cell and so on, and character
>>> background is a specialization of it (like shading).
>>> - LO's background color and MS shading both has more color to choose
>>> from, while MS highlighting allows only 16 colors.
>>> - LO's background color and MS shading has a meaning like "fill the
>>> selected object's background with a color", while highlight has the
>>> meaning like "highlight a text range with a highlighter pen".
>>> So IMHO LO background color should be exported as shading to MS file
>>> formats and not as highlighting.
>>>
>>> Only similarity between LO's background color and MS highlighting is
>>> the "Highlighting" toolbar button and this is the
>>> problem here. Why LO uses an other name for character background on
>>> the toolbar and why not use exactly the same
>>> name (e.g. as in the menu)? This causes the misconceptions we have here.
>>
>> i agree that having 2 different ways to do almost but not exactly the
>> same thing in the UI is confusing.
>>
>>> So my new plan is:
>>> - Remove "Highlighting" toolbar button
>>> - Replace it with the existing "Background color" toolbar button (set
>>> it as default)
>>> - Extend the functionality of this "Background color" button to be
>>> able to set character background too (By now it is used for setting
>>> paragraph, frame and cell background)
>>>
>>> With that the toolbar icon of LO's character background will be
>>> similar to that which is used in Word for setting MS shading attribute
>>> (a paintbucket). This also means we don't need to support highlighting
>>> in LO to solve this interoperability problem.
>>>
>>> With respect to RES_CHRATR_HIGHLIGHT attribute it's still useful to
>>> store MS highlighting on a separate attribute so an MS file won't
>>> loose shading/highlighting information during a round trip. We can
>>> solve that on a transparent way, so the users won't know that we have
>>> two kind of character backgrounds behind the scenes.
>>
>> actually - why do we need 2 core attributes for this?  if you apply both
>> "highlight" and "shading" in Word, one should override the other
>> completely in the document view, or how does it work?  can't we just in
>> the import filter convert both to the same core item, and if both apply
>> to the same text range, then only apply the "higher priority" one?  then
>> export it again as the attribute that allows more colors :)
>
> In Word when both shading and highlighting is set to the same text
> range, then highlighting covers shading, but
> when highlighting is removed later then the shading "under" the
> highlighting becomes visible. I can imagine this like
> shading is a static part of the document while highlighting is set
> temporarily (similar to the comments highlighting).
>
> Other difference between these two attributes in Word is that shading
> has effect on automatic font color (automatic
> font color is a feature of MS Word which makes the actual font color
> changing according to the background color, dark/light background ->
> white/black font color), but highlighting has no such interaction with
> it. So using only one background
> attribute and so convert both shading and highlighting into one
> attribute (shading or highlighting) during a round trip can
> lead also to font color change (opening in Word).
>
> So I think it's a good idea to handle both attribute separately.
>
> Best Regards,
> T

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

2015-03-24 Thread Yousuf Philips

 sw/uiconfig/swriter/toolbar/drawbar.xml  |   15 ---
 sw/uiconfig/swriter/toolbar/drawingobjectbar.xml |7 +--
 sw/uiconfig/swriter/toolbar/standardbar.xml  |2 +-
 sw/uiconfig/swriter/toolbar/tableobjectbar.xml   |8 
 4 files changed, 18 insertions(+), 14 deletions(-)

New commits:
commit ff9fde527ec05a71c27fa3109ef4b57216f785dd
Author: Yousuf Philips 
Date:   Wed Mar 25 00:35:11 2015 +0400

tdf#81475 Fix missing space in standard toolbar and rearranged other 
toolbars

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

diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml 
b/sw/uiconfig/swriter/toolbar/drawbar.xml
index b31c198..e3ab05e 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -23,17 +23,18 @@
  
  
  
- 
- 
+ 
+ 
+ 
  
+ 
+ 
  
  
  
- 
- 
+ 
+ 
  
- 
- 
  
  
  
@@ -45,7 +46,7 @@
  
  
  
- 
+ 
  
  
 
diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
index 376a501..ef68b95 100644
--- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
@@ -46,12 +46,15 @@
  
  
  
+ 
  
+ 
+ 
  
- 
  
+ 
  
  
  
  
-
\ No newline at end of file
+
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml 
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 88c28bd..4910fb8 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -67,7 +67,7 @@
  
  
  
- 
+ 
  
  
  
diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
index 7c41027..48fa579 100644
--- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
@@ -18,7 +18,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
- 
+ 
  
  
  
@@ -46,9 +46,9 @@
  
  
  
+ 
+ 
+ 
  
  
- 
- 
- 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Winfried Donkers

 formula/source/core/api/token.cxx  |2 ++
 formula/source/core/resource/core_resource.src |2 +-
 sc/source/core/tool/compiler.cxx   |3 ++-
 sc/source/core/tool/interpr3.cxx   |   14 --
 sc/source/filter/oox/formulabase.cxx   |2 +-
 sc/source/ui/src/scfuncs.src   |2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit f1f4167bac271f4b7f4ed766db4b077f94fd4daa
Author: Winfried Donkers 
Date:   Thu Feb 26 17:09:10 2015 +0100

tdf#40835 add ODFF function FDIST

and clean up F-Distribution function names.

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

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 117f276..39067e2 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1055,6 +1055,7 @@ inline bool MissingConventionOOXML::isRewriteNeeded( 
OpCode eOp ) const
 case ocIndex:
 
 case ocGammaDist:
+case ocFDist_LT:
 case ocPoissonDist:
 case ocNormDist:
 case ocLogNormDist:
@@ -1166,6 +1167,7 @@ void FormulaMissingContext::AddMoreArgs( 
FormulaTokenArray *pNewArr, const Missi
 break;
 
 case ocGammaDist:
+case ocFDist_LT:
 case ocNormDist:
 if (mnCurArg == 2)
 {
diff --git a/formula/source/core/resource/core_resource.src 
b/formula/source/core/resource/core_resource.src
index b6e6f7e..31d5d94 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -299,7 +299,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_T_DIST_MS { Text = "COM.MICROSOFT.T.DIST" ; };
 String SC_OPCODE_T_DIST_RT { Text = "COM.MICROSOFT.T.DIST.RT" ; };
 String SC_OPCODE_F_DIST { Text = "LEGACY.FDIST" ; };
-String SC_OPCODE_F_DIST_LT { Text = "COM.MICROSOFT.F.DIST" ; };
+String SC_OPCODE_F_DIST_LT { Text = "FDIST" ; };
 String SC_OPCODE_F_DIST_RT { Text = "COM.MICROSOFT.F.DIST.RT" ; };
 String SC_OPCODE_CHI_DIST { Text = "LEGACY.CHIDIST" ; };
 String SC_OPCODE_CHI_DIST_MS { Text = "COM.MICROSOFT.CHISQ.DIST.RT" ; };
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ca67769..551f690 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2499,7 +2499,8 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool 
bInArray )
 { "EASTERSUNDAY",   ocEasterSunday },   // EASTERSUNDAY -> 
ORG.OPENOFFICE.EASTERSUNDAY
 { "ZGZ",ocRRI },// ZGZ -> RRI
 { "COLOR",  ocColor },  // COLOR -> 
ORG.LIBREOFFICE.COLOR
-{ "GOALSEEK",   ocBackSolver }  // GOALSEEK -> 
ORG.OPENOFFICE.GOALSEEK
+{ "GOALSEEK",   ocBackSolver }, // GOALSEEK -> 
ORG.OPENOFFICE.GOALSEEK
+{ "COM.MICROSOFT.F.DIST", ocFDist_LT }, // fdo#40835, -> FDIST -> 
COM.MICROSOFT.F.DIST
 // Renamed new names, prepare to read future names:
 //{ "ORG.OPENOFFICE.XXX", ocXXX } // XXX -> 
ORG.OPENOFFICE.XXX
 };
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 051bb66..2def402 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1702,9 +1702,19 @@ void ScInterpreter::ScFDist()
 
 void ScInterpreter::ScFDist_LT()
 {
-if ( !MustHaveParamCount( GetByte(), 4 ) )
+int nParamCount = GetByte();
+if ( !MustHaveParamCount( nParamCount, 3, 4 ) )
 return;
-bool   bCum = GetBool();
+bool bCum;
+if ( nParamCount == 3 )
+bCum = true;
+else if ( IsMissing() )
+{
+bCum = true;
+Pop();
+}
+else
+bCum = GetBool();
 double fF2 = ::rtl::math::approxFloor( GetDouble() );
 double fF1 = ::rtl::math::approxFloor( GetDouble() );
 double fF  = GetDouble();
diff --git a/sc/source/filter/oox/formulabase.cxx 
b/sc/source/filter/oox/formulabase.cxx
index 40d282f..e1237b7 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -773,7 +773,7 @@ static const FunctionData saFuncTable2010[] =
 { "COM.MICROSOFT.CHISQ.TEST", "CHISQ.TEST",  NOID,
NOID,   2,  2,  V, { VA }, FUNCFLAG_MACROCALL_NEW },
 { "COM.MICROSOFT.CONFIDENCE.NORM","CONFIDENCE.NORM", NOID,
NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
 { "COM.MICROSOFT.CONFIDENCE.T",   "CONFIDENCE.T",NOID,
NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
-{ "COM.MICROSOFT.F.DIST", "F.DIST",  NOID,   
NOID,4,  4,

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

2015-03-24 Thread Chr . Rossmanith

 filter/source/svg/svgwriter.cxx |   20 ++--
 filter/source/svg/svgwriter.hxx |6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 5a5c9d0fa42201d0fbec2670f097f00a8ff91d2c
Author: Chr. Rossmanith 
Date:   Tue Mar 24 22:19:46 2015 +0100

fix typo in variable name

mbIsPlacehlolderShape -> mbIsPlaceholderShape

Change-Id: Ie01335293a3acd6da628e7ea123e10f77c1513da
Reviewed-on: https://gerrit.libreoffice.org/14991
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a9c0dc4..4a394266 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -434,7 +434,7 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport )
 mbLineBreak( false ),
 mbIsURLField( false ),
 msUrl(),
-mbIsPlacehlolderShape( false ),
+mbIsPlaceholderShape( false ),
 mbIWS( false ),
 maCurrentFont(),
 maParentFont()
@@ -1029,7 +1029,7 @@ bool SVGTextWriter::nextTextPortion()
 {
 mrCurrentTextPortion.clear();
 mbIsURLField = false;
-mbIsPlacehlolderShape = false;
+mbIsPlaceholderShape = false;
 if( mrTextPortionEnumeration.is() && 
mrTextPortionEnumeration->hasMoreElements() )
 {
 #if OSL_DEBUG_LEVEL > 0
@@ -1097,7 +1097,7 @@ bool SVGTextWriter::nextTextPortion()
 if( sFieldName == "DateTime" || sFieldName == "Header"
 || sFieldName == "Footer" || sFieldName == 
"PageNumber" )
 {
-mbIsPlacehlolderShape = true;
+mbIsPlaceholderShape = true;
 }
 else
 {
@@ -1602,10 +1602,10 @@ void SVGTextWriter::implWriteTextPortion( const Point& 
rPos,
 mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rTextPortionId );
 }
 
-if( mbIsPlacehlolderShape )
+if( mbIsPlaceholderShape )
 {
 mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" 
);
-mbIsPlacehlolderShape = false;
+mbIsPlaceholderShape = false;
 }
 
 addFontAttributes( /* isTexTContainer: */ false );
@@ -1616,7 +1616,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& 
rPos,
 OUString sTextContent = rText;
 
 //  tag for link should be the innermost tag, inside 
-if( !mbIsPlacehlolderShape && mbIsURLField && !msUrl.isEmpty() )
+if( !mbIsPlaceholderShape && mbIsURLField && !msUrl.isEmpty() )
 {
 mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "UrlField" );
 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
@@ -1647,7 +1647,7 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, 
SVGFontExport& rFontExport
 maTextWriter( rExport ),
 mnInnerMtfCount( 0 ),
 mbClipAttrChanged( false ),
-mbIsPlacehlolderShape( false )
+mbIsPlaceholderShape( false )
 {
 mpVDev = new VirtualDevice;
 mpVDev->EnableOutput( false );
@@ -2456,7 +2456,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, 
const OUString& rText,
 
 bool bIsPlaceholderField = false;
 
-if( mbIsPlacehlolderShape )
+if( mbIsPlaceholderShape )
 {
 OUString sTextContent = rText;
 bIsPlaceholderField = sTextContent.match( sPlaceholderTag );
@@ -2657,10 +2657,10 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile& rMtf,
 bIsTextShape = true;
 }
 #endif
-mbIsPlacehlolderShape = false;
+mbIsPlaceholderShape = false;
 if( ( pElementId != NULL ) && ( *pElementId == sPlaceholderTag ) )
 {
-mbIsPlacehlolderShape = true;
+mbIsPlaceholderShape = true;
 // since we utilize pElementId in an improper way we reset it to NULL 
before to go on
 pElementId = NULL;
 }
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 8d296a2..a74ca30 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -204,7 +204,7 @@ class SVGTextWriter
 boolmbIsURLField;
 OUStringmsUrl;
 OUStringmsHyperlinkIdList;
-boolmbIsPlacehlolderShape;
+boolmbIsPlaceholderShape;
 boolmbIWS;
 vcl::Font   maCurrentFont;
 vcl::Font   maParentFont;
@@ -266,7 +266,7 @@ class SVGTextWriter
 
 void setPlaceholderShapeFlag( bool bState )
 {
-mbIsPlacehlolderShape = bState;
+mbIsPlaceholderShape = bState;
 }
 
   private:
@@ -307,7 +307,7 @@ private:
 MapMode maTargetMapMode;
 sal_uInt32

Re: GSoC IDEA- AUTOMATED ERROR CHECKING IN CALC

2015-03-24 Thread Thorsten Behrens

Eike Rathke wrote:
> Your idea seems more suitable for an independent extension that obtains
> values from somewhere in the net and saves them to the conversion
> configuration or provides some currency conversion Add-In function(s),
> instead of wiring it into the core code.
> 
Which even exists - there's Ted Schlossmacher's GetQuote extension.

Cheers,

-- Thorsten


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

LibreOffice Gerrit News for core on 2015-03-25

2015-03-24 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ tdf#88635 Added new namespace.
  in https://gerrit.libreoffice.org/14993 from Gülşah Köse
  about module scaddins
+ fdo#87441-Sending document as Email removes invisible content - this shou
  in https://gerrit.libreoffice.org/14549 from Charu Tyagi
  about module cui, officecfg, sw
+ tdf#68547 Turkısh "ı" ıs specıal
  in https://gerrit.libreoffice.org/14995 from Matthew Francis
  about module wizards
+ fdo#87441-Send document as Email removes invisible content
  in https://gerrit.libreoffice.org/14994 from Charu Tyagi
  about module cui, officecfg, sw
+ tdf#89387 Add functor for ScAmpersand
  in https://gerrit.libreoffice.org/14873 from Łukasz Hryniuk
  about module sc
+ tdf#87904 changing the sort arrangment of impress's sidebar tabs
  in https://gerrit.libreoffice.org/14986 from Yousuf Philips
  about module officecfg
+ Fixed all  postfix operator++ and operator--
  in https://gerrit.libreoffice.org/14975 from Ahmad Samir
  about module sw
+ tdf#88230: Move {Acquire,Release}SolarMutex() to SolarMutexReleaser
  in https://gerrit.libreoffice.org/14974 from Pranav Kant
  about module fpicker, include, vcl
+ tdf#88230 Dropped the recursive solar mutex.
  in https://gerrit.libreoffice.org/14869 from Gülşah Köse
  about module accessibility
+ tdf#86606 remove direct formatting entries from context menu
  in https://gerrit.libreoffice.org/14979 from Yousuf Philips
  about module sc, sd, sw
+ Removed unnecessary variables which occupy space
  in https://gerrit.libreoffice.org/14951 from Karthick Prasad
  about module unotools
 End of freshness 

+ tdf56467: improve export of formulas to SVG
  in https://gerrit.libreoffice.org/14992 from Christina Roßmanith
  about module filter
+ tdf#89783: sal_uInt16 SwVectorModifyBase::GetPos() --> const_iterator Fin
  in https://gerrit.libreoffice.org/14725 from Christoph Lutz
  about module sw
+ tdf#88547 allow inline date-arrays for Calc array functions
  in https://gerrit.libreoffice.org/14839 from Winfried Donkers
  about module sc


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

+ fix typo in variable name
  in https://gerrit.libreoffice.org/14991 from Christina Roßmanith
+ tdf#40835 add ODFF function FDIST
  in https://gerrit.libreoffice.org/14657 from Winfried Donkers
+ tdf#81475 Fix missing space in standard toolbar and rearranged other tool
  in https://gerrit.libreoffice.org/14990 from Yousuf Philips
+ CppunitTest_services: Check that XServiceInfo and .component data matches
  in https://gerrit.libreoffice.org/14887 from Stephan Bergmann
+ Resolves tdf#72152: respect page orientation of Calc files in recent docs
  in https://gerrit.libreoffice.org/14512 from Julien Nabet
+ Change icon for track changes in sidebar
  in https://gerrit.libreoffice.org/14987 from Yousuf Philips
+ Rearrange writer's view menu and fix label
  in https://gerrit.libreoffice.org/14985 from Yousuf Philips
+ tdf#90174 FILESAVE: export of bullet color for pptx
  in https://gerrit.libreoffice.org/14966 from Priyanka Gaikwad
+ tdf#75256 updating icons and adding duplicate links
  in https://gerrit.libreoffice.org/14977 from Yousuf Philips
+ tdf#89405 DOC export: fix corrupted comment order
  in https://gerrit.libreoffice.org/14841 from Piet van Oostrum
+ tdf#89783: sal_uInt16 replacement by size_t
  in https://gerrit.libreoffice.org/14982 from Vasily Melenchuk
+ tdf#90090 reduce the size of the right page/slide pane
  in https://gerrit.libreoffice.org/14983 from Yousuf Philips
+ tdf#90187 icon for track changes toolbar button and sidebar
  in https://gerrit.libreoffice.org/14980 from Yousuf Philips
+ Reverts and correct "tdf#88230: Cleanup solar mutex yielding"
  in https://gerrit.libreoffice.org/14981 from Pranav Kant
+ tdf#88230: Remove bogus AcquireSolarMutex fpicker wrapper
  in https://gerrit.libreoffice.org/14972 from Pranav Kant
+ tdf#88230: Cleanup solar mutex yielding
  in https://gerrit.libreoffice.org/14973 from Pranav Kant
+ SkipImages option for document import
  in https://gerrit.libreoffice.org/14733 from Németh László
+ tdf#87234 Breeze: Tweak the alignment icons
  in https://gerrit.libreoffice.org/14976 from Yousuf Philips


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

+ Second preparation of the LibreOfficeKit for Windows
  in https://gerrit.libreoffice.org/13017 from juergen funk


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

+ tdf#39468 Translate German Comments - sc/source/core/data/
  in https://gerrit.libreoffice.org/14866 from Christian M. Heller
+ tdf#49893: final fix for blank rectangle problem
  in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk
+ xmloff: convert xof.component to use constructor syntax
  in https://gerrit.libreoffice.org/14820 from Chris Sherlock
+ xmloff: use constructor syntax in xo.component
  in https://gerri

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

2015-03-24 Thread Matthew J . Francis

 wizards/source/euro/Common.xba|2 +-
 wizards/source/euro/ConvertRun.xba|2 +-
 wizards/source/euro/Writer.xba|2 +-
 wizards/source/template/Autotext.xba  |2 +-
 wizards/source/tools/Listbox.xba  |4 ++--
 wizards/source/tools/Strings.xba  |   12 ++--
 wizards/source/tools/UCB.xba  |2 +-
 wizards/source/tutorials/TutorialOpen.xba |2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit ca07d5bef335b220139b858a5b54aa62983a66e1
Author: Matthew J. Francis 
Date:   Wed Mar 25 13:01:17 2015 +0800

tdf#68547 TurkÄ±sh "Ä±" Ä±s specÄ±al

Capital "i" is "Ä°"
Small "I" is "Ä±"
Therefore, any BASIC we ship had better be clean of case-insensitive 
function
name comparisons (or at least those involving "i"s), because they will not
work when the system locale is Turkish.

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

diff --git a/wizards/source/euro/Common.xba b/wizards/source/euro/Common.xba
index 94a8b198b..550042e 100644
--- a/wizards/source/euro/Common.xba
+++ b/wizards/source/euro/Common.xba
@@ -159,7 +159,7 @@ Dim oFormatofObject() as Object
CheckFormatType = False
Exit Function
End If
-   If FieldinArray(CurrSymbolList(),2,oFormatofObject.CurrencySymbol) Then
+   If FieldInArray(CurrSymbolList(),2,oFormatofObject.CurrencySymbol) Then
' If the Currencysymbol of the object is the one needed, 
then check the Currency extension
sFormatCurrExt = oFormatofObject.CurrencyExtension
 
diff --git a/wizards/source/euro/ConvertRun.xba 
b/wizards/source/euro/ConvertRun.xba
index 61c50fc..caf28ef 100644
--- a/wizards/source/euro/ConvertRun.xba
+++ b/wizards/source/euro/ConvertRun.xba
@@ -286,7 +286,7 @@ End Sub
 
 ' Checks if a Field (LocField) is already defined in an Array
 ' Returns 'True' or 'False'
-Function FieldinList(LocList(), MaxIndex as integer, ByVal LocField ) As 
Boolean
+Function FieldInList(LocList(), MaxIndex as integer, ByVal LocField ) As 
Boolean
 Dim i as integer
LocField = Ucase(LocField)
For i = Lbound(LocList()) to MaxIndex
diff --git a/wizards/source/euro/Writer.xba b/wizards/source/euro/Writer.xba
index fa2b024..d747b46 100644
--- a/wizards/source/euro/Writer.xba
+++ b/wizards/source/euro/Writer.xba
@@ -74,7 +74,7 @@ Dim MaxIndex as Integer
End If
ElseIf 
oTextField.TextFieldMaster.PropertySetInfo.HasPropertyByName("Value") 
Then
CurInstanceName = 
oTextField.TextFieldMaster.InstanceName
-   If Not FieldinArray(InstanceNames(), 
MaxIndex, CurInstanceName) Then
+   If Not FieldInArray(InstanceNames(), 
MaxIndex, CurInstanceName) Then

oTextField.TextFieldMaster.Content = 
CStr(Round(oTextField.TextFieldMaster.Value/CurrFactor,2))
InstanceNames(MaxIndex) = 
CurInstanceName
MaxIndex = MaxIndex + 1
diff --git a/wizards/source/template/Autotext.xba 
b/wizards/source/template/Autotext.xba
index 5e41dc3..f99a54f 100644
--- a/wizards/source/template/Autotext.xba
+++ b/wizards/source/template/Autotext.xba
@@ -125,7 +125,7 @@ Sub CreateUserDatafield(oCursor, sFoundContent as String)
oUserfield = 
oDocAuto.CreateInstance("com.sun.star.text.TextField.ExtendedUser")
sFoundList() = ArrayoutofString(sFoundContent,":",MaxIndex)
UserInfo = UCase(LTrim(sFoundList(1)))
-   UserIndex = IndexinArray(UserInfo, UserfieldDatatype())
+   UserIndex = IndexInArray(UserInfo, UserfieldDatatype())
If UserIndex <> -1 Then
oUserField.UserDatatype = UserIndex
oCursor.Text.InsertTextContent(oCursor,oUserField,True)
diff --git a/wizards/source/tools/Listbox.xba b/wizards/source/tools/Listbox.xba
index 2ac741c..2f4e48b 100644
--- a/wizards/source/tools/Listbox.xba
+++ b/wizards/source/tools/Listbox.xba
@@ -172,10 +172,10 @@ Dim iOldSourceSelect as Integer
m = 0
For n = 0 To MaxOriginalIndex
SearchString = OriginalList(n)
-   If IndexinArray(SearchString, SelList()) <> -1 
Then
+   If IndexInArray(SearchString, SelList()) <> -1 
Then
NewSourceList(m) =  SearchString
m = m + 1
-   ElseIf IndexinArray(SearchString, SourceList()) 
<> -1 Then
+   ElseIf IndexInArray(SearchString, SourceList()) 
<> -1 Then
NewSourceList(m) =  SearchString

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

2015-03-24 Thread Gulsah Kose

 bin/gbuild-to-ide |   41 +
 1 file changed, 41 insertions(+)

New commits:
commit e03654bbd6d672d5eacc0a915c4970c3fc4d818a
Author: Gulsah Kose 
Date:   Sat Mar 14 21:17:20 2015 +0200

fdo#84628 Created .project file generator.

This patch is starting to EclipseCDT Integration. Written the .project file 
generating function.

Change-Id: If38077561820d9a333d186a2785ecddd1113fe92
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/14871
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3a78d9f..54b46d6 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -226,6 +226,46 @@ class IdeIntegrationGenerator:
 def emit(self):
 pass
 
+class EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
+def __init__(self, gbuildparser, ide):
+IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
+self.oe_cdt = 'org.eclipse.cdt'
+self.cdt_mb = self.oe_cdt + '.managebuilder.core'
+self.cdt_core = self.oe_cdt + '.core'
+
+def generate_project_file(self, name, comment, xmlversion, encoding):
+
+projectfiletemplate = """
+
+
+%(name)s
+%(comment)s
+
+
+
+
+"""+ self.cdt_mb +""".genmakebuilder
+clean,full,incremental,
+
+
+
+
+"""+ self.cdt_mb +""".ScannerConfigBuilder
+full,incremental,
+
+
+
+
+
+""" + self.cdt_core + """.cnature
+""" + self.cdt_core + """.ccnature
+""" + self.cdt_mb + """.managedBuildNature
+""" + self.cdt_mb + """.ScannerConfigNature
+
+
+"""
+
+return projectfiletemplate % {'name': name, 'comment': comment, 
'xmlversion': xmlversion, 'encoding':encoding}
 
 class DebugIntegrationGenerator(IdeIntegrationGenerator):
 
@@ -900,6 +940,7 @@ if __name__ == '__main__':
 args = parser.parse_args()
 paths = {}
 generators = {
+   'eclipsecdt': EclipseCDTIntegrationGenerator,
 'kdevelop': KdevelopIntegrationGenerator,
 'xcode': XcodeIntegrationGenerator,
 'vs2012': VisualStudioIntegrationGenerator,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-24 Thread Phillip Sz

 shell/source/unix/misc/gnome-open-url.sh |2 --
 shell/source/unix/misc/kde-open-url.sh   |2 --
 shell/source/unix/misc/kde4-open-url.sh  |1 -
 shell/source/unix/misc/senddoc.sh|2 --
 shell/source/unix/misc/tde-open-url.sh   |2 --
 5 files changed, 9 deletions(-)

New commits:
commit 3f6bfb4c0d6814c38035e4e1d0c4d5321dd6a5a7
Author: Phillip Sz 
Date:   Mon Mar 16 20:49:05 2015 +0100

remove exit 0 at the end of a shell script

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

diff --git a/shell/source/unix/misc/gnome-open-url.sh 
b/shell/source/unix/misc/gnome-open-url.sh
index 0bcd7b63..bffe6f2 100755
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ b/shell/source/unix/misc/gnome-open-url.sh
@@ -2,5 +2,3 @@
 
 # use xdg-open or gnome-open if available, falling back to our own open-url
 xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || `dirname 
"$0"`/open-url "$1" 2>/dev/null
-
-exit 0
diff --git a/shell/source/unix/misc/kde-open-url.sh 
b/shell/source/unix/misc/kde-open-url.sh
index 43ab738..b0eac27 100755
--- a/shell/source/unix/misc/kde-open-url.sh
+++ b/shell/source/unix/misc/kde-open-url.sh
@@ -23,5 +23,3 @@ if echo $1 | grep '^mailto:' > /dev/null; then
 else
   kfmclient openURL "$1" &
 fi
-
-exit 0
diff --git a/shell/source/unix/misc/kde4-open-url.sh 
b/shell/source/unix/misc/kde4-open-url.sh
index e5b8125..c6e8b17 100755
--- a/shell/source/unix/misc/kde4-open-url.sh
+++ b/shell/source/unix/misc/kde4-open-url.sh
@@ -19,4 +19,3 @@
 
 # use kde-open or xdg-open if available, falling back to our own open-url
 kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname 
"$0"`/open-url "$1" 2>/dev/null
-exit 0
diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index cb287e6..a642546 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -438,5 +438,3 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 ${MAILER} "${MAILTO}" &
 ;;
 esac
-
-exit 0
diff --git a/shell/source/unix/misc/tde-open-url.sh 
b/shell/source/unix/misc/tde-open-url.sh
index 43ab738..b0eac27 100755
--- a/shell/source/unix/misc/tde-open-url.sh
+++ b/shell/source/unix/misc/tde-open-url.sh
@@ -23,5 +23,3 @@ if echo $1 | grep '^mailto:' > /dev/null; then
 else
   kfmclient openURL "$1" &
 fi
-
-exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source framework/source include/basic include/connectivity

2015-03-24 Thread Noel Grandin

 compilerplugins/clang/compat.hxx|   12 
 compilerplugins/clang/constantfunction.cxx  |  485 
++
 connectivity/source/commontools/parameters.cxx  |5 
 connectivity/source/commontools/propertyids.cxx |  221 +---
 connectivity/source/drivers/mork/MCatalog.cxx   |2 
 connectivity/source/drivers/mork/MConnection.hxx|2 
 connectivity/source/drivers/mork/MQueryHelper.cxx   |5 
 connectivity/source/drivers/mork/MQueryHelper.hxx   |2 
 connectivity/source/drivers/mork/MResultSet.cxx |   39 
 connectivity/source/drivers/mork/MResultSet.hxx |3 
 connectivity/source/drivers/mork/MResultSetMetaData.cxx |2 
 connectivity/source/drivers/mork/MStatement.cxx |   48 
 connectivity/source/drivers/mork/MStatement.hxx |2 
 connectivity/source/drivers/mork/MTable.hxx |2 
 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |   18 
 connectivity/source/drivers/odbc/OResultSet.cxx |5 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx  |   52 -
 connectivity/source/drivers/postgresql/pq_databasemetadata.hxx  |1 
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |   16 
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx |2 
 connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx |9 
 connectivity/source/inc/odbc/OResultSet.hxx |3 
 connectivity/source/inc/propertyids.hxx |7 
 framework/source/services/substitutepathvars.cxx|3 
 include/basic/sbxobj.hxx|1 
 include/connectivity/parameters.hxx |7 
 26 files changed, 606 insertions(+), 348 deletions(-)

New commits:
commit c7a50d072f0f9a19e7975c09eeff7a11bdea1370
Author: Noel Grandin 
Date:   Tue Mar 24 15:26:35 2015 +0200

new constantfunction loplugin

Change-Id: Ie9b7a0c41fc4dbd2560ceff6bae9ab85357f518b

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index dd1d7e3..78acb54 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -23,6 +23,7 @@
 #include "clang/Basic/Linkage.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/Visibility.h"
+#include "clang/Frontend/CompilerInstance.h"
 #include "clang/Lex/PPCallbacks.h"
 #include "clang/Lex/Preprocessor.h"
 #include "llvm/ADT/StringRef.h"
@@ -210,6 +211,17 @@ inline void addPPCallbacks(
 #endif
 }
 
+inline bool isMacroBodyExpansion(clang::CompilerInstance& compiler, 
clang::SourceLocation location)
+{
+#if (__clang_major__ == 3 && __clang_minor__ >= 3) || __clang_major__ > 3
+return compiler.getSourceManager().isMacroBodyExpansion(location);
+#else
+return location.isMacroID()
+&& !compiler.getSourceManager().isMacroArgExpansion(location);
+#endif
+}
+
+
 }
 
 #endif
diff --git a/compilerplugins/clang/constantfunction.cxx 
b/compilerplugins/clang/constantfunction.cxx
new file mode 100644
index 000..49a2c10
--- /dev/null
+++ b/compilerplugins/clang/constantfunction.cxx
@@ -0,0 +1,485 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "plugin.hxx"
+#include "compat.hxx"
+#include 
+
+/*
+  Look for member functions that merely return a compile-time constant, or 
they are empty, and can thus
+  be either removed, or converted into a constant.
+
+  This mostly tends to happen as a side-effect of other cleanups.
+*/
+namespace {
+
+class ConstantFunction:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+StringRef getFilename(SourceLocation loc);
+public:
+explicit ConstantFunction(InstantiationData const & data): Plugin(data) {}
+
+void run() override
+{
+// these files crash clang-3.5 somewhere in the 
isEvaluatable/EvaluateAsXXX stuff
+FileID mainFileID = compiler.getSourceManager().getMainFileID();
+if 
(strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(),
 "sc/source/core/data") != 0) {
+return;
+}
+if 
(strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(),
 "sc/source/ui/app") != 0) {
+return;
+}
+if 
(strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getDir()->getName(),
 "sc/qa/unit") != 0) {
+return;
+}
+if 
(strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), 
"

72 matches

Mail list logo