[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 2 commits - loleaflet/src

[Mihai Varga]

 loleaflet/src/core/Log.js |2 +-
 loleaflet/src/layer/tile/GridLayer.js |8 
 loleaflet/src/layer/tile/TileLayer.js |   28 ++--
 loleaflet/src/map/Map.js  |4 ++--
 4 files changed, 25 insertions(+), 17 deletions(-)

New commits:
commit 299df144bc511fdc19dd0eed631200f3d0f31b13
Author: Mihai Varga 
Date:   Fri Aug 7 09:57:45 2015 +0300

loleaflet: fixed jslint errors

diff --git a/loleaflet/src/core/Log.js b/loleaflet/src/core/Log.js
index e8f731f..551cff7 100644
--- a/loleaflet/src/core/Log.js
+++ b/loleaflet/src/core/Log.js
@@ -5,7 +5,7 @@
 L.Log = {
log: function (msg, direction, tileCoords, time) {
if (!time) {
-   var time = Date.now();
+   time = Date.now();
}
if (!this._logs) {
this._logs = [];
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 1a983d1..3b38029 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -768,11 +768,11 @@ L.GridLayer = L.Layer.extend({
if (!this._preFetchBorder) {
if (this._currentPart !== this._preFetchPart) {
// all tiles from the new part have to be 
pre-fetched
-   tileBorder = this._preFetchBorder = new 
L.Bounds(new L.Point(0, 0), new L.Point(0, 0));
+   var tileBorder = this._preFetchBorder = new 
L.Bounds(new L.Point(0, 0), new L.Point(0, 0));
}
else {
-   var pixelBounds = 
this._map.getPixelBounds(center, zoom),
-   tileBorder = 
this._pxBoundsToTileRange(pixelBounds);
+   var pixelBounds = 
this._map.getPixelBounds(center, zoom);
+   tileBorder = 
this._pxBoundsToTileRange(pixelBounds);
this._preFetchBorder = tileBorder;
}
}
@@ -904,7 +904,7 @@ L.GridLayer = L.Layer.extend({
}
var interval = 750;
var idleTime = 5000;
-   this._preFetchIdle = setTimeout(L.bind( function () {
+   this._preFetchIdle = setTimeout(L.bind(function () {
this._tilesPreFetcher = 
setInterval(L.bind(this._preFetchTiles, this), interval);
}, this), idleTime);
}
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 774ced8..dfa0572 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -312,7 +312,7 @@ L.TileLayer = L.GridLayer.extend({
}
var cursorPos = 
this._map.project(this._visibleCursor.getNorthWest());
cursorPos = cursorPos.divideBy(this._tileSize);
-   toRequest.sort(function(x, y) {return 
x.coords.distanceTo(cursorPos) - y.coords.distanceTo(cursorPos)});
+   toRequest.sort(function(x, y) {return 
x.coords.distanceTo(cursorPos) - y.coords.distanceTo(cursorPos);});
for (var i = 0; i < toRequest.length; i++) {
this.sendMessage(toRequest[i].msg, 
toRequest[i].key);
}
@@ -403,7 +403,7 @@ L.TileLayer = L.GridLayer.extend({
 
// read the tile data
var strBytes = '';
-   for (var i = 0; i < data.length; i++) {
+   for (i = 0; i < data.length; i++) {
strBytes += String.fromCharCode(data[i]);
}
 
@@ -572,7 +572,7 @@ L.TileLayer = L.GridLayer.extend({
// remove newline characters
command.type = 
tokens[i].substring(5).replace(/(\r\n|\n|\r)/gm, '');
}
-   else if (tokens[i].substring(0,9) === 'prefetch=') {
+   else if (tokens[i].substring(0, 9) === 'prefetch=') {
command.preFetch = tokens[i].substring(9);
}
}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index aa7333e..500ffae 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -752,11 +752,11 @@ L.Map = L.Evented.extend({
return Math.max(min, Math.min(max, zoom));
},
 
-   _onSocketError: function (e) {
+   _onSocketError: function () {
this.fire('error', {msg: 'Socket connection error'});
},
 
-   _onSocketClose: function (e) {
+   _onSocketClose: function () {
this.fire('error', {msg: 'Socket connection closed'});
}
 });
commit ac1efd969ff521d5d6d85

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

[Ian]

 scaddins/source/datefunc/datefunc.cxx |   14 +++---
 scaddins/source/datefunc/datefunc.hxx |   44 ++
 2 files changed, 7 insertions(+), 51 deletions(-)

New commits:
commit 09a9234c021ad98c5adeb493b5814e97b92ee912
Author: Ian 
Date:   Thu Aug 6 16:24:50 2015 +0100

tdf#90222: Removed ScaStringList and replaced all uses with std::vector

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

diff --git a/scaddins/source/datefunc/datefunc.cxx 
b/scaddins/source/datefunc/datefunc.cxx
index 64679ff..f3fe9a8 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -62,12 +62,6 @@ void ScaList::_Grow()
 pData = pNewData;
 }
 
-ScaStringList::~ScaStringList()
-{
-for( OUString* pStr = First(); pStr; pStr = Next() )
-delete pStr;
-}
-
 ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) :
 ResId( nId, rResMgr )
 {
@@ -109,7 +103,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, 
ResMgr& rResMgr ) :
 const ResStringArray& rArr = aArrLoader.GetStringArray();
 
 for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
-aCompList.Append( rArr.GetString( nIndex ) );
+aCompList.push_back( rArr.GetString( nIndex ) );
 }
 
 ScaFuncData::~ScaFuncData()
@@ -445,14 +439,14 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL 
ScaDateAddIn::getCompatibilityNam
 if( !pFData )
 return uno::Sequence< sheet::LocalizedName >( 0 );
 
-const ScaStringList& rStrList = pFData->GetCompNameList();
-sal_uInt32 nCount = rStrList.Count();
+const std::vector& rStrList = pFData->GetCompNameList();
+sal_uInt32 nCount = rStrList.size();
 
 uno::Sequence< sheet::LocalizedName > aRet( nCount );
 sheet::LocalizedName* pArray = aRet.getArray();
 
 for( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ )
-pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), 
*rStrList.Get( nIndex ) );
+pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), 
rStrList.at( nIndex ) );
 
 return aRet;
 }
diff --git a/scaddins/source/datefunc/datefunc.hxx 
b/scaddins/source/datefunc/datefunc.hxx
index 9922bdf..db6e8f1 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -23,6 +23,7 @@
 #define INCLUDED_SCADDINS_SOURCE_DATEFUNC_DATEFUNC_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -78,45 +79,6 @@ inline void ScaList::Append( void* pNew )
 }
 
 
-class ScaStringList : protected ScaList
-{
-public:
-inline  ScaStringList() : ScaList() {};
-virtual ~ScaStringList();
-
-using ScaList::Count;
-
-inline const OUString* Get( sal_uInt32 nIndex ) const;
-
-inline OUString* First();
-inline OUString* Next();
-
-using ScaList::Append;
-inline void Append( const OUString& rNew );
-};
-
-
-inline const OUString* ScaStringList::Get( sal_uInt32 nIndex ) const
-{
-return static_cast< const OUString* >( ScaList::GetObject( nIndex ) );
-}
-
-inline OUString* ScaStringList::First()
-{
-return static_cast< OUString* >( ScaList::First() );
-}
-
-inline OUString* ScaStringList::Next()
-{
-return static_cast< OUString* >( ScaList::Next() );
-}
-
-inline void ScaStringList::Append( const OUString& rNew )
-{
-ScaList::Append( new OUString( rNew ) );
-}
-
-
 class ScaResId : public ResId
 {
 public:
@@ -214,7 +176,7 @@ private:
 sal_uInt16  nDescrID;   // leads also to parameter 
descriptions!
 sal_uInt16  nCompListID;// resource ID to list of 
valid names
 sal_uInt16  nParamCount;// num of parameters
-ScaStringList   aCompList;  // list of all valid names
+std::vector   aCompList;  // list of all valid names
 ScaCategory eCat;   // function category
 boolbDouble;// name already exist in Calc
 boolbWithOpt;   // first parameter is internal
@@ -232,7 +194,7 @@ public:
 inline bool Is( const OUString& rCompare ) const
 { return aIntName == 
rCompare; }
 
-inline const ScaStringList& GetCompNameList() const { return aCompList; }
+inline const std::vector& GetCompNameList() const { return 
aCompList; }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

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

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

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

[bugzilla-daemon]

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

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

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

tdf#90222: Removed ScaStringList and replaced all uses with std::vector

It will be available in 5.1.0.

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

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

graphite2 released

[Martin Hosken]

Dear All,

Graphite has released a new version of its library and it would be good to get 
all that arabic goodness into libreoffice. Can someone upload the library from 
either of:

http://projects.palaso.org/attachments/download/427/graphite2-1.3.0.tgz
http://sourceforge.net/projects/silgraphite/files/graphite2/graphite2-1.3.0.tgz/download

Then I'll submit a patch to handle various improvements around graphite 
integration.

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

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

[Miklos Vajna]

 sw/inc/doc.hxx   |   43 +--
 sw/inc/fmtanchr.hxx  |4 +-
 sw/inc/printdata.hxx |   11 +++---
 sw/inc/tblafmt.hxx   |4 +-
 sw/inc/undobj.hxx|4 +-
 sw/inc/unofieldcoll.hxx  |4 +-
 sw/source/core/attr/swatrset.cxx |4 +-
 sw/source/core/crsr/crstrvl.cxx  |5 +--
 sw/source/core/crsr/findtxt.cxx  |4 +-
 sw/source/core/doc/DocumentDeviceManager.cxx |6 +--
 sw/source/core/inc/UndoInsert.hxx|4 +-
 sw/source/core/unocore/unofield.cxx  |3 +
 sw/source/uibase/app/docst.cxx   |6 +--
 13 files changed, 54 insertions(+), 48 deletions(-)

New commits:
commit 33aead22a90ec94e625bbc1b9808096e6c370616
Author: Miklos Vajna 
Date:   Fri Aug 7 09:21:39 2015 +0200

sw: use std::unique_ptr in sw-global includes

Change-Id: I7b1a313e6c36fd162878cfc9f17ae73f91a72665

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e7542e1..b9f803b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -55,7 +55,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 namespace editeng { class SvxBorderLine; }
@@ -253,7 +252,7 @@ class SW_DLLPUBLIC SwDoc :
 friend void _FinitCore();
 
 // private Member
-::boost::scoped_ptr m_pNodes;  //< document content (Nodes Array)
+std::unique_ptr m_pNodes;  //< document content (Nodes Array)
 SwAttrPool* mpAttrPool; //< the attribute pool
 SwPageDescs maPageDescs; //< PageDescriptors
 Link<>  maOle2Link;  //< OLE 2.0-notification
@@ -268,26 +267,26 @@ class SW_DLLPUBLIC SwDoc :
 mxXForms;//< container with XForms models
 mutable com::sun::star::uno::Reference< 
com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator;
 
-const ::boost::scoped_ptr< ::sw::mark::MarkManager> mpMarkManager;
-const ::boost::scoped_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager;
-const ::boost::scoped_ptr< ::sw::DocumentDrawModelManager > 
m_pDocumentDrawModelManager;
-const ::boost::scoped_ptr< ::sw::DocumentRedlineManager > 
m_pDocumentRedlineManager;
-const ::boost::scoped_ptr< ::sw::DocumentStateManager > 
m_pDocumentStateManager;
-const ::boost::scoped_ptr< ::sw::UndoManager > m_pUndoManager;
-const ::boost::scoped_ptr< ::sw::DocumentSettingManager > 
m_pDocumentSettingManager;
-const ::boost::scoped_ptr< ::sw::DocumentChartDataProviderManager > 
m_pDocumentChartDataProviderManager;
-::boost::scoped_ptr< ::sw::DocumentDeviceManager > m_pDeviceAccess;
-const ::boost::scoped_ptr< ::sw::DocumentTimerManager > 
m_pDocumentTimerManager;
-const ::boost::scoped_ptr< ::sw::DocumentLinksAdministrationManager > 
m_pDocumentLinksAdministrationManager;
-const ::boost::scoped_ptr< ::sw::DocumentListItemsManager > 
m_pDocumentListItemsManager;
-const ::boost::scoped_ptr< ::sw::DocumentListsManager > 
m_pDocumentListsManager;
-const ::boost::scoped_ptr< ::sw::DocumentOutlineNodesManager > 
m_pDocumentOutlineNodesManager;
-const ::boost::scoped_ptr< ::sw::DocumentContentOperationsManager > 
m_pDocumentContentOperationsManager;
-const ::boost::scoped_ptr< ::sw::DocumentFieldsManager > 
m_pDocumentFieldsManager;
-const ::boost::scoped_ptr< ::sw::DocumentStatisticsManager > 
m_pDocumentStatisticsManager;
-const ::boost::scoped_ptr< ::sw::DocumentLayoutManager > 
m_pDocumentLayoutManager;
-const ::boost::scoped_ptr< ::sw::DocumentStylePoolManager > 
m_pDocumentStylePoolManager;
-const ::boost::scoped_ptr< ::sw::DocumentExternalDataManager > 
m_pDocumentExternalDataManager;
+const std::unique_ptr< ::sw::mark::MarkManager> mpMarkManager;
+const std::unique_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager;
+const std::unique_ptr< ::sw::DocumentDrawModelManager > 
m_pDocumentDrawModelManager;
+const std::unique_ptr< ::sw::DocumentRedlineManager > 
m_pDocumentRedlineManager;
+const std::unique_ptr< ::sw::DocumentStateManager > 
m_pDocumentStateManager;
+const std::unique_ptr< ::sw::UndoManager > m_pUndoManager;
+const std::unique_ptr< ::sw::DocumentSettingManager > 
m_pDocumentSettingManager;
+const std::unique_ptr< ::sw::DocumentChartDataProviderManager > 
m_pDocumentChartDataProviderManager;
+std::unique_ptr< ::sw::DocumentDeviceManager > m_pDeviceAccess;
+const std::unique_ptr< ::sw::DocumentTimerManager > 
m_pDocumentTimerManager;
+const std::unique_ptr< ::sw::DocumentLinksAdministrationManager > 
m_pDocumentLinksAdministrationManager;
+const std::unique_ptr< ::sw::DocumentListItemsManager > 
m_pDocumentListItemsManager;
+const std::unique_ptr< ::sw::DocumentListsManager > 
m_pDocumentListsManager;
+const std::unique_ptr< ::sw::DocumentOutlineNodesManager > 
m_pDocumentOutlineNodesManager;
+const std::unique

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

[Andrzej Hunt]

 sc/inc/sc.hrc  |5 +
 sc/source/ui/inc/viewfunc.hxx  |3 -
 sc/source/ui/src/units.src |5 +
 sc/source/ui/view/viewfunc.cxx |  114 +
 4 files changed, 104 insertions(+), 23 deletions(-)

New commits:
commit 54fc383bee9fe07388a9f9d5b6ae13a1e0e9eca0
Author: Andrzej Hunt 
Date:   Fri Aug 7 08:25:48 2015 +0100

Implement undoing conversion of individual locally annotated cells

Change-Id: I16b62f1105f7839b047a96fdab0e3e6089d400ee

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 42a0561..fe78cd8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1005,7 +1005,10 @@
 #define STR_UNITS_CONVERSION_RECOMMENDED (STR_START + 455)
 #define BT_UNITS_CONVERT_THIS_CELL  (STR_START + 456)
 #define BT_UNITS_CONV_ALL   (STR_START + 457)
-#define STR_END (BT_UNITS_CONV_ALL)
+
+#define STR_UNDO_UNITSCONVERSION (STR_START + 458)
+
+#define STR_END (STR_UNDO_UNITSCONVERSION)
 
 #define BMP_START   (STR_END)
 
diff --git a/sc/source/ui/src/units.src b/sc/source/ui/src/units.src
index d666923..bc9a315 100644
--- a/sc/source/ui/src/units.src
+++ b/sc/source/ui/src/units.src
@@ -55,4 +55,9 @@ PushButton BT_UNITS_CONV_ALL
 Text [ en-US ] = "Convert (automatically for all cells needing $2)" ;
 };
 
+String STR_UNDO_UNITSCONVERSION
+{
+Text [ en-US ] = "Units conversion";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 063a3a8..a6f66e7 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2976,8 +2976,7 @@ void ScViewFunc::NotifyUnitConversionRecommended( const 
ScAddress& rCellAddress,

  rCellAddress,

  pDoc,

  rsHeaderUnit,
-   
  rsCellUnit,
-   
  pDocSh );
+   
  rsCellUnit );
 pButtonConvertCell->SetClickHdl( LINK( this, ScViewFunc, 
UnitConversionRecommendedHandler ) );
 
 OUString sConvertText = pButtonConvertCell->GetText();
@@ -2994,32 +2993,108 @@ IMPL_LINK( ScViewFunc, 
UnitConversionRecommendedHandler, UnitConversionPushButto
 #ifdef ENABLE_CALC_UNITVERIFICATION
 boost::shared_ptr< Units > pUnits = Units::GetUnits();
 
-ScDocShell* pDocShell = 
static_cast(pButton->mpDoc->GetDocumentShell());
+ScDocument* pDoc = pButton->mpDoc;
+ScDocShell* pDocShell = static_cast(pDoc->GetDocumentShell());
 
 ScDocShellModificator aModificator( *pDocShell );
+bool bUndo = pDoc->IsUndoEnabled();
+ScCellValue aOldVal;
+ScDocument* pUndoDoc;
+ScMarkData aMark;
 
-OUString sOriginalValue = pButton->mpDoc->GetString( pButton->aCellAddress 
);
+svl::IUndoManager* pUndoManager;
+ScDrawLayer* pDrawLayer;
+
+if ( bUndo )
+{
+pUndoManager = pDocShell->GetUndoManager();
+
+aOldVal.assign( *pDoc, pButton->aCellAddress );
+
+aMark.SetMarkArea( pButton->aCellAddress );
+pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
+pUndoDoc->InitUndo( pDoc, pButton->aCellAddress.Tab(), 
pButton->aCellAddress.Tab() );
+pDoc->CopyToDocument( ScRange( pButton->aCellAddress ), IDF_ATTRIB, 
false, pUndoDoc, &aMark );
+
+// This commences logging of changes to the drawing layer
+// (i.e. notes) for storing in an undo. (See more below.)
+pDrawLayer = pDoc->GetDrawLayer();
+pDrawLayer->BeginCalcUndo(false);
+}
+
+OUString sOriginalValue = pDoc->GetString( pButton->aCellAddress );
 
 pUnits->convertCellToHeaderUnit( pButton->aCellAddress,
- pButton->mpDoc,
+ pDoc,
  pButton->sHeaderUnit,
  pButton->sCellUnit );
 
-ScPostIt* pNote = pButton->mpDoc->GetOrCreateNote( pButton->aCellAddress );
-OUString sCurrentNote = pNote->GetText();
-
-OUString sConversionNote("Original input: " + sOriginalValue);
+const OUString sCurrentNoteText = pDoc->GetOrCreateNote( 
pButton->aCellAddress )->GetText();
+const OUString sConversionNote("Original input: " + sOriginalValue);
+OUString sNewNoteText;
 
-if (sCurrentNote.isEmpty())
+if (sCurrentNoteText.isEmpty())
 {
-pNote->SetText( pButton->aCellAddress, sConversionNote );
+sNewNoteText = sConversionNote;
 }
 else
 {
-pNote->SetText( pButton->aCellAddress, sCurrentNote + "\n\n" + 
sConversionNote );
+sNewNoteText = sCurrentNoteText + "\n\n" + sConversi

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

[Yousuf Philips]

 sd/uiconfig/simpress/menubar/menubar.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0ff1c37159216d26816d0d797a80db277e37a59d
Author: Yousuf Philips 
Date:   Fri Aug 7 03:46:36 2015 +0400

tdf#91857 Move master display items to View menu

Change-Id: Ia5404045389d87a001671e870458a7985d0b990b
Reviewed-on: https://gerrit.libreoffice.org/17552
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 71146c2..ef87919 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -136,6 +136,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -435,10 +439,6 @@
 
 
 
-
-
-
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libwpd external/libwps

[Andras Timar]

 external/libwpd/ExternalPackage_libwpd.mk |2 +-
 external/libwpd/UnpackedTarball_libwpd.mk |8 
 external/libwpd/libwpd-bundled-soname.patch.0 |   11 +++
 external/libwps/ExternalPackage_libwps.mk |2 +-
 external/libwps/UnpackedTarball_libwps.mk |8 
 external/libwps/libwps-bundled-soname.patch.0 |   11 +++
 6 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 4284337d92420373f2e1bcb40c9513db94a73bca
Author: Andras Timar 
Date:   Thu Aug 6 21:51:28 2015 +0200

libwpd bundled soname patch

Change-Id: I25dee74be0391b56587b4cc3eb9599708446825d
Reviewed-on: https://gerrit.libreoffice.org/17548
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/libwpd/ExternalPackage_libwpd.mk 
b/external/libwpd/ExternalPackage_libwpd.mk
index 23d639b..61702da 100644
--- a/external/libwpd/ExternalPackage_libwpd.mk
+++ b/external/libwpd/ExternalPackage_libwpd.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.so.10,src/lib/.libs/libwpd-0.10.so.10.0.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpd/UnpackedTarball_libwpd.mk 
b/external/libwpd/UnpackedTarball_libwpd.mk
index 9610dfb..7fb7c3b 100644
--- a/external/libwpd/UnpackedTarball_libwpd.mk
+++ b/external/libwpd/UnpackedTarball_libwpd.mk
@@ -18,4 +18,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
$(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
+   external/libwpd/libwpd-bundled-soname.patch.0 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpd/libwpd-bundled-soname.patch.0 
b/external/libwpd/libwpd-bundled-soname.patch.0
new file mode 100644
index 000..04661f2
--- /dev/null
+++ b/external/libwpd/libwpd-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig   2015-08-06 21:41:41.073622494 +0200
 src/lib/Makefile.in2015-08-06 21:42:09.377622009 +0200
+@@ -429,7 +429,7 @@
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) 
-DLIBWPD_BUILD=1
+ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) 
@LIBWPD_WIN32_RESOURCE@
+ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBWPD_WIN32_RESOURCE@
+-libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic $(no_undefined)
++libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic $(no_undefined) -release lo
+ libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = \
+   libwpd_internal.cpp \
+   libwpd_math.cpp \
commit fff1d5bdd087f72178321f47b649323013d933cf
Author: Andras Timar 
Date:   Thu Aug 6 12:07:40 2015 +0200

libwps bundled soname patch

Change-Id: I6661ff49e25921ce11dc04fffab84cf5db3c95fe
Reviewed-on: https://gerrit.libreoffice.org/17533
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/libwps/ExternalPackage_libwps.mk 
b/external/libwps/ExternalPackage_libwps.mk
index 182589f..daa17c1 100644
--- a/external/libwps/ExternalPackage_libwps.mk
+++ b/external/libwps/ExternalPackage_libwps.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.$(WPS_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4-lo.so.4,src/lib/.libs/libwps-0.4-lo.so.4.0.$(WPS_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/UnpackedTarball_libwps.mk 
b/external/libwps/UnpackedTarball_libwps.mk
index a87224b..9839f06 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -19,6 +19,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+   external/libwps/libwps-bundled-soname.patch.0 \
+))
+endif
+endif
+
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
diff --git a/external/libwps/libwps-bundled-

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

[Andras Timar]

 external/libwpg/ExternalPackage_libwpg.mk |2 +-
 external/libwpg/UnpackedTarball_libwpg.mk |8 
 external/libwpg/libwpg-bundled-soname.patch.0 |   11 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 68279e04de33201b8f75b55ad8cac9deef3d044d
Author: Andras Timar 
Date:   Thu Aug 6 21:37:36 2015 +0200

libwpg bundled soname patch

Change-Id: Ied2f331000c83d696fb5dd662860c3b51b95c616
Reviewed-on: https://gerrit.libreoffice.org/17547
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/libwpg/ExternalPackage_libwpg.mk 
b/external/libwpg/ExternalPackage_libwpg.mk
index fcaab4e..9de3845 100644
--- a/external/libwpg/ExternalPackage_libwpg.mk
+++ b/external/libwpg/ExternalPackage_libwpg.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.so.3,src/lib/.libs/libwpg-0.3.so.3.0.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/UnpackedTarball_libwpg.mk 
b/external/libwpg/UnpackedTarball_libwpg.mk
index d0b1e99..f470bdf 100644
--- a/external/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk
@@ -17,4 +17,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
 external/libwpg/rpath.patch \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
+external/libwpg/libwpg-bundled-soname.patch.0 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/libwpg-bundled-soname.patch.0 
b/external/libwpg/libwpg-bundled-soname.patch.0
new file mode 100644
index 000..4fef3c2
--- /dev/null
+++ b/external/libwpg/libwpg-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig   2015-08-06 21:30:41.615633795 +0200
 src/lib/Makefile.in2015-08-06 21:31:03.764633415 +0200
+@@ -357,7 +357,7 @@
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(WPD_CFLAGS) 
$(DEBUG_CXXFLAGS) -DLIBWPG_BUILD=1
+ libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) 
$(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@
+ libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBWPG_WIN32_RESOURCE@
+-libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined
++libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined -release lo
+ libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_SOURCES = \
+   WPGraphics.cpp \
+   WPGDashArray.cpp \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/inc/unx/gtk/gtkgdi.hxx|1 +
 vcl/unx/gtk/app/gtkdata.cxx   |   19 +++
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   18 ++
 3 files changed, 38 insertions(+)

New commits:
commit c0b75759ace5d0aca033504bc1cb2179fcce47d1
Author: Tomaž Vajngerl 
Date:   Mon Jul 13 16:12:11 2015 +0900

GTK3 HiDPI: disable window scaling and get display DPI via GTK3

Change-Id: I66b92146757352408a331f9e23289839f443ff79
(cherry picked from commit 2a19bb85cbe83aa031871a3689b9ff03629da548)
Reviewed-on: https://gerrit.libreoffice.org/17553
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 80de62b..b533cb4 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -61,6 +61,7 @@ public:
 
 cairo_t* getCairoContext() const;
 
+virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) 
SAL_OVERRIDE;
 private:
 GtkWidget   *mpWindow;
 static GtkStyleContext *mpButtonStyle;
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index df1546a..2d8e26c 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -46,6 +46,12 @@
 
 #include 
 
+#if GTK_CHECK_VERSION(3,10,0)
+#ifdef GDK_WINDOWING_X11
+#include 
+#endif
+#endif
+
 using namespace vcl_sal;
 
 /***
@@ -87,6 +93,19 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
 #else
 m_bX11Display = true;
 #endif
+
+#if GTK_CHECK_VERSION(3,10,0)
+#ifdef GDK_WINDOWING_X11
+if (m_bX11Display)
+{
+if (!getenv("GDK_SCALE"))
+{
+gdk_x11_display_set_window_scale(m_pGdkDisplay, 1);
+}
+}
+#endif
+#endif
+
 }
 
 GtkSalDisplay::~GtkSalDisplay()
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 5c71040..402c17d 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -2097,4 +2097,22 @@ cairo_t* GtkSalGraphics::getCairoContext() const
 return mpFrame->getCairoContext();
 }
 
+void GtkSalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+{
+GdkScreen* pScreen = gtk_widget_get_screen(mpWindow);
+double fResolution = -1.0;
+g_object_get(pScreen, "resolution", &fResolution, nullptr);
+
+int nScaleFactor = 1;
+
+#if GTK_CHECK_VERSION(3, 10, 0)
+nScaleFactor = gdk_window_get_scale_factor(widget_get_window(mpWindow));
+#endif
+
+if (fResolution > 0.0)
+rDPIX = rDPIY = sal_Int32(fResolution * nScaleFactor);
+else
+rDPIX = rDPIY = 96;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mihály Palenik]

 sw/source/ui/config/optpage.cxx   |   71 --
 sw/source/uibase/config/cfgitems.cxx  |   22 ---
 sw/source/uibase/inc/cfgitems.hxx |4 -
 sw/source/uibase/inc/optpage.hxx  |6 -
 sw/uiconfig/swriter/ui/optfonttabpage.ui  |   55 +++--
 sw/uiconfig/swriter/ui/viewoptionspage.ui |   93 ++
 6 files changed, 57 insertions(+), 194 deletions(-)

New commits:
commit 745c7bce5fe8b218f7d300667a5409bc7ef58c34
Author: Mihály Palenik 
Date:   Thu Aug 6 15:16:41 2015 +0200

Delete unnecessary writer options from Options dialog

Here https://wiki.documentfoundation.org/Design/Whiteboards/Options/Writer
are unnecessary writer options. These options are set in
Expert Configuration dialog under org.oppenoffice.Office.Writer node.
Some of them have void type therefore they aren't deleted.

Preference name, Property, Location in Options dialog;
org.openoffice.Office.Writer/Layout/Window, HorizontalScroll,
View/View/Horizontal Scrollbar;
org.openoffice.Office.Writer/Layout/Window, VerticalScroll,
View/View/Vertical Scrollbar;
org.openoffice.Office.Writer/Layout/Window, HorizontalRuler,
View/View/Horizontal Ruler;
org.openoffice.Office.Writer/DefaultFont, Document,
Basic Fonts (Western)/Current documentum only;
org.openoffice.Office.Writer/DefaultFontCJK, Document,
Basic Fonts (Asian)/Current documentum only;
org.openoffice.Office.Writer/DefaultFontCTL, Document,
Basic Fonts (CTL)/Current documentum only;

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

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 2ae97be..671615d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -90,10 +90,6 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
 {
 get (m_pCrossCB, "helplines");
 
-get (m_pHScrollBox, "hscrollbar");
-get (m_pVScrollBox, "vscrollbar");
-get (m_pAnyRulerCB, "ruler");
-get (m_pHRulerCBox, "hruler");
 get (m_pHMetric, "hrulercombobox");
 get (m_pVRulerCBox, "vruler");
 get (m_pVRulerRightCBox, "vrulerright");
@@ -126,7 +122,6 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
 if(!aCJKOptions.IsVerticalTextEnabled() )
 m_pVRulerRightCBox->Hide();
 m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
-m_pAnyRulerCB->SetClickHdl(LINK(this, SwContentOptPage, AnyRulerHdl));
 
 SvxStringArray aMetricArr( SW_RES( STR_ARR_METRIC ) );
 for ( size_t i = 0; i < aMetricArr.Count(); ++i )
@@ -174,10 +169,6 @@ SwContentOptPage::~SwContentOptPage()
 void SwContentOptPage::dispose()
 {
 m_pCrossCB.clear();
-m_pHScrollBox.clear();
-m_pVScrollBox.clear();
-m_pAnyRulerCB.clear();
-m_pHRulerCBox.clear();
 m_pHMetric.clear();
 m_pVRulerCBox.clear();
 m_pVRulerRightCBox.clear();
@@ -234,10 +225,6 @@ void SwContentOptPage::Reset(const SfxItemSet* rSet)
 m_pFieldNameCB->Check (pElemAttr->bFieldName);
 m_pPostItCB->Check (pElemAttr->bNotes);
 m_pCrossCB->Check (pElemAttr->bCrosshair);
-m_pHScrollBox->Check (pElemAttr->bHorzScrollbar);
-m_pVScrollBox->Check (pElemAttr->bVertScrollbar);
-m_pAnyRulerCB->Check (pElemAttr->bAnyRuler);
-m_pHRulerCBox->Check (pElemAttr->bHorzRuler);
 m_pVRulerCBox->Check (pElemAttr->bVertRuler);
 m_pVRulerRightCBox->Check (pElemAttr->bVertRulerRight);
 m_pSmoothCBox->Check (pElemAttr->bSmoothScroll);
@@ -246,7 +233,6 @@ void SwContentOptPage::Reset(const SfxItemSet* rSet)
 lcl_SelectMetricLB(m_pMetricLB, SID_ATTR_METRIC, *rSet);
 lcl_SelectMetricLB(m_pHMetric, FN_HSCROLL_METRIC, *rSet);
 lcl_SelectMetricLB(m_pVMetric, FN_VSCROLL_METRIC, *rSet);
-AnyRulerHdl(m_pAnyRulerCB);
 }
 
 bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
@@ -263,10 +249,6 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
 aElem.bFieldName= m_pFieldNameCB->IsChecked();
 aElem.bNotes= m_pPostItCB->IsChecked();
 aElem.bCrosshair= m_pCrossCB->IsChecked();
-aElem.bHorzScrollbar= m_pHScrollBox->IsChecked();
-aElem.bVertScrollbar= m_pVScrollBox->IsChecked();
-aElem.bAnyRuler = m_pAnyRulerCB->IsChecked();
-aElem.bHorzRuler= m_pHRulerCBox->IsChecked();
 aElem.bVertRuler= m_pVRulerCBox->IsChecked();
 aElem.bVertRulerRight   = m_pVRulerRightCBox->IsChecked();
 aElem.bSmoothScroll = m_pSmoothCBox->IsChecked();
@@ -310,17 +292,6 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, CheckBox*, pBox)
 return 0;
 }
 
-IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox)
-{
-bool bChecked = pBox->IsChecked();
-  

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

[Caolán McNamara]

 package/inc/ZipOutputEntry.hxx|1 +
 package/source/zipapi/ZipOutputEntry.cxx  |7 +++
 package/source/zipapi/ZipOutputStream.cxx |2 ++
 3 files changed, 10 insertions(+)

New commits:
commit ef698035aa2aa64fc4c4455b394e6782772fef4f
Author: Caolán McNamara 
Date:   Wed Aug 5 23:26:27 2015 +0100

Related: tdf#88314 delete temp files

clear to close the inputstream before attempting to delete the temp file, 
which
is plausible as the windows-specific failure in earlier attempts at this

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

diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index d431a07..3a6447c 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -69,6 +69,7 @@ public:
 css::uno::Reference< css::io::XInputStream > getData() const;
 ::css::uno::Any getParallelDeflateException() const { return 
m_aParallelDeflateException; }
 void closeBufferFile();
+void deleteBufferFile();
 
 ZipEntry* getZipEntry() { return m_pCurrentEntry; }
 ZipPackageStream* getZipPackageStream() { return m_pCurrentStream; }
diff --git a/package/source/zipapi/ZipOutputEntry.cxx 
b/package/source/zipapi/ZipOutputEntry.cxx
index e307003..47ecbb4 100644
--- a/package/source/zipapi/ZipOutputEntry.cxx
+++ b/package/source/zipapi/ZipOutputEntry.cxx
@@ -114,6 +114,13 @@ void ZipOutputEntry::closeBufferFile()
 m_xOutStream.clear();
 }
 
+void ZipOutputEntry::deleteBufferFile()
+{
+assert(!m_xOutStream.is() && !m_aTempURL.isEmpty());
+uno::Reference < ucb::XSimpleFileAccess3 > 
xAccess(ucb::SimpleFileAccess::create(m_xContext));
+xAccess->kill(m_aTempURL);
+}
+
 uno::Reference< io::XInputStream > ZipOutputEntry::getData() const
 {
 uno::Reference < ucb::XSimpleFileAccess3 > 
xTempAccess(ucb::SimpleFileAccess::create(m_xContext));
diff --git a/package/source/zipapi/ZipOutputStream.cxx 
b/package/source/zipapi/ZipOutputStream.cxx
index 4acfa77..be261cd 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -121,10 +121,12 @@ void ZipOutputStream::finish()
 rawWrite(aSequence);
 }
 while (nRead == n_ConstBufferSize);
+xInput.clear();
 
 rawCloseEntry(m_aEntries[i]->isEncrypt());
 
 
m_aEntries[i]->getZipPackageStream()->successfullyWritten(m_aEntries[i]->getZipEntry());
+m_aEntries[i]->deleteBufferFile();
 delete m_aEntries[i];
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Enum types in IDL and in code

[Miklos Vajna]

Hi,

On Fri, Aug 07, 2015 at 01:07:52PM +0800, "Matthew J. Francis" 
 wrote:
> Mainly the latter confusion. The problem the user I was discussing this
> with had was that when trying to develop using such an interface you
> have no idea what the value you receive from it is unless you can find
> it in the IDL, and when you do so it suggests that it should have been
> an actual enum to begin with.

If the IDL documentation and the actual code differs in such enum vs int
types, I think the best would be to adjust the documentation to match
the code, and not the other way around.

That would help new users to get the right information and would not
break existing clients. Doing the other way around would break existing
users, I'm afraid.

Regards,

Miklos


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

Re: graphite2 released

[Miklos Vajna]

Hi,

On Fri, Aug 07, 2015 at 02:11:19PM +0700, Martin Hosken  
wrote:
> Graphite has released a new version of its library and it would be good to 
> get all that arabic goodness into libreoffice. Can someone upload the library 
> from either of:
> 
> http://projects.palaso.org/attachments/download/427/graphite2-1.3.0.tgz
> http://sourceforge.net/projects/silgraphite/files/graphite2/graphite2-1.3.0.tgz/download

Done.

Regards,

Miklos


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

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

[Mihai Varga]

 loleaflet/src/control/Permission.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 06c2f2ce2d6d8abf8fa3d386d7b539f31ea5c6e5
Author: Mihai Varga 
Date:   Fri Aug 7 11:12:39 2015 +0300

loleaflet: request lok session when entering edit mode

diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index f6ed8ee..902afa7 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -5,6 +5,7 @@ L.Map.include({
setPermission: function (perm) {
this._docLayer._permission = perm;
if (perm === 'edit') {
+   this._docLayer.sendMessage('requestloksession');
this.dragging.disable();
}
else if (perm === 'view' || perm === 'readonly') {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 basctl/source/dlged/managelang.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e8620d35f73f38f3cc6b550909c73188b64a88bf
Author: Caolán McNamara 
Date:   Fri Aug 7 09:10:57 2015 +0100

Resolves: tdf#92896 wrong delete language dialog path

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

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index 5910699..998a688 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -164,7 +164,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
 
 IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
 {
-ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", 
"modules/BasicIDE/ui/deletelang.ui");
+ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", 
"modules/BasicIDE/ui/deletelangdialog.ui");
 if ( aQBox->Execute() == RET_OK )
 {
 sal_uInt16 i, nCount = m_pLanguageLB->GetSelectEntryCount();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 vcl/source/control/edit.cxx |   21 +
 vcl/source/window/paint.cxx |   12 
 2 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit 207edc05ceadda49e311758cae67be1ea2d0e49d
Author: Miklos Vajna 
Date:   Thu Aug 6 18:11:44 2015 +0200

tdf#92982 vcl rendercontext: fix missing background repaint of Edit

Change-Id: Ic45f65d10835eb39b6709e7adeed1392905ea631
(cherry picked from commit f4a2c604c73337cd21cd98d975b4f2b943fbab60)
Reviewed-on: https://gerrit.libreoffice.org/17564
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 7ddad42..e9f5c82 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1023,6 +1023,27 @@ void Edit::ImplClearBackground(vcl::RenderContext& 
rRenderContext, long nXStart,
 
 if( !(ImplUseNativeBorder(rRenderContext, GetStyle()) || 
IsPaintTransparent()))
 rRenderContext.Erase(aRect);
+else if (SupportsDoubleBuffering() && mbIsSubEdit)
+{
+// ImplPaintBorder() is a NOP, we have a native border, and this is a 
sub-edit of a control.
+// That means we have to draw the parent native widget to paint the 
edit area to clear our background.
+long nLeft = mnXOffset + ImplGetExtraXOffset();
+long nTop = ImplGetTextYPosition();
+long nRight = GetOutputWidthPixel();
+long nHeight = GetTextHeight();
+Rectangle aEditArea(nLeft, nTop, nRight, nTop + nHeight);
+
+ControlType aCtrlType = ImplGetNativeControlType();
+ControlPart aCtrlPart = PART_ENTIRE_CONTROL;
+Rectangle aCtrlRegion(0, 0, GetParent()->GetOutputWidthPixel(), 
GetParent()->GetOutputHeightPixel());
+ControlState nState = ControlState::ENABLED;
+ImplControlValue aControlValue;
+
+rRenderContext.Push(PushFlags::CLIPREGION);
+rRenderContext.SetClipRegion(vcl::Region(aEditArea));
+rRenderContext.DrawNativeControl(aCtrlType, aCtrlPart, aCtrlRegion, 
nState, aControlValue, OUString());
+rRenderContext.Pop();
+}
 }
 
 void Edit::ImplPaintBorder(vcl::RenderContext& rRenderContext, long nXStart, 
long nXEnd)
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a02d600..81f601d 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -190,18 +190,6 @@ void PaintHelper::StartBufferedPaint()
 ImplFrameData* pFrameData = m_pWindow->mpWindowImpl->mpFrameData;
 assert(!pFrameData->mbInBufferedPaint);
 
-// Instead of creating a new VirtualDevice, just erase the area we'll be
-// painting over, as VirtualDevice::ImplInitVirDev() would do.
-// The painted area is m_aPaintRect, or in case it's empty, then the whole 
window.
-pFrameData->mpBuffer->SetBackground(Wallpaper(Color(COL_WHITE)));
-{
-PaintBufferGuard g(pFrameData, m_pWindow);
-if (m_aPaintRect.IsEmpty())
-pFrameData->mpBuffer->Erase(Rectangle(Point(0, 0), 
m_pWindow->GetOutputSize()));
-else
-pFrameData->mpBuffer->Erase(m_aPaintRect);
-}
-
 pFrameData->mbInBufferedPaint = true;
 m_bStartedBufferedPaint = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/control/Permission.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d68f69a2b6259736bf4bc2c98c6bf994b70da72a
Author: Mihai Varga 
Date:   Fri Aug 7 11:12:39 2015 +0300

loleaflet: request lok session when entering edit mode

diff --git a/loleaflet/src/control/Permission.js 
b/loleaflet/src/control/Permission.js
index f6ed8ee..902afa7 100644
--- a/loleaflet/src/control/Permission.js
+++ b/loleaflet/src/control/Permission.js
@@ -5,6 +5,7 @@ L.Map.include({
setPermission: function (perm) {
this._docLayer._permission = perm;
if (perm === 'edit') {
+   this._docLayer.sendMessage('requestloksession');
this.dragging.disable();
}
else if (perm === 'view' || perm === 'readonly') {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svl/source/numbers/zforfind.cxx |   57 +++-
 svl/source/numbers/zforfind.hxx |1 
 2 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit c978ce3b0774912ec0979b6cfec02927d8837a3e
Author: Eike Rathke 
Date:   Thu Aug 6 18:22:16 2015 +0200

Resolves: tdf#93080 short day name and month name may interfere

Change-Id: I088633e4cff278e1add8eeea8828f9ba9c9fb140
(cherry picked from commit c7d66949beecab92dc8f1380c54751710aa0b7a2)
Reviewed-on: https://gerrit.libreoffice.org/17545
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 36dd18e..f7dd8b0 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -110,6 +110,7 @@ void ImpSvNumberInputScan::Reset()
 {
 nMonth   = 0;
 nMonthPos= 0;
+nDayOfWeek   = 0;
 nTimePos = 0;
 nSign= 0;
 nESign   = 0;
@@ -2100,6 +2101,33 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString,
 {
 const sal_Int32 nMonthStart = nPos;
 short nTempMonth = GetMonth(rString, nPos);
+if (nTempMonth < 0)
+{
+// Short month and day names may be identical in some locales, e.g.
+// "mar" for "martes" or "marzo" in Spanish.
+// Do not let a month name immediately take precedence if a day
+// name was meant instead. Assume that both could be valid, until
+// encountered differently or the final evaluation in
+// IsNumberFormat() checks, but continue with weighing the month
+// name higher unless we have both day of week and month name here.
+sal_Int32 nTempPos = nMonthStart;
+nDayOfWeek = GetDayOfWeek( rString, nTempPos);
+if (nDayOfWeek < 0)
+{
+SkipChar( '.', rString, nTempPos ); // abbreviated
+SkipString( 
pFormatter->GetLocaleData()->getLongDateDayOfWeekSep(), rString, nTempPos );
+SkipBlanks( rString, nTempPos);
+short nTempTempMonth = GetMonth( rString, nTempPos);
+if (nTempTempMonth)
+{
+// Fall into the else branch below that handles both.
+nTempMonth = 0;
+nPos = nMonthStart;
+nDayOfWeek = 0;
+// Do not set nDayOfWeek hereafter, anywhere.
+}
+}
+}
 if ( nTempMonth )// month (Jan 1)?
 {
 // Jan1 without separator is not a date, unless it is followed by a
@@ -2122,14 +2150,14 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString,
 }
 else
 {
-int nDayOfWeek = GetDayOfWeek( rString, nPos );
-if ( nDayOfWeek )
+int nTempDayOfWeek = GetDayOfWeek( rString, nPos );
+if ( nTempDayOfWeek )
 {
 // day of week is just parsed away
 eScannedType = css::util::NumberFormat::DATE;   // !!! it 
IS a date !!!
 if ( nPos < rString.getLength() )
 {
-if ( nDayOfWeek < 0 )
+if ( nTempDayOfWeek < 0 )
 {
 // abbreviated
 if ( rString[ nPos ] == (sal_Unicode)'.' )
@@ -2805,12 +2833,12 @@ bool ImpSvNumberInputScan::ScanEndString( const 
OUString& rString,
 nPos = nPos + rSep.getLength();
 SkipBlanks(rString, nPos);
 }
-int nDayOfWeek = GetDayOfWeek( rString, nPos );
-if ( nDayOfWeek )
+int nTempDayOfWeek = GetDayOfWeek( rString, nPos );
+if ( nTempDayOfWeek )
 {
 if ( nPos < rString.getLength() )
 {
-if ( nDayOfWeek < 0 )
+if ( nTempDayOfWeek < 0 )
 {   // short
 if ( rString[ nPos ] == (sal_Unicode)'.' )
 {
@@ -3501,6 +3529,14 @@ bool ImpSvNumberInputScan::IsNumberFormat( const 
OUString& rString, // s
 break;
 
 case css::util::NumberFormat::DATE:
+if (nMonth < 0 && nDayOfWeek < 0 && nAnzNums == 3)
+{
+// If both, short month name and day of week name were
+// detected, and also numbers for full date, assume that we
+// have a day of week instead of month name.
+nMonth = 0;
+nMonthPos = 0;
+}
 if (nMonth)
 {   // month name and numbers
 if (nAnzNums > 2)
@@ -3547,6 +3583,15 @@ bool ImpSvNumberInputScan::IsNumberFormat( const 
OUString& rString, // s
 break;
 
 

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

[Eike Rathke]

 svl/source/numbers/zforfind.cxx |   57 +++-
 svl/source/numbers/zforfind.hxx |1 
 2 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit 28b7e6f0acfa5e8cc3a08218584eeb71e4b313a3
Author: Eike Rathke 
Date:   Thu Aug 6 18:22:16 2015 +0200

Resolves: tdf#93080 short day name and month name may interfere

(cherry picked from commit c7d66949beecab92dc8f1380c54751710aa0b7a2)

Conflicts:
svl/source/numbers/zforfind.cxx

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

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index ce6d0e0..fb42220 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -109,6 +109,7 @@ void ImpSvNumberInputScan::Reset()
 {
 nMonth   = 0;
 nMonthPos= 0;
+nDayOfWeek   = 0;
 nTimePos = 0;
 nSign= 0;
 nESign   = 0;
@@ -2099,6 +2100,33 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString,
 {
 const sal_Int32 nMonthStart = nPos;
 short nTempMonth = GetMonth(rString, nPos);
+if (nTempMonth < 0)
+{
+// Short month and day names may be identical in some locales, e.g.
+// "mar" for "martes" or "marzo" in Spanish.
+// Do not let a month name immediately take precedence if a day
+// name was meant instead. Assume that both could be valid, until
+// encountered differently or the final evaluation in
+// IsNumberFormat() checks, but continue with weighing the month
+// name higher unless we have both day of week and month name here.
+sal_Int32 nTempPos = nMonthStart;
+nDayOfWeek = GetDayOfWeek( rString, nTempPos);
+if (nDayOfWeek < 0)
+{
+SkipChar( '.', rString, nTempPos ); // abbreviated
+SkipString( 
pFormatter->GetLocaleData()->getLongDateDayOfWeekSep(), rString, nTempPos );
+SkipBlanks( rString, nTempPos);
+short nTempTempMonth = GetMonth( rString, nTempPos);
+if (nTempTempMonth)
+{
+// Fall into the else branch below that handles both.
+nTempMonth = 0;
+nPos = nMonthStart;
+nDayOfWeek = 0;
+// Do not set nDayOfWeek hereafter, anywhere.
+}
+}
+}
 if ( nTempMonth )// month (Jan 1)?
 {
 // Jan1 without separator is not a date, unless it is followed by a
@@ -2121,14 +2149,14 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString,
 }
 else
 {
-int nDayOfWeek = GetDayOfWeek( rString, nPos );
-if ( nDayOfWeek )
+int nTempDayOfWeek = GetDayOfWeek( rString, nPos );
+if ( nTempDayOfWeek )
 {
 // day of week is just parsed away
 eScannedType = NUMBERFORMAT_DATE;   // !!! it IS a date !!!
 if ( nPos < rString.getLength() )
 {
-if ( nDayOfWeek < 0 )
+if ( nTempDayOfWeek < 0 )
 {
 // abbreviated
 if ( rString[ nPos ] == (sal_Unicode)'.' )
@@ -2804,12 +2832,12 @@ bool ImpSvNumberInputScan::ScanEndString( const 
OUString& rString,
 nPos = nPos + rSep.getLength();
 SkipBlanks(rString, nPos);
 }
-int nDayOfWeek = GetDayOfWeek( rString, nPos );
-if ( nDayOfWeek )
+int nTempDayOfWeek = GetDayOfWeek( rString, nPos );
+if ( nTempDayOfWeek )
 {
 if ( nPos < rString.getLength() )
 {
-if ( nDayOfWeek < 0 )
+if ( nTempDayOfWeek < 0 )
 {   // short
 if ( rString[ nPos ] == (sal_Unicode)'.' )
 {
@@ -3500,6 +3528,14 @@ bool ImpSvNumberInputScan::IsNumberFormat( const 
OUString& rString, // s
 break;
 
 case NUMBERFORMAT_DATE:
+if (nMonth < 0 && nDayOfWeek < 0 && nAnzNums == 3)
+{
+// If both, short month name and day of week name were
+// detected, and also numbers for full date, assume that we
+// have a day of week instead of month name.
+nMonth = 0;
+nMonthPos = 0;
+}
 if (nMonth)
 {   // month name and numbers
 if (nAnzNums > 2)
@@ -3546,6 +3582,15 @@ bool ImpSvNumberInputScan::IsNumberFormat( const 
OUString& rString, // s
   

[Libreoffice-commits] online.git: loleaflet/src

[Mihai Varga]

 loleaflet/src/layer/tile/TileLayer.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 898765d5a8d4f3653b95aafa996e1072859436c1
Author: Mihai Varga 
Date:   Fri Aug 7 11:26:20 2015 +0300

loleaflet: also set the status to 100% when all tiles are loaded

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index dfa0572..05a820f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -428,6 +428,7 @@ L.TileLayer = L.GridLayer.extend({
this._emptyTilesCount -= 1;
if (this._emptyTilesCount === 0) {

this._map.fire('statusindicator', {statusType: 'alltilesloaded'});
+   
this._map.fire('statusindicator', {statusType: 'setvalue', value: 100});
}
}
tile.el.src = img;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mihai Varga]

 loleaflet/src/layer/tile/TileLayer.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fcdebfed0f4bdbb965ef39b3987c6c25b8c3610f
Author: Mihai Varga 
Date:   Fri Aug 7 11:26:20 2015 +0300

loleaflet: also set the status to 100% when all tiles are loaded

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index dfa0572..05a820f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -428,6 +428,7 @@ L.TileLayer = L.GridLayer.extend({
this._emptyTilesCount -= 1;
if (this._emptyTilesCount === 0) {

this._map.fire('statusindicator', {statusType: 'alltilesloaded'});
+   
this._map.fire('statusindicator', {statusType: 'setvalue', value: 100});
}
}
tile.el.src = img;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Enum types in IDL and in code

[Matthew J. Francis]

On 07/08/2015 16:00, Miklos Vajna wrote:

Hi,

On Fri, Aug 07, 2015 at 01:07:52PM +0800, "Matthew J. Francis" 
 wrote:

Mainly the latter confusion. The problem the user I was discussing this
with had was that when trying to develop using such an interface you
have no idea what the value you receive from it is unless you can find
it in the IDL, and when you do so it suggests that it should have been
an actual enum to begin with.


If the IDL documentation and the actual code differs in such enum vs int
types, I think the best would be to adjust the documentation to match
the code, and not the other way around.


How specifically should that be changed, though. In this case, merely
changing the declared type to short would leave it such that its value
is defined by the set of integer values of an enum, which is still
annoying in terms of manipulation using PyUNO and peculiar in terms of
the IDL.

An equivalent constant group could be added, although that would be not
ideal in a different way - the original enum definition couldn't be
removed, as it may still be used for instance by existing Python code
to blindly assign values to the property.

Any advance then on the idea of:
- Making the declared type short
- Adding a constant group for it
- Deprecating the enum

I note that for this particular case, css::report::XReportControlFormat
declares a ParaAdjust attribute which is actually a short - the
documentation would need changing there to reference the new constant
group, but not the definition.

Regards
Matthew Francis

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 2 commits - loleaflet/dist loleaflet/src

[Mihai Varga]

 loleaflet/dist/leaflet.css   |5 +
 loleaflet/src/control/Control.Buttons.js |   23 +--
 loleaflet/src/layer/tile/TileLayer.js|   11 +++
 3 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit e3ef6a75fb1e2b1c511f71f077a5e53a436492ca
Author: Mihai Varga 
Date:   Fri Aug 7 12:22:19 2015 +0300

loleaflet: disable buttons in viewing mode

diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 2c8beca..477f86f 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -329,10 +329,15 @@ a.leaflet-control-buttons:first-child,
 a.leaflet-control-buttons:hover:first-child {
margin-left: 0px;
}
+
 .leaflet-control-buttons-active {
border: thin solid;
}
 
+.leaflet-control-buttons-disabled{
+   opacity: 0.5;
+   }
+
 .leaflet-control-button-separator {
width: 14px;
height: 1px;
diff --git a/loleaflet/src/control/Control.Buttons.js 
b/loleaflet/src/control/Control.Buttons.js
index 3c971c7..dd7625c 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -33,6 +33,7 @@ L.Control.Buttons = L.Control.extend({
buttonsName, container, this._onButtonClick);
}
map.on('commandstatechanged', this._onStateChange, this);
+   map.on('updatepermission', this._onPermissionUpdate, this);
 
return container;
},
@@ -64,7 +65,7 @@ L.Control.Buttons = L.Control.extend({
callback: L.bind(this._onSaveAs, this)
});
}
-   else {
+   else if (this._map._docLayer._permission === 'edit') {
this._map.toggleCommandState(button.uno);
}
},
@@ -81,6 +82,12 @@ L.Control.Buttons = L.Control.extend({
else if (state === 'false') {

L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-active');
}
+   else if (state === 'enabled' && 
this._map._docLayer._permission === 'edit') {
+   
L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled');
+   }
+   else if (state === 'disabled') {
+   
L.DomUtil.removeClass(button.el.firstChild, 'leaflet-control-buttons-disabled');
+   }
}
}
},
@@ -99,6 +106,18 @@ L.Control.Buttons = L.Control.extend({
if (e !== false) {
this._map.saveAs(e.url, e.format, e.options);
}
+   },
+
+   _onPermissionUpdate: function (e) {
+   for (var key in this._buttons) {
+   var button = this._buttons[key];
+   if (e.perm !== 'edit') {
+   L.DomUtil.addClass(button.el.firstChild, 
'leaflet-control-buttons-disabled');
+   }
+   else {
+   L.DomUtil.removeClass(button.el.firstChild, 
'leaflet-control-buttons-disabled');
+   }
+   }
}
 });
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 1d815cc..bcda4aa 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -116,12 +116,15 @@ L.TileLayer = L.GridLayer.extend({
this._endMarker.on('drag dragend', this._onSelectionHandleDrag, 
this);
this._textArea = this._map._textArea;
this._textArea.focus();
-   if (this.options.edit && !this.options.readOnly) {
-   this._map.setPermission('edit');
-   }
if (this.options.readOnly) {
this._map.setPermission('readonly');
}
+   else if (this.options.edit) {
+   this._map.setPermission('edit');
+   }
+   else {
+   this._map.setPermission('view');
+   }
this._map.fire('statusindicator', {statusType: 
'loleafletloaded'});
},
 
commit 54f00fae191e5be5f5f87131f5f9cfa6e4761e70
Author: Mihai Varga 
Date:   Fri Aug 7 11:48:31 2015 +0300

loleaflet: forgot to rename command state event

diff --git a/loleaflet/src/control/Control.Buttons.js 
b/loleaflet/src/control/Control.Buttons.js
index 076c642..3c971c7 100644
--- a/loleaflet/src/control/Control.Buttons.js
+++ b/loleaflet/src/control/Control.Buttons.js
@@ -32,7 +32,7 @@ L.Control.Buttons = L.Control.extend({
button.el = this._createButton(key, button.title, 
button.iconName,
 

Re: Enum types in IDL and in code

[Miklos Vajna]

Hi,

On Fri, Aug 07, 2015 at 04:52:36PM +0800, "Matthew J. Francis" 
 wrote:
> How specifically should that be changed, though. In this case, merely
> changing the declared type to short would leave it such that its value
> is defined by the set of integer values of an enum, which is still
> annoying in terms of manipulation using PyUNO and peculiar in terms of
> the IDL.

If the documentation says that this is a short, exact possible values
are defined here and there, I don't see that worse than the current
situation. :-)

> An equivalent constant group could be added, although that would be not
> ideal in a different way - the original enum definition couldn't be
> removed, as it may still be used for instance by existing Python code
> to blindly assign values to the property.

I think we add equivalent constant groups only in case the
enumeration would be extended (but isn't to avoid incompatibility), e.g.
text::WritingMode vs text::WritingMode2.

> Any advance then on the idea of:
> - Making the declared type short

I would do this.

> - Adding a constant group for it
> - Deprecating the enum

I would only these if there will be a new item for the enumration in the
future.

> I note that for this particular case, css::report::XReportControlFormat
> declares a ParaAdjust attribute which is actually a short - the
> documentation would need changing there to reference the new constant
> group, but not the definition.

This is a problem for Writer paragraphs' ParaAdjust property, too:

text::Paragraph refers to style::ParagraphProperties, which says
ParaAdjust is a style::ParagraphAdjust, which is an enum.

In reality, sw/source/core/unocore/unomap.cxx says UNO_NAME_PARA_ADJUST
is a sal_Int16.

In case all other ParaAdjust implementations (I'm sure at least editeng
has one) also deal with a sal_Int16 in fact, then just changing
'[property] com::sun::star::style::ParagraphAdjust ParaAdjust;' to
'[property] short ParaAdjust;' in the IDL file (and using a comment to
still refer to the enumeration informally) would make sense, I think.
Even if the in-build check complains that this is nominally an
incompatible change.

Regards,

Miklos


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

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

[Phillip Sz]

 sw/source/filter/ww8/ww8scan.cxx |  348 +++
 1 file changed, 171 insertions(+), 177 deletions(-)

New commits:
commit 6d3b26829b5f30ea934249ef88eb10b2507969f1
Author: Phillip Sz 
Date:   Wed Aug 5 23:10:29 2015 +0200

tdf#39468 Translate German Comments - sw/source/filter/ww8/ww8scan.cxx

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 174f7f0..6c1c600 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1511,13 +1511,13 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 if (!checkSeek(*pStr, nClxPos))
 return NULL;
 
-while( true ) // Zaehle Zahl der Grpprls
+while( true ) // count number of Grpprls
 {
 sal_uInt8 clxt(2);
 pStr->ReadUChar( clxt );
 nLeft--;
 if( 2 == clxt ) // PLCFfpcd ?
-break;  // PLCFfpcd gefunden
+break;  // PLCFfpcd found
 if( 1 == clxt ) // clxtGrpprl ?
 {
 if (nGrpprl == SHRT_MAX)
@@ -1529,7 +1529,7 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 nLeft -= 2 + nLen;
 if( nLeft < 0 )
 return NULL;// gone wrong
-pStr->SeekRel( nLen );  // ueberlies grpprl
+pStr->SeekRel( nLen );  // ignore grpprl
 }
 
 if (!checkSeek(*pStr, nClxPos))
@@ -1557,18 +1557,18 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* 
pStr, const WW8Fib* pWwF )
 if (nLen > pStr->remainingSize())
 return NULL;
 sal_uInt8* p = new sal_uInt8[nLen+2]; // allocate
-ShortToSVBT16(nLen, p); // trage Laenge ein
+ShortToSVBT16(nLen, p); // add length
 if (!checkRead(*pStr, p+2, nLen))   // read grpprl
 {
 delete[] p;
 return NULL;
 }
-pPieceGrpprls[nAktGrpprl++] = p;// trage in Array ein
+pPieceGrpprls[nAktGrpprl++] = p;// add to array
 }
 else
-pStr->SeekRel( nLen );  // ueberlies nicht-Grpprl
+pStr->SeekRel( nLen );  // non-Grpprl left
 }
-// lies Piece Table PLCF ein
+// read Piece Table PLCF
 sal_Int32 nPLCFfLen(0);
 if (pWwF->GetFIBVersion() <= ww::eWW2)
 {
@@ -1761,7 +1761,6 @@ WW8ScannerBase::~WW8ScannerBase()
 delete pSepPLCF;
 delete pPapPLCF;
 delete pChpPLCF;
-// vergessene Schaeflein
 delete pMainFdoa;
 delete pHdFtFdoa;
 delete pMainTxbx;
@@ -4050,17 +4049,19 @@ long WW8PLCFx_Book::GetNoSprms( WW8_CP& rStart, WW8_CP& 
rEnd, sal_Int32& rLen )
 return pBook[nIsEnd]->GetIdx();
 }
 
-// Der Operator ++ hat eine Tuecke: Wenn 2 Bookmarks aneinandergrenzen, dann
-// sollte erst das Ende des ersten und dann der Anfang des 2. erreicht werden.
-// Liegen jedoch 2 Bookmarks der Laenge 0 aufeinander, *muss* von jedem 
Bookmark
-// erst der Anfang und dann das Ende gefunden werden.
-// Der Fall: ][
-//[...]
-//   ][
-// ist noch nicht geloest, dabei muesste ich in den Anfangs- und Endindices
-// vor- und zurueckspringen, wobei ein weiterer Index oder ein Bitfeld
-// oder etwas aehnliches zum Merken der bereits abgearbeiteten Bookmarks
-// noetig wird.
+// The operator ++ has a pitfall: If 2 bookmarks adjoin each other,
+// we should first go to the end of the first one
+// and then to the beginning of the second one.
+// But if 2 bookmarks with the length of 0 lie on top of each other,
+// we *must* first find the start and end of each bookmark.
+// The case of: ][
+//   [...]
+//  ][
+// is not solved yet.
+// Because I must jump back and forth in the start- and end-indices then.
+// This would require one more index or bitfield to remember
+// the already processed bookmarks.
+
 void WW8PLCFx_Book::advance()
 {
 if( pBook[0] && pBook[1] && nIMax )
@@ -4353,9 +4354,9 @@ bool WW8PLCFx_AtnBook::getIsEnd() const
 
 #ifndef DUMP
 
-// Am Ende eines Absatzes reichen bei WW6 die Attribute bis hinter das .
-// Das wird fuer die Verwendung mit dem SW um 1 Zeichen zurueckgesetzt, wenn
-// dadurch kein AErger zu erwarten ist.
+// In the end of an paragraph in WW6 the attribute extends behind the .
+// This will be reset by one character to be used with SW,
+// if we don't expect trouble thereby.
 void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 {
 //Store old end position for supercool new property finder that uses
@@ -4377,20 +4378,20 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl vcl/inc vcl/opengl vcl/unx

[Tomaž Vajngerl]

 include/vcl/salnativewidgets.hxx |   42 +++
 vcl/inc/opengl/x11/gdiimpl.hxx   |   11 +++-
 vcl/inc/unx/salgdi.h |6 ++
 vcl/inc/unx/x11/x11gdiimpl.h |6 ++
 vcl/opengl/x11/gdiimpl.cxx   |   84 ++-
 vcl/unx/generic/gdi/gdiimpl.cxx  |   11 
 vcl/unx/generic/gdi/gdiimpl.hxx  |5 +
 vcl/unx/generic/gdi/salgdi2.cxx  |   15 +
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   23 +---
 9 files changed, 182 insertions(+), 21 deletions(-)

New commits:
commit b4faa69e4a9a99cdd12b7999d95459b1a8639e9f
Author: Tomaž Vajngerl 
Date:   Thu Jul 23 19:15:20 2015 +0900

tdf#92018 cache native controls for X11 OpenGL backend (for now)

Change-Id: I85c7cc01113bc4ac810c450a6460059463cc8e03
(cherry picked from commit 450727fdffa4a0dc3b2d4e635a5c1bc0411b3c36)
Reviewed-on: https://gerrit.libreoffice.org/17554
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 66bc744..9692a80 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 /* Control Types:
  *
  *   Specify the overall, whole control
@@ -254,6 +256,46 @@ namespace o3tl
 template<> struct typed_flags : is_typed_flags {};
 }
 
+class ControlCacheKey
+{
+public:
+ControlType mnType;
+ControlPart mnPart;
+ControlState mnState;
+Size maSize;
+
+ControlCacheKey(ControlType nType, ControlPart nPart, ControlState nState, 
const Size& rSize)
+: mnType(nType)
+, mnPart(nPart)
+, mnState(nState)
+, maSize(rSize)
+{}
+
+bool operator==(ControlCacheKey const& aOther) const
+{
+return mnType == aOther.mnType
+&& mnPart == aOther.mnPart
+&& mnState == aOther.mnState
+&& maSize.Width() == aOther.maSize.Width()
+&& maSize.Height() == aOther.maSize.Height();
+}
+};
+
+struct ControlCacheHashFunction
+{
+std::size_t operator()(ControlCacheKey const& aCache) const
+{
+std::size_t seed = 0;
+boost::hash_combine(seed, aCache.mnType);
+boost::hash_combine(seed, aCache.mnPart);
+boost::hash_combine(seed, aCache.mnState);
+boost::hash_combine(seed, aCache.maSize.Width());
+boost::hash_combine(seed, aCache.maSize.Height());
+return seed;
+}
+};
+
+
 /* ButtonValue:
  *
  *   Identifies the tri-state value options
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index feb3961..9e2ece3 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -16,6 +16,8 @@
 #include "unx/x11/x11gdiimpl.h"
 #include "openglgdiimpl.hxx"
 
+class TextureCombo;
+
 class VCL_PLUGIN_PUBLIC X11OpenGLSalGraphicsImpl : public 
OpenGLSalGraphicsImpl, public X11GraphicsImpl
 {
 private:
@@ -29,6 +31,8 @@ protected:
 virtual OpenGLContext* CreateWinContext() SAL_OVERRIDE;
 virtual bool UseContext( OpenGLContext* pContext ) SAL_OVERRIDE;
 
+bool RenderPixmap(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY, 
TextureCombo& rCombo);
+
 public:
 // implementation of X11GraphicsImpl
 
@@ -37,7 +41,12 @@ public:
 virtual void Init() SAL_OVERRIDE;
 
 bool FillPixmapFromScreen( X11Pixmap* pPixmap, int nX, int nY ) 
SAL_OVERRIDE;
-bool RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, 
int nY ) SAL_OVERRIDE;
+bool RenderPixmapToScreen(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, 
int nY) SAL_OVERRIDE;
+
+bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int 
nX, int nY,
+ ControlCacheKey& aControlCacheKey) 
SAL_OVERRIDE;
+bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey,
+  int nX, int nY) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_INC_OPENGL_X11_GDIIMPL_HXX
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 0a0d0d3..a44ef1e 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -272,6 +272,12 @@ public:
 virtual voidBeginPaint() SAL_OVERRIDE;
 virtual voidEndPaint() SAL_OVERRIDE;
 
+bool TryRenderCachedNativeControl(ControlCacheKey& aControlCacheKey,
+  int nX, int nY);
+
+bool RenderAndCacheNativeControl(X11Pixmap* pPixmap, X11Pixmap* pMask, int 
nX, int nY,
+ ControlCacheKey& aControlCacheKey);
+
 // fill a pixmap from a screen region
 boolFillPixmapFromScreen( X11Pixmap* pPixmap, 
int nX, int nY );
 
diff --git a/vcl/inc/unx/x11/x11gdiimpl.h b/vcl/inc/unx/x11/x11gdiimpl.h
index 22859c3..c504364 100644
--- a/vcl/inc/unx/x11/x11gdiimpl.h
+++ b/vcl/inc/unx/x11/x11gdiimpl.h
@@ -12,6 +12,8 @@
 
 #i

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/o3tl o3tl/CppunitTest_o3tl_tests.mk o3tl/qa

[Tomaž Vajngerl]

 include/o3tl/lru_map.hxx   |  141 
 o3tl/CppunitTest_o3tl_tests.mk |1 
 o3tl/qa/test-lru_map.cxx   |  239 +
 3 files changed, 381 insertions(+)

New commits:
commit 1215b9deff48c071f1ca8916f8307cb329bf495e
Author: Tomaž Vajngerl 
Date:   Fri Jul 24 13:39:22 2015 +0900

LRU map (cache) implementation to o3tl + tests

Change-Id: I6b1a39918e6c8c67712be2c8e9907266dcfefedb
(cherry picked from commit 80a92134806a876287818530eb61c6bb536a05f9)
Reviewed-on: https://gerrit.libreoffice.org/17555
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
new file mode 100644
index 000..6d3b725
--- /dev/null
+++ b/include/o3tl/lru_map.hxx
@@ -0,0 +1,141 @@
+/* -*- 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/.
+ *
+ */
+
+#ifndef INCLUDED_O3TL_LRU_MAP_HXX
+#define INCLUDED_O3TL_LRU_MAP_HXX
+
+#include 
+#include 
+
+namespace o3tl
+{
+
+/** LRU map
+ *
+ * Similar to unordered_map (it actually uses it) with additionaly 
functionality
+ * which removes the entries that have been "least recently used" when the size
+ * hits the specified capacity.
+ *
+ * It only implements the minimal methods needed and the implementation is NOT
+ * thread safe.
+ *
+ * The implementation is as simple as possible but it still uses O(1) 
complexity
+ * for most of the operations with a combination unordered map and linked list.
+ *
+ **/
+template>
+class lru_map SAL_FINAL
+{
+private:
+typedef typename std::pair key_value_pair_t;
+typedef std::list list_t;
+typedef typename list_t::iterator list_iterator_t;
+typedef typename list_t::const_iterator list_const_iterator_t;
+
+typedef std::unordered_map map_t;
+typedef typename map_t::iterator map_iterator_t;
+typedef typename map_t::const_iterator map_const_iterator_t;
+
+list_t mLruList;
+map_t mLruMap;
+const size_t mMaxSize;
+
+inline void checkLRU()
+{
+if (mLruMap.size() > mMaxSize)
+{
+// remove from map
+mLruMap.erase(mLruList.back().first);
+// remove from list
+mLruList.pop_back();
+}
+}
+public:
+typedef list_iterator_t iterator;
+typedef list_const_iterator_t const_iterator;
+
+lru_map(size_t nMaxSize)
+: mMaxSize(nMaxSize)
+{}
+
+void insert(key_value_pair_t& rPair)
+{
+map_iterator_t iterator = mLruMap.find(rPair.first);
+
+if (iterator == mLruMap.end()) // doesn't exist -> add to queue and map
+{
+// add to front of the list
+mLruList.push_front(rPair);
+// add the list position (iterator) to the map
+mLruMap[rPair.first] = mLruList.begin();
+checkLRU();
+}
+else // already exists -> replace value
+{
+// replace value
+iterator->second->second = rPair.second;
+// bring to front of the lru list
+mLruList.splice(mLruList.begin(), mLruList, iterator->second);
+}
+}
+
+void insert(key_value_pair_t&& rPair)
+{
+map_iterator_t iterator = mLruMap.find(rPair.first);
+
+if (iterator == mLruMap.end()) // doesn't exist -> add to list and map
+{
+// add to front of the list
+mLruList.push_front(std::move(rPair));
+// add the list position (iterator) to the map
+mLruMap[rPair.first] = mLruList.begin();
+checkLRU();
+}
+else // already exists -> replace value
+{
+// replace value
+iterator->second->second = std::move(rPair.second);
+// push to back of the lru list
+mLruList.splice(mLruList.begin(), mLruList, iterator->second);
+}
+}
+
+const list_const_iterator_t find(const Key& key)
+{
+const map_iterator_t iterator = mLruMap.find(key);
+if (iterator == mLruMap.cend()) // can't find entry for the key
+{
+// return empty iterator
+return mLruList.cend();
+}
+else
+{
+// push to back of the lru list
+mLruList.splice(mLruList.begin(), mLruList, iterator->second);
+return iterator->second;
+}
+}
+
+const list_const_iterator_t end() const
+{
+return mLruList.end();
+}
+
+size_t size() const
+{
+return mLruList.size();
+}
+};
+
+}
+
+#endif /* INCLUDED_O3TL_LRU_MAP_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_te

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

[Tomaž Vajngerl]

 vcl/inc/opengl/salbmp.hxx  |2 +
 vcl/opengl/scale.cxx   |   52 -
 vcl/opengl/x11/gdiimpl.cxx |7 ++
 3 files changed, 56 insertions(+), 5 deletions(-)

New commits:
commit 22421a4083529e852fc6d290c2cc8c7611e9150b
Author: Tomaž Vajngerl 
Date:   Fri Jul 31 16:31:29 2015 +0900

opengl: when scaling, create a new texture with equal settings

Change-Id: Id0258fe0db89aa06b91233ae2052f018d606cc74
(cherry picked from commit 6d9ddfb9c7a946e9b9cc58ae2cebcf3a21a5bf22)
Reviewed-on: https://gerrit.libreoffice.org/17558
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 3df78c8..15ff571 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -106,6 +106,8 @@ private:
 bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, 
const Kernel& aKernel );
 bool ImplScaleArea( double rScaleX, double rScaleY );
 
+bool getFormatAndType(GLenum& nFormat, GLenum& nType);
+
 public:
 
 bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag 
nScaleFlag );
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index a479a11..fcb4273 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -43,6 +43,31 @@ public:
 void GetSize( Size& rSize ) const SAL_OVERRIDE;
 };
 
+bool OpenGLSalBitmap::getFormatAndType(GLenum& nFormat, GLenum& nType)
+{
+switch(mnBits)
+{
+case  8:
+nFormat = GL_LUMINANCE;
+nType = GL_UNSIGNED_BYTE;
+break;
+case 16:
+nFormat = GL_RGB;
+nType = GL_UNSIGNED_SHORT_5_6_5;
+break;
+case 24:
+nFormat = GL_RGB;
+nType = GL_UNSIGNED_BYTE;
+break;
+case 32:
+default:
+nFormat = GL_RGBA;
+nType = GL_UNSIGNED_BYTE;
+break;
+}
+return true;
+}
+
 bool OpenGLSalBitmap::ImplScaleFilter(
 const double& rScaleX,
 const double& rScaleY,
@@ -59,7 +84,11 @@ bool OpenGLSalBitmap::ImplScaleFilter(
 if( !pProgram )
 return false;
 
-OpenGLTexture aNewTex = OpenGLTexture( nNewWidth, nNewHeight );
+GLenum nFormat;
+GLenum nType;
+getFormatAndType(nFormat, nType);
+
+OpenGLTexture aNewTex = OpenGLTexture(nNewWidth, nNewHeight, nFormat, 
nType, nullptr);
 pFramebuffer = mpContext->AcquireFramebuffer( aNewTex );
 
 pProgram->SetTexture( "sampler", maTexture );
@@ -138,10 +167,15 @@ bool OpenGLSalBitmap::ImplScaleConvolution(
 if( pProgram == 0 )
 return false;
 
+GLenum nFormat;
+GLenum nType;
+getFormatAndType(nFormat, nType);
+
 // horizontal scaling in scratch texture
 if( mnWidth != nNewWidth )
 {
-OpenGLTexture aScratchTex = OpenGLTexture( nNewWidth, mnHeight );
+OpenGLTexture aScratchTex = OpenGLTexture(nNewWidth, mnHeight, 
nFormat, nType, nullptr);
+
 pFramebuffer = mpContext->AcquireFramebuffer( aScratchTex );
 
 for( sal_uInt32 i = 0; i < 16; i++ )
@@ -163,7 +197,8 @@ bool OpenGLSalBitmap::ImplScaleConvolution(
 // vertical scaling in final texture
 if( mnHeight != nNewHeight )
 {
-OpenGLTexture aScratchTex = OpenGLTexture( nNewWidth, nNewHeight );
+OpenGLTexture aScratchTex = OpenGLTexture(nNewWidth, nNewHeight, 
nFormat, nType, nullptr);
+
 pFramebuffer = mpContext->AcquireFramebuffer( aScratchTex );
 
 for( sal_uInt32 i = 0; i < 16; i++ )
@@ -223,7 +258,12 @@ bool OpenGLSalBitmap::ImplScaleArea( double rScaleX, 
double rScaleY )
 if( pProgram == 0 )
 return false;
 
-OpenGLTexture aScratchTex = OpenGLTexture( nNewWidth, nNewHeight );
+GLenum nFormat;
+GLenum nType;
+getFormatAndType(nFormat, nType);
+
+OpenGLTexture aScratchTex = OpenGLTexture(nNewWidth, nNewHeight, nFormat, 
nType, nullptr);
+
 OpenGLFramebuffer* pFramebuffer = mpContext->AcquireFramebuffer( 
aScratchTex );
 
 // NOTE: This setup is also done in 
OpenGLSalGraphicsImpl::DrawTransformedTexture().
@@ -325,7 +365,9 @@ void ScaleOp::GetSize( Size& rSize ) const
 
 bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, 
BmpScaleFlag nScaleFlag )
 {
-SAL_INFO( "vcl.opengl", "::Scale " << static_cast(nScaleFlag) );
+SAL_INFO("vcl.opengl", "::Scale " << int(nScaleFlag)
+ << " from " << mnWidth << "x" << mnHeight
+ << " to " << (mnWidth * rScaleX) << "x" << (mnHeight * rScaleY) );
 
 if( nScaleFlag == BmpScaleFlag::Fast ||
 nScaleFlag == BmpScaleFlag::BiLinear ||
commit c02d01ba71f5290beac991d5ddafe1309b428ebf
Author: Tomaž Vajngerl 
Date:   Fri Jul 24 16:08:01 2015 +0900

opengl: don't cache checkboxes for now

Change-Id: I67d0dcb48d1843587abbc1dc0f7da1f8057b281e
(cherry picked from commit 1c28c59f927361ef85c8aea8b575d274c532a34d)
Reviewed-on: https://gerrit.libreoffice.org/17557
Tested-by: Jenkins 
Reviewed-by: 

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #195 from Commit Notification 
 ---
Phillip Sz committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468 Translate German Comments - sw/source/filter/ww8/ww8scan.cxx

It will be available in 5.1.0.

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

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

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

[Tomaž Vajngerl]

 vcl/opengl/x11/gdiimpl.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 7152aa8cba6ec58c4b234cd0024a5b1a980e0b04
Author: Tomaž Vajngerl 
Date:   Fri Jul 24 14:19:35 2015 +0900

Use LRU map for caching of native widgets

Change-Id: Ia0423dac5309aabc5e81357cf4f67b5ee14bab31
(cherry picked from commit 3bc00eca4acf9dfc3b2834077cee552f32c8f107)
Reviewed-on: https://gerrit.libreoffice.org/17556
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 3890b64..2114419 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+
 X11OpenGLSalGraphicsImpl::X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent ):
 OpenGLSalGraphicsImpl(rParent,rParent.GetGeometryProvider()),
 mrParent(rParent)
@@ -117,9 +119,10 @@ struct TextureCombo
 std::unique_ptr mpMask;
 };
 
-typedef std::unordered_map, 
ControlCacheHashFunction> ControlCacheType;
+typedef typename std::pair> 
ControlCachePair;
+typedef o3tl::lru_map, 
ControlCacheHashFunction> ControlCacheType;
 
-ControlCacheType gTextureCache;
+ControlCacheType gTextureCache(200);
 
 bool X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap* pPixmap, X11Pixmap* 
pMask, int nX, int nY, TextureCombo& rCombo)
 {
@@ -235,7 +238,8 @@ bool 
X11OpenGLSalGraphicsImpl::RenderAndCacheNativeControl(X11Pixmap* pPixmap, X
 {
 std::unique_ptr pCombo(new TextureCombo);
 bool bResult = RenderPixmap(pPixmap, pMask, nX, nY, *pCombo);
-gTextureCache[aControlCacheKey] = std::move(pCombo);
+ControlCachePair pair(aControlCacheKey, std::move(pCombo));
+gTextureCache.insert(std::move(pair));
 return bResult;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 92018] Implement caching for native widget rendering in OpenGL rendering

[bugzilla-daemon]

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

--- Comment #2 from Commit Notification 
 ---
Tomaž Vajngerl committed a patch related to this issue.
It has been pushed to "libreoffice-5-0":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=b4faa69e4a9a99cdd12b7999d95459b1a8639e9f&h=libreoffice-5-0

tdf#92018 cache native controls for X11 OpenGL backend (for now)

It will be available in 5.0.1.

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

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

[Bug 92018] Implement caching for native widget rendering in OpenGL rendering

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack|EasyHack
   |DifficultyInteresting   |DifficultyInteresting
   |SkillCpp target:5.1.0   |SkillCpp target:5.1.0
   ||target:5.0.1

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

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

[Tomaž Vajngerl]

 vcl/opengl/program.cxx |1 +
 vcl/opengl/salbmp.cxx  |7 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit b55e95ab39c684e226c667af456dea4f3d53b791
Author: Tomaž Vajngerl 
Date:   Mon Aug 3 10:13:38 2015 +0900

Apply MVP matrix when drawing texture using OpenGLProgram

Change-Id: I1dc34eee645b77537517e147b86599cfe74f09a9
(cherry picked from commit d97cc94a02c00b912bbcb430cde55ce0cfb0292c)
Reviewed-on: https://gerrit.libreoffice.org/17560
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx
index 157243b..3bfa6c2 100644
--- a/vcl/opengl/program.cxx
+++ b/vcl/opengl/program.cxx
@@ -278,6 +278,7 @@ bool OpenGLProgram::DrawTexture( OpenGLTexture& rTexture )
 rTexture.GetWholeCoord( aTexCoord );
 SetVertices( aPosition );
 SetTextureCoord( aTexCoord );
+ApplyMatrix(fWidth, fHeight);
 glDrawArrays( GL_TRIANGLE_FAN, 0, 4 );
 CHECK_GL_ERROR();
 
commit 127768880d44881defa937a98d222df321a47262
Author: Tomaž Vajngerl 
Date:   Fri Jul 31 16:46:47 2015 +0900

opengl: support reading 8bit texture (fixes icon corruption)

Change-Id: Iba3fd58374a550f3411b02f029f12f4509fb6048
(cherry picked from commit f73e1f50240208257964e28e0e65a56e323d86da)
Reviewed-on: https://gerrit.libreoffice.org/17559
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 982de8b..7b7f674 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -368,7 +368,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
 else
 {
 // convert to 32 bits RGBA using palette
-pData = new sal_uInt8[ mnBufHeight * (mnBufWidth << 2) ];
+pData = new sal_uInt8[mnBufHeight * mnBufWidth * 4];
 bAllocated = true;
 nFormat = GL_RGBA;
 nType = GL_UNSIGNED_BYTE;
@@ -424,13 +424,16 @@ bool OpenGLSalBitmap::ReadTexture()
 if( pData == NULL )
 return false;
 
-if( mnBits == 16 || mnBits == 24 || mnBits == 32 )
+if (mnBits == 8 || mnBits == 16 || mnBits == 24 || mnBits == 32)
 {
 // no conversion needed for truecolor
 pData = maUserBuffer.get();
 
 switch( mnBits )
 {
+case 8: nFormat = GL_LUMINANCE;
+nType = GL_UNSIGNED_BYTE;
+break;
 case 16:nFormat = GL_RGB;
 nType = GL_UNSIGNED_SHORT_5_6_5;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/inc/opengl/win/gdiimpl.hxx   |9 ++
 vcl/inc/openglgdiimpl.hxx|6 +
 vcl/opengl/win/gdiimpl.cxx   |   85 +++
 vcl/opengl/x11/gdiimpl.cxx   |6 -
 vcl/win/source/gdi/gdiimpl.cxx   |   14 
 vcl/win/source/gdi/gdiimpl.hxx   |6 +
 vcl/win/source/gdi/salnativewidgets-luna.cxx |   25 +++
 7 files changed, 130 insertions(+), 21 deletions(-)

New commits:
commit b63b54e7453cdda92914dfe3d1ea2d9f0d1f0d29
Author: Tomaž Vajngerl 
Date:   Mon Aug 3 15:06:55 2015 +0900

opengl: cache native widget textures also for Windows

Change-Id: I476f0ffaef383f3227c0c12b50fcdebf393190f6
Reviewed-on: https://gerrit.libreoffice.org/17487
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit dea885f80a80c6a5839ee5dbf8521487186a9522)
Reviewed-on: https://gerrit.libreoffice.org/17561
Reviewed-by: Miklos Vajna 

diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 03007c9..e1fa195 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -23,6 +23,9 @@ class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl
 private:
 WinSalGraphics& mrParent;
 
+bool RenderCompatibleDC(OpenGLCompatibleDC& rWhite, OpenGLCompatibleDC& 
rBlack,
+int nX, int nY, TextureCombo& rCombo);
+
 public:
 WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics,
  SalGeometryProvider *mpProvider);
@@ -34,6 +37,12 @@ protected:
 public:
 virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* 
pSrcGraphics ) SAL_OVERRIDE;
 
+
+bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int 
nX, int nY);
+
+bool RenderAndCacheNativeControl(OpenGLCompatibleDC& rWhite, 
OpenGLCompatibleDC& rBlack,
+ int nX, int nY , ControlCacheKey& 
aControlCacheKey);
+
 };
 
 #endif
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 1ac1ec3..9e95f5e 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -40,6 +40,12 @@ namespace basegfx
 class B2DTrapezoid;
 };
 
+struct TextureCombo
+{
+std::unique_ptr mpTexture;
+std::unique_ptr mpMask;
+};
+
 class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public SalGraphicsImpl
 {
 protected:
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index ee53c8a..cd7dc87 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -7,6 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+
 #include "opengl/win/gdiimpl.hxx"
 
 #include 
@@ -43,4 +46,86 @@ bool WinOpenGLSalGraphicsImpl::UseContext( OpenGLContext* 
pContext )
 return ( pContext->getOpenGLWindow().hWnd == mrParent.mhWnd );
 }
 
+namespace
+{
+
+typedef std::pair> 
ControlCachePair;
+typedef o3tl::lru_map, 
ControlCacheHashFunction> ControlCacheType;
+
+ControlCacheType gTextureCache(200);
+
+}
+
+bool WinOpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& 
rControlCacheKey, int nX, int nY)
+{
+static bool gbCacheEnabled = !getenv("SAL_WITHOUT_WIDGET_CACHE");
+
+if (!gbCacheEnabled)
+return false;
+
+ControlCacheType::const_iterator iterator = 
gTextureCache.find(rControlCacheKey);
+
+if (iterator == gTextureCache.end())
+return false;
+
+const std::unique_ptr& pCombo = iterator->second;
+
+PreDraw();
+
+OpenGLTexture& rTexture = *pCombo->mpTexture;
+
+SalTwoRect aPosAry(0,  0,  rTexture.GetWidth(), rTexture.GetHeight(),
+   nX, nY, rTexture.GetWidth(), rTexture.GetHeight());
+
+if (pCombo->mpMask)
+DrawTextureDiff(rTexture, *pCombo->mpMask, aPosAry, true);
+else
+DrawTexture(rTexture, aPosAry, true);
+
+PostDraw();
+
+return true;
+}
+
+bool WinOpenGLSalGraphicsImpl::RenderCompatibleDC(OpenGLCompatibleDC& rWhite, 
OpenGLCompatibleDC& rBlack,
+  int nX, int nY, 
TextureCombo& rCombo)
+{
+PreDraw();
+
+rCombo.mpTexture.reset(rWhite.getTexture());
+rCombo.mpMask.reset(rBlack.getTexture());
+
+
+if (rCombo.mpTexture && rCombo.mpMask)
+{
+OpenGLTexture& rTexture = *rCombo.mpTexture;
+
+SalTwoRect aPosAry(0,   0, rTexture.GetWidth(), rTexture.GetHeight(),
+   nX, nY, rTexture.GetWidth(), rTexture.GetHeight());
+
+DrawTextureDiff(*rCombo.mpTexture, *rCombo.mpMask, aPosAry);
+}
+
+PostDraw();
+return true;
+}
+
+bool WinOpenGLSalGraphicsImpl::RenderAndCacheNativeControl(OpenGLCompatibleDC& 
rWhite, OpenGLCompatibleDC& rBlack,
+   int nX, int nY , 
ControlCacheKey& aControlCacheKey)
+{
+std::unique_ptr pCombo(new TextureCombo);
+
+bool bResult = RenderCompatibleDC(rWhi

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

[Caolán McNamara]

 basctl/source/dlged/managelang.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89d8ad07c3fe619a0efa809750687e1276668fd4
Author: Caolán McNamara 
Date:   Fri Aug 7 09:10:57 2015 +0100

Resolves: tdf#92896 wrong delete language dialog path

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

diff --git a/basctl/source/dlged/managelang.cxx 
b/basctl/source/dlged/managelang.cxx
index 5910699..998a688 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -164,7 +164,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
 
 IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
 {
-ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", 
"modules/BasicIDE/ui/deletelang.ui");
+ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", 
"modules/BasicIDE/ui/deletelangdialog.ui");
 if ( aQBox->Execute() == RET_OK )
 {
 sal_uInt16 i, nCount = m_pLanguageLB->GetSelectEntryCount();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |   35 +++
 1 file changed, 19 insertions(+), 16 deletions(-)

New commits:
commit ea4a775eb1a15d2be198e42b199af025ed90926a
Author: Caolán McNamara 
Date:   Fri Aug 7 10:43:09 2015 +0100

Resolves: tdf#93198 gtk3: support PRIMARY as well as CLIPBOARD

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

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 41708923c..76b44da 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -97,8 +97,15 @@ class GtkTransferable : public ::cppu::WeakImplHelper1 <
 css::datatransfer::XTransferable >
 {
 private:
+GdkAtom m_nSelection;
 std::map m_aMimeTypeToAtom;
 public:
+
+GtkTransferable(GdkAtom nSelection)
+: m_nSelection(nSelection)
+{
+}
+
 /*
  * XTransferable
  */
@@ -109,7 +116,7 @@ public:
   css::uno::RuntimeException, std::exception
   ) SAL_OVERRIDE
 {
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 if (rFlavor.MimeType == "text/plain;charset=utf-16")
 {
 OUString aStr;
@@ -142,7 +149,7 @@ public:
 {
 std::vector aVector;
 
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 
 GdkAtom *targets;
 gint n_targets;
@@ -270,6 +277,7 @@ class VclGtkClipboard :
 datatransfer::clipboard::XSystemClipboard,
 XServiceInfo>
 {
+GdkAtom  m_nSelection;
 osl::Mutex   m_aMutex;
 ClipboardOwner*  m_pOwner;
 gulong   
m_nOwnerChangedSignalId;
@@ -281,7 +289,7 @@ class VclGtkClipboard :
 
 public:
 
-VclGtkClipboard();
+VclGtkClipboard(GdkAtom nSelection);
 virtual ~VclGtkClipboard();
 
 /*
@@ -366,7 +374,7 @@ Reference< css::datatransfer::XTransferable > 
VclGtkClipboard::getContents() thr
 {
 if (!m_aContents.is())
 {
-m_aContents = new GtkTransferable();
+m_aContents = new GtkTransferable(m_nSelection);
 }
 return m_aContents;
 }
@@ -489,11 +497,12 @@ namespace
 }
 }
 
-VclGtkClipboard::VclGtkClipboard()
+VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
 : cppu::WeakComponentImplHelper
 (m_aMutex)
+, m_nSelection(nSelection)
 {
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 m_nOwnerChangedSignalId = g_signal_connect(clipboard, "owner-change",

G_CALLBACK(handle_owner_change), this);
 m_pOwner = CLIPBOARD_OWNER(g_object_new(CLIPBOARD_OWNER_OBJECT, NULL));
@@ -502,7 +511,7 @@ VclGtkClipboard::VclGtkClipboard()
 
 VclGtkClipboard::~VclGtkClipboard()
 {
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 g_signal_handler_disconnect(clipboard, m_nOwnerChangedSignalId);
 g_object_unref(m_pOwner);
 }
@@ -562,7 +571,7 @@ void VclGtkClipboard::setContents(
 
 //if there was a previous gtk_clipboard_set_with_data call then
 //ClipboardClearFunc will be called now
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 //use with_owner with m_pOwner so we can distinguish in 
handle_owner_change
 //if we have gained or lost ownership of the clipboard
 gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), 
aGtkTargets.size(),
@@ -618,15 +627,9 @@ Reference< XInterface > GtkInstance::CreateClipboard(const 
Sequence< Any >& argu
 css::uno::Reference(), -1);
 }
 
-//see window.cxx HAVE_FEATURE_X11 hack, for now just support the
-//system clipboard and not the primary selection
-if (sel != "CLIPBOARD")
-{
-Reference< XComponentContext > 
xContext(comphelper::getProcessComponentContext());
-return 
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.datatransfer.clipboard.GenericClipboard",
 xContext);
-}
+GdkAtom nSelection = (sel == "CLIPBOARD") ? GDK_SELECTION_CLIPBOARD : 
GDK_SELECTION_PRIMARY;
 
-return Reference< XInterface >( static_cast(new 
VclGtkClipboard()) );
+return Reference< XInterface >( static_cast(new 
VclGtkClipboard(nSelection)) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits

Re: Enum types in IDL and in code

[Stephan Bergmann]

On 08/07/2015 11:32 AM, Miklos Vajna wrote:

In case all other ParaAdjust implementations (I'm sure at least editeng
has one) also deal with a sal_Int16 in fact, then just changing
'[property] com::sun::star::style::ParagraphAdjust ParaAdjust;' to
'[property] short ParaAdjust;' in the IDL file (and using a comment to
still refer to the enumeration informally) would make sense, I think.
Even if the in-build check complains that this is nominally an
incompatible change.


or, even more conservatively, keep the property declaration of type 
ParagraphAdjust (to avoid becoming---if only nominally---incompatible) 
and just adapt the documentation and state that actual implementations 
use values of type SHORT instead

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

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

[bugzilla-daemon]

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

--- Comment #15 from Ian Gilham  ---
Another small one: https://gerrit.libreoffice.org/17573

-- 
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/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotxed.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 482677679b868ba41b3829023542bed607704c7e
Author: matteocam 
Date:   Fri Aug 7 12:34:15 2015 +0200

Prevent flushing.

Change-Id: Ia3d0399fa7745904ec66b818a278ce12f73e3529

diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 92288ad..0366545 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -298,7 +298,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
 rOutl.ClearOverflowingParaNum();
 // XXX: Experiment
 /* Flush overflow for next textbox */
-if (
+if (false &&
 IsChainable() &&
 GetNextLinkInChain() &&
 GetTextChain()->GetPendingOverflowCheck(GetNextLinkInChain()) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[matteocam]

 editeng/source/outliner/outlvw.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eddc701b22134997c53edc7c1d438a343bac017a
Author: matteocam 
Date:   Fri Aug 7 12:37:54 2015 +0200

Calling chaining during undo action for paste

Change-Id: I68516eaa53703df9a96a8c5727272ee11f172788

diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index 16c416c..2f691bd 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -707,13 +707,13 @@ void OutlinerView::PasteSpecial()
 pOwner->ImplSetLevelDependendStyleSheet( nPara );
 }
 
+// XXX: Chaining call
+if (aEndCutPasteLink.IsSet())
+aEndCutPasteLink.Call(NULL);
+
 pEditView->SetEditEngineUpdateMode( true );
 pOwner->UndoActionEnd( OLUNDO_INSERT );
 pEditView->ShowCursor( true, true );
-
-// XXX: Not sure if this should be called right before ShowCursor
-if (aEndCutPasteLink.IsSet())
-aEndCutPasteLink.Call(NULL);
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Enum types in IDL and in code

[Matthew J. Francis]

On 07/08/2015 17:32, Miklos Vajna wrote:

Hi,

On Fri, Aug 07, 2015 at 04:52:36PM +0800, "Matthew J. Francis" 
 wrote:

How specifically should that be changed, though. In this case, merely
changing the declared type to short would leave it such that its value
is defined by the set of integer values of an enum, which is still
annoying in terms of manipulation using PyUNO and peculiar in terms of
the IDL.


If the documentation says that this is a short, exact possible values
are defined here and there, I don't see that worse than the current
situation. :-)


It's not worse, but also not by itself a solution for an important part
of the problem, which is that you currently can't compare a value from
this property with anything in PyUNO - only assign blindly to the
property (unless you go to the trouble of defining your own constants
from reading the IDL)

If there's a constant group, since a recent change you can

  import something.Group

then

  if obj.SomeProperty == Group.VALUE: ...


If there isn't, I'll have to also do something similar to make Enums
aware of their value set (which may be a good idea anyway), and make
them int-comparable as mentioned previously (which is ickier, Python
avoids doing this in its more recently added native Enum class - you
have to explicitly use an IntEnum for that).

[...]


In case all other ParaAdjust implementations (I'm sure at least editeng
has one) also deal with a sal_Int16 in fact, then just changing
'[property] com::sun::star::style::ParagraphAdjust ParaAdjust;' to
'[property] short ParaAdjust;' in the IDL file (and using a comment to
still refer to the enumeration informally) would make sense, I think.
Even if the in-build check complains that this is nominally an
incompatible change.


Unfortunately it looks like this may not be the case.
chart2/source/model/main/Title.cxx / 
offapi/com/sun/star/chart2/Title.idl look suspicious for one. If 
different implementations of the ParagraphProperties service disagree 
about the real type, then I don't see a way to make everything 
consistent compatibly.



Regards
Matthew Francis

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

Re: LibreOffice On-Line WebSocket Daemon - Help required

[Venkatesh]

>
>
>
> Iam trying to insall libra office on a debian 8.0 OS server.
> In this readme file of loolwds
>
>
> https://gerrit.libreoffice.org/gitweb?p=online.git;a=blob;f=loolwsd/README;h=39550cc7316460d2de4f47073220df2830edfab2;hb=HEAD
>
> I did not under this section
>
> loolwsd uses autoconf/automake, so build using the usual:
> 25
> 
> 26
> 
> MASTER=/path/to/built/core.git # configure for your system
>
>
> Where is this core.git will be ?
>
>
>
> If you can help me on this would be great help from you.
>
>
> Thanks
> Venkatesh
>
>
>
>
>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: German code comments

[Papamatti]

Hi all,

we could use the list as signpost. It is very anoying to search for
german comments manually. But I disagree with editing of text on github.
What if the source changes? Without the sourcecode it is hard to
translate the text correctly sometimes.

Cheese/Käse

Matthias

Am 06.08.2015 um 18:34 schrieb Philipp Weissenbacher:
> Hi Johannes, all,
> 
> Sorry, but this is not going to work properly and will presumably burden
> the reviewers (mostly German-speaking core developers) a lot.
> See, even the example on the GitHub page is inaccurate, due to missing
> context:
> 
> sw/source/filter/ww8/ww8struc.hxx:534: hiermit wird weitergearbeitet 
> (entspricht weitestgehend dem Ver8-Format
> -> with this we continue (largely matches the Ver8-format
> 
> That should be "With this we continue (largely corresponds to the
> version 8 format)".
> 
> My experience tells me, that the best translations get as much context
> from existing comments and surrounding code as possible.
> I just can't see that happening out of context in a large text file.
> 
> I really like your enthusiasm, so please read up on how to contribute
> comment translations like code via Gerrit
> (https://wiki.documentfoundation.org/Development/gerrit).
> 
> Cheers/Grüße,
> Philipp
> 
> On 6 August 2015 at 14:41, Bjoern Michaelsen
>  > wrote:
> 
> Hi,
> 
> On Thu, Aug 06, 2015 at 07:36:16AM -0500, Norbert Thiebaud wrote:
> > As long as the result is re-injected back in core.git via proper
> > gerrit patch, that can work...
> 
>  assuming the last 5.000 of 50.000 german comments are not
> weird, strange
> leftovers that require lots and lots of context from the surrounding
> code to be
> sensibly translated at all.
> 
> Lets see, maybe this works, but I am somewhat sceptical.
> 
> Best,
> 
> Bjoern
> ___
> 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
> 

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

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

[Henry Castro]

 loolwsd/loolstat |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 5c7071085160b0dd5d1404f6f4bf659445e01b8e
Author: Henry Castro 
Date:   Fri Aug 7 08:10:53 2015 -0400

loolwsd: update loolstat, socket client and  ...

prisoner

diff --git a/loolwsd/loolstat b/loolwsd/loolstat
index 91e1550..c2f4706 100755
--- a/loolwsd/loolstat
+++ b/loolwsd/loolstat
@@ -75,35 +75,35 @@ $PSTREE -a -c -h -A -p $LOOLWSD_PID;
 # get the number of running processes.
 LOOLWSD=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' 
| $GREP -o '^loolwsd,' | $WC -l);
 
-# get the number of running threads.
-LOOLWSD_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR 
-d ' |-' | $GREP -o '{loolwsd}' | $WC -l);
-
 # get the number of running processes.
 LOOLBROKER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' 
|-' | $GREP -o '^loolbroker,' | $WC -l);
 
-# get the number of running threads.
-LOOLBROKER_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | 
$TR -d ' |-' | $GREP -o '{loolbroker}' | $WC -l);
-
 # get the number of running processes.
 LOOLKIT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR -d ' |-' 
| $GREP -o '^loolkit,' | $WC -l);
 
-# get the number of running processes.
-LOOLKIT_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | $TR 
-d ' |-' | $GREP -o '{loolkit}' | $WC -l);
+# get the number of running threads.
+LOOLWSD_THREADS=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{.*}' | $WC -l);
+
+# get the number of running client socket.
+LOOLWSD_CLIENT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '{client_socket}' 
| $WC -l);
+
+# get the number of running client socket.
+LOOLWSD_PRISIONER=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o 
'{prision_socket}' | $WC -l);
 
 # get the number of processes swapped out.
-LOOLKIT_SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $SED -e "s/\`//g" | 
$TR -d ' |-' | $GREP -o '(loolkit,' | $WC -l);
+LOOLKIT_SWAPPEDOUT=$($PSTREE -a -h -A -p $LOOLWSD_PID | $GREP -o '(.*)' | $WC 
-l);
 
 # display report stats
 printf "\n %-10s\n" "LOOLWSD STATS";
 printf "==\n";
 printf " %-10s %d\n" "Running loolwsd process:" "$LOOLWSD";
 printf " %-10s %d\n" "Running loolwsd threads:" "$LOOLWSD_THREADS";
+printf " %-10s %d\n" "Socket Client   threads:" "$LOOLWSD_CLIENT";
+printf " %-10s %d\n" "Socket Prision  threads:" "$LOOLWSD_PRISIONER";
+printf " %-10s %d\n\n" "Process ... swapped out:" "$LOOLKIT_SWAPPEDOUT";
 $TOP -bn 1 -p $LOOLWSD_PID | $GREP -E 'loolwsd|COMMAND'
-printf " %-10s %d\n" "Running loolbroker process:" "$LOOLBROKER";
-printf " %-10s %d\n" "Running loolbroker threads:" "$LOOLBROKER_THREADS";
+printf "\n %-10s %d\n" "Running loolbroker process:" "$LOOLBROKER";
 $TOP -bn 1 | $GREP -E 'loolbroker|COMMAND'
-printf " %-10s %d\n" "Running LibreOfficeKit process:" "$LOOLKIT";
-printf " %-10s %d\n" "Running LibreOfficeKit threads:" "$LOOLKIT_THREADS";
-printf " %-10s %d\n" "Process LibreOfficeKit swapped out:" 
"$LOOLKIT_SWAPPEDOUT";
+printf "\n%-10s %d\n" "Running LibreOfficeKit process:" "$LOOLKIT";
 $TOP -bn 1 | $GREP -E 'loolkit|COMMAND'
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Godard]

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

New commits:
commit 35e449707501c2f19a585fba3efcf1ccd217df6e
Author: Laurent Godard 
Date:   Thu Jul 9 17:00:54 2015 +0200

init maTabData to the correct tab size tdf#92629

Change-Id: I6b226f8e992b3a2b6bcebc44b36ca1f2f06a128e
Reviewed-on: https://gerrit.libreoffice.org/16894
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
(cherry picked from commit ebdc15f93587b59a79a5104f8358841a28940a82)

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8795afe..04d11f3 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -370,6 +370,12 @@ ScViewData::ScViewData( ScDocShell* pDocSh, 
ScTabViewShell* pViewSh ) :
 pThisTab = maTabData[nTabNo];
 }
 
+if (pDoc)
+{
+SCTAB nTableCount = pDoc->GetTableCount();
+EnsureTabDataSize(nTableCount);
+}
+
 CalcPPT();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

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

New commits:
commit fc47e7bb752a60297327de2740fbcde63332522f
Author: Eike Rathke 
Date:   Tue Jul 21 16:09:34 2015 +0200

MATCH, HLOOKUP and VLOOKUP have a ReferenceOrForceArray parameter

tdf#91278 related

Change-Id: Iab4728b07649bcbb1beb372e68369f3762b13a5c
(cherry picked from commit 01eea7fe40c939311bf1920b6e8b4391a93c2e82)
Reviewed-on: https://gerrit.libreoffice.org/17264
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 8afc2b0..61c79cc 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -114,7 +114,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocGreaterEqual,{{ Array, Array   
  }, 0 }},
 { ocGrowth,  {{ Reference, Reference, Reference, Value 
  }, 0 }},
 { ocHarMean, {{ Reference  
  }, 1 }},
-{ ocHLookup, {{ Value, Reference, Value, Value 
  }, 0 }},
+{ ocHLookup, {{ Value, ReferenceOrForceArray, Value, Value 
  }, 0 }},
 { ocIRR, {{ Reference, Value   
  }, 0 }},
 { ocIndex,   {{ Reference, Value, Value, Value 
  }, 0 }},
 { ocIntercept,   {{ ForceArray, ForceArray 
  }, 0 }},
@@ -126,7 +126,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocLess,{{ Array, Array   
  }, 0 }},
 { ocLessEqual,   {{ Array, Array   
  }, 0 }},
 { ocLookup,  {{ Value, ReferenceOrForceArray, 
ReferenceOrForceArray  }, 0 }},
-{ ocMatch,   {{ Value, Reference, Reference
  }, 0 }},
+{ ocMatch,   {{ Value, ReferenceOrForceArray, Value
  }, 0 }},
 { ocMatDet,  {{ ForceArray 
  }, 0 }},
 { ocMatInv,  {{ ForceArray 
  }, 0 }},
 { ocMatMult, {{ ForceArray, ForceArray 
  }, 0 }},
@@ -204,7 +204,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocVarPA,   {{ Reference  
  }, 1 }},
 { ocVarP_MS, {{ Reference  
  }, 1 }},
 { ocVarS,{{ Reference  
  }, 1 }},
-{ ocVLookup, {{ Value, Reference, Value, Value 
  }, 0 }},
+{ ocVLookup, {{ Value, ReferenceOrForceArray, Value, Value 
  }, 0 }},
 { ocXor, {{ Reference  
  }, 1 }},
 { ocZTest,   {{ Reference, Value, Value
  }, 0 }},
 { ocZTest_MS,{{ Reference, Value, Value
  }, 0 }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 vcl/inc/window.h|   14 
 vcl/source/window/paint.cxx |  152 
 2 files changed, 86 insertions(+), 80 deletions(-)

New commits:
commit c85b25114a756e1abb3e68a4c7d3630c486917b5
Author: Miklos Vajna 
Date:   Fri Aug 7 14:27:44 2015 +0200

tdf#92982 vcl rendercontext: make PaintBufferGuard visible outside paint.cxx

Change-Id: I4bafba3d99fc45d6d5fa875a91d498518d3a0c29

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index f4976f2..e2acda8 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -382,6 +382,20 @@ public:
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > 
mxDNDListenerContainer;
 };
 
+/// Sets up the buffer to have settings matching the window, and restores the 
original state in the dtor.
+class PaintBufferGuard
+{
+ImplFrameData* mpFrameData;
+bool mbBackground;
+Wallpaper maBackground;
+AllSettings maSettings;
+long mnOutOffX;
+long mnOutOffY;
+public:
+PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow);
+~PaintBufferGuard();
+};
+
 // helper methods
 
 bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, 
bool bMouseLeave,
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 5e83a00..1438f2c 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -40,87 +40,79 @@
 #define IMPL_PAINT_ERASE((sal_uInt16)0x0010)
 #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020)
 
-/// Sets up the buffer to have settings matching the window, and restore the 
original state in the dtor.
-class PaintBufferGuard
+// PaintBufferGuard
+
+PaintBufferGuard::PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* 
pWindow)
+: mpFrameData(pFrameData),
+mbBackground(false),
+mnOutOffX(0),
+mnOutOffY(0)
 {
-ImplFrameData* mpFrameData;
-bool mbBackground;
-Wallpaper maBackground;
-AllSettings maSettings;
-long mnOutOffX;
-long mnOutOffY;
-public:
-PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow)
-: mpFrameData(pFrameData),
-mbBackground(false),
-mnOutOffX(0),
-mnOutOffY(0)
-{
-// transfer various settings
-// FIXME: this must disappear as we move to RenderContext only,
-// the painting must become state-less, so that no actual
-// vcl::Window setting affects this
-mbBackground = pFrameData->mpBuffer->IsBackground();
-if (pWindow->IsBackground())
-{
-maBackground = pFrameData->mpBuffer->GetBackground();
-pFrameData->mpBuffer->SetBackground(pWindow->GetBackground());
-}
-//else
-//SAL_WARN("vcl.doublebuffering", "the root of the 
double-buffering hierarchy should not have a transparent background");
-
-PushFlags nFlags = PushFlags::NONE;
-nFlags |= PushFlags::CLIPREGION;
-nFlags |= PushFlags::FILLCOLOR;
-nFlags |= PushFlags::FONT;
-nFlags |= PushFlags::LINECOLOR;
-nFlags |= PushFlags::MAPMODE;
-maSettings = pFrameData->mpBuffer->GetSettings();
-nFlags |= PushFlags::REFPOINT;
-nFlags |= PushFlags::TEXTCOLOR;
-nFlags |= PushFlags::TEXTLINECOLOR;
-nFlags |= PushFlags::OVERLINECOLOR;
-nFlags |= PushFlags::TEXTFILLCOLOR;
-nFlags |= PushFlags::TEXTALIGN;
-nFlags |= PushFlags::RASTEROP;
-nFlags |= PushFlags::TEXTLAYOUTMODE;
-nFlags |= PushFlags::TEXTLANGUAGE;
-pFrameData->mpBuffer->Push(nFlags);
-pFrameData->mpBuffer->SetClipRegion(pWindow->GetClipRegion());
-pFrameData->mpBuffer->SetFillColor(pWindow->GetFillColor());
-pFrameData->mpBuffer->SetFont(pWindow->GetFont());
-pFrameData->mpBuffer->SetLineColor(pWindow->GetLineColor());
-pFrameData->mpBuffer->SetMapMode(pWindow->GetMapMode());
-pFrameData->mpBuffer->SetRefPoint(pWindow->GetRefPoint());
-pFrameData->mpBuffer->SetSettings(pWindow->GetSettings());
-pFrameData->mpBuffer->SetTextColor(pWindow->GetTextColor());
-pFrameData->mpBuffer->SetTextLineColor(pWindow->GetTextLineColor());
-pFrameData->mpBuffer->SetOverlineColor(pWindow->GetOverlineColor());
-pFrameData->mpBuffer->SetTextFillColor(pWindow->GetTextFillColor());
-pFrameData->mpBuffer->SetTextAlign(pWindow->GetTextAlign());
-pFrameData->mpBuffer->SetRasterOp(pWindow->GetRasterOp());
-pFrameData->mpBuffer->SetLayoutMode(pWindow->GetLayoutMode());
-pFrameData->mpBuffer->SetDigitLanguage(pWindow->GetDigitLanguage());
-
-mnOutOffX = pFrameData->mpBuffer->GetOutOffXPixel();
-mnOutOffY = pFrameData->mpBuffer->GetOutOffYPixel();
-pFrameData->mpBuffer->SetOutOffXPixel(pWindow->GetOutOffXPixel());
-pFrameData->mpBuffer->SetOutOffYPixel(pWindow->GetOutOffYPixel());
-}
-~PaintBufferGuard()
-{
-// Rest

Re: German code comments

[Luc Castermans]

Hi, there is no better/other way then to go through the code and translate.
Also the last pieces can be done this way.

Luc

Op vr 7 aug. 2015 14:10 schreef Papamatti :

> Hi all,
>
> we could use the list as signpost. It is very anoying to search for
> german comments manually. But I disagree with editing of text on github.
> What if the source changes? Without the sourcecode it is hard to
> translate the text correctly sometimes.
>
> Cheese/Käse
>
> Matthias
>
> Am 06.08.2015 um 18:34 schrieb Philipp Weissenbacher:
> > Hi Johannes, all,
> >
> > Sorry, but this is not going to work properly and will presumably burden
> > the reviewers (mostly German-speaking core developers) a lot.
> > See, even the example on the GitHub page is inaccurate, due to missing
> > context:
> >
> > sw/source/filter/ww8/ww8struc.hxx:534: hiermit wird weitergearbeitet
> (entspricht weitestgehend dem Ver8-Format
> > -> with this we continue (largely matches the Ver8-format
> >
> > That should be "With this we continue (largely corresponds to the
> > version 8 format)".
> >
> > My experience tells me, that the best translations get as much context
> > from existing comments and surrounding code as possible.
> > I just can't see that happening out of context in a large text file.
> >
> > I really like your enthusiasm, so please read up on how to contribute
> > comment translations like code via Gerrit
> > (https://wiki.documentfoundation.org/Development/gerrit).
> >
> > Cheers/Grüße,
> > Philipp
> >
> > On 6 August 2015 at 14:41, Bjoern Michaelsen
> >  > > wrote:
> >
> > Hi,
> >
> > On Thu, Aug 06, 2015 at 07:36:16AM -0500, Norbert Thiebaud wrote:
> > > As long as the result is re-injected back in core.git via proper
> > > gerrit patch, that can work...
> >
> >  assuming the last 5.000 of 50.000 german comments are not
> > weird, strange
> > leftovers that require lots and lots of context from the surrounding
> > code to be
> > sensibly translated at all.
> >
> > Lets see, maybe this works, but I am somewhat sceptical.
> >
> > Best,
> >
> > Bjoern
> > ___
> > 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
> >
>
> ___
> 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

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

[matteocam]

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

New commits:
commit 0a831fb805994ddeabc36c3512198e6eadb9b0d2
Author: matteocam 
Date:   Fri Aug 7 14:33:33 2015 +0200

Add UndoSetText for chaining in edit mode

Change-Id: I684c9cfed36510a967ad043cceeb71f91fd56ae8

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 53a0af2..c731052 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -517,9 +517,27 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
 pTextChain->SetPreChainingSel(pTextObj, pOLV->GetSelection());
 //maPreChainingSel = new ESelection(pOLV->GetSelection());
 
+// Handling Undo
+const int nText = 0; // XXX: hardcoded index (SdrTextObj::getText 
handles only 0)
+
+SdrUndoObjSetText *pTxtUndo  = dynamic_cast< SdrUndoObjSetText* >
+( 
GetModel()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTextObj, nText ) );
+
 // trigger actual chaining
 pTextObj->onChainingEvent();
 
+   if (pTxtUndo!=NULL)
+{
+pTxtUndo->AfterSetText();
+if (!pTxtUndo->IsDifferent())
+{
+delete pTxtUndo;
+pTxtUndo=NULL;
+}
+}
+
+AddUndo(pTxtUndo);
+
 //maCursorEvent = new 
CursorChainingEvent(pTextChain->GetCursorEvent(pTextObj));
 //SdrTextObj *pNextLink = pTextObj->GetNextLinkInChain();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loolwsd/LOOLKit.cpp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0ca07a87b3e34c44fd920b7103bc56c718a1f459
Author: Henry Castro 
Date:   Fri Aug 7 08:36:43 2015 -0400

loolwsd: destroy LOKit when child finished

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 4aad389..818fdeb 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -194,6 +194,9 @@ int main(int argc, char** argv)
 queue.clear();
 queue.put("eof");
 queueHandlerThread.join();
+
+// Destroy LibreOfficeKit
+loKit->pClass->destroy(loKit);
 }
 catch (Exception& exc)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[matteocam]

 svx/source/svdraw/textchainflow.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5169902cbda85d0a9ba55c86f6c83aa6d01050a8
Author: matteocam 
Date:   Fri Aug 7 14:37:47 2015 +0200

Add debugging output for EditingTextChainFlow constructor

Change-Id: Ia9cfe90422911c37fb7bd236efc905592a9a5284

diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 581b5be..1da308a 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -278,6 +278,7 @@ UFlowChainedText *TextChainFlow::GetUnderflowChainedText() 
const
 EditingTextChainFlow::EditingTextChainFlow(SdrTextObj *pLinkTarget) :
 TextChainFlow(pLinkTarget)
 {
+fprintf(stderr, "[TEXTCHAINFLOW] Creating a new EditingTextChainFlow\n");
 }
 
 void EditingTextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libodfgen external/librevenge

[Andras Timar]

 external/libodfgen/ExternalPackage_libodfgen.mk   |2 +-
 external/libodfgen/UnpackedTarball_libodfgen.mk   |9 +
 external/libodfgen/libodfgen-bundled-soname.patch.0   |   11 +++
 external/librevenge/ExternalPackage_librevenge.mk |2 +-
 external/librevenge/UnpackedTarball_librevenge.mk |8 
 external/librevenge/librevenge-bundled-soname.patch.0 |   11 +++
 6 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 27ba1e316833671b1067fe8e6745530fa91c173d
Author: Andras Timar 
Date:   Fri Aug 7 12:02:04 2015 +0200

librevenge bundled soname patch

Change-Id: I8c55eb6eeca40faf8201af037f31a57ce9b64ac0
Reviewed-on: https://gerrit.libreoffice.org/17572
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/librevenge/ExternalPackage_librevenge.mk 
b/external/librevenge/ExternalPackage_librevenge.mk
index bde4344..58ae6ee 100644
--- a/external/librevenge/ExternalPackage_librevenge.mk
+++ b/external/librevenge/ExternalPackage_librevenge.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/libreven
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.2))
+$(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.0.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/UnpackedTarball_librevenge.mk 
b/external/librevenge/UnpackedTarball_librevenge.mk
index dabad6a..192faf4 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -21,4 +21,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
 endif
 endif
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
+external/librevenge/librevenge-bundled-soname.patch.0 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/librevenge-bundled-soname.patch.0 
b/external/librevenge/librevenge-bundled-soname.patch.0
new file mode 100644
index 000..f959def
--- /dev/null
+++ b/external/librevenge/librevenge-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig   2015-08-07 11:57:42.256742305 +0200
 src/lib/Makefile.in2015-08-07 11:58:11.818741799 +0200
+@@ -470,7 +470,7 @@
+   -DLIBREVENGE_BUILD $(am__append_2)
+ librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD = 
@LIBREVENGE_WIN32_RESOURCE@
+ librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBREVENGE_WIN32_RESOURCE@
+-librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic $(no_undefined)
++librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic $(no_undefined) -release lo
+ librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_SOURCES = \
+   RVNGBinaryData.cpp \
+   RVNGMemoryStream.cpp \
commit cc22b245bee8b6d243c22f73b8715f12ebd03f88
Author: Andras Timar 
Date:   Fri Aug 7 11:33:13 2015 +0200

libodfgen bundled soname patch

Change-Id: I09f0528420577e4b417ee4e39a52150777910d13
Reviewed-on: https://gerrit.libreoffice.org/17569
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk 
b/external/libodfgen/ExternalPackage_libodfgen.mk
index efdbd21..f2df2a6 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.$(ODFGEN_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1-lo.so.1,src/.libs/libodfgen-0.1-lo.so.1.0.$(ODFGEN_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk 
b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 32c8b36..1c002c8 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -27,4 +27,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 ))
 endif
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+external/libodfgen/libodfgen-bundled-soname.patch.0 \
+))
+endif
+endif
+
+
 # vim: set noet sw=4 ts=4:
diff --gi

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

[Andras Timar]

 external/libetonyek/ExternalPackage_libetonyek.mk |2 +-
 external/libetonyek/UnpackedTarball_libetonyek.mk |8 
 external/libetonyek/libetonyek-bundled-soname.patch.0 |   11 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 824e663cfbba436db32e4f2a20e3acbe275252e7
Author: Andras Timar 
Date:   Fri Aug 7 10:57:36 2015 +0200

libetonyek bundled soname patch

Change-Id: Ib9ca5d65a493db7daa094b0dea3613637c4c184b
Reviewed-on: https://gerrit.libreoffice.org/17567
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk 
b/external/libetonyek/ExternalPackage_libetonyek.mk
index 80b0a54..98d4763 100644
--- a/external/libetonyek/ExternalPackage_libetonyek.mk
+++ b/external/libetonyek/ExternalPackage_libetonyek.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetony
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.so.1,src/lib/.libs/libetonyek-0.1.so.1.0.$(ETONYEK_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1-lo.so.1,src/lib/.libs/libetonyek-0.1-lo.so.1.0.$(ETONYEK_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index dd536f8..7f0d653 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -22,6 +22,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+   external/libetonyek/libetonyek-bundled-soname.patch.0 \
+))
+endif
+endif
+
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 
b/external/libetonyek/libetonyek-bundled-soname.patch.0
new file mode 100644
index 000..301aa38
--- /dev/null
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig   2015-08-07 10:51:32.494810336 +0200
 src/lib/Makefile.in2015-08-07 10:51:55.493809942 +0200
+@@ -463,7 +463,7 @@
+
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = 
libetonyek_internal.la $(REVENGE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) 
@LIBETONYEK_WIN32_RESOURCE@
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = 
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
+-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
++libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
+   EtonyekDocument.cpp
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sot/source/base/exchange.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit cf6869230c3676db068e774a4e2b0a0e43c85390
Author: Noel Grandin 
Date:   Thu Aug 6 14:04:02 2015 +0200

tdf#93018 - Copying forms not working anymore (part2)

I missed a similar bug lower down

Change-Id: I673c69dd1d36cc1b502a7de7821a05d859313aac
(cherry picked from commit 0c08cb23b4902f19ed0e1050b5c9a52164c0d2ac)
Reviewed-on: https://gerrit.libreoffice.org/17537
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 0d9cf8b..75bf9f1 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -286,16 +286,14 @@ SotClipboardFormatId SotExchange::RegisterFormatMimeType( 
const OUString& rMimeT
 return static_cast(i + 
static_cast(SotClipboardFormatId::USER_END) + 1);
 }
 
-// nMax ist der neue Platz
 DataFlavor* pNewFlavor = new DataFlavor;
-
 pNewFlavor->MimeType = rMimeType;
 pNewFlavor->HumanPresentableName = rMimeType;
 pNewFlavor->DataType = cppu::UnoType::get();
 
 rL.push_back( pNewFlavor );
 
-return static_cast(static_cast(nMax) + 
static_cast(SotClipboardFormatId::USER_END) + 1);
+return static_cast(static_cast(rL.size()-1) + 
static_cast(SotClipboardFormatId::USER_END) + 1);
 }
 
 /*
commit 6bc20fff1a1cdd6550e5130356b06de149ee12f6
Author: Noel Grandin 
Date:   Thu Aug 6 13:46:36 2015 +0200

tdf#93018 - Copying forms not working anymore

Bug introduced by commit fb14be5f8f74f83ba89e15f891ddf1f753dcc62f
"create new 'enum class' SotClipboardFormatId to unify types"

Change-Id: I3febb927f658ac27d2b864869775db3b71940a5c
(cherry picked from commit f7d65b04126b614bbb0b1bc0e7b6309900d4dc8d)
Reviewed-on: https://gerrit.libreoffice.org/17536
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 8b3541f..0d9cf8b 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -253,16 +253,14 @@ SotClipboardFormatId SotExchange::RegisterFormatName( 
const OUString& rName )
 return static_cast(i + 
static_cast(SotClipboardFormatId::USER_END) + 1);
 }
 
-// nMax ist der neue Platz
 DataFlavor* pNewFlavor = new DataFlavor;
-
 pNewFlavor->MimeType = rName;
 pNewFlavor->HumanPresentableName = rName;
 pNewFlavor->DataType = cppu::UnoType::get();
 
 rL.push_back( pNewFlavor );
 
-return static_cast(static_cast(nMax) + 
static_cast(SotClipboardFormatId::USER_END) + 1);
+return static_cast(static_cast(rL.size()-1) + 
static_cast(SotClipboardFormatId::USER_END) + 1);
 }
 
 SotClipboardFormatId SotExchange::RegisterFormatMimeType( const OUString& 
rMimeType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/globstr.hrc|4 +++-
 sc/source/ui/namedlg/namemgrtable.cxx |2 +-
 sc/source/ui/src/globstr.src  |6 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 29be11a5d5d9e3e72816ebf6b204099ff8d86058
Author: Eike Rathke 
Date:   Mon Jul 13 19:07:02 2015 +0200

Resolves: tdf#92709 conditional formats are applied to ranges, not 
expressions

Hence we need a separate string as header in the dialog. Unfortunately I
did not see this when applying 0cf38e7d0c5d2b67dca828aae1797bff58b6c5fe

Change-Id: Ib60cef29e663e71a25849df1d5a926f0e871bb8b
(cherry picked from commit ffebdead5445dffd60fb09382e69701d8a06cfc8)
Reviewed-on: https://gerrit.libreoffice.org/17239
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 07896d4..6ca1fd7 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -700,7 +700,9 @@
 
 #define STR_TABLE_COUNT 535
 
-#define SC_GLOBSTR_STR_COUNT536 /**< the count of permanently 
resident strings */
+#define STR_HEADER_RANGE_OR_EXPR536
+
+#define SC_GLOBSTR_STR_COUNT537 /**< the count of permanently 
resident strings */
 
 #endif
 
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index e226e89..89749c6 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -45,7 +45,7 @@ ScRangeManagerTable::ScRangeManagerTable( 
SvSimpleTableContainer& rParent, boost
 SetTabs( &aStaticTabs[0], MAP_PIXEL );
 
 OUString aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME));
-OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE));
+OUString aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE_OR_EXPR));
 OUString aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE));
 
 HeaderBar& rHeaderBar = GetTheHeaderBar();
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 0ce65a8..8ebb2c6 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1772,7 +1772,7 @@ Resource RID_GLOBSTR
 {
 Text [en-US] = "Name";
 };
-String STR_HEADER_RANGE
+String STR_HEADER_RANGE_OR_EXPR
 {
 Text [en-US] = "Range or formula expression";
 };
@@ -1804,6 +1804,10 @@ Resource RID_GLOBSTR
 {
 Text [ en-US ] = "This Document is referenced by another document and 
not yet saved. Closing it without saving will result in data loss.";
 };
+String STR_HEADER_RANGE
+{
+Text [en-US] = "Range";
+};
 String STR_HEADER_COND
 {
 Text [ en-US ] = "First Condition";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/compare.hxx   |8 ++--
 sc/source/core/inc/interpre.hxx  |2 +-
 sc/source/core/tool/compare.cxx  |   22 --
 sc/source/core/tool/interpr1.cxx |   20 ++--
 sc/source/core/tool/scmatrix.cxx |2 +-
 5 files changed, 34 insertions(+), 20 deletions(-)

New commits:
commit 34bdbdee3baebf5f008f2ad6762f455db7752e48
Author: Eike Rathke 
Date:   Mon Jul 20 19:13:06 2015 +0200

Resolves: tdf#58838 do not use collation for Equal/NotEqual operators

Unicode collation ignores control characters and other specific
characters, see
http://www.unicode.org/charts/collation/chart_Ignored.html
and thus is not suitable to be used for Equal/NotEqual operators.

Change-Id: Ib84713e1da59d92e07bc974d93b6def8217bb067
(cherry picked from commit 1e5e7b9323c3321a380edf86097ccc2e3f0a7a7a)
Reviewed-on: https://gerrit.libreoffice.org/17240
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index 69080a5..e04b5db 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -61,9 +61,13 @@ private:
 };
 
 /** @param pOptions
-NULL means case sensitivity document option is to be used!
+Used for comparing two strings, if given.
+NULL means that for comparing two strings ScQueryOp rComp.meOp is
+tested for SC_EQUAL and SC_NOT_EQUAL, else pOptions->aQueryEntry.eOp
+Case sensitivity document option is always to be passed in
+rComp.mbIgnoreCase.
  */
-double CompareFunc( const Compare::Cell& rCell1, const Compare::Cell& rCell2, 
bool bIgnoreCase, CompareOptions* pOptions = NULL );
+double CompareFunc( const Compare& rComp, CompareOptions* pOptions = NULL );
 double CompareFunc( const Compare::Cell& rCell1, double fCell2, 
CompareOptions* pOptions = NULL );
 double CompareFunc( double fCell1, double fCell2 );
 
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index aea7c5f..f804052 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -407,7 +407,7 @@ void ScChooseJump();
 // Returns true if last jump was executed and result matrix pushed.
 bool JumpMatrix( short nStackLevel );
 
-double Compare();
+double Compare( ScQueryOp eOp );
 /** @param pOptions
 NULL means case sensitivity document option is to be used!
  */
diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index 6395f2f..b883605 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -43,8 +43,11 @@ CompareOptions::CompareOptions( ScDocument* pDoc, const 
ScQueryEntry& rEntry, bo
 // struct if needed.
 }
 
-double CompareFunc( const Compare::Cell& rCell1, const Compare::Cell& rCell2, 
bool bIgnoreCase, CompareOptions* pOptions )
+double CompareFunc( const Compare& rComp, CompareOptions* pOptions )
 {
+const Compare::Cell& rCell1 = rComp.maCells[0];
+const Compare::Cell& rCell2 = rComp.maCells[1];
+
 // Keep DoubleError if encountered
 // #i40539# if bEmpty is set, bVal/nVal are uninitialized
 if (!rCell1.mbEmpty && rCell1.mbValue && 
!rtl::math::isFinite(rCell1.mfValue))
@@ -134,7 +137,7 @@ double CompareFunc( const Compare::Cell& rCell1, const 
Compare::Cell& rCell2, bo
 sal_Int32 nStart = 0;
 sal_Int32 nStop  = rCell1.maStr.getLength();
 bool bMatch = rEntry.GetSearchTextPtr(
-!bIgnoreCase)->SearchForward(
+!rComp.mbIgnoreCase)->SearchForward(
 rCell1.maStr.getString(), &nStart, &nStop);
 if (bMatch && pOptions->bMatchWholeCell && (nStart != 0 || 
nStop != rCell1.maStr.getLength()))
 bMatch = false; // RegEx must match entire string.
@@ -143,12 +146,12 @@ double CompareFunc( const Compare::Cell& rCell1, const 
Compare::Cell& rCell2, bo
 else if (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL)
 {
 ::utl::TransliterationWrapper* pTransliteration =
-(bIgnoreCase ? ScGlobal::GetpTransliteration() :
+(rComp.mbIgnoreCase ? ScGlobal::GetpTransliteration() :
  ScGlobal::GetCaseTransliteration());
 bool bMatch = false;
 if (pOptions->bMatchWholeCell)
 {
-if (bIgnoreCase)
+if (rComp.mbIgnoreCase)
 bMatch = rCell1.maStr.getDataIgnoreCase() == 
rCell2.maStr.getDataIgnoreCase();
 else
 bMatch = rCell1.maStr.getData() == 
rCell2.maStr.getData();
@@ -165,14 +168,21 @@ double CompareFunc( const Compare::Cell& rCell1, const 
Compare::Cell& rCell2, bo
 }
 fRes = (bMatch ? 0 : 1);
 }
-else if (bIgnoreCase)
+else if (rComp.mbIgnoreCase)
  

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.4-2'

[Olivier R]

Tag 'cp-4.4-2' created by Andras Timar  at 
2015-08-07 14:01 -0700

cp-4.4-2

Changes since cp-4.4-branch-point-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.4-2'

[Andras Timar]

Tag 'cp-4.4-2' created by Andras Timar  at 
2015-08-07 14:01 -0700

cp-4.4-2

Changes since cp-4.4-branch-point:
Andras Timar (1):
  tdf#86301 fix hids of startcenter

---
 source/text/shared/guide/startcenter.xhp |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.4-2'

[Andras Timar]

Tag 'cp-4.4-2' created by Andras Timar  at 
2015-08-07 14:01 -0700

cp-4.4-2

Changes since cp-4.4-branch-point-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.4-2'

[Andras Timar]

Tag 'cp-4.4-2' created by Andras Timar  at 
2015-08-07 14:01 -0700

cp-4.4-2

Changes since cp-4.4-1-81:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/source/filter/ww8/wrtw8nds.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f7eeb007050d7bc4606f3c3e8221175d92ab06b
Author: Justin Luth 
Date:   Wed Jul 29 09:47:32 2015 +0300

related to tdf#87437:  prevent null pointer function call

Fix for change id  Ia98017cbba7d3a43b67764ae0fa6447b7e90ca86

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

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 06c96de..544c094 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2123,7 +2123,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 if ( pTextNodeInfo.get() != NULL )
 {
 pTextNodeInfoInner = pTextNodeInfo->getFirstInner();
-if ( pTextNodeInfoInner->isEndOfCell() ) {
+if ( pTextNodeInfoInner && pTextNodeInfoInner->isEndOfCell() ) {
 bIsEndOfCell = true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 93240] New: replace boost::ptr_container with std::container

[bugzilla-daemon]

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

Bug ID: 93240
   Summary: replace boost::ptr_container with
std::container
   Product: LibreOffice
   Version: 5.1.0.0.alpha0+ Master
  Hardware: Other
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: mst...@redhat.com
CC: libreoffice@lists.freedesktop.org

we use a lot of boost::ptr_container currently:

  git grep ptr_container | wc -l
  286

with C++11 it is now possible to use std::unique_ptr with the C++
standard library containers, and this makes most use of
boost::ptr_container obsolete.

the bundled boost headers require a lot of patches to suppress warnings
so it would reduce the maintenance burden here to use standard C++11
containers instead, and it would also make incremental rebuilds faster
whenever boost is modified/patched.

also with GCC 5's libstdc++ somehow loads of auto_ptr deprecation
warnings are being generated (and ignored) via the boost headers, and
that problem would also be substantially reduced by converting these.

for examples on how to do this search the git log for "boost::ptr_"

in some cases it is even easier to replace the ptr_container with a
std container that doesn't use unique_ptr but holds the elements
by value - a lot of these containers were converted from awkward
legacy tools containers that forced manual memory allocations everywhere.

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

[Bug 93240] replace boost::ptr_container with std::container

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
 Whiteboard||EasyHack DifficultyBeginner
   ||SkillCpp TopicCleanup

-- 
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: external/libmwaw

[Andras Timar]

 external/libmwaw/ExternalPackage_libmwaw.mk |2 +-
 external/libmwaw/UnpackedTarball_libmwaw.mk |8 
 external/libmwaw/libmwaw-bundled-soname.patch.0 |   14 ++
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 0dc79f35aa3a373414c17f596ca4491a69083864
Author: Andras Timar 
Date:   Fri Aug 7 11:09:01 2015 +0200

libmwaw bundled soname patch

Change-Id: Ibaba47be8aeefca7719d1ff335f551777130c6cd
Reviewed-on: https://gerrit.libreoffice.org/17568
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk 
b/external/libmwaw/ExternalPackage_libmwaw.mk
index b6bda7d..6f3f27c 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3-lo.so.3,src/lib/.libs/libmwaw-0.3-lo.so.3.0.$(MWAW_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 4ba779a..50aa54c 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -21,6 +21,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 endif
 endif
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
+external/libmwaw/libmwaw-bundled-soname.patch.0 \
+))
+endif
+endif
+
 ifeq ($(SYSTEM_REVENGE),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 external/libmwaw/rpath.patch \
diff --git a/external/libmwaw/libmwaw-bundled-soname.patch.0 
b/external/libmwaw/libmwaw-bundled-soname.patch.0
new file mode 100644
index 000..2abf77c
--- /dev/null
+++ b/external/libmwaw/libmwaw-bundled-soname.patch.0
@@ -0,0 +1,14 @@
+--- src/lib/Makefile.in.orig   2015-08-07 14:04:47.646611627 +0200
 src/lib/Makefile.in2015-08-07 14:25:49.888589996 +0200
+@@ -418,8 +418,8 @@
+ 
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS)
+ libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) 
@LIBMWAW_WIN32_RESOURCE@
+-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBMWAW_WIN32_RESOURCE@  
+-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic  -no-undefined
++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBMWAW_WIN32_RESOURCE@
++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
+ libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_SOURCES = \
+   libmwaw_internal.cxx\
+   libmwaw_internal.hxx\
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[bugzilla-daemon]

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

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

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

tdf#90222: Removed redundant collection type

It will be available in 5.1.0.

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

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

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

[Ian]

 scaddins/source/pricing/pricing.cxx |   14 +++
 scaddins/source/pricing/pricing.hxx |   44 ++--
 2 files changed, 7 insertions(+), 51 deletions(-)

New commits:
commit 25534a62b2ba398c6298c6b9e521f20de1087540
Author: Ian 
Date:   Fri Aug 7 10:59:28 2015 +0100

tdf#90222: Removed redundant collection type

Removed ScaStringList collection and replaced it with
std::vector

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

diff --git a/scaddins/source/pricing/pricing.cxx 
b/scaddins/source/pricing/pricing.cxx
index 21174c7..3b83dcf 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -72,12 +72,6 @@ void ScaList::_Grow()
 pData = pNewData;
 }
 
-ScaStringList::~ScaStringList()
-{
-for( OUString* pStr = First(); pStr; pStr = Next() )
-delete pStr;
-}
-
 ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) :
 ResId( nId, rResMgr )
 {
@@ -114,7 +108,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, 
ResMgr& rResMgr ) :
 const ResStringArray& rArr = aArrLoader.GetStringArray();
 
 for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ )
-aCompList.Append( rArr.GetString( nIndex ) );
+aCompList.push_back( rArr.GetString( nIndex ) );
 }
 
 ScaFuncData::~ScaFuncData()
@@ -452,14 +446,14 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL 
ScaPricingAddIn::getCompatibility
 if( !pFData )
 return uno::Sequence< sheet::LocalizedName >( 0 );
 
-const ScaStringList& rStrList = pFData->GetCompNameList();
-sal_uInt32 nCount = rStrList.Count();
+const std::vector& rStrList = pFData->GetCompNameList();
+sal_uInt32 nCount = rStrList.size();
 
 uno::Sequence< sheet::LocalizedName > aRet( nCount );
 sheet::LocalizedName* pArray = aRet.getArray();
 
 for( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ )
-pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), 
*rStrList.Get( nIndex ) );
+pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), 
rStrList[nIndex] );
 
 return aRet;
 }
diff --git a/scaddins/source/pricing/pricing.hxx 
b/scaddins/source/pricing/pricing.hxx
index 21a3c498..0daf3f8 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -29,6 +29,7 @@
 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -90,45 +91,6 @@ inline void ScaList::Append( void* pNew )
 }
 
 
-class ScaStringList : protected ScaList
-{
-public:
-inline  ScaStringList() : ScaList() {};
-virtual ~ScaStringList();
-
-using ScaList::Count;
-
-inline const OUString* Get( sal_uInt32 nIndex ) const;
-
-inline OUString* First();
-inline OUString* Next();
-
-using ScaList::Append;
-inline void Append( const OUString& rNew );
-};
-
-
-inline const OUString* ScaStringList::Get( sal_uInt32 nIndex ) const
-{
-return static_cast< const OUString* >( ScaList::GetObject( nIndex ) );
-}
-
-inline OUString* ScaStringList::First()
-{
-return static_cast< OUString* >( ScaList::First() );
-}
-
-inline OUString* ScaStringList::Next()
-{
-return static_cast< OUString* >( ScaList::Next() );
-}
-
-inline void ScaStringList::Append( const OUString& rNew )
-{
-ScaList::Append( new OUString( rNew ) );
-}
-
-
 class ScaResId : public ResId
 {
 public:
@@ -226,7 +188,7 @@ private:
 sal_uInt16  nDescrID;   // leads also to parameter 
descriptions!
 sal_uInt16  nCompListID;// resource ID to list of 
valid names
 sal_uInt16  nParamCount;// num of parameters
-ScaStringList   aCompList;  // list of all valid names
+std::vector   aCompList;  // list of all valid names
 ScaCategory eCat;   // function category
 boolbDouble;// name already exist in Calc
 boolbWithOpt;   // first parameter is internal
@@ -244,7 +206,7 @@ public:
 inline bool Is( const OUString& rCompare ) const
 { return aIntName == 
rCompare; }
 
-inline const ScaStringList& GetCompNameList() const { return aCompList; }
+inline const std::vector& GetCompNameList() const { return 
aCompList; }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 93243] replace boost::bind with C++11 lambdas

[bugzilla-daemon]

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

Michael Stahl  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
 Whiteboard||EasyHack DifficultyBeginner
   ||SkillCpp TopicCleanup

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

[Bug 93243] New: replace boost::bind with C++11 lambdas

[bugzilla-daemon]

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

Bug ID: 93243
   Summary: replace boost::bind with C++11 lambdas
   Product: LibreOffice
   Version: 5.1.0.0.alpha0+ Master
  Hardware: Other
OS: All
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: mst...@redhat.com
CC: libreoffice@lists.freedesktop.org

boost::bind is used to create function objects.

the bundled boost headers require a lot of patches to suppress warnings
so it would reduce the maintenance burden here to use standard C++11
features instead, and it would also make incremental rebuilds faster
whenever boost is modified/patched.

C++11 has both built-in lambda syntax to create function objects,
and std::bind in  which is very similar to boost::bind.

the C++11 lambdas have the advantage that they are built-in
syntax so are the fastest to compile; they are also often
easier to read in the more complex nested boost::bind cases.

there is one obscure pit-fall here: in very rare cases the function is
passed as an argument to a preprocessor macro.  lambdas may not work
in this case because the preprocessor interprets commas in the
capture list as macro argument separators and compilation fails.
use std::bind in such cases.

to find the offending code just "git grep boost::bind"

-- 
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: 2 commits - vcl/inc vcl/source

[Miklos Vajna]

 vcl/inc/window.h |6 +++
 vcl/source/outdev/rect.cxx   |2 +
 vcl/source/window/cursor.cxx |9 -
 vcl/source/window/paint.cxx  |   69 +--
 4 files changed, 63 insertions(+), 23 deletions(-)

New commits:
commit c64a7ce1fcd1e30956a77530d0b76ad493841024
Author: Miklos Vajna 
Date:   Fri Aug 7 16:35:11 2015 +0200

Resolves: tdf#92982 vcl rendercontext: handle buffered paint of vcl::Cursor

Instead of painting on the vcl::Window directly, take a
PaintBufferGuard, and use the vcl::RenderContext of it, that may be
either the vcl::Window or the toplevel frame's buffer.

Trigger the paint of the buffer by informing the guard what area was
painted. In case of direct painting, both the ctor and the dtor of the
guard is a NOP.

This means that finally we can also assert Invert() calls on the output
device, so that direct paint can't happen when double-buffering.

Change-Id: I0322563369dc63b3c49061cbe7c4a911cb13a2e2

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 27d5ccc..07bc09d 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -398,6 +398,8 @@ public:
 ~PaintBufferGuard();
 /// If this is called, then the dtor will also copy rRectangle to the 
window from the buffer, before restoring the state.
 void SetPaintRect(const Rectangle& rRectangle);
+/// Returns either the frame's buffer or the window, in case of no 
buffering.
+vcl::RenderContext* GetRenderContext();
 };
 
 // helper methods
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index d786649..e8ecf440 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -131,6 +131,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
 
 void OutputDevice::Invert( const Rectangle& rRect, InvertFlags nFlags )
 {
+assert(!is_double_buffered_window());
 if ( !IsDeviceOutputNecessary() )
 return;
 
@@ -163,6 +164,7 @@ void OutputDevice::Invert( const Rectangle& rRect, 
InvertFlags nFlags )
 
 void OutputDevice::Invert( const Polygon& rPoly, InvertFlags nFlags )
 {
+assert(!is_double_buffered_window());
 if ( !IsDeviceOutputNecessary() )
 return;
 
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 2eaa551..d022aaa 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -44,7 +44,9 @@ struct ImplCursorData
 static void ImplCursorInvert( ImplCursorData* pData )
 {
 vcl::Window* pWindow  = pData->mpWindow;
-vcl::RenderContext* pRenderContext = pWindow->GetOutDev();
+PaintBufferGuard aGuard(pWindow->ImplGetWindowImpl()->mpFrameData, 
pWindow);
+vcl::RenderContext* pRenderContext = aGuard.GetRenderContext();
+Rectangle aPaintRect;
 boolbMapMode = pRenderContext->IsMapModeEnabled();
 pRenderContext->EnableMapMode( false );
 InvertFlags nInvertStyle;
@@ -109,11 +111,16 @@ static void ImplCursorInvert( ImplCursorData* pData )
 if ( pData->mnOrientation )
 aPoly.Rotate( pData->maPixRotOff, pData->mnOrientation );
 pRenderContext->Invert( aPoly, nInvertStyle );
+aPaintRect = aPoly.GetBoundRect();
 }
 }
 else
+{
 pRenderContext->Invert( aRect, nInvertStyle );
+aPaintRect = aRect;
+}
 pRenderContext->EnableMapMode( bMapMode );
+aGuard.SetPaintRect(pRenderContext->PixelToLogic(aPaintRect));
 }
 
 void vcl::Cursor::ImplDraw()
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index c06d701..4fef67f 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -151,6 +151,14 @@ void PaintBufferGuard::SetPaintRect(const Rectangle& 
rRectangle)
 m_aPaintRect = rRectangle;
 }
 
+vcl::RenderContext* PaintBufferGuard::GetRenderContext()
+{
+if (mpFrameData->mpBuffer)
+return mpFrameData->mpBuffer;
+else
+return m_pWindow;
+}
+
 class PaintHelper
 {
 private:
commit a6c7a0bf105c399d087e2d9f843dbd9b175fdf42
Author: Miklos Vajna 
Date:   Fri Aug 7 14:52:45 2015 +0200

tdf#92982 vcl rendercontext: move buffer paint logic to PaintBufferGuard

The motivation is that this way vcl::Cursor will be able to reuse it.

Change-Id: I7e89d5acb5d63d3297d7c3c8050ccd2172c8608d

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index e2acda8..27d5ccc 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -386,14 +386,18 @@ public:
 class PaintBufferGuard
 {
 ImplFrameData* mpFrameData;
+VclPtr m_pWindow;
 bool mbBackground;
 Wallpaper maBackground;
 AllSettings maSettings;
 long mnOutOffX;
 long mnOutOffY;
+Rectangle m_aPaintRect;
 public:
 PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow);
 ~PaintBufferGuard();
+/// If this is called, then the dtor will also copy rRectangle to the 
window from the buffer, before restoring the state.
+void SetPaintRect(const 

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

[Caolán McNamara]

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |   35 +++
 1 file changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 48bb50302187536339f680d850c90a3e4512c996
Author: Caolán McNamara 
Date:   Fri Aug 7 10:43:09 2015 +0100

Resolves: tdf#93198 gtk3: support PRIMARY as well as CLIPBOARD

Change-Id: Ia8c7da1e321f363efee2d60b29078b35fcbe1dcd
Reviewed-on: https://gerrit.libreoffice.org/17571
Reviewed-by: Eike Rathke 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 41708923c..76b44da 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -97,8 +97,15 @@ class GtkTransferable : public ::cppu::WeakImplHelper1 <
 css::datatransfer::XTransferable >
 {
 private:
+GdkAtom m_nSelection;
 std::map m_aMimeTypeToAtom;
 public:
+
+GtkTransferable(GdkAtom nSelection)
+: m_nSelection(nSelection)
+{
+}
+
 /*
  * XTransferable
  */
@@ -109,7 +116,7 @@ public:
   css::uno::RuntimeException, std::exception
   ) SAL_OVERRIDE
 {
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 if (rFlavor.MimeType == "text/plain;charset=utf-16")
 {
 OUString aStr;
@@ -142,7 +149,7 @@ public:
 {
 std::vector aVector;
 
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 
 GdkAtom *targets;
 gint n_targets;
@@ -270,6 +277,7 @@ class VclGtkClipboard :
 datatransfer::clipboard::XSystemClipboard,
 XServiceInfo>
 {
+GdkAtom  m_nSelection;
 osl::Mutex   m_aMutex;
 ClipboardOwner*  m_pOwner;
 gulong   
m_nOwnerChangedSignalId;
@@ -281,7 +289,7 @@ class VclGtkClipboard :
 
 public:
 
-VclGtkClipboard();
+VclGtkClipboard(GdkAtom nSelection);
 virtual ~VclGtkClipboard();
 
 /*
@@ -366,7 +374,7 @@ Reference< css::datatransfer::XTransferable > 
VclGtkClipboard::getContents() thr
 {
 if (!m_aContents.is())
 {
-m_aContents = new GtkTransferable();
+m_aContents = new GtkTransferable(m_nSelection);
 }
 return m_aContents;
 }
@@ -489,11 +497,12 @@ namespace
 }
 }
 
-VclGtkClipboard::VclGtkClipboard()
+VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection)
 : cppu::WeakComponentImplHelper
 (m_aMutex)
+, m_nSelection(nSelection)
 {
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 m_nOwnerChangedSignalId = g_signal_connect(clipboard, "owner-change",

G_CALLBACK(handle_owner_change), this);
 m_pOwner = CLIPBOARD_OWNER(g_object_new(CLIPBOARD_OWNER_OBJECT, NULL));
@@ -502,7 +511,7 @@ VclGtkClipboard::VclGtkClipboard()
 
 VclGtkClipboard::~VclGtkClipboard()
 {
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 g_signal_handler_disconnect(clipboard, m_nOwnerChangedSignalId);
 g_object_unref(m_pOwner);
 }
@@ -562,7 +571,7 @@ void VclGtkClipboard::setContents(
 
 //if there was a previous gtk_clipboard_set_with_data call then
 //ClipboardClearFunc will be called now
-GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+GtkClipboard* clipboard = gtk_clipboard_get(m_nSelection);
 //use with_owner with m_pOwner so we can distinguish in 
handle_owner_change
 //if we have gained or lost ownership of the clipboard
 gtk_clipboard_set_with_owner(clipboard, aGtkTargets.data(), 
aGtkTargets.size(),
@@ -618,15 +627,9 @@ Reference< XInterface > GtkInstance::CreateClipboard(const 
Sequence< Any >& argu
 css::uno::Reference(), -1);
 }
 
-//see window.cxx HAVE_FEATURE_X11 hack, for now just support the
-//system clipboard and not the primary selection
-if (sel != "CLIPBOARD")
-{
-Reference< XComponentContext > 
xContext(comphelper::getProcessComponentContext());
-return 
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.datatransfer.clipboard.GenericClipboard",
 xContext);
-}
+GdkAtom nSelection = (sel == "CLIPBOARD") ? GDK_SELECTION_CLIPBOARD : 
GDK_SELECTION_PRIMARY;
 
-return Reference< XInterface >( static_cast(new 
VclGtkClipboard()) );
+return Reference< XInterface >( static_cast(new 
VclGtkClipboard(nSelection)) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_

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

[Michael Stahl]

 include/xmloff/xmltkmap.hxx |6 -
 svtools/inc/pch/precompiled_svt.hxx |1 
 svtools/source/contnr/fileview.cxx  |  115 +---
 xmloff/inc/pch/precompiled_xo.hxx   |1 
 xmloff/source/core/xmltkmap.cxx |   26 
 xmloff/source/style/impastpl.cxx|  103 
 xmloff/source/style/impastpl.hxx|   83 +++--
 xmloff/source/style/xmlnumfi.cxx|   62 ++-
 8 files changed, 154 insertions(+), 243 deletions(-)

New commits:
commit febd02b705c06929810835c5e2f677bfc91fb52c
Author: Michael Stahl 
Date:   Fri Aug 7 15:35:01 2015 +0200

xmloff: replace boost::ptr_set with std::set

boost::ptr_set was actually quite nice here, pity about the obnoxious
warnings...

Change-Id: I46973635fd26e4f1db96f2806c211b83436bef5e

diff --git a/xmloff/inc/pch/precompiled_xo.hxx 
b/xmloff/inc/pch/precompiled_xo.hxx
index 685fa2b..49a133d 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index c0054f0..7c98e3e 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -60,7 +60,7 @@ XMLAutoStyleFamily::~XMLAutoStyleFamily() {}
 
 void XMLAutoStyleFamily::ClearEntries()
 {
-maParentSet.clear();
+m_ParentSet.clear();
 }
 
 static OUString
@@ -506,16 +506,17 @@ bool SvXMLAutoStylePoolP_Impl::Add(
 
 XMLAutoStyleFamily &rFamily = **iter;
 
-XMLAutoStylePoolParent aTmp(rParentName);
-XMLAutoStyleFamily::ParentSetType::iterator it2 = 
rFamily.maParentSet.find(aTmp);
-if (it2 == rFamily.maParentSet.end())
+std::unique_ptr pTmp(new 
XMLAutoStylePoolParent(rParentName));
+auto it2 = rFamily.m_ParentSet.find(pTmp);
+if (it2 == rFamily.m_ParentSet.end())
 {
 std::pair r =
-rFamily.maParentSet.insert(new 
XMLAutoStylePoolParent(rParentName));
+rFamily.m_ParentSet.insert(std::unique_ptr(
+new XMLAutoStylePoolParent(rParentName)));
 it2 = r.first;
 }
 
-XMLAutoStylePoolParent& rParent = *it2;
+XMLAutoStylePoolParent& rParent = **it2;
 
 bool bRet = false;
 if (rParent.Add(rFamily, rProperties, rName, bDontSeek))
@@ -539,16 +540,17 @@ bool SvXMLAutoStylePoolP_Impl::AddNamed(
 
 XMLAutoStyleFamily &rFamily = **iter;
 
-XMLAutoStylePoolParent aTmp(rParentName);
-XMLAutoStyleFamily::ParentSetType::iterator it2 = 
rFamily.maParentSet.find(aTmp);
-if (it2 == rFamily.maParentSet.end())
+std::unique_ptr pTmp(new 
XMLAutoStylePoolParent(rParentName));
+auto it2 = rFamily.m_ParentSet.find(pTmp);
+if (it2 == rFamily.m_ParentSet.end())
 {
 std::pair r =
-rFamily.maParentSet.insert(new 
XMLAutoStylePoolParent(rParentName));
+rFamily.m_ParentSet.insert(std::unique_ptr(
+new XMLAutoStylePoolParent(rParentName)));
 it2 = r.first;
 }
 
-XMLAutoStylePoolParent& rParent = *it2;
+XMLAutoStylePoolParent& rParent = **it2;
 
 bool bRet = false;
 if (rParent.AddNamed(rFamily, rProperties, rName))
@@ -575,11 +577,11 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 
nFamily,
 assert(iter != m_FamilySet.end()); // family must be known
 
 XMLAutoStyleFamily const& rFamily = **iter;
-XMLAutoStylePoolParent aTmp( rParent );
-XMLAutoStyleFamily::ParentSetType::const_iterator it2 = 
rFamily.maParentSet.find(aTmp);
-if (it2 != rFamily.maParentSet.end())
+std::unique_ptr pTmp(new 
XMLAutoStylePoolParent(rParent));
+auto const it2 = rFamily.m_ParentSet.find(pTmp);
+if (it2 != rFamily.m_ParentSet.end())
 {
-sName = it2->Find(rFamily, rProperties);
+sName = (*it2)->Find(rFamily, rProperties);
 }
 
 return sName;
@@ -628,8 +630,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 // which contains a parent-name and a SvXMLAutoStylePoolProperties_Impl
 std::vector aExpStyles(nCount);
 
-XMLAutoStyleFamily::ParentSetType::iterator it = 
rFamily.maParentSet.begin(), itEnd = rFamily.maParentSet.end();
-for (; it != itEnd; ++it)
+for (auto const& it : rFamily.m_ParentSet)
 {
 XMLAutoStylePoolParent& rParent = *it;
 size_t nProperties = rParent.GetPropertiesList().size();
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 5093281..0989389 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_STYLE_IMPASTPL_HXX
 #define INCLUDED_XMLOFF_SOURCE_STYLE_IMPASTPL_HXX
 
-#include 
 #include 
 #include 
 #include 
@@ -37,39 +36,10 @@
 
 class SvXMLAutoStylePoolP;
 class XMLAutoStylePoolParent;
+class XMLAutoStyleFamily;
 class SvXMLExportPropertyMapper;
 class SvXMLE

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

[Michael Stahl]

 xmloff/source/style/impastpl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 30335b9fae7eef8d5f07dd5b0abf3efedd5a1176
Author: Michael Stahl 
Date:   Fri Aug 7 17:10:57 2015 +0200

stupid warning

Change-Id: I1ec30be94ebfc7449a1bd946a73a52eafbe67264

diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 0989389..4dbce49 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -36,7 +36,7 @@
 
 class SvXMLAutoStylePoolP;
 class XMLAutoStylePoolParent;
-class XMLAutoStyleFamily;
+struct XMLAutoStyleFamily;
 class SvXMLExportPropertyMapper;
 class SvXMLExport;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 vcl/inc/window.h |   20 
 vcl/source/outdev/rect.cxx   |2 
 vcl/source/window/cursor.cxx |9 +
 vcl/source/window/paint.cxx  |  215 +++
 4 files changed, 146 insertions(+), 100 deletions(-)

New commits:
commit ec5da2f76adbfeaf1cebc6fb0e0dea08a7bdfe79
Author: Miklos Vajna 
Date:   Fri Aug 7 16:35:11 2015 +0200

Resolves: tdf#92982 vcl rendercontext: handle buffered paint of vcl::Cursor

Instead of painting on the vcl::Window directly, take a
PaintBufferGuard, and use the vcl::RenderContext of it, that may be
either the vcl::Window or the toplevel frame's buffer.

Trigger the paint of the buffer by informing the guard what area was
painted. In case of direct painting, both the ctor and the dtor of the
guard is a NOP.

This means that finally we can also assert Invert() calls on the output
device, so that direct paint can't happen when double-buffering.

Also:

- make PaintBufferGuard visible outside paint.cxx
- move buffer paint logic to PaintBufferGuard

(cherry picked from commits c85b25114a756e1abb3e68a4c7d3630c486917b5,
a6c7a0bf105c399d087e2d9f843dbd9b175fdf42 and
c64a7ce1fcd1e30956a77530d0b76ad493841024)

Change-Id: I0322563369dc63b3c49061cbe7c4a911cb13a2e2
Reviewed-on: https://gerrit.libreoffice.org/17576
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins 

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 60f9b1a..213e215 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -378,6 +378,26 @@ public:
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > 
mxDNDListenerContainer;
 };
 
+/// Sets up the buffer to have settings matching the window, and restores the 
original state in the dtor.
+class PaintBufferGuard
+{
+ImplFrameData* mpFrameData;
+VclPtr m_pWindow;
+bool mbBackground;
+Wallpaper maBackground;
+AllSettings maSettings;
+long mnOutOffX;
+long mnOutOffY;
+Rectangle m_aPaintRect;
+public:
+PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow);
+~PaintBufferGuard();
+/// If this is called, then the dtor will also copy rRectangle to the 
window from the buffer, before restoring the state.
+void SetPaintRect(const Rectangle& rRectangle);
+/// Returns either the frame's buffer or the window, in case of no 
buffering.
+vcl::RenderContext* GetRenderContext();
+};
+
 // helper methods
 
 bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, 
bool bMouseLeave,
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index dfa491a..03afdf9 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -131,6 +131,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
 
 void OutputDevice::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
 {
+assert(!is_double_buffered_window());
 if ( !IsDeviceOutputNecessary() )
 return;
 
@@ -163,6 +164,7 @@ void OutputDevice::Invert( const Rectangle& rRect, 
sal_uInt16 nFlags )
 
 void OutputDevice::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
 {
+assert(!is_double_buffered_window());
 if ( !IsDeviceOutputNecessary() )
 return;
 
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 0bcad80..1968a26 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -44,7 +44,9 @@ struct ImplCursorData
 static void ImplCursorInvert( ImplCursorData* pData )
 {
 vcl::Window* pWindow  = pData->mpWindow;
-vcl::RenderContext* pRenderContext = pWindow->GetOutDev();
+PaintBufferGuard aGuard(pWindow->ImplGetWindowImpl()->mpFrameData, 
pWindow);
+vcl::RenderContext* pRenderContext = aGuard.GetRenderContext();
+Rectangle aPaintRect;
 boolbMapMode = pRenderContext->IsMapModeEnabled();
 pRenderContext->EnableMapMode( false );
 sal_uInt16 nInvertStyle;
@@ -109,11 +111,16 @@ static void ImplCursorInvert( ImplCursorData* pData )
 if ( pData->mnOrientation )
 aPoly.Rotate( pData->maPixRotOff, pData->mnOrientation );
 pRenderContext->Invert( aPoly, nInvertStyle );
+aPaintRect = aPoly.GetBoundRect();
 }
 }
 else
+{
 pRenderContext->Invert( aRect, nInvertStyle );
+aPaintRect = aRect;
+}
 pRenderContext->EnableMapMode( bMapMode );
+aGuard.SetPaintRect(pRenderContext->PixelToLogic(aPaintRect));
 }
 
 void vcl::Cursor::ImplDraw()
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 81f601d..19f5cdc 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -40,87 +40,124 @@
 #define IMPL_PAINT_ERASE((sal_uInt16)0x0010)
 #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020)
 
-/// Sets up the buffer to have settings matching the window, and restore the 
original state in the dtor.
-class PaintBufferGuard
+// PaintB

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

[Christian Lohmaier]

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

New commits:
commit 89e401055c694205da18fcce7f3c7f7b20bc9bc5
Author: Christian Lohmaier 
Date:   Fri Aug 7 17:02:35 2015 +0200

Updated core
Project: translations  ee62796699c03b6d31184697010db569f6dae8de

update translations for 5.0.1 rc1

and force-fix errors using pocheck

Change-Id: I53ea5774b8c02e329e916f8a533051d6720a5028

diff --git a/translations b/translations
index c99833c..ee62796 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c99833cf91a9e95776f1a279e791f55343f51685
+Subproject commit ee62796699c03b6d31184697010db569f6dae8de
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[matteocam]

 editeng/source/outliner/outliner.cxx   |   28 +++-
 editeng/source/outliner/outlvw.cxx |1 +
 editeng/source/outliner/overflowingtxt.cxx |   16 +---
 include/editeng/overflowingtxt.hxx |2 ++
 svx/source/svdraw/textchainflow.cxx|2 +-
 5 files changed, 44 insertions(+), 5 deletions(-)

New commits:
commit 30db056d97d95d5d68f938e390e0874f12f40e87
Author: matteocam 
Date:   Fri Aug 7 17:43:39 2015 +0200

Using QuickDelete instead of SetText for changes in Overflow

Change-Id: Ia952113a6cdd0beace331e1f63d08b124d2629b0

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 1404868..68a17c2 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2107,6 +2107,31 @@ NonOverflowingText *Outliner::GetNonOverflowingText() 
const
 return NULL;
  }
 
+ // Same code as GetOverflowingText (we just have to get that selection 
after all)
+
+sal_Int32 nHeadPara = pEditEngine->GetOverflowingParaNum();
+sal_uInt32 nParaCount = GetParagraphCount();
+
+sal_uInt32 nLen = 0;
+for ( sal_Int32 nLine = 0;
+  nLine < pEditEngine->GetOverflowingLineNum();
+  nLine++) {
+nLen += GetLineLen(nHeadPara, nLine);
+}
+
+sal_uInt32 nOverflowingPara = pEditEngine->GetOverflowingParaNum();
+ESelection aOverflowingTextSel;
+sal_Int32 nLastPara = nParaCount-1;
+sal_Int32 nLastParaLen = GetText(GetParagraph(nLastPara)).getLength();
+aOverflowingTextSel = ESelection(nOverflowingPara, nLen,
+ nLastPara, nLastParaLen);
+bool bLastParaInterrupted =
+pEditEngine->GetOverflowingLineNum() > 0;
+
+return new NonOverflowingText(aOverflowingTextSel, bLastParaInterrupted);
+
+/* Old code
+
 // Only overflowing text, i.e. 1st line of 1st paragraph overflowing
 bool bItAllOverflew = nCount == 0 && nOverflowLine == 0;
 if ( bItAllOverflew )
@@ -2147,8 +2172,9 @@ NonOverflowingText *Outliner::GetNonOverflowingText() 
const
 bool bLastParaInterrupted =
 pEditEngine->GetOverflowingLineNum() > 0;
 
-return new NonOverflowingText(pTObj, bLastParaInterrupted);
+   return new NonOverflowingText(pTObj, bLastParaInterrupted);
 }
+* */
 }
 
 OutlinerParaObject *Outliner::GetEmptyParaObject() const
diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index 8f7be36..39f6321 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -697,9 +697,6 @@ void OutlinerView::PasteSpecial()
 pOwner->UndoActionStart( OLUNDO_INSERT );
 
 pOwner->pEditEngine->SetUpdateMode( false );
-// XXX:Experiment with QuickDelete
-pOwner->QuickDelete(ESelection(0,0,0,1));
-
 pOwner->bPasting = true;
 pEditView->PasteSpecial();
 
diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index b015c28..34f1bb4 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -135,6 +135,12 @@ NonOverflowingText::NonOverflowingText(const 
EditTextObject *pTObj,  bool bLastP
  // XXX: may have to delete pTObj
 }
 
+NonOverflowingText::NonOverflowingText(const ESelection &aSel, bool 
bLastParaInterrupted)
+: maContentSel(aSel),
+  mbLastParaInterrupted(bLastParaInterrupted)
+{
+}
+
 bool NonOverflowingText::IsLastParaInterrupted() const
 {
 return mbLastParaInterrupted;
@@ -143,9 +149,13 @@ bool NonOverflowingText::IsLastParaInterrupted() const
 
 OutlinerParaObject *NonOverflowingText::ToParaObject(Outliner *pOutliner) const
 {
-OutlinerParaObject *pPObj = new OutlinerParaObject(*mpContentTextObj);
-pPObj->SetOutlinerMode(pOutliner->GetOutlinerMode());
-return pPObj;
+// XXX: Old code
+//OutlinerParaObject *pPObj = new OutlinerParaObject(*mpContentTextObj);
+//pPObj->SetOutlinerMode(pOutliner->GetOutlinerMode());
+//return pPObj;
+
+pOutliner->QuickDelete(maContentSel);
+return pOutliner->CreateParaObject();
 }
 
 ESelection NonOverflowingText::GetOverflowPointSel() const
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index ae9b39e..76a9623 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -68,10 +68,12 @@ public:
 private:
 // Constructor
 NonOverflowingText(const EditTextObject *pTObj, bool 
bLastParaInterrupted);
+NonOverflowingText(const ESelection &aSel, bool bLastParaInterrupted);
 
 friend class Outliner;
 const EditTextObject *mpContentTextObj;
 const bool mbLastParaInterrupted;
+const ESelection maContentSel;
 };
 
 
diff --git a/svx/source/svdraw/textchainflow.cxx 
b/svx/source/svdraw/textchainflow.cxx
index 1da308a..71fd30f 100644
--- a/svx/source/svdra

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

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d403cf5451d9a525f7fd76357ec9fa907908d40c
Author: Caolán McNamara 
Date:   Fri Aug 7 16:46:28 2015 +0100

gtk3: it was pointed out to me we have up and down reversed

by jrb, oops

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

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1d3e184..e4e563e 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -136,11 +136,11 @@ Rectangle GtkSalGraphics::NWGetSpinButtonRect( 
ControlPart nPart, Rectangle aAre
 buttonRect.Bottom() = buttonRect.Top() + aAreaRect.GetHeight();
 if ( nPart == PART_BUTTON_UP )
 {
-buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
2*buttonRect.GetWidth()));
+buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
buttonRect.GetWidth()));
 }
 else if( nPart == PART_BUTTON_DOWN )
 {
-buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
buttonRect.GetWidth()));
+buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
2*buttonRect.GetWidth()));
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2244 ++--
 1 file changed, 1135 insertions(+), 1109 deletions(-)

New commits:
commit 467c482da453c2232bb7617e0983a75833ee46f2
Author: Christian Lohmaier 
Date:   Fri Aug 7 17:58:02 2015 +0200

update credits

Change-Id: I90d1a5696e0c964d7e5df8be14781a4e292d9c12

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index b287684..407ae1d 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.5.2$Linux_X86_64
 
LibreOffice_project/a22f674fd25a3b6f45bdebf25400ed2adff0ff992012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.0.5$Linux_X86_64
 
LibreOffice_project/437e4abdf9e72fd0a6e6f8697a0e659bc77f9b102012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   501
+   580
501
-   41250
+   41197
22518
true
true

 
  view2
- 3676
- 3471
+ 41466
+ 1242
  501
- 501
- 41749
- 23017
+ 580
+ 41697
+ 23096
  0
  0
  false
@@ -28,85 +28,60 @@

   
   
-   
-   0
-   true
+   false
+   true
+   true
true
+   true
+   0
true
-   false
-   false
-   false
-   true
+   
+   false
+   false
false
+   false
false
-   false
false
+   false
false
+   false
+   false
false
+   false
false
-   false
+   true
+   false
true
-   true
true
-   1557161
-   false
-   false
-   false
-   false
-   false
-   false
-   false
-   false
+   false
+   false
+   false
+   
+   false
+   false
+   true
false
-   false
-   true
-   true
false
+   
+   false
false
-   false
-   false
-   true
-   false
-   true
-   false
-   false
-   false
-   false
-   false
-   false
-   true
-   high-resolution
-   false
-   
-   
-   false
-   false
-   0
-   
-   3308223
-   false
-   
-   true
-   false
false
-   true
-   0
+   false
+   true
+   3437403
+   false
+   false
false
+   false
+   true
+   true
+   false
true
-   false
+   0
+   false
true
-   true
-   false
+   high-resolution
false
-   false
-   true
-   false
-   false
-   true
-   false
-   
-   1
-   true

 
  hu
@@ -116,7 +91,33 @@
  
 

-   false
+   false
+   true
+   true
+   true
+   
+   true
+   true
+   false
+   false
+   false
+   
+   false
+   false
+   1557161
+   false
+   1
+   true
+   false
+   false
+   0
+   false
+   false
+   
+   
+   false
+   false
+   false
   
  
  
@@ -310,26 +311,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -391,23 +389,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -743,6 +744,7 @@
  
  
   
+   

 
 
@@ 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2244 ++--
 1 file changed, 1135 insertions(+), 1109 deletions(-)

New commits:
commit b316576f31b9b27799fd55c00c4f057a243bd591
Author: Christian Lohmaier 
Date:   Fri Aug 7 17:58:02 2015 +0200

update credits

Change-Id: I90d1a5696e0c964d7e5df8be14781a4e292d9c12
(cherry picked from commit 467c482da453c2232bb7617e0983a75833ee46f2)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index b287684..407ae1d 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.5.2$Linux_X86_64
 
LibreOffice_project/a22f674fd25a3b6f45bdebf25400ed2adff0ff992012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.0.5$Linux_X86_64
 
LibreOffice_project/437e4abdf9e72fd0a6e6f8697a0e659bc77f9b102012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   501
+   580
501
-   41250
+   41197
22518
true
true

 
  view2
- 3676
- 3471
+ 41466
+ 1242
  501
- 501
- 41749
- 23017
+ 580
+ 41697
+ 23096
  0
  0
  false
@@ -28,85 +28,60 @@

   
   
-   
-   0
-   true
+   false
+   true
+   true
true
+   true
+   0
true
-   false
-   false
-   false
-   true
+   
+   false
+   false
false
+   false
false
-   false
false
+   false
false
+   false
+   false
false
+   false
false
-   false
+   true
+   false
true
-   true
true
-   1557161
-   false
-   false
-   false
-   false
-   false
-   false
-   false
-   false
+   false
+   false
+   false
+   
+   false
+   false
+   true
false
-   false
-   true
-   true
false
+   
+   false
false
-   false
-   false
-   true
-   false
-   true
-   false
-   false
-   false
-   false
-   false
-   false
-   true
-   high-resolution
-   false
-   
-   
-   false
-   false
-   0
-   
-   3308223
-   false
-   
-   true
-   false
false
-   true
-   0
+   false
+   true
+   3437403
+   false
+   false
false
+   false
+   true
+   true
+   false
true
-   false
+   0
+   false
true
-   true
-   false
+   high-resolution
false
-   false
-   true
-   false
-   false
-   true
-   false
-   
-   1
-   true

 
  hu
@@ -116,7 +91,33 @@
  
 

-   false
+   false
+   true
+   true
+   true
+   
+   true
+   true
+   false
+   false
+   false
+   
+   false
+   false
+   1557161
+   false
+   1
+   true
+   false
+   false
+   0
+   false
+   false
+   
+   
+   false
+   false
+   false
   
  
  
@@ -310,26 +311,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -391,23 +389,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2244 ++--
 1 file changed, 1135 insertions(+), 1109 deletions(-)

New commits:
commit 3d3f46c0eb0d321d2fd96de56c1262be9dbdde6d
Author: Christian Lohmaier 
Date:   Fri Aug 7 17:58:02 2015 +0200

update credits

Change-Id: I90d1a5696e0c964d7e5df8be14781a4e292d9c12
(cherry picked from commit 467c482da453c2232bb7617e0983a75833ee46f2)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index b287684..407ae1d 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.5.2$Linux_X86_64
 
LibreOffice_project/a22f674fd25a3b6f45bdebf25400ed2adff0ff992012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.0.0.5$Linux_X86_64
 
LibreOffice_project/437e4abdf9e72fd0a6e6f8697a0e659bc77f9b102012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   501
+   580
501
-   41250
+   41197
22518
true
true

 
  view2
- 3676
- 3471
+ 41466
+ 1242
  501
- 501
- 41749
- 23017
+ 580
+ 41697
+ 23096
  0
  0
  false
@@ -28,85 +28,60 @@

   
   
-   
-   0
-   true
+   false
+   true
+   true
true
+   true
+   0
true
-   false
-   false
-   false
-   true
+   
+   false
+   false
false
+   false
false
-   false
false
+   false
false
+   false
+   false
false
+   false
false
-   false
+   true
+   false
true
-   true
true
-   1557161
-   false
-   false
-   false
-   false
-   false
-   false
-   false
-   false
+   false
+   false
+   false
+   
+   false
+   false
+   true
false
-   false
-   true
-   true
false
+   
+   false
false
-   false
-   false
-   true
-   false
-   true
-   false
-   false
-   false
-   false
-   false
-   false
-   true
-   high-resolution
-   false
-   
-   
-   false
-   false
-   0
-   
-   3308223
-   false
-   
-   true
-   false
false
-   true
-   0
+   false
+   true
+   3437403
+   false
+   false
false
+   false
+   true
+   true
+   false
true
-   false
+   0
+   false
true
-   true
-   false
+   high-resolution
false
-   false
-   true
-   false
-   false
-   true
-   false
-   
-   1
-   true

 
  hu
@@ -116,7 +91,33 @@
  
 

-   false
+   false
+   true
+   true
+   true
+   
+   true
+   true
+   false
+   false
+   false
+   
+   false
+   false
+   1557161
+   false
+   1
+   true
+   false
+   false
+   0
+   false
+   false
+   
+   
+   false
+   false
+   false
   
  
  
@@ -310,26 +311,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -391,23 +389,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   

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

[Pedro Giffuni]

 connectivity/source/drivers/dbase/makefile.mk |4 +++-
 solenv/inc/tg_compv.mk|4 
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d0b7d2a311e6e5efe71462e1a2bda845897d58d5
Author: Pedro Giffuni 
Date:   Fri Aug 7 15:14:25 2015 +

FreeBSD: Work around clang-3.4 issues.

It is well known that clang-3.4 doesn't build all AOO correctly.
Workaround the issue for FreeBSD 10 which ships with clang-3.4.
The workaround may still be needed for other clang based platforms.

Submitted by:   Don Lewis

diff --git a/connectivity/source/drivers/dbase/makefile.mk 
b/connectivity/source/drivers/dbase/makefile.mk
index 5d5fbfac..62247f7 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -76,7 +76,9 @@ EXCEPTIONSFILES=\
 $(SLO)$/DDriver.obj
 
 # [kh] ppc linux gcc compiler problem
-.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
+# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with
+# symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj
+.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC" || 
("$(OS)$(COM)$(CPUNAME)"=="FREEBSDCLANGX86_64" && $(CCNUMVER)>=00030004 && 
$(CCNUMVER)<00030005)
 EXCEPTIONSNOOPTFILES= \
 $(SLO)$/DTable.obj
 .ELSE
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index e1295e6..bd0d73a 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -38,7 +38,11 @@ CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v 
num=true -f $(SOLARENV)
 .ELIF "$(COM)"=="CLANG"
 CFLAGSVERSION=--version
 CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//"
+.IF "$(OS)"="FREEBSD"
+CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | $(AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk
+.ELSE
 CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -e"s/\.//"
+.ENDIF
 .ELIF "$(COM)"=="MSC"
 CFLAGSVERSION=
 CFLAGSVERSION_CMD=  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[bugzilla-daemon]

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

--- Comment #17 from Ian Gilham  ---
Another: https://gerrit.libreoffice.org/#/c/17579/

-- 
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: include/connectivity

[Caolán McNamara]

 include/connectivity/sqliterator.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a29d82d8739edc55f79478b38b2a817c66e52ed8
Author: Caolán McNamara 
Date:   Fri Aug 7 17:19:34 2015 +0100

error C2039: ´getCreateColumns´ used in mozab/MStatement.cxx

Change-Id: Ie1fb9718e094f02fe99a47f9fa8bd9f8db2be733

diff --git a/include/connectivity/sqliterator.hxx 
b/include/connectivity/sqliterator.hxx
index 0a9fd32..be8274a 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -215,6 +215,7 @@ namespace connectivity
 ::rtl::Reference getGroupColumns() const { return 
m_aGroupColumns;}
 ::rtl::Reference getOrderColumns() const { return 
m_aOrderColumns;}
 ::rtl::Reference getParameters()   const { return 
m_aParameters; }
+::rtl::Reference getCreateColumns() const { return 
m_aCreateColumns;}
 
 /** return the columname and the table range
 @param  _pColumnRef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d0/b7d2a311e6e5efe71462e1a2bda845897d58d5

[Caolán McNamara]

 d0/b7d2a311e6e5efe71462e1a2bda845897d58d5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d0d1db75749d441ffd8ba49c5124ae593ddad822
Author: Caolán McNamara 
Date:   Fri Aug 7 17:22:57 2015 +0100

Notes added by 'git notes add'

diff --git a/d0/b7d2a311e6e5efe71462e1a2bda845897d58d5 
b/d0/b7d2a311e6e5efe71462e1a2bda845897d58d5
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/d0/b7d2a311e6e5efe71462e1a2bda845897d58d5
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thomas Klausner]

 sw/source/filter/ww8/ww8scan.hxx |  241 +++
 1 file changed, 120 insertions(+), 121 deletions(-)

New commits:
commit 6f98a0ab51cc5c860576b4ad44478b438cc5a5eb
Author: Thomas Klausner 
Date:   Fri Aug 7 18:24:45 2015 +0200

Translate remaining German comments to English.

Change-Id: I0b6b60bd4fa921993388340b8c16c533ba9f257f

diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index cc2d0f6..cd101bd 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -173,21 +173,21 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 
nStart, sal_Int32 nLen
 
 struct WW8FieldDesc
 {
-long nLen;  ///< Gesamtlaenge ( zum Text ueberlesen )
-WW8_CP nSCode;  ///< Anfang Befehlscode
-WW8_CP nLCode;  ///< Laenge
-WW8_CP nSRes;   ///< Anfang Ergebnis
-WW8_CP nLRes;   ///< Laenge ( == 0, falls kein Ergebnis )
-sal_uInt16 nId; ///< WW-Id fuer Felder
-sal_uInt8 nOpt;  ///< WW-Flags ( z.B.: vom User geaendert )
-bool bCodeNest:1;   ///< Befehl rekursiv verwendet
-bool bResNest:1;///< Befehl in Resultat eingefuegt
+long nLen;  ///< total length (to skip over text)
+WW8_CP nSCode;  ///< start of instructions code
+WW8_CP nLCode;  ///< length
+WW8_CP nSRes;   ///< start of result
+WW8_CP nLRes;   ///< length ( == 0, if no result )
+sal_uInt16 nId; ///< WW-id for fields
+sal_uInt8 nOpt;  ///< WW-Flags ( e.g.: changed by user )
+bool bCodeNest:1;   ///< instruction used recursively
+bool bResNest:1;///< instruction inserted into result
 };
 
 struct WW8PLCFxSave1
 {
 sal_uLong nPLCFxPos;
-sal_uLong nPLCFxPos2;   ///< fuer PLCF_Cp_Fkp: PieceIter-Pos
+sal_uLong nPLCFxPos2;   ///< for PLCF_Cp_Fkp: PieceIter-Pos
 long nPLCFxMemOfs;
 WW8_CP nStartCp;///< for cp based iterator like PAP and CHP
 long nCpOfs;
@@ -198,16 +198,16 @@ struct WW8PLCFxSave1
 };
 
 /**
-u.a. fuer Felder, also genausoviele Attr wie Positionen,
-falls Ctor-Param bNoEnd = false
+among others for fields, that is, the same number of attr as positions,
+if Ctor-Param bNoEnd = false
 */
-class WW8PLCFspecial// Iterator fuer PLCFs
+class WW8PLCFspecial// iterator for PLCFs
 {
 private:
-sal_Int32* pPLCF_PosArray;  ///< Pointer auf Pos-Array und auf ganze 
Struktur
-sal_uInt8*  pPLCF_Contents;  ///< Pointer auf Inhalts-Array-Teil des 
Pos-Array
-long nIMax; ///< Anzahl der Elemente
-long nIdx;  ///< Merker, wo wir gerade sind
+sal_Int32* pPLCF_PosArray;  ///< pointer to Pos-array and to the whole 
structure
+sal_uInt8*  pPLCF_Contents;  ///< pointer to content-array-part of 
Pos-array
+long nIMax; ///< number of elements
+long nIdx;  ///< marker where we currently are
 sal_uInt32 nStru;
 
 public:
@@ -217,8 +217,8 @@ public:
 long GetIdx() const { return nIdx; }
 void SetIdx( long nI ) { nIdx = nI; }
 long GetIMax() const { return nIMax; }
-bool SeekPos(long nPos);// geht ueber FC- bzw. CP-Wert
-// bzw. naechste groesseren Wert
+bool SeekPos(long nPos);// walks over FC- or CP-value
+// resp. next biggest value
 bool SeekPosExact(long nPos);
 sal_Int32 Where() const
 { return ( nIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nIdx]; }
@@ -271,21 +271,21 @@ private:
 WW8SprmIter& operator=(const WW8SprmIter&) SAL_DELETED_FUNCTION;
 };
 
-/* u.a. fuer FKPs auf normale Attr., also ein Attr weniger als Positionen */
-class WW8PLCF   // Iterator fuer PLCFs
+/* among others for FKPs to normal attr., i.e. one less attr than positions */
+class WW8PLCF   // Iterator for PLCFs
 {
 private:
-WW8_CP* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur
-sal_uInt8* pPLCF_Contents;   // Pointer auf Inhalts-Array-Teil des 
Pos-Array
-sal_Int32 nIMax;// Anzahl der Elemente
+WW8_CP* pPLCF_PosArray; // pointer to Pos-array and the whole structure
+sal_uInt8* pPLCF_Contents;   // pointer to content-array-part of Pos-array
+sal_Int32 nIMax;// number of elements
 sal_Int32 nIdx;
 int nStru;
 
 void ReadPLCF(SvStream& rSt, WW8_FC nFilePos, sal_uInt32 nPLCF);
 
 /*
-Falls im Dok ein PLC fehlt und die FKPs solo dastehen,
-machen wir uns hiermit einen PLC:
+If a PLC is missing in the doc and the FKPs stand alone,
+we create a PLC with this:
 */
 void GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN);
 
@@ -296,7 +296,7 @@ public:
 WW8_CP nStartPos = -1);
 
 /*
-folgender Ctor generie

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

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |   46 ++--
 fpicker/source/office/RemoteFilesDialog.hxx |8 
 fpicker/source/office/fpsofficeResMgr.hxx   |2 -
 fpicker/source/office/iodlg.cxx |1 
 fpicker/uiconfig/ui/remotefilesdialog.ui|   38 +--
 5 files changed, 88 insertions(+), 7 deletions(-)

New commits:
commit 14c0e9a2efd6b5c2517639acee22b4a903e214b6
Author: Szymon Kłos 
Date:   Fri Aug 7 18:32:32 2015 +0200

added New Folder button

Change-Id: I4b1ef03e707fdfb3d1968dca9f48c548f872612c

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index bfdb3a6..cc96e02 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -183,6 +183,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, 
WinBits nBits )
 get( m_pServices_lb, "services_lb" );
 get( m_pFilter_lb, "filter_lb" );
 get( m_pName_ed, "name_ed" );
+get( m_pNewFolder, "new_folder" );
 
 m_eMode = ( nBits & WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE : 
REMOTEDLG_MODE_OPEN;
 m_eType = ( nBits & WB_PATH ) ? REMOTEDLG_TYPE_PATHDLG : 
REMOTEDLG_TYPE_FILEDLG;
@@ -196,10 +197,20 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* 
pParent, WinBits nBits )
 m_pName_ed->Enable( false );
 
 if( m_eMode == REMOTEDLG_MODE_OPEN )
+{
 get( m_pOk_btn, "open" );
+
+m_pNewFolder->Hide();
+}
 else
+{
 get( m_pOk_btn, "save" );
 
+m_aImages = ImageList( fpicker::SvtResId( RID_FILEPICKER_IMAGES ) );
+m_pNewFolder->SetModeImage( m_aImages.GetImage( 
IMG_FILEDLG_CREATEFOLDER ) );
+m_pNewFolder->SetClickHdl( LINK( this, RemoteFilesDialog, NewFolderHdl 
) );
+}
+
 m_pOk_btn->Show();
 m_pOk_btn->Enable( false );
 
@@ -324,6 +335,7 @@ void RemoteFilesDialog::dispose()
 m_pServices_lb.clear();
 m_pFilter_lb.clear();
 m_pName_ed.clear();
+m_pNewFolder.clear();
 
 ModalDialog::dispose();
 }
@@ -876,6 +888,34 @@ IMPL_LINK ( RemoteFilesDialog, SelectBreadcrumbHdl, 
Breadcrumb*, pPtr )
 return 1;
 }
 
+IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl )
+{
+m_pFileView->EndInplaceEditing( false );
+
+SmartContent aContent( m_pFileView->GetViewURL() );
+OUString aTitle;
+aContent.getTitle( aTitle );
+ScopedVclPtrInstance< QueryFolderNameDialog > aDlg( this, aTitle, 
fpicker::SVT_RESSTR( STR_SVT_NEW_FOLDER ) );
+bool bHandled = false;
+
+while( !bHandled )
+{
+if( aDlg->Execute() == RET_OK )
+{
+OUString aUrl = aContent.createFolder( aDlg->GetName() );
+if( !aUrl.isEmpty() )
+{
+m_pFileView->CreatedFolder( aUrl, aDlg->GetName() );
+bHandled = true;
+}
+}
+else
+bHandled = true;
+}
+
+return 1;
+}
+
 IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
 {
 // auto extension
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx 
b/fpicker/source/office/RemoteFilesDialog.hxx
index 65e4ef2..72bf1b7 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -37,6 +37,9 @@
 
 #include "fpdialogbase.hxx"
 #include "fpsofficeResMgr.hxx"
+#include "OfficeFilePicker.hrc"
+#include "QueryFolderName.hxx"
+#include "iodlg.hrc"
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
@@ -143,6 +146,7 @@ private:
 VclPtr< MenuButton > m_pAddService_btn;
 VclPtr< ListBox > m_pServices_lb;
 VclPtr< Breadcrumb > m_pPath;
+VclPtr m_pNewFolder;
 VclPtr< Splitter > m_pSplitter;
 VclPtr< FolderTree > m_pTreeView;
 VclPtr< SvtFileView > m_pFileView;
@@ -151,6 +155,8 @@ private:
 VclPtr< Edit > m_pName_ed;
 PopupMenu* m_pAddMenu;
 
+ImageList m_aImages;
+
 std::vector< ServicePtr > m_aServices;
 std::vector< std::pair< OUString, OUString > > m_aFilters;
 
@@ -186,6 +192,8 @@ private:
 
 DECL_LINK( SelectBreadcrumbHdl, Breadcrumb * );
 
+DECL_LINK( NewFolderHdl, void * );
+
 DECL_LINK( OkHdl, void * );
 DECL_LINK( CancelHdl, void * );
 };
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui 
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index 8bf57a3..7c0c923 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -138,12 +138,44 @@
   
 
 
-  
+  
 True
 False
-True
+6
 
-  
+  
+True
+False
+center
+True
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+False
+2

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

[Thomas Klausner]

 sw/source/filter/ww8/ww8par.hxx |  202 +++-
 1 file changed, 100 insertions(+), 102 deletions(-)

New commits:
commit da4bd92d474455c6ef88ec2190b6c305ee3740ba
Author: Thomas Klausner 
Date:   Fri Aug 7 18:43:22 2015 +0200

Translate remaining German comments to English.

Change-Id: If0bd1d61578176ae82630ed35309c6fe0e79a4d1

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index e2bd354..e11ef0f 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -113,7 +113,7 @@ namespace com{namespace sun {namespace star{
 namespace lang{class XMultiServiceFactory;}
 }}}
 
-// defines nur fuer die WW8-variable der INI-Datei
+// defines only for the WW8-variable of the INI file
 #define WW8FL_NO_STYLES  2
 #define WW8FL_NO_GRAF 0x80
 
@@ -121,10 +121,10 @@ namespace com{namespace sun {namespace star{
 #define WW8FL_NO_IMPLPASP0x4000  // no implicit para space
 #define WW8FL_NO_GRAFLAYER   0x8000
 
-// Zusatz-Filter-Flags, gueltig ab Winword 8
+// Add-on-filter-flags, valid from Winword 8 on
 #define WW8FL_NO_FLY_FOR_TXBX 1
 
-//Listen-Manager (ab Ver8)
+//List-Manager (from Ver8 on)
 
 struct WW8LFOInfo;
 
@@ -162,7 +162,7 @@ private:
 const WW8Fib&rFib;
 SvStream&rSt;
 std::vector maLSTInfos;
-boost::ptr_vector pLFOInfos;// D. aus PLF LFO, sortiert genau 
wie im WW8 Stream
+boost::ptr_vector pLFOInfos;// D. from PLF LFO, sorted 
exactly like in the WW8 Stream
 sal_uInt16   nUniqueList; // current number for creating unique list 
names
 sal_uInt8* GrpprlHasSprm(sal_uInt16 nId, sal_uInt8& rSprms, sal_uInt8 
nLen);
 WW8LSTInfo* GetLSTByListId(sal_uInt32  nIdLst ) const;
@@ -172,9 +172,9 @@ private:
 bool bSetStartNo, std::deque &rNotReallyThere, sal_uInt16 nLevel,
 ww::bytes &rParaSprms);
 
-// Zeichenattribute aus GrpprlChpx
+// character attributes from GrpprlChpx
 typedef SfxItemSet* WW8aISet[nMaxLevel];
-// Zeichen Style Pointer
+// character style pointer
 typedef SwCharFormat* WW8aCFormat[nMaxLevel];
 
 void AdjustLVL(sal_uInt8 nLevel, SwNumRule& rNumRule, WW8aISet& 
rListItemSet,
@@ -187,20 +187,19 @@ private:
 };
 
 struct WW8FlyPara
-{   // WinWord-Attribute
-// Achtung: *Nicht* umsortieren, da Teile mit
-// memcmp verglichen werden
+{   // WinWord-attributes
+// Attention: *DO NOT* reorder, since parts will be
+// compared using memcmp
 bool bVer67;
-sal_Int16 nSp26, nSp27; // rohe Position
-sal_Int16 nSp45, nSp28; // Breite / Hoehe
-sal_Int16 nLeMgn, nRiMgn, nUpMgn, nLoMgn;   // Raender
-sal_uInt8 nSp29; // rohe Bindung + Alignment
+sal_Int16 nSp26, nSp27; // raw position
+sal_Int16 nSp45, nSp28; // width / height
+sal_Int16 nLeMgn, nRiMgn, nUpMgn, nLoMgn;   // borders
+sal_uInt8 nSp29; // raw binding + alignment
 sal_uInt8 nSp37; // Wrap-Mode ( 1 / 2; 0 = no Apo ? )
-WW8_BRCVer9_5 brc;  // Umrandung Top, Left, Bottom, Right, Between
-bool bBorderLines;  // Umrandungslinien
-bool bGrafApo;  // true: Dieser Rahmen dient allein dazu, die
-// enthaltene Grafik anders als zeichengebunden
-// zu positionieren
+WW8_BRCVer9_5 brc;  // borders Top, Left, Bottom, Right, Between
+bool bBorderLines;  // border lines
+bool bGrafApo;  // true: this frame is only used to position
+// the contained graphics *not* as a character
 bool mbVertSet; // true if vertical positioning has been set
 
 WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc = 0);
@@ -217,9 +216,9 @@ class SwWW8StyInf
 OUStringsWWStyleName;
 sal_uInt16  nWWStyleId;
 public:
-rtl_TextEncoding eLTRFontSrcCharSet;// rtl_TextEncoding fuer den Font
-rtl_TextEncoding eRTLFontSrcCharSet;// rtl_TextEncoding fuer den Font
-rtl_TextEncoding eCJKFontSrcCharSet;// rtl_TextEncoding fuer den Font
+rtl_TextEncoding eLTRFontSrcCharSet;// rtl_TextEncoding for the font
+rtl_TextEncoding eRTLFontSrcCharSet;// rtl_TextEncoding for the font
+rtl_TextEncoding eCJKFontSrcCharSet;// rtl_TextEncoding for the font
 SwFormat*  pFormat;
 WW8FlyPara* pWWFly;
 SwNumRule*  pOutlineNumrule;
@@ -237,14 +236,14 @@ public:
 // 9: body text
 sal_uInt8 mnWW8OutlineLevel;
 
-sal_uInt16  n81Flags;   // Fuer Bold, Italic, ...
-sal_uInt16  n81BiDiFlags;   // Fuer Bold, Italic, ...
+sal_uInt16  n81Flags;   // for bold, italic, ...
+sal_uInt16  n81BiDiFlags;

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

[Thomas Klausner]

 sw/source/filter/ww8/wrtww8.hxx |   43 +++-
 1 file changed, 21 insertions(+), 22 deletions(-)

New commits:
commit cf27d96fa3bffe603941f3e11e871b3202a3ba96
Author: Thomas Klausner 
Date:   Fri Aug 7 18:54:33 2015 +0200

Translate remaining German comments to English.

XXX: one sentence sounds incorrect, I have added a TODO marker so someone
can check it.

Change-Id: I5bd5a01b64ad0f0234465ca9347b4b842e6d0172

diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 7e0d897..917b5f8 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -43,7 +43,7 @@
 #include 
 class SvxBrushItem;
 
-// einige Forward Deklarationen
+// some forward declarations
 class SwWW8AttrIter;
 namespace msfilter
 {
@@ -106,7 +106,7 @@ class WW8_WrPlcPn;
 class WW8_WrPlcAnnotations;
 class MSWordSections;
 class WW8_WrPlcTextBoxes;
-class WW8_WrPct;// Verwaltung
+class WW8_WrPct;// administration
 class WW8_WrtBookmarks;
 class WW8_WrtRedlineAuthor;
 class SvxMSExportOLEObjects;
@@ -122,7 +122,7 @@ class SvxBrushItem;
 
 #include "WW8TableInfo.hxx"
 
-#define GRF_MAGIC_1 0x12// 3 magic Bytes fuer PicLocFc-Attribute
+#define GRF_MAGIC_1 0x12// 3 magic bytes for PicLocFc attribute
 #define GRF_MAGIC_2 0x34
 #define GRF_MAGIC_3 0x56
 #define GRF_MAGIC_321 0x563412L
@@ -236,7 +236,7 @@ class WW8_WrPlcSepx : public MSWordSections
 ::std::vector< ::boost::shared_ptr > m_SectionAttributes;
 // hack to prevent adding sections in endnotes
 bool m_bHeaderFooterWritten;
-WW8_WrPlc0* pTextPos;// Pos der einzelnen Header / Footer
+WW8_WrPlc0* pTextPos;// Position of the headers/footers
 
 WW8_WrPlcSepx( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
 WW8_WrPlcSepx& operator=( const WW8_WrPlcSepx& ) SAL_DELETED_FUNCTION;
@@ -437,8 +437,9 @@ struct MSWordSaveData
 bool bOldFlyFrmAttrs : 1;
 bool bOldStartTOX : 1;
 bool bOldInWriteTOX : 1;
-// bOutPageDesc muss nicht gesichert werden, da es nur nicht waehrend der
-// Ausgabe von Spezial-Texten veraendert wird.
+// bOutPageDesc does not have to be saved, since it is only not modified
+// when outputting special texts.
+/// TODO wiz 20150807: "not modified" -> "modified"? (translated literally)
 };
 
 /// Base class for WW8Export and DocxExport
@@ -450,9 +451,9 @@ public:
 typedef std::vector::const_iterator mycCFIter;
 OUString m_aMainStg;
 std::vector m_aTOXArr;
-const SfxItemSet* m_pISet;// fuer Doppel-Attribute
+const SfxItemSet* m_pISet;// for double attributes
 WW8_WrPct*  m_pPiece; // Pointer auf Piece-Table
-SwNumRuleTable* m_pUsedNumTable;  // alle used NumRules
+SwNumRuleTable* m_pUsedNumTable;  // all used NumRules
 const SwTextNode *m_pTopNodeOfHdFtPage; ///< Top node of host page when in 
hd/ft
 std::map< sal_uInt16, sal_uInt16 > m_aRuleDuplicates; //map to Duplicated 
numrules
 std::stack< sal_Int32 > m_aCurrentCharPropStarts; ///< To remember the 
position in a run.
@@ -466,8 +467,8 @@ public:
 
 sal_uInt16 m_nCharFormatStart;
 sal_uInt16 m_nFormatCollStart;
-sal_uInt16 m_nStyleBeforeFly; ///< Style-Nummer des Nodes,
-///<   in/an dem ein Fly verankert ist
+sal_uInt16 m_nStyleBeforeFly; ///< style number of the node
+///<   to which the Fly is connected
 sal_uInt16 m_nLastFormatId;  ///< Style of last TextNode in normal 
range
 sal_uInt16 m_nUniqueList; ///< current number for creating unique 
list names
 unsigned int m_nHdFtIndex;
@@ -502,9 +503,8 @@ public:
 const sw::Frame *m_pParentFrame; // If set we are exporting content inside
 // a frame, e.g. a graphic node
 
-Point* m_pFlyOffset;  // zur Justierung eines im Writer als
-RndStdIds m_eNewAnchorType;   // Zeichen gebundenen Flys, der im WW
-// Absatzgebunden wird.
+Point* m_pFlyOffset;  // for adjusting of character-bound Fly 
in the Writer,
+RndStdIds m_eNewAnchorType;   // that is paragraph-bound in the WW.
 
 WW8_WrPlcField* m_pFieldMain; // fields in MainText
 WW8_WrPlcField* m_pFieldHdFt; // fields in Header/Footer
@@ -527,7 +527,7 @@ public:
 
 SwEscherEx* m_pEscher;// escher export class
 // #i43447# - removed
-//SwTwips nFlyWidth, nFlyHeight;  // Fuer Anpassung Graphic
+//SwTwips nFlyWidth, nFlyHeight;  // for adaptation of graphics
 
 sal_uInt8 m_nTextTyp;
 
@@ -538,7 +538,7 @@ public:
 bool m_bOutPageDescs : 1; ///< PageDescs (section properties) are 
being written
 bool m_bOutFirstPage : 1; // w

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

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 489b4f1b38c8ea902c9def00e2379bb10bb55f9a
Author: Caolán McNamara 
Date:   Fri Aug 7 16:46:28 2015 +0100

gtk3: it was pointed out to me we have up and down reversed

by jrb, oops

Change-Id: Id722533edae72d4849129e339bd6cca265d3c35c
Reviewed-on: https://gerrit.libreoffice.org/17578
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 402c17d..126d6d1 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -134,11 +134,11 @@ Rectangle GtkSalGraphics::NWGetSpinButtonRect( 
ControlPart nPart, Rectangle aAre
 buttonRect.Bottom() = buttonRect.Top() + aAreaRect.GetHeight();
 if ( nPart == PART_BUTTON_UP )
 {
-buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
2*buttonRect.GetWidth()));
+buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
buttonRect.GetWidth()));
 }
 else if( nPart == PART_BUTTON_DOWN )
 {
-buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
buttonRect.GetWidth()));
+buttonRect.setX(aAreaRect.Left() + (aAreaRect.GetWidth() - 
2*buttonRect.GetWidth()));
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 svtools/source/brwbox/editbrowsebox.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 3136d9698054cfe0f68a424ebf03f0fd5e017373
Author: Lionel Elie Mamane 
Date:   Wed Jul 15 19:47:18 2015 +0200

Remove harmful ill-timed CellController disable on mouse button down

This disable will be done, in a better way, by the call to
BrowseBox::MouseButtonDown below, *after* the destination of the mouse
click has grabbed the focus, by a call to DeactivateCell().

If this is done here, while the "source" controller still has the
focus, then the window's Disable() method will try to pass the focus
the the "next control". However, the "next" control may belong to
another form, and this will do a (premature!) save to the database of
the modifications. This may lead to a database error, when the data is
not in a shape to be written to the database, e.g. when on an
insertion row and not all mandatory fields have been filled in.
This then pops up an error message to the user.

Change-Id: I38b1850319691b34232e51f131f8d099dc4a9114
Reviewed-on: https://gerrit.libreoffice.org/17270
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index 56155dd..d0c8d53 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -482,20 +482,10 @@ namespace svt
 
 void EditBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt)
 {
-sal_uInt16  nColPos = GetColumnPos( rEvt.GetColumnId() );
-longnRow= rEvt.GetRow();
-
 // absorb double clicks
 if (rEvt.GetClicks() > 1 && rEvt.GetRow() >= 0)
 return;
 
-// change to a new position
-if (IsEditing() && (nColPos != nEditCol || nRow != nEditRow) && 
(nColPos != BROWSER_INVALIDID) && (nRow < GetRowCount()))
-{
-CellControllerRef aCellController(Controller());
-HideAndDisable(aCellController);
-}
-
 // we are about to leave the current cell. If there is a "this cell 
has been modified" notification
 // pending (asynchronously), this may be deadly -> do it synchronously
 if ( nCellModifiedEvent )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 svx/source/form/fmvwimp.cxx |   96 
 1 file changed, 79 insertions(+), 17 deletions(-)

New commits:
commit 107edbf3c1d109f915b5fbed03d2625c0a45d780
Author: Lionel Elie Mamane 
Date:   Tue Jul 21 16:58:38 2015 +0200

form document view activation: prioritise activation of already active form

This avoids arbitrarily switching to the first form in the document,
which would do a (premature!) save to the database of the
modifications pending in the active form. This may lead to a database
error, when the data is not in a shape to be written to the database,
e.g. when on an insertion row and not all mandatory fields have been
filled in. This then pops up an error message to the user.

Change-Id: I30bb533598ca707b892bb7155e54ce05d4ddf275
Reviewed-on: https://gerrit.libreoffice.org/17269
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8044e8b..5fae555 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -656,6 +656,66 @@ void FmXFormView::resumeTabOrderUpdate()
 m_aNeedTabOrderUpdate.clear();
 }
 
+namespace
+{
+bool isActivableDatabaseForm(const Reference< XFormController > 
&xController)
+{
+// only database forms are to be activated
+Reference< XRowSet >  xForm(xController->getModel(), UNO_QUERY);
+if ( !xForm.is() || !getConnection( xForm ).is() )
+return false;
+
+Reference< XPropertySet > xFormSet( xForm, UNO_QUERY );
+if ( !xFormSet.is() )
+{
+SAL_WARN( "svx.form", "FmXFormView::OnActivate: a form which does 
not have properties?" );
+return false;
+}
+
+const OUString aSource = ::comphelper::getString( 
xFormSet->getPropertyValue( FM_PROP_COMMAND ) );
+
+return !aSource.isEmpty();
+}
+
+class find_active_databaseform
+{
+const Reference< XFormController > xActiveController;
+
+public:
+
+find_active_databaseform( const Reference< XFormController > 
_xActiveController )
+: xActiveController(_xActiveController )
+{}
+
+Reference < XFormController > operator() (const Reference< 
XFormController > &xController)
+{
+if(xController == xActiveController && 
isActivableDatabaseForm(xController))
+return xController;
+
+Reference< XIndexAccess > xSubControllers( xController, UNO_QUERY 
);
+if ( !xSubControllers.is() )
+{
+SAL_WARN( "svx.form", "FmXFormView::OnActivate: a form 
controller which does not have children?" );
+return nullptr;
+}
+
+for(sal_Int32 i = 0; i < xSubControllers->getCount(); ++i)
+{
+const Any a(xSubControllers->getByIndex(i));
+Reference < XFormController > xI;
+if ((a >>= xI) && xI.is())
+{
+Reference < XFormController > xRes(operator()(xI));
+if (xRes.is())
+return xRes;
+}
+}
+
+return nullptr;
+}
+};
+}
+
 
 IMPL_LINK_NOARG(FmXFormView, OnActivate)
 {
@@ -670,6 +730,13 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate)
 // setting the controller to activate
 if (m_pView->GetFormShell() && m_pView->GetActualOutDev() && 
m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW)
 {
+FmXFormShell* const pShImpl =  m_pView->GetFormShell()->GetImpl();
+
+if(!pShImpl)
+return 0;
+
+find_active_databaseform fad(pShImpl->getActiveController());
+
 vcl::Window* pWindow = const_cast(static_cast(m_pView->GetActualOutDev()));
 PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? 
NULL : m_aPageWindowAdapters[0];
 for (   PageWindowAdapterList::const_iterator i = 
m_aPageWindowAdapters.begin();
@@ -683,6 +750,7 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate)
 
 if ( pAdapter.get() )
 {
+Reference< XFormController > xControllerToActivate;
 for (   ::std::vector< Reference< XFormController > 
>::const_iterator i = pAdapter->GetList().begin();
 i != pAdapter->GetList().end();
 ++i
@@ -692,27 +760,21 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate)
 if ( !xController.is() )
 continue;
 
-// only database forms are to be activated
-Reference< XRowSet >  xForm(xController->getModel(), 
UNO_QUERY);
-if ( !xForm.is() || !getConnection( xForm ).is() )
-continue;
-
-Reference< XPropertySet > xFormSet( xForm, UNO_QUERY );
-if ( !xFormSet.is() )
 {
-SAL_WARN( "svx.form", "FmXFormView::OnActivate: a

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

[Lionel Elie Mamane]

 svx/source/form/formcontrolling.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 3ec3220bbb5ed19f4a862a9ad67131f4fc31fbf1
Author: Lionel Elie Mamane 
Date:   Tue Jul 21 17:31:56 2015 +0200

Listen to error only while operating on controller.

Else, on any action done directly (not through the
FormControllerHelper) on the controller and raising an SQL error, this
would silently swallow the error message, and the operation would fail
without any message to the user.

E.g. when validating an insertion or modification in a grid control by
moving the cursor to a different line (as opposed to clicking the
"Save Record" button).

Change-Id: Ie569d9c826609f803f7b312c046990718ef2
Reviewed-on: https://gerrit.libreoffice.org/17268
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/form/formcontrolling.cxx 
b/svx/source/form/formcontrolling.cxx
index e2ef294..cf4455f 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -240,11 +240,6 @@ namespace svx
 m_xFormOperations = FormOperations::createWithFormController( 
comphelper::getProcessComponentContext(), _rxController );
 if ( m_xFormOperations.is() )
 m_xFormOperations->setFeatureInvalidation( this );
-
-// to prevent the controller from displaying any error messages 
which happen while we operate on it,
-// we add ourself as XSQLErrorListener. By contract, a 
FormController displays errors if and only if
-// no SQLErrorListeners are registered.
-_rxController->addSQLErrorListener( this );
 }
 catch( const Exception& )
 {
@@ -333,6 +328,11 @@ namespace svx
 const_cast< FormControllerHelper* >( this )->m_aOperationError.clear();
 try
 {
+// to prevent the controller from displaying any error messages 
which happen while we operate on it,
+// we add ourself as XSQLErrorListener. By contract, a 
FormController displays errors if and only if
+// no SQLErrorListeners are registered.
+m_xFormOperations->getController()->addSQLErrorListener( 
const_cast< FormControllerHelper* >(this) );
+
 switch ( _eWhat )
 {
 case COMMIT_CONTROL:
@@ -359,10 +359,12 @@ namespace svx
 }
 catch ( const SQLException& )
 {
+m_xFormOperations->getController()->removeSQLErrorListener( 
const_cast< FormControllerHelper* >(this) );
 aError = ::cppu::getCaughtException();
 }
 catch( const Exception& )
 {
+m_xFormOperations->getController()->removeSQLErrorListener( 
const_cast< FormControllerHelper* >(this) );
 SQLException aFallbackError;
 aFallbackError.Message = ::comphelper::anyToString( 
::cppu::getCaughtException() );
 aError <<= aFallbackError;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/source/filter/ww8/wrtw8nds.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 15c2e6c8c6bfdb05ca0cb4f09835828123c95b49
Author: Justin Luth 
Date:   Thu Apr 16 13:31:39 2015 +0300

tdf#87437 exclude CR/cell break from redline deletions

The marker used in Word to identify table cell division was being
included in the track-changes deletion from the following cell if
the deletion was the first node in the cell.  This would cause the
two table cells to merge into one when changes were accepted by
Word.  (Problem not seen in LibreOffice itself.)

Change-Id: Ia98017cbba7d3a43b67764ae0fa6447b7e90ca86
Reviewed-on: https://gerrit.libreoffice.org/15340
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/17142
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index ac7d9c3..9adbbb1 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2185,13 +2185,19 @@ void MSWordExportBase::OutputTextNode( const 
SwTextNode& rNode )
 
 sal_Int32 nAktPos = 0;
 sal_Int32 const nEnd = aStr.getLength();
+bool bIsEndOfCell = false;
 bool bIncludeEndOfParaCRInRedlineProperties = false;
 sal_Int32 nOpenAttrWithRange = 0;
 OUString aStringForImage("\001");
 
 ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner;
 if ( pTextNodeInfo.get() != NULL )
+{
 pTextNodeInfoInner = pTextNodeInfo->getFirstInner();
+if ( pTextNodeInfoInner && pTextNodeInfoInner->isEndOfCell() ) {
+bIsEndOfCell = true;
+}
+}
 
 do {
 const SwRedlineData* pRedlineData = aAttrIter.GetRunLevelRedline( 
nAktPos );
@@ -2394,6 +2400,11 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 }
 
 WriteCR( pTextNodeInfoInner );
+
+if ( bIsEndOfCell )
+{
+AttrOutput().OutputFKP(true);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/uiwriter/uiwriter.cxx|   42 ++
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx |3 -
 2 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit f72c7c0d9a92866e68ba968b7a4cc5e4b8209c60
Author: Miklos Vajna 
Date:   Mon Jul 27 09:16:16 2015 +0200

tdf#90575 sw: fix pasting DDE links

Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that the added additional IDocumentMarkAccess::GetType() check in
lcl_FindDdeBookmark(), which means that the function no longer finds
bookmarks with the matching name, only real DDE marks. This is a
problem, as SwTrnsfrDdeLink::WriteData() depends on the fact that
sw::mark::Bookmark inherits from sw::mark::DdeBookmark. As a result, the
fast IDocumentMarkAccess::GetType() (that intentionally doesn't handle
inheritance for performance reasons) can't be used here.

(cherry picked from commit e06e2cb18874987d2dafd4faa0a8b71fc0aa6453)

Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: I2b7a07c18b641ac991f3227812a609dedc960e08
Reviewed-on: https://gerrit.libreoffice.org/17447
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 43aeb63..ed31220 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -49,6 +50,7 @@
 #include 
 #include "com/sun/star/util/SearchAlgorithms.hpp"
 #include "com/sun/star/i18n/TransliterationModulesExtra.hpp"
+#include 
 
 static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
 
@@ -93,6 +95,7 @@ public:
 void testUndoCharAttribute();
 void testTdf86639();
 void testTdf90883TableBoxGetCoordinates();
+void testDde();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -130,6 +133,7 @@ public:
 CPPUNIT_TEST(testUndoCharAttribute);
 CPPUNIT_TEST(testTdf86639);
 CPPUNIT_TEST(testTdf90883TableBoxGetCoordinates);
+CPPUNIT_TEST(testDde);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -980,6 +984,44 @@ void SwUiWriterTest::testTdf90883TableBoxGetCoordinates()
 CPPUNIT_ASSERT_EQUAL( 2, (int)pos.Y() );
 }
 
+void lcl_dispatchCommand(const uno::Reference& xComponent, 
const OUString& rCommand, const uno::Sequence& 
rPropertyValues)
+{
+uno::Reference xController = 
uno::Reference(xComponent, 
uno::UNO_QUERY)->getCurrentController();
+CPPUNIT_ASSERT(xController.is());
+uno::Reference xFrame(xController->getFrame(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xFrame.is());
+
+uno::Reference xContext = 
::comphelper::getProcessComponentContext();
+uno::Reference 
xDispatchHelper(frame::DispatchHelper::create(xContext));
+CPPUNIT_ASSERT(xDispatchHelper.is());
+
+xDispatchHelper->executeDispatch(xFrame, rCommand, OUString(), 0, 
rPropertyValues);
+}
+
+void SwUiWriterTest::testDde()
+{
+// Type asdf and copy it.
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Insert("asdf");
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 4, 
/*bBasicCall=*/false);
+uno::Sequence aPropertyValues;
+lcl_dispatchCommand(mxComponent, ".uno:Copy", aPropertyValues);
+
+// Go before the selection and paste as a DDE link.
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+aPropertyValues = comphelper::InitPropertySequence(
+{
+{"SelectedFormat", 
uno::makeAny(static_cast(SotClipboardFormatId::LINK))}
+});
+lcl_dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", 
aPropertyValues);
+
+// Make sure that the document starts with a field now, and its expanded 
string value contains asdf.
+const uno::Reference< text::XTextRange > xField = getRun(getParagraph(1), 
1);
+CPPUNIT_ASSERT_EQUAL(OUString("TextField"), getProperty(xField, 
"TextPortionType"));
+CPPUNIT_ASSERT(xField->getString().endsWith("asdf"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx 
b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 01be182..989a852 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -95,9 +95,8 @@ namespace
 ppMark != rMarkAccess.getAllMarksEnd();
 ++ppMark)
 {
-if ( IDocumentMarkAccess::GetType( *(ppMark->get()) ) == 
IDocumentMarkAccess::MarkType::DDE_BOOKMARK)
+if (::sw::mark::DdeBookmark* const pBkmk = dynamic_cast< 
::sw::mark::DdeBookmark*>(ppMark->get()))
 {
-::sw::mark::DdeB

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-0-1'

[Christian Lohmaier]

New branch 'libreoffice-5-0-1' available with the following commits:
commit 174193c2875683b2d6301ebd1492ff3350ff1703
Author: Christian Lohmaier 
Date:   Fri Aug 7 19:19:00 2015 +0200

Branch libreoffice-5-0-1

This is 'libreoffice-5-0-1' - the stable branch for the 5.0.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3b3d4ebd7c65f18b458bd0c72e864edf072dbe86

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-0-1'

[Christian Lohmaier]

New branch 'libreoffice-5-0-1' available with the following commits:
commit 0f3e7371b6be622bc6bfad8823e4429366c2d768
Author: Christian Lohmaier 
Date:   Fri Aug 7 19:19:00 2015 +0200

Branch libreoffice-5-0-1

This is 'libreoffice-5-0-1' - the stable branch for the 5.0.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I4cf30376619d4506fad28b8a9eee42014305a8f4

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-0-1'

[Christian Lohmaier]

New branch 'libreoffice-5-0-1' available with the following commits:
commit 36cbda5c833b6e48a1e30786b6a78da38a2fcf7d
Author: Christian Lohmaier 
Date:   Fri Aug 7 19:19:00 2015 +0200

Branch libreoffice-5-0-1

This is 'libreoffice-5-0-1' - the stable branch for the 5.0.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ib61f7b08497a9521f4f4a4b6046d21e9a9e82308

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-0-1'

[Christian Lohmaier]

New branch 'libreoffice-5-0-1' available with the following commits:
commit ab7964994c099138ae8816c6adc81fc88d17592c
Author: Christian Lohmaier 
Date:   Fri Aug 7 19:19:20 2015 +0200

Branch libreoffice-5-0-1

This is 'libreoffice-5-0-1' - the stable branch for the 5.0.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.0.x release,
please use the 'libreoffice-5-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I7ba0a3355e581e354b3d0b97e12030126efedf64

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

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

[Christian Lohmaier]

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

New commits:
commit 0c3661fe3583146e703b54a4325848b303d5509c
Author: Christian Lohmaier 
Date:   Fri Aug 7 19:21:09 2015 +0200

bump product version to 5.0.2.0.0+

Change-Id: Ibdc0596181711e748e4b1f59ffc27629c5423e66

diff --git a/configure.ac b/configure.ac
index 601a3cf..989f386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.2.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits